Removed option for history frame from new host page wizard (#449)

gwt-plugins · Mar 6, 2024 · 6eb36ed · 6eb36ed
1 parent 99612c0
commit 6eb36ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 35 deletions.
diff --git a/...wtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/wizards/NewHostPageWizard.java b/...wtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/wizards/NewHostPageWizard.java
@@ -167,11 +167,6 @@ protected InputStream getInitialContents() {
  sb.append("\n");
  sb.append(" <body>\n");
 
- // Inject history frame, if desired
- if (wizardPage.isHistorySupportIncluded()) {
- sb.append(" <iframe src=\"javascript:''\" id=\"__gwt_historyFrame\" tabIndex='-1' style=\"position:absolute;width:0;height:0;border:0\"></iframe>\n");
- }
-
  sb.append("\n");
  sb.append(" </body>\n");
  sb.append("</html>");

diff --git a/...ugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/wizards/NewHostPageWizardPage.java b/...ugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/wizards/NewHostPageWizardPage.java
@@ -44,7 +44,6 @@
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogFieldGroup;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.Separator;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;
@@ -55,7 +54,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 
@@ -74,10 +72,12 @@ public class NewHostPageWizardPage extends WizardPage {
  private class HostPageFieldAdapter implements IDialogFieldListener,
  IModulesChangeListener {
 
+ @Override
  public void dialogFieldChanged(DialogField field) {
  validateFields();
  }
 
+ @Override
  public void onModulesChanged() {
  validateFields();
  }
@@ -86,6 +86,7 @@ public void onModulesChanged() {
  private class PathFieldAdapter extends HostPageFieldAdapter implements
  IStringButtonAdapter {
 
+ @Override
  public void changeControlPressed(DialogField field) {
  IPath path = choosePath(new Path(pathField.getText()));
  if (path != null) {
@@ -97,6 +98,7 @@ public void changeControlPressed(DialogField field) {
  private class ProjectFieldAdapter extends HostPageFieldAdapter implements
  IStringButtonAdapter {
 
+ @Override
  public void changeControlPressed(DialogField field) {
  IJavaProject jproject = chooseProject();
  if (jproject != null) {
@@ -110,8 +112,6 @@ public void changeControlPressed(DialogField field) {
 
  private StringDialogField fileNameField;
 
- private SelectionButtonDialogFieldGroup hostPageElementsButtons;
-
  private IPath hostPagePath;
 
  private IProject hostPageProject;
@@ -149,13 +149,9 @@ protected NewHostPageWizardPage() {
 
  modulesBlock = new EntryPointModulesSelectionBlock("Modules:",
  new HostPageFieldAdapter());
-
- String[] buttonNames = new String[] {"Support for browser history (Back, Forward, bookmarks)"};
- hostPageElementsButtons = new SelectionButtonDialogFieldGroup(SWT.CHECK,
- buttonNames, 1);
- hostPageElementsButtons.setLabelText("Which elements do you want to include in your page?");
  }
 
+ @Override
  public void createControl(Composite parent) {
  initializeDialogUnits(parent);
  Composite composite = new Composite(parent, SWT.NONE);
@@ -172,7 +168,6 @@ public void createControl(Composite parent) {
 
  createFileNameControls(composite, columns);
  createModulesComponent(composite, columns);
- createPageElementsControls(composite, columns);
  }
 
  public String getFileName() {
@@ -208,16 +203,10 @@ public void init(IResource selection) {
  initModules(selection);
  }
 
- setPageElementsSelection(true);
-
  // Validate the initial field values
  validateFields();
  }
 
- public boolean isHistorySupportIncluded() {
- return hostPageElementsButtons.isSelected(0);
- }
-
  @Override
  public void setVisible(boolean visible) {
  super.setVisible(visible);
@@ -286,16 +275,6 @@ private void createModulesComponent(Composite parent, int columns) {
  modulesBlock.doFillIntoGrid(parent, columns);
  }
 
- private void createPageElementsControls(Composite composite, int nColumns) {
- Control labelControl = hostPageElementsButtons.getLabelControl(composite);
- LayoutUtil.setHorizontalSpan(labelControl, nColumns);
-
- DialogField.createEmptySpace(composite);
-
- Control buttonGroup = hostPageElementsButtons.getSelectionButtonsGroup(composite);
- LayoutUtil.setHorizontalSpan(buttonGroup, nColumns - 1);
- }
-
  private void createPathControls(Composite composite, int columns) {
  pathField.doFillIntoGrid(composite, columns);
  setFieldWidthHint(pathField);
@@ -383,10 +362,6 @@ private void setFocus() {
  fileNameField.setFocus();
  }
 
- private void setPageElementsSelection(boolean historySupport) {
- hostPageElementsButtons.setSelection(0, historySupport);
- }
-
  private void updateModulesIfProjectChanged() {
  if (hostPageProject != null) {
  if (hostPageProject != null