[473363] Server configuration view renders time fields unusable
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.xml b/features/org.eclipse.wst.server_ui.feature/feature.xml
index c3bc7d0..e1abecb 100644
--- a/features/org.eclipse.wst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_ui.feature"
label="%featureName"
- version="3.3.600.qualifier"
+ version="3.3.601.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.server_ui.feature/pom.xml b/features/org.eclipse.wst.server_ui.feature/pom.xml
index 4eac273..bd60022 100644
--- a/features/org.eclipse.wst.server_ui.feature/pom.xml
+++ b/features/org.eclipse.wst.server_ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.wst.server_ui.feature</artifactId>
- <version>3.3.600-SNAPSHOT</version>
+ <version>3.3.601-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
index 9a2e5ab..ffb6ecc 100644
--- a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.ui; singleton:=true
-Bundle-Version: 1.5.201.qualifier
+Bundle-Version: 1.5.202.qualifier
Bundle-Activator: org.eclipse.wst.server.ui.internal.ServerUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.server.ui/pom.xml b/plugins/org.eclipse.wst.server.ui/pom.xml
index deb8f5b..80e3f17 100644
--- a/plugins/org.eclipse.wst.server.ui/pom.xml
+++ b/plugins/org.eclipse.wst.server.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.wst.server.ui</artifactId>
- <version>1.5.201-SNAPSHOT</version>
+ <version>1.5.202-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 fa0ee64..023f2ce 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2014 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,11 +17,7 @@
import java.util.List;
import java.util.Map;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@@ -30,11 +26,7 @@
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.fieldassist.AutoCompleteField;
-import org.eclipse.jface.fieldassist.ControlDecoration;
-import org.eclipse.jface.fieldassist.FieldDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.jface.fieldassist.TextContentAdapter;
+import org.eclipse.jface.fieldassist.*;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ICheckStateListener;
@@ -46,19 +38,8 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.ui.*;
import org.eclipse.ui.dialogs.ContainerSelectionDialog;
import org.eclipse.ui.forms.IFormColors;
import org.eclipse.ui.forms.IManagedForm;
@@ -69,20 +50,15 @@
import org.eclipse.ui.help.IWorkbenchHelpSystem;
import org.eclipse.ui.part.MultiPageEditorSite;
import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.core.internal.Publisher;
-import org.eclipse.wst.server.core.internal.Server;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-import org.eclipse.wst.server.core.internal.ServerType;
+import org.eclipse.wst.server.core.internal.*;
import org.eclipse.wst.server.core.util.SocketUtil;
import org.eclipse.wst.server.ui.AbstractUIControl;
-import org.eclipse.wst.server.ui.AbstractUIControl.UIControlEntry;
import org.eclipse.wst.server.ui.AbstractUIControl.IUIControlListener;
-import org.eclipse.wst.server.ui.editor.*;
-import org.eclipse.wst.server.ui.internal.ContextIds;
-import org.eclipse.wst.server.ui.internal.ImageResource;
+import org.eclipse.wst.server.ui.AbstractUIControl.UIControlEntry;
+import org.eclipse.wst.server.ui.editor.ServerEditorOverviewPageModifier;
+import org.eclipse.wst.server.ui.editor.ServerEditorPart;
+import org.eclipse.wst.server.ui.internal.*;
import org.eclipse.wst.server.ui.internal.Messages;
-import org.eclipse.wst.server.ui.internal.SWTUtil;
-import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
import org.eclipse.wst.server.ui.internal.Trace;
import org.eclipse.wst.server.ui.internal.command.*;
import org.eclipse.wst.server.ui.internal.viewers.BaseContentProvider;
@@ -122,6 +98,8 @@
private IServerType oldServerType;
+ final int MAX_SPINNER_TIME = 60*60*24; // 24 hours in seconds
+
class PublisherContentProvider extends BaseContentProvider {
protected Publisher[] pubs;
public PublisherContentProvider(Publisher[] pubs) {
@@ -682,10 +660,10 @@
autoPublishTime = new Spinner(composite, SWT.BORDER);
autoPublishTime.setMinimum(0);
autoPublishTime.setIncrement(5);
- autoPublishTime.setMaximum(120);
- autoPublishTime.setSelection(svr.getAutoPublishTime());
+ autoPublishTime.setMaximum(MAX_SPINNER_TIME);
+ autoPublishTime.setSelection(svr.getAutoPublishTime());
data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- data.widthHint = 30;
+ data.widthHint = SWT.DEFAULT;
autoPublishTime.setLayoutData(data);
autoPublishTime.setEnabled(!autoPublishDisable.getSelection());
SWTUtil.setSpinnerTooltip(autoPublishTime);
@@ -819,12 +797,12 @@
startTimeoutSpinner = new Spinner(composite, SWT.BORDER);
startTimeoutSpinner.setEnabled(true);
startTimeoutSpinner.setMinimum(1);
- startTimeoutSpinner.setMaximum(60*60*24); // 24 hours
+ startTimeoutSpinner.setMaximum(MAX_SPINNER_TIME);
startTimeoutSpinner.setIncrement(5);
startTimeoutSpinner.setSelection(svr.getStartTimeout());
SWTUtil.setSpinnerTooltip(startTimeoutSpinner);
data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- data.widthHint = 30;
+ data.widthHint = SWT.DEFAULT;
startTimeoutSpinner.setLayoutData(data);
whs.setHelp(startTimeoutSpinner, ContextIds.EDITOR_TIMEOUT_START);
@@ -837,12 +815,12 @@
stopTimeoutSpinner = new Spinner(composite, SWT.BORDER);
stopTimeoutSpinner.setEnabled(true);
stopTimeoutSpinner.setMinimum(1);
- stopTimeoutSpinner.setMaximum(60*60*24); // 24 hours
+ stopTimeoutSpinner.setMaximum(MAX_SPINNER_TIME);
stopTimeoutSpinner.setIncrement(5);
stopTimeoutSpinner.setSelection(svr.getStopTimeout());
SWTUtil.setSpinnerTooltip(stopTimeoutSpinner);
data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- data.widthHint = 30;
+ data.widthHint = SWT.DEFAULT;
stopTimeoutSpinner.setLayoutData(data);
whs.setHelp(stopTimeoutSpinner, ContextIds.EDITOR_TIMEOUT_STOP);
