[176630] Auto-publishing improvements
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java index 5e1453d..3afe13f 100644 --- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java +++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
@@ -22,7 +22,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.*; import org.eclipse.wst.server.core.model.*; -import org.eclipse.wst.server.core.util.SocketUtil; /** * */ @@ -57,9 +56,8 @@ */ public static final String FILE_EXTENSION = "server"; - public static final int AUTO_PUBLISH_DEFAULT = 0; public static final int AUTO_PUBLISH_DISABLE = 1; - public static final int AUTO_PUBLISH_OVERRIDE = 2; + public static final int AUTO_PUBLISH_ENABLE = 2; protected static final String PROP_HOSTNAME = "hostname"; protected static final String SERVER_ID = "server-id"; @@ -350,11 +348,11 @@ } public int getAutoPublishTime() { - return getAttribute(PROP_AUTO_PUBLISH_TIME, -1); + return getAttribute(PROP_AUTO_PUBLISH_TIME, 15); } public int getAutoPublishSetting() { - return getAttribute(PROP_AUTO_PUBLISH_SETTING, AUTO_PUBLISH_DEFAULT); + return getAttribute(PROP_AUTO_PUBLISH_SETTING, AUTO_PUBLISH_ENABLE); } public int getStartTimeout() { @@ -616,14 +614,7 @@ return; int time = 0; - if (getAutoPublishSetting() == AUTO_PUBLISH_DEFAULT) { - ServerPreferences pref = ServerPreferences.getInstance(); - boolean local = SocketUtil.isLocalhost(getHost()); - if (local && pref.getAutoPublishLocal()) - time = pref.getAutoPublishLocalTime(); - else if (!local && pref.getAutoPublishRemote()) - time = pref.getAutoPublishRemoteTime(); - } else + if (getAutoPublishSetting() == AUTO_PUBLISH_ENABLE) time = getAutoPublishTime(); if (time > 0) {
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPreferences.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPreferences.java index 6f58831..d683646 100644 --- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPreferences.java +++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPreferences.java
@@ -17,12 +17,7 @@ public class ServerPreferences { private static final String PREF_AUTO_PUBLISH = "auto-publish"; private static final String PREF_MODULE_START_TIMEOUT = "module-start-timeout"; - - private static final String PREF_AUTO_PUBLISH_LOCAL = "auto-publish-local"; - private static final String PREF_AUTO_PUBLISH_LOCAL_TIME = "auto-publish-local-time"; - private static final String PREF_AUTO_PUBLISH_REMOTE = "auto-publish-remote"; - private static final String PREF_AUTO_PUBLISH_REMOTE_TIME = "auto-publish-remote-time"; - + private Preferences preferences; protected static ServerPreferences instance; @@ -95,129 +90,14 @@ return preferences.getInt(PREF_MODULE_START_TIMEOUT); } - /** - * Returns the default setting for local auto-publishing. - * - * @return int - */ - public boolean getDefaultAutoPublishLocal() { - return true; - } - /** - * Returns the setting for local auto-publishing. - * - * @return int - */ - public boolean getAutoPublishLocal() { - return preferences.getBoolean(PREF_AUTO_PUBLISH_LOCAL); - } - - /** - * Sets the value for local auto-publishing. - * - * @param auto - */ - public void setAutoPublishLocal(boolean auto) { - preferences.setValue(PREF_AUTO_PUBLISH_LOCAL, auto); - ServerPlugin.getInstance().savePluginPreferences(); - } - - /** - * Returns the default setting for local auto-publishing. - * - * @return int - */ - public int getDefaultAutoPublishLocalTime() { - return 5; - } - - /** - * Returns the setting for local auto-publishing. - * - * @return int - */ - public int getAutoPublishLocalTime() { - return preferences.getInt(PREF_AUTO_PUBLISH_LOCAL_TIME); - } - - /** - * Sets the value for local auto-publishing. - * - * @param auto - */ - public void setAutoPublishLocalTime(int auto) { - preferences.setValue(PREF_AUTO_PUBLISH_LOCAL_TIME, auto); - ServerPlugin.getInstance().savePluginPreferences(); - } - - /** - * Returns the default setting for remote auto-publishing. - * - * @return int - */ - public boolean getDefaultAutoPublishRemote() { - return true; - } - - /** - * Returns the setting for remote auto-publishing. - * - * @return int - */ - public boolean getAutoPublishRemote() { - return preferences.getBoolean(PREF_AUTO_PUBLISH_REMOTE); - } - - /** - * Sets the value for remote auto-publishing. - * - * @param auto - */ - public void setAutoPublishRemote(boolean auto) { - preferences.setValue(PREF_AUTO_PUBLISH_REMOTE, auto); - ServerPlugin.getInstance().savePluginPreferences(); - } - - /** - * Returns the default setting for remote auto-publishing. - * - * @return int - */ - public int getDefaultAutoPublishRemoteTime() { - return 60; - } - - /** - * Returns the setting for remote auto-publishing. - * - * @return int - */ - public int getAutoPublishRemoteTime() { - return preferences.getInt(PREF_AUTO_PUBLISH_REMOTE_TIME); - } - - /** - * Sets the value for remote auto-publishing. - * - * @param auto - */ - public void setAutoPublishRemoteTime(int auto) { - preferences.setValue(PREF_AUTO_PUBLISH_REMOTE_TIME, auto); - ServerPlugin.getInstance().savePluginPreferences(); - } /** * Set the default values. */ public void setDefaults() { preferences.setDefault(PREF_AUTO_PUBLISH, isDefaultAutoPublishing()); - - preferences.setDefault(PREF_AUTO_PUBLISH_LOCAL, getDefaultAutoPublishLocal()); - preferences.setDefault(PREF_AUTO_PUBLISH_LOCAL_TIME, getDefaultAutoPublishLocalTime()); - preferences.setDefault(PREF_AUTO_PUBLISH_REMOTE, getDefaultAutoPublishRemote()); - preferences.setDefault(PREF_AUTO_PUBLISH_REMOTE_TIME, getDefaultAutoPublishRemoteTime()); - + preferences.setDefault(PREF_MODULE_START_TIMEOUT, 300001); boolean save = false; if (preferences.isDefault(PREF_MODULE_START_TIMEOUT)) {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ContextIds.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ContextIds.java index aacee8e..d399791 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ContextIds.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ContextIds.java
@@ -40,8 +40,6 @@ public static final String DELETE_SERVER_DIALOG = ServerUIPlugin.PLUGIN_ID + ".svcp0002"; public static final String PREF_GENERAL = ServerUIPlugin.PLUGIN_ID + ".spge0000"; - public static final String PREF_GENERAL_AUTOPUBLISH_LOCAL = ServerUIPlugin.PLUGIN_ID + ".spge0002"; - public static final String PREF_GENERAL_AUTOPUBLISH_REMOTE = ServerUIPlugin.PLUGIN_ID + ".spge0006"; public static final String PREF_GENERAL_PUBLISH_BEFORE_START = ServerUIPlugin.PLUGIN_ID + ".spge0012"; public static final String PREF_GENERAL_SHOW_ON_ACTIVITY = ServerUIPlugin.PLUGIN_ID + ".spge0022"; public static final String PREF_GENERAL_SAVE_EDITORS = ServerUIPlugin.PLUGIN_ID + ".spge0024"; @@ -64,8 +62,7 @@ public static final String EDITOR_CONFIGURATION = ServerUIPlugin.PLUGIN_ID + ".seop0004"; public static final String EDITOR_HOSTNAME = ServerUIPlugin.PLUGIN_ID + ".seop0006"; public static final String EDITOR_RUNTIME = ServerUIPlugin.PLUGIN_ID + ".seop0008"; - public static final String EDITOR_AUTOPUBLISH_DEFAULT = ServerUIPlugin.PLUGIN_ID + ".seop0010"; - public static final String EDITOR_AUTOPUBLISH_OVERRIDE = ServerUIPlugin.PLUGIN_ID + ".seop0012"; + public static final String EDITOR_AUTOPUBLISH_ENABLE = ServerUIPlugin.PLUGIN_ID + ".seop0012"; public static final String EDITOR_AUTOPUBLISH_DISABLE = ServerUIPlugin.PLUGIN_ID + ".seop0016"; public static final String AUDIO_PREFERENCES = ServerUIPlugin.PLUGIN_ID + ".aupr0000";
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java index 5ebb8a9..192e280 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java
@@ -89,10 +89,6 @@ public static String defaultDialogTitle; public static String preferenceRuntimesTitleLong; public static String prefAutoPublish; - public static String prefAutoPublishLocal; - public static String prefAutoPublishLocalTime; - public static String prefAutoPublishRemote; - public static String prefAutoPublishRemoteTime; public static String prefLaunchMode; public static String prefLaunchModeRestart; public static String prefLaunchModeContinue; @@ -283,8 +279,6 @@ public static String serverEditorOverviewServerConfigurationBrowseMessage; public static String serverEditorOverviewAutoPublishSection; public static String serverEditorOverviewAutoPublishDescription; - public static String serverEditorOverviewAutoPublishDefault; - public static String serverEditorOverviewAutoPublishDefaultEdit; public static String serverEditorOverviewAutoPublishDisable; public static String serverEditorOverviewAutoPublishOverride; public static String serverEditorOverviewAutoPublishOverrideInterval;
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties index d6790f1..2f14c73 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties
@@ -204,10 +204,6 @@ # Server preferences prefAutoPublish=Automatically publish w&hen starting servers -prefAutoPublishLocal=Automatically publish to &local servers -prefAutoPublishLocalTime=Publishing i&nterval (in seconds): -prefAutoPublishRemote=Automatically publish to rem&ote servers -prefAutoPublishRemoteTime=Publishing inter&val (in seconds): prefShowOnActivity=Show &Servers view when server state changes prefSaveEditors=Save dirty editors before starting server @@ -439,10 +435,8 @@ serverEditorOverviewRuntimeCommand=set runtime serverEditorOverviewAutoPublishSection=Automatic Publishing -serverEditorOverviewAutoPublishDescription=Override when the server is automatically published. -serverEditorOverviewAutoPublishDefault=Use default publishing settings -serverEditorOverviewAutoPublishDefaultEdit=Edit -serverEditorOverviewAutoPublishOverride=Override default settings +serverEditorOverviewAutoPublishDescription=Automatically publish changes to the server. +serverEditorOverviewAutoPublishOverride=Use automatic publishing settings serverEditorOverviewAutoPublishOverrideInterval=Publishing interval (in seconds): serverEditorOverviewAutoPublishDisable=Never publish automatically serverEditorOverviewAutoPublishCommand=modify publish settings
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerPreferencePage.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerPreferencePage.java index b897d8a..4794a07 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerPreferencePage.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerPreferencePage.java
@@ -13,17 +13,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Spinner; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; @@ -38,12 +32,6 @@ protected Button showOnActivity; - protected Button autoPublishOnAction; - protected Button autoPublishLocal; - protected Spinner autoPublishLocalTime; - protected Button autoPublishRemote; - protected Spinner autoPublishRemoteTime; - /** * ServerPreferencesPage constructor comment. */ @@ -84,85 +72,6 @@ showOnActivity.setSelection(uiPreferences.getShowOnActivity()); whs.setHelp(showOnActivity, ContextIds.PREF_GENERAL_SHOW_ON_ACTIVITY); - autoPublishLocal = new Button(composite, SWT.CHECK); - autoPublishLocal.setText(Messages.prefAutoPublishLocal); - data = new GridData(GridData.FILL_HORIZONTAL); - data.horizontalSpan = 3; - autoPublishLocal.setLayoutData(data); - autoPublishLocal.setSelection(preferences.getAutoPublishLocal()); - whs.setHelp(autoPublishLocal, ContextIds.PREF_GENERAL_AUTOPUBLISH_LOCAL); - - final Label autoPublishLocalTimeLabel = new Label(composite, SWT.NONE); - autoPublishLocalTimeLabel.setText(Messages.prefAutoPublishLocalTime); - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - data.horizontalSpan = 2; - data.horizontalIndent = 20; - autoPublishLocalTimeLabel.setLayoutData(data); - autoPublishLocalTimeLabel.setEnabled(autoPublishLocal.getSelection()); - - autoPublishLocalTime = new Spinner(composite, SWT.BORDER); - autoPublishLocalTime.setMinimum(0); - autoPublishLocalTime.setMaximum(120); - autoPublishLocalTime.setIncrement(5); - autoPublishLocalTime.setSelection(preferences.getAutoPublishLocalTime()); - autoPublishLocalTime.setEnabled(autoPublishLocal.getSelection()); - SWTUtil.setSpinnerTooltip(autoPublishLocalTime); - data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - data.widthHint = 60; - autoPublishLocalTime.setLayoutData(data); - whs.setHelp(autoPublishLocalTime, ContextIds.PREF_GENERAL_AUTOPUBLISH_LOCAL); - - autoPublishLocal.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - autoPublishLocalTimeLabel.setEnabled(autoPublishLocal.getSelection()); - autoPublishLocalTime.setEnabled(autoPublishLocal.getSelection()); - } - }); - autoPublishLocalTime.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e) { - SWTUtil.setSpinnerTooltip(autoPublishLocalTime); - } - }); - - autoPublishRemote = new Button(composite, SWT.CHECK); - autoPublishRemote.setText(Messages.prefAutoPublishRemote); - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - data.horizontalSpan = 3; - autoPublishRemote.setLayoutData(data); - autoPublishRemote.setSelection(preferences.getAutoPublishRemote()); - whs.setHelp(autoPublishRemote, ContextIds.PREF_GENERAL_AUTOPUBLISH_REMOTE); - - final Label autoPublishRemoteTimeLabel = new Label(composite, SWT.NONE); - autoPublishRemoteTimeLabel.setText(Messages.prefAutoPublishRemoteTime); - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - data.horizontalSpan = 2; - data.horizontalIndent = 20; - autoPublishRemoteTimeLabel.setLayoutData(data); - autoPublishRemoteTimeLabel.setEnabled(autoPublishRemote.getSelection()); - - autoPublishRemoteTime = new Spinner(composite, SWT.BORDER); - autoPublishRemoteTime.setMinimum(0); - autoPublishRemoteTime.setIncrement(5); - autoPublishRemoteTime.setMaximum(120); - autoPublishRemoteTime.setSelection(preferences.getAutoPublishRemoteTime()); - autoPublishRemoteTime.setEnabled(autoPublishRemote.getSelection()); - SWTUtil.setSpinnerTooltip(autoPublishRemoteTime); - data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - data.widthHint = 60; - autoPublishRemoteTime.setLayoutData(data); - whs.setHelp(autoPublishRemoteTime, ContextIds.PREF_GENERAL_AUTOPUBLISH_REMOTE); - - autoPublishRemote.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - autoPublishRemoteTimeLabel.setEnabled(autoPublishRemote.getSelection()); - autoPublishRemoteTime.setEnabled(autoPublishRemote.getSelection()); - } - }); - autoPublishRemoteTime.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e) { - SWTUtil.setSpinnerTooltip(autoPublishRemoteTime); - } - }); Dialog.applyDialogFont(composite); @@ -184,10 +93,6 @@ protected void performDefaults() { showOnActivity.setSelection(uiPreferences.getDefaultShowOnActivity()); - autoPublishLocal.setSelection(preferences.getDefaultAutoPublishLocal()); - autoPublishLocalTime.setSelection(preferences.getDefaultAutoPublishLocalTime()); - autoPublishRemote.setSelection(preferences.getDefaultAutoPublishRemote()); - autoPublishRemoteTime.setSelection(preferences.getDefaultAutoPublishRemoteTime()); super.performDefaults(); } @@ -198,11 +103,6 @@ public boolean performOk() { uiPreferences.setShowOnActivity(showOnActivity.getSelection()); - preferences.setAutoPublishLocal(autoPublishLocal.getSelection()); - preferences.setAutoPublishLocalTime(autoPublishLocalTime.getSelection()); - preferences.setAutoPublishRemote(autoPublishRemote.getSelection()); - preferences.setAutoPublishRemoteTime(autoPublishRemoteTime.getSelection()); - return true; }
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/OverviewEditorPart.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/OverviewEditorPart.java index 65cce3e..9a710ec 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/OverviewEditorPart.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/OverviewEditorPart.java
@@ -32,7 +32,6 @@ import org.eclipse.jface.fieldassist.FieldDecoration; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; import org.eclipse.jface.fieldassist.TextContentAdapter; -import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; @@ -50,7 +49,6 @@ import org.eclipse.ui.IEditorSite; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ContainerSelectionDialog; -import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.forms.IFormColors; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.ManagedForm; @@ -84,9 +82,8 @@ protected Text hostname; protected Combo runtimeCombo; protected Button browse; - protected Button autoPublishDefault; protected Button autoPublishDisable; - protected Button autoPublishOverride; + protected Button autoPublishEnable; protected Spinner autoPublishTime; protected Spinner startTimeoutSpinner; protected Spinner stopTimeoutSpinner; @@ -173,10 +170,9 @@ } else if (event.getPropertyName().equals(Server.PROP_AUTO_PUBLISH_SETTING)) { Integer autoPublishSetting = (Integer)event.getNewValue(); int setting = autoPublishSetting.intValue(); - autoPublishDefault.setSelection(setting == Server.AUTO_PUBLISH_DEFAULT); - autoPublishOverride.setSelection(setting == Server.AUTO_PUBLISH_OVERRIDE); + autoPublishEnable.setSelection(setting == Server.AUTO_PUBLISH_ENABLE); autoPublishDisable.setSelection(setting == Server.AUTO_PUBLISH_DISABLE); - autoPublishTime.setEnabled(setting == Server.AUTO_PUBLISH_OVERRIDE); + autoPublishTime.setEnabled(setting == Server.AUTO_PUBLISH_ENABLE); validate(); } else if (event.getPropertyName().equals(Server.PROP_START_TIMEOUT)) { Integer time = (Integer)event.getNewValue(); @@ -555,21 +551,8 @@ if (server != null) { final Server svr = (Server) server; int publishSetting = svr.getAutoPublishSetting(); - autoPublishDefault = toolkit.createButton(composite, Messages.serverEditorOverviewAutoPublishDefault, SWT.RADIO); - GridData data = new GridData(GridData.FILL_HORIZONTAL); - autoPublishDefault.setLayoutData(data); - autoPublishDefault.setSelection(publishSetting == Server.AUTO_PUBLISH_DEFAULT); - whs.setHelp(autoPublishDefault, ContextIds.EDITOR_AUTOPUBLISH_DEFAULT); - Hyperlink editDefaults = toolkit.createHyperlink(composite, Messages.serverEditorOverviewAutoPublishDefaultEdit, SWT.NONE); - editDefaults.addHyperlinkListener(new HyperlinkAdapter() { - public void linkActivated(HyperlinkEvent e) { - showPreferencePage(); - } - }); - editDefaults.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END)); - whs.setHelp(editDefaults, ContextIds.EDITOR_AUTOPUBLISH_DEFAULT); - + GridData data = new GridData(GridData.FILL_HORIZONTAL); autoPublishDisable = toolkit.createButton(composite, Messages.serverEditorOverviewAutoPublishDisable, SWT.RADIO); data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; @@ -577,57 +560,44 @@ autoPublishDisable.setSelection(publishSetting == Server.AUTO_PUBLISH_DISABLE); whs.setHelp(autoPublishDisable, ContextIds.EDITOR_AUTOPUBLISH_DISABLE); - autoPublishOverride = toolkit.createButton(composite, Messages.serverEditorOverviewAutoPublishOverride, SWT.RADIO); - autoPublishOverride.setSelection(publishSetting == Server.AUTO_PUBLISH_OVERRIDE); + autoPublishEnable = toolkit.createButton(composite, Messages.serverEditorOverviewAutoPublishOverride, SWT.RADIO); + autoPublishEnable.setSelection(publishSetting == Server.AUTO_PUBLISH_ENABLE); data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; - autoPublishOverride.setLayoutData(data); - whs.setHelp(autoPublishOverride, ContextIds.EDITOR_AUTOPUBLISH_OVERRIDE); + autoPublishEnable.setLayoutData(data); + whs.setHelp(autoPublishEnable, ContextIds.EDITOR_AUTOPUBLISH_ENABLE); final Label autoPublishTimeLabel = createLabel(toolkit,composite, Messages.serverEditorOverviewAutoPublishOverrideInterval); data = new GridData(); data.horizontalIndent = 20; autoPublishTimeLabel.setLayoutData(data); - autoPublishTimeLabel.setEnabled(autoPublishOverride.getSelection()); + autoPublishTimeLabel.setEnabled(autoPublishEnable.getSelection()); autoPublishTime = new Spinner(composite, SWT.BORDER); autoPublishTime.setMinimum(0); autoPublishTime.setIncrement(5); autoPublishTime.setMaximum(120); autoPublishTime.setSelection(svr.getAutoPublishTime()); - data = new GridData(); + data = new GridData(GridData.HORIZONTAL_ALIGN_END); data.widthHint = 30; autoPublishTime.setLayoutData(data); - autoPublishTime.setEnabled(autoPublishOverride.getSelection()); + autoPublishTime.setEnabled(autoPublishEnable.getSelection()); SWTUtil.setSpinnerTooltip(autoPublishTime); - whs.setHelp(autoPublishTime, ContextIds.EDITOR_AUTOPUBLISH_OVERRIDE); + whs.setHelp(autoPublishTime, ContextIds.EDITOR_AUTOPUBLISH_ENABLE); - autoPublishOverride.addSelectionListener(new SelectionAdapter() { + autoPublishEnable.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - if (updating || !autoPublishOverride.getSelection()) + if (updating || !autoPublishEnable.getSelection()) return; updating = true; - execute(new SetServerAutoPublishDefaultCommand(getServer(), Server.AUTO_PUBLISH_OVERRIDE)); + execute(new SetServerAutoPublishDefaultCommand(getServer(), Server.AUTO_PUBLISH_ENABLE)); updating = false; - autoPublishTimeLabel.setEnabled(autoPublishOverride.getSelection()); - autoPublishTime.setEnabled(autoPublishOverride.getSelection()); + autoPublishTimeLabel.setEnabled(autoPublishEnable.getSelection()); + autoPublishTime.setEnabled(autoPublishEnable.getSelection()); validate(); } }); - - autoPublishDefault.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - if (updating || !autoPublishDefault.getSelection()) - return; - updating = true; - execute(new SetServerAutoPublishDefaultCommand(getServer(), Server.AUTO_PUBLISH_DEFAULT)); - updating = false; - autoPublishTimeLabel.setEnabled(autoPublishOverride.getSelection()); - autoPublishTime.setEnabled(autoPublishOverride.getSelection()); - validate(); - } - }); - + autoPublishDisable.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { if (updating || !autoPublishDisable.getSelection()) @@ -635,8 +605,8 @@ updating = true; execute(new SetServerAutoPublishDefaultCommand(getServer(), Server.AUTO_PUBLISH_DISABLE)); updating = false; - autoPublishTimeLabel.setEnabled(autoPublishOverride.getSelection()); - autoPublishTime.setEnabled(autoPublishOverride.getSelection()); + autoPublishTimeLabel.setEnabled(autoPublishEnable.getSelection()); + autoPublishTime.setEnabled(autoPublishEnable.getSelection()); validate(); } }); @@ -749,12 +719,6 @@ } } - protected boolean showPreferencePage() { - String id = "org.eclipse.wst.server.ui.preferencePage"; - final PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getSite().getShell(), id, new String[] { id }, null); - return (dialog.open() == Window.OK); - } - protected int showWizard(final IRuntimeWorkingCopy runtimeWorkingCopy) { String title = Messages.wizEditRuntimeWizardTitle; final WizardFragment fragment2 = ServerUIPlugin.getWizardFragment(runtimeWorkingCopy.getRuntimeType().getId()); @@ -879,20 +843,17 @@ Server svr = (Server) server; int publishSetting = svr.getAutoPublishSetting(); - autoPublishDefault.setSelection(publishSetting == Server.AUTO_PUBLISH_DEFAULT); autoPublishDisable.setSelection(publishSetting == Server.AUTO_PUBLISH_DISABLE); - autoPublishOverride.setSelection(publishSetting == Server.AUTO_PUBLISH_OVERRIDE); + autoPublishEnable.setSelection(publishSetting == Server.AUTO_PUBLISH_ENABLE); autoPublishTime.setSelection(svr.getAutoPublishTime()); if (readOnly) { - autoPublishDefault.setEnabled(false); autoPublishDisable.setEnabled(false); - autoPublishOverride.setEnabled(false); + autoPublishEnable.setEnabled(false); autoPublishTime.setEnabled(false); } else { - autoPublishDefault.setEnabled(true); autoPublishDisable.setEnabled(true); - autoPublishOverride.setEnabled(true); + autoPublishEnable.setEnabled(true); autoPublishTime.setEnabled(true); } } @@ -922,7 +883,7 @@ } mForm.getMessageManager().removeMessage("auto-publish", autoPublishTime); - if (autoPublishTime != null && autoPublishTime.isEnabled() && autoPublishOverride.getSelection()) { + if (autoPublishTime != null && autoPublishTime.isEnabled() && autoPublishEnable.getSelection()) { int i = autoPublishTime.getSelection(); if (i < 1) mForm.getMessageManager().addMessage("auto-publish", Messages.serverEditorOverviewAutoPublishInvalid, null, IMessageProvider.WARNING, autoPublishTime);