Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...wtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/wizards/NewHostPageWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>");
Expand Down
35 changes: 5 additions & 30 deletions ...ugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/wizards/NewHostPageWizardPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand All @@ -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();
}
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -110,8 +112,6 @@ public void changeControlPressed(DialogField field) {

private StringDialogField fileNameField;

private SelectionButtonDialogFieldGroup hostPageElementsButtons;

private IPath hostPagePath;

private IProject hostPageProject;
Expand Down Expand Up @@ -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);
Expand All @@ -172,7 +168,6 @@ public void createControl(Composite parent) {

createFileNameControls(composite, columns);
createModulesComponent(composite, columns);
createPageElementsControls(composite, columns);
}

public String getFileName() {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down