*** empty log message ***
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorComposite.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorComposite.java
deleted file mode 100644
index fea09e5..0000000
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorComposite.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-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.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.internet.monitor.core.IMonitor;
-import org.eclipse.wst.internet.monitor.core.IMonitorWorkingCopy;
-import org.eclipse.wst.internet.monitor.core.MonitorCore;
-/**
- *
- */
-public class MonitorComposite extends Composite {
- protected Table table;
- protected TableViewer tableViewer;
-
- protected Button edit;
- protected Button remove;
- protected Button start;
- protected Button stop;
-
- protected List selection2;
-
- public MonitorComposite(Composite parent, int style) {
- super(parent, style);
-
- createWidgets();
- }
-
- protected void createWidgets() {
- GridLayout layout = new GridLayout();
- layout.horizontalSpacing = 6;
- layout.verticalSpacing = 6;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- layout.numColumns = 2;
- setLayout(layout);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- setLayoutData(data);
-
- Label label = new Label(this, SWT.WRAP);
- label.setText(MonitorUIPlugin.getResource("%monitorList"));
- label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER));
-
- label = new Label(this, SWT.NONE);
-
- table = new Table(this, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
- data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
- data.widthHint = 300;
- PlatformUI.getWorkbench().getHelpSystem().setHelp(table, ContextIds.PREF_MONITORS);
-
- table.setLayoutData(data);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- TableLayout tableLayout = new TableLayout();
-
- TableColumn statusColumn = new TableColumn(table, SWT.NONE);
- statusColumn.setText(MonitorUIPlugin.getResource("%columnStatus"));
- ColumnWeightData colData = new ColumnWeightData(6, 60, true);
- tableLayout.addColumnData(colData);
-
- TableColumn remoteColumn = new TableColumn(table, SWT.NONE);
- remoteColumn.setText(MonitorUIPlugin.getResource("%columnRemote"));
- colData = new ColumnWeightData(12, 120, true);
- tableLayout.addColumnData(colData);
-
- TableColumn httpColumn = new TableColumn(table, SWT.NONE);
- httpColumn.setText(MonitorUIPlugin.getResource("%columnType"));
- colData = new ColumnWeightData(5, 55, true);
- tableLayout.addColumnData(colData);
-
- TableColumn localColumn = new TableColumn(table, SWT.NONE);
- localColumn.setText(MonitorUIPlugin.getResource("%columnLocal"));
- colData = new ColumnWeightData(5, 50, true);
- tableLayout.addColumnData(colData);
-
- table.setLayout(tableLayout);
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new MonitorContentProvider());
- tableViewer.setLabelProvider(new MonitorTableLabelProvider());
- tableViewer.setInput("root");
-
- tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- setSelection(event.getSelection());
- }
- });
-
- Composite buttonComp = new Composite(this, SWT.NONE);
- layout = new GridLayout();
- layout.horizontalSpacing = 0;
- layout.verticalSpacing = 8;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- layout.numColumns = 1;
- buttonComp.setLayout(layout);
- data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_FILL);
- buttonComp.setLayoutData(data);
-
- Button add = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%add"));
- add.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- MonitorDialog dialog = new MonitorDialog(getShell());
- if (dialog.open() == Window.CANCEL)
- return;
- tableViewer.refresh();
-
- IMonitor[] monitors = MonitorCore.getMonitors();
- Object monitor = monitors[monitors.length - 1];
- tableViewer.setSelection(new StructuredSelection(monitor));
- }
- });
-
- edit = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%edit"));
- edit.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- IMonitor monitor = (IMonitor) getSelection().get(0);
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
-
- MonitorDialog dialog = new MonitorDialog(getShell(), wc);
- if (dialog.open() != Window.CANCEL) {
- try {
- tableViewer.refresh(wc.save());
- } catch (Exception ex) {
- // ignore
- }
- }
- }
- });
- edit.setEnabled(false);
-
- remove = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%remove"));
- remove.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- Iterator iterator = getSelection().iterator();
- while (iterator.hasNext()) {
- IMonitor monitor = (IMonitor) iterator.next();
- try {
- monitor.delete();
- } catch (Exception ex) {
- // ignore
- }
- tableViewer.remove(monitor);
-
- IMonitor[] monitors = MonitorCore.getMonitors();
- Object monitor2 = monitors[monitors.length - 1];
- tableViewer.setSelection(new StructuredSelection(monitor2));
- }
- }
- });
- remove.setEnabled(false);
-
- start = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%start"));
- start.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- Iterator iterator = getSelection().iterator();
- while (iterator.hasNext()) {
- IMonitor monitor = (IMonitor) iterator.next();
- try {
- monitor.start();
- } catch (CoreException ce) {
- MessageDialog.openError(getShell(), MonitorUIPlugin.getResource("%errorDialogTitle"), ce.getStatus().getMessage());
- } catch (Exception ce) {
- MessageDialog.openError(getShell(), MonitorUIPlugin.getResource("%errorDialogTitle"), ce.getMessage());
- }
- tableViewer.refresh(monitor, true);
- }
- tableViewer.setSelection(tableViewer.getSelection());
- }
- });
- start.setEnabled(false);
-
- stop = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%stop"));
- stop.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- Iterator iterator = getSelection().iterator();
- while (iterator.hasNext()) {
- IMonitor monitor = (IMonitor) iterator.next();
- try {
- monitor.stop();
- } catch (Exception ex) {
- // ignore
- }
- tableViewer.refresh(monitor, true);
- }
- tableViewer.setSelection(tableViewer.getSelection());
- }
- });
- stop.setEnabled(false);
- }
-
- protected List getSelection() {
- return selection2;
- }
-
- protected void setSelection(ISelection sel2) {
- IStructuredSelection sel = (IStructuredSelection) sel2;
- Iterator iterator = sel.iterator();
- selection2 = new ArrayList();
-
- while (iterator.hasNext()) {
- Object obj = iterator.next();
- if (obj instanceof IMonitor)
- selection2.add(obj);
- }
-
- if (!selection2.isEmpty()) {
- remove.setEnabled(true);
-
- boolean allStopped = true;
- boolean allStarted = true;
-
- iterator = selection2.iterator();
- while (iterator.hasNext()) {
- IMonitor monitor = (IMonitor) iterator.next();
- if (monitor.isRunning())
- allStopped = false;
- else
- allStarted = false;
- }
- start.setEnabled(allStopped);
- stop.setEnabled(allStarted);
- edit.setEnabled(selection2.size() == 1 && allStopped);
- } else {
- edit.setEnabled(false);
- remove.setEnabled(false);
- start.setEnabled(false);
- stop.setEnabled(false);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorPreferencePage.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorPreferencePage.java
index a72f9ca..3e42a89 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorPreferencePage.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorPreferencePage.java
@@ -10,22 +10,53 @@
*******************************************************************************/
package org.eclipse.wst.internet.monitor.ui.internal;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import org.eclipse.swt.*;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.*;
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.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.internet.monitor.core.IMonitor;
+import org.eclipse.wst.internet.monitor.core.IMonitorWorkingCopy;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
/**
* The preference page that holds monitor properties.
*/
public class MonitorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
protected Button displayButton;
+
+ protected Table table;
+ protected TableViewer tableViewer;
+
+ protected Button edit;
+ protected Button remove;
+ protected Button start;
+ protected Button stop;
+
+ protected List selection2;
/**
* MonitorPreferencePage constructor comment.
@@ -46,9 +77,9 @@
Composite composite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
- layout.numColumns = 1;
+ layout.numColumns = 2;
layout.horizontalSpacing = convertHorizontalDLUsToPixels(4);
- layout.verticalSpacing = convertVerticalDLUsToPixels(4);
+ layout.verticalSpacing = convertVerticalDLUsToPixels(3);
layout.marginWidth = 0;
layout.marginHeight = 0;
composite.setLayout(layout);
@@ -59,19 +90,175 @@
Label label = new Label(composite, SWT.WRAP);
label.setText(MonitorUIPlugin.getResource("%preferenceDescription"));
data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+ data.horizontalSpan = 2;
label.setLayoutData(data);
displayButton = new Button(composite, SWT.CHECK);
displayButton.setText(MonitorUIPlugin.getResource("%prefShowView"));
displayButton.setSelection(MonitorUIPlugin.getShowOnActivityPreference());
+ data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+ data.horizontalSpan = 2;
+ displayButton.setLayoutData(data);
PlatformUI.getWorkbench().getHelpSystem().setHelp(displayButton, ContextIds.PREF_SHOW);
label = new Label(composite, SWT.NONE);
label.setText("");
-
- MonitorComposite monitorComp = new MonitorComposite(composite, SWT.NONE);
- data = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- monitorComp.setLayoutData(data);
+ data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+ data.horizontalSpan = 2;
+ label.setLayoutData(data);
+
+ label = new Label(composite, SWT.WRAP);
+ label.setText(MonitorUIPlugin.getResource("%monitorList"));
+ data = new GridData(GridData.FILL_HORIZONTAL);
+ data.horizontalSpan = 2;
+ label.setLayoutData(data);
+
+ table = new Table(composite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
+ data = new GridData(GridData.FILL_BOTH);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(table, ContextIds.PREF_MONITORS);
+
+ table.setLayoutData(data);
+ table.setHeaderVisible(true);
+ table.setLinesVisible(true);
+
+ TableLayout tableLayout = new TableLayout();
+
+ TableColumn statusColumn = new TableColumn(table, SWT.NONE);
+ statusColumn.setText(MonitorUIPlugin.getResource("%columnStatus"));
+ ColumnWeightData colData = new ColumnWeightData(6, 60, true);
+ tableLayout.addColumnData(colData);
+
+ TableColumn remoteColumn = new TableColumn(table, SWT.NONE);
+ remoteColumn.setText(MonitorUIPlugin.getResource("%columnRemote"));
+ colData = new ColumnWeightData(12, 120, true);
+ tableLayout.addColumnData(colData);
+
+ TableColumn httpColumn = new TableColumn(table, SWT.NONE);
+ httpColumn.setText(MonitorUIPlugin.getResource("%columnType"));
+ colData = new ColumnWeightData(5, 55, true);
+ tableLayout.addColumnData(colData);
+
+ TableColumn localColumn = new TableColumn(table, SWT.NONE);
+ localColumn.setText(MonitorUIPlugin.getResource("%columnLocal"));
+ colData = new ColumnWeightData(5, 50, true);
+ tableLayout.addColumnData(colData);
+
+ table.setLayout(tableLayout);
+
+ tableViewer = new TableViewer(table);
+ tableViewer.setContentProvider(new MonitorContentProvider());
+ tableViewer.setLabelProvider(new MonitorTableLabelProvider());
+ tableViewer.setInput("root");
+
+ tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ setSelection(event.getSelection());
+ }
+ });
+
+ Composite buttonComp = new Composite(composite, SWT.NONE);
+ layout = new GridLayout();
+ layout.horizontalSpacing = 0;
+ layout.verticalSpacing = convertVerticalDLUsToPixels(3);
+ layout.marginWidth = 0;
+ layout.marginHeight = 0;
+ layout.numColumns = 1;
+ buttonComp.setLayout(layout);
+ data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_FILL);
+ buttonComp.setLayoutData(data);
+
+ Button add = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%add"));
+ add.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ MonitorDialog dialog = new MonitorDialog(getShell());
+ if (dialog.open() == Window.CANCEL)
+ return;
+ tableViewer.refresh();
+
+ IMonitor[] monitors = MonitorCore.getMonitors();
+ Object monitor = monitors[monitors.length - 1];
+ tableViewer.setSelection(new StructuredSelection(monitor));
+ }
+ });
+
+ edit = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%edit"));
+ edit.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ IMonitor monitor = (IMonitor) getSelection().get(0);
+ IMonitorWorkingCopy wc = monitor.createWorkingCopy();
+
+ MonitorDialog dialog = new MonitorDialog(getShell(), wc);
+ if (dialog.open() != Window.CANCEL) {
+ try {
+ tableViewer.refresh(wc.save());
+ } catch (Exception ex) {
+ // ignore
+ }
+ }
+ }
+ });
+ edit.setEnabled(false);
+
+ remove = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%remove"));
+ remove.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ Iterator iterator = getSelection().iterator();
+ while (iterator.hasNext()) {
+ IMonitor monitor = (IMonitor) iterator.next();
+ try {
+ monitor.delete();
+ } catch (Exception ex) {
+ // ignore
+ }
+ tableViewer.remove(monitor);
+
+ IMonitor[] monitors = MonitorCore.getMonitors();
+ Object monitor2 = monitors[monitors.length - 1];
+ tableViewer.setSelection(new StructuredSelection(monitor2));
+ }
+ }
+ });
+ remove.setEnabled(false);
+
+ start = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%start"));
+ data = (GridData) start.getLayoutData();
+ data.verticalIndent = 9;
+ start.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ Iterator iterator = getSelection().iterator();
+ while (iterator.hasNext()) {
+ IMonitor monitor = (IMonitor) iterator.next();
+ try {
+ monitor.start();
+ } catch (CoreException ce) {
+ MessageDialog.openError(getShell(), MonitorUIPlugin.getResource("%errorDialogTitle"), ce.getStatus().getMessage());
+ } catch (Exception ce) {
+ MessageDialog.openError(getShell(), MonitorUIPlugin.getResource("%errorDialogTitle"), ce.getMessage());
+ }
+ tableViewer.refresh(monitor, true);
+ }
+ tableViewer.setSelection(tableViewer.getSelection());
+ }
+ });
+ start.setEnabled(false);
+
+ stop = SWTUtil.createButton(buttonComp, MonitorUIPlugin.getResource("%stop"));
+ stop.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ Iterator iterator = getSelection().iterator();
+ while (iterator.hasNext()) {
+ IMonitor monitor = (IMonitor) iterator.next();
+ try {
+ monitor.stop();
+ } catch (Exception ex) {
+ // ignore
+ }
+ tableViewer.refresh(monitor, true);
+ }
+ tableViewer.setSelection(tableViewer.getSelection());
+ }
+ });
+ stop.setEnabled(false);
Dialog.applyDialogFont(composite);
@@ -109,4 +296,44 @@
MonitorUIPlugin.getInstance().savePluginPreferences();
return true;
}
+
+ protected List getSelection() {
+ return selection2;
+ }
+
+ protected void setSelection(ISelection sel2) {
+ IStructuredSelection sel = (IStructuredSelection) sel2;
+ Iterator iterator = sel.iterator();
+ selection2 = new ArrayList();
+
+ while (iterator.hasNext()) {
+ Object obj = iterator.next();
+ if (obj instanceof IMonitor)
+ selection2.add(obj);
+ }
+
+ if (!selection2.isEmpty()) {
+ remove.setEnabled(true);
+
+ boolean allStopped = true;
+ boolean allStarted = true;
+
+ iterator = selection2.iterator();
+ while (iterator.hasNext()) {
+ IMonitor monitor = (IMonitor) iterator.next();
+ if (monitor.isRunning())
+ allStopped = false;
+ else
+ allStarted = false;
+ }
+ start.setEnabled(allStopped);
+ stop.setEnabled(allStarted);
+ edit.setEnabled(selection2.size() == 1 && allStopped);
+ } else {
+ edit.setEnabled(false);
+ remove.setEnabled(false);
+ start.setEnabled(false);
+ stop.setEnabled(false);
+ }
+ }
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.ui/plugin.properties b/plugins/org.eclipse.wst.server.ui/plugin.properties
index 4009ce6..c20c6f3 100644
--- a/plugins/org.eclipse.wst.server.ui/plugin.properties
+++ b/plugins/org.eclipse.wst.server.ui/plugin.properties
@@ -246,7 +246,8 @@
prefProjectNoServer=<None>
# Installed runtimes
-preferenceRuntimesDescription=Add, remove, or edit installed server runtime definitions.\nThe checked runtime will be used by default when creating projects.\nInstalled server runtimes:
+preferenceRuntimesDescription=Add, remove, or edit installed server runtime definitions.\nThe checked runtime will be used by default when creating new projects.
+preferenceRuntimesTable=Installed server runtimes:
# --------------- Tasks (progress monitors) ---------------
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/RuntimePreferencePage.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/RuntimePreferencePage.java
index a8e0c92..2189db3 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/RuntimePreferencePage.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/RuntimePreferencePage.java
@@ -79,7 +79,7 @@
Composite composite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
layout.horizontalSpacing = convertHorizontalDLUsToPixels(4);
- layout.verticalSpacing = convertVerticalDLUsToPixels(4);
+ layout.verticalSpacing = convertVerticalDLUsToPixels(3);
layout.marginWidth = 0;
layout.marginHeight = 0;
layout.numColumns = 2;
@@ -94,6 +94,12 @@
label.setLayoutData(data);
label.setText(ServerUIPlugin.getResource("%preferenceRuntimesDescription"));
+ label = new Label(composite, SWT.WRAP);
+ data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
+ data.horizontalSpan = 2;
+ label.setLayoutData(data);
+ label.setText(ServerUIPlugin.getResource("%preferenceRuntimesTable"));
+
final RuntimeComposite runtimeComp = new RuntimeComposite(composite, SWT.NONE, new RuntimeComposite.RuntimeSelectionListener() {
public void runtimeSelected(IRuntime runtime) {
if (runtime == null) {
@@ -116,7 +122,7 @@
Composite buttonComp = new Composite(composite, SWT.NONE);
layout = new GridLayout();
layout.horizontalSpacing = 0;
- layout.verticalSpacing = convertVerticalDLUsToPixels(4);
+ layout.verticalSpacing = convertVerticalDLUsToPixels(3);
layout.marginWidth = 0;
layout.marginHeight = 0;
layout.numColumns = 1;
@@ -168,6 +174,8 @@
});
Button search = SWTUtil.createButton(buttonComp, ServerUIPlugin.getResource("%search"));
+ data = (GridData) search.getLayoutData();
+ data.verticalIndent = 9;
search.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
try {
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 a8c1633..1fa2a29 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
@@ -25,7 +25,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Spinner;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.PlatformUI;
@@ -52,9 +52,9 @@
protected Button autoPublishOnAction;
protected Button autoPublishLocal;
- protected Text autoPublishLocalTime;
+ protected Spinner autoPublishLocalTime;
protected Button autoPublishRemote;
- protected Text autoPublishRemoteTime;
+ protected Spinner autoPublishRemoteTime;
/**
* ServerPreferencesPage constructor comment.
@@ -104,8 +104,10 @@
autoPublishLocal.setSelection(preferences.getAutoPublishLocal());
//WorkbenchHelp.setHelp(savePrompt, ContextIds.);
- autoPublishLocalTime = new Text(composite, SWT.BORDER);
- autoPublishLocalTime.setText(preferences.getAutoPublishLocalTime() + "");
+ autoPublishLocalTime = new Spinner(composite, SWT.BORDER);
+ autoPublishLocalTime.setMinimum(0);
+ autoPublishLocalTime.setMaximum(120);
+ autoPublishLocalTime.setSelection(preferences.getAutoPublishLocalTime());
autoPublishLocalTime.setEnabled(autoPublishLocal.getSelection());
data = new GridData(GridData.HORIZONTAL_ALIGN_END);
data.widthHint = 75;
@@ -130,8 +132,10 @@
autoPublishRemote.setSelection(preferences.getAutoPublishRemote());
//WorkbenchHelp.setHelp(autoPublishRemote, ContextIds.);
- autoPublishRemoteTime = new Text(composite, SWT.BORDER);
- autoPublishRemoteTime.setText(preferences.getAutoPublishRemoteTime() + "");
+ autoPublishRemoteTime = new Spinner(composite, SWT.BORDER);
+ autoPublishLocalTime.setMinimum(0);
+ autoPublishLocalTime.setMaximum(120);
+ autoPublishRemoteTime.setSelection(preferences.getAutoPublishRemoteTime());
autoPublishRemoteTime.setEnabled(autoPublishRemote.getSelection());
data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
data.widthHint = 75;
@@ -248,9 +252,9 @@
createInWorkspace.setSelection(preferences.isDefaultCreateResourcesInWorkspace());
autoPublishLocal.setSelection(preferences.getDefaultAutoPublishLocal());
- autoPublishLocalTime.setText(preferences.getDefaultAutoPublishLocalTime() + "");
+ autoPublishLocalTime.setSelection(preferences.getDefaultAutoPublishLocalTime());
autoPublishRemote.setSelection(preferences.getDefaultAutoPublishRemote());
- autoPublishRemoteTime.setText(preferences.getDefaultAutoPublishRemoteTime() + "");
+ autoPublishRemoteTime.setSelection(preferences.getDefaultAutoPublishRemoteTime());
setSaveEditorStatus(uiPreferences.getDefaultSaveEditors());
@@ -269,9 +273,9 @@
preferences.setCreateResourcesInWorkspace(createInWorkspace.getSelection());
preferences.setAutoPublishLocal(autoPublishLocal.getSelection());
- preferences.setAutoPublishLocalTime(Integer.parseInt(autoPublishLocalTime.getText()));
+ preferences.setAutoPublishLocalTime(autoPublishLocalTime.getSelection());
preferences.setAutoPublishRemote(autoPublishRemote.getSelection());
- preferences.setAutoPublishRemoteTime(Integer.parseInt(autoPublishRemoteTime.getText()));
+ preferences.setAutoPublishRemoteTime(autoPublishRemoteTime.getSelection());
// auto restart any servers that are ready for restart
if (autoRestart.getSelection())
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 af7a2e7..658d238 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
@@ -24,6 +24,7 @@
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
@@ -47,7 +48,7 @@
protected Combo runtimeCombo;
protected Button autoPublishDefault;
protected Button autoPublishOverride;
- protected Text autoPublishTime;
+ protected Spinner autoPublishTime;
protected boolean updating;
@@ -271,7 +272,11 @@
}
});
- autoPublishTime = toolkit.createText(composite, svr.getAutoPublishTime() + "");
+ //autoPublishTime = toolkit.createText(composite, svr.getAutoPublishTime() + "");
+ autoPublishTime = new Spinner(composite, SWT.BORDER);
+ autoPublishTime.setMinimum(0);
+ autoPublishTime.setMaximum(120);
+ autoPublishTime.setSelection(svr.getAutoPublishTime());
data = new GridData(GridData.FILL_HORIZONTAL);
autoPublishTime.setLayoutData(data);
autoPublishTime.setEnabled(autoPublishOverride.getSelection());
@@ -281,8 +286,7 @@
return;
updating = true;
try {
- int time = Integer.parseInt(autoPublishTime.getText());
- getCommandManager().executeCommand(new SetServerAutoPublishTimeCommand(getServer(), time));
+ getCommandManager().executeCommand(new SetServerAutoPublishTimeCommand(getServer(), autoPublishTime.getSelection()));
} catch (Exception ex) {
// ignore
}