Skip to content

Commit 6eb36ed

Browse files
protoismprotoism
authored
Removed option for history frame from new host page wizard (#449)
1 parent 99612c0 commit 6eb36ed

File tree

2 files changed

+5
-35
lines changed

2 files changed

+5
-35
lines changed

‎plugins/com.gwtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/wizards/NewHostPageWizard.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,6 @@ protected InputStream getInitialContents() {
167167
sb.append("\n");
168168
sb.append(" <body>\n");
169169

170-
// Inject history frame, if desired
171-
if (wizardPage.isHistorySupportIncluded()) {
172-
sb.append(" <iframe src=\"javascript:''\" id=\"__gwt_historyFrame\" tabIndex='-1' style=\"position:absolute;width:0;height:0;border:0\"></iframe>\n");
173-
}
174-
175170
sb.append("\n");
176171
sb.append(" </body>\n");
177172
sb.append("</html>");

‎plugins/com.gwtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/wizards/NewHostPageWizardPage.java

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
4545
import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
4646
import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
47-
import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogFieldGroup;
4847
import org.eclipse.jdt.internal.ui.wizards.dialogfields.Separator;
4948
import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
5049
import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;
@@ -55,7 +54,6 @@
5554
import org.eclipse.swt.SWT;
5655
import org.eclipse.swt.layout.GridLayout;
5756
import org.eclipse.swt.widgets.Composite;
58-
import org.eclipse.swt.widgets.Control;
5957
import org.eclipse.swt.widgets.Text;
6058
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
6159

@@ -74,10 +72,12 @@ public class NewHostPageWizardPage extends WizardPage {
7472
private class HostPageFieldAdapter implements IDialogFieldListener,
7573
IModulesChangeListener {
7674

75+
@Override
7776
public void dialogFieldChanged(DialogField field) {
7877
validateFields();
7978
}
8079

80+
@Override
8181
public void onModulesChanged() {
8282
validateFields();
8383
}
@@ -86,6 +86,7 @@ public void onModulesChanged() {
8686
private class PathFieldAdapter extends HostPageFieldAdapter implements
8787
IStringButtonAdapter {
8888

89+
@Override
8990
public void changeControlPressed(DialogField field) {
9091
IPath path = choosePath(new Path(pathField.getText()));
9192
if (path != null) {
@@ -97,6 +98,7 @@ public void changeControlPressed(DialogField field) {
9798
private class ProjectFieldAdapter extends HostPageFieldAdapter implements
9899
IStringButtonAdapter {
99100

101+
@Override
100102
public void changeControlPressed(DialogField field) {
101103
IJavaProject jproject = chooseProject();
102104
if (jproject != null) {
@@ -110,8 +112,6 @@ public void changeControlPressed(DialogField field) {
110112

111113
private StringDialogField fileNameField;
112114

113-
private SelectionButtonDialogFieldGroup hostPageElementsButtons;
114-
115115
private IPath hostPagePath;
116116

117117
private IProject hostPageProject;
@@ -149,13 +149,9 @@ protected NewHostPageWizardPage() {
149149

150150
modulesBlock = new EntryPointModulesSelectionBlock("Modules:",
151151
new HostPageFieldAdapter());
152-
153-
String[] buttonNames = new String[] {"Support for browser history (Back, Forward, bookmarks)"};
154-
hostPageElementsButtons = new SelectionButtonDialogFieldGroup(SWT.CHECK,
155-
buttonNames, 1);
156-
hostPageElementsButtons.setLabelText("Which elements do you want to include in your page?");
157152
}
158153

154+
@Override
159155
public void createControl(Composite parent) {
160156
initializeDialogUnits(parent);
161157
Composite composite = new Composite(parent, SWT.NONE);
@@ -172,7 +168,6 @@ public void createControl(Composite parent) {
172168

173169
createFileNameControls(composite, columns);
174170
createModulesComponent(composite, columns);
175-
createPageElementsControls(composite, columns);
176171
}
177172

178173
public String getFileName() {
@@ -208,16 +203,10 @@ public void init(IResource selection) {
208203
initModules(selection);
209204
}
210205

211-
setPageElementsSelection(true);
212-
213206
// Validate the initial field values
214207
validateFields();
215208
}
216209

217-
public boolean isHistorySupportIncluded() {
218-
return hostPageElementsButtons.isSelected(0);
219-
}
220-
221210
@Override
222211
public void setVisible(boolean visible) {
223212
super.setVisible(visible);
@@ -286,16 +275,6 @@ private void createModulesComponent(Composite parent, int columns) {
286275
modulesBlock.doFillIntoGrid(parent, columns);
287276
}
288277

289-
private void createPageElementsControls(Composite composite, int nColumns) {
290-
Control labelControl = hostPageElementsButtons.getLabelControl(composite);
291-
LayoutUtil.setHorizontalSpan(labelControl, nColumns);
292-
293-
DialogField.createEmptySpace(composite);
294-
295-
Control buttonGroup = hostPageElementsButtons.getSelectionButtonsGroup(composite);
296-
LayoutUtil.setHorizontalSpan(buttonGroup, nColumns - 1);
297-
}
298-
299278
private void createPathControls(Composite composite, int columns) {
300279
pathField.doFillIntoGrid(composite, columns);
301280
setFieldWidthHint(pathField);
@@ -383,10 +362,6 @@ private void setFocus() {
383362
fileNameField.setFocus();
384363
}
385364

386-
private void setPageElementsSelection(boolean historySupport) {
387-
hostPageElementsButtons.setSelection(0, historySupport);
388-
}
389-
390365
private void updateModulesIfProjectChanged() {
391366
if (hostPageProject != null) {
392367
if (hostPageProject != null

0 commit comments

Comments
 (0)