[97329] Accessibility
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Messages.properties b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Messages.properties
index f3855d4..710fba0 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Messages.properties
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Messages.properties
@@ -44,17 +44,16 @@
# Add/Edit Mime Mapping dialog
configurationEditorMimeMapppingDialogTitleEdit=Edit MIME Mapping
configurationEditorMimeMapppingDialogTitleAdd=Add MIME Mapping
-configurationEditorMimeMapppingDialogMimeType=MIME type:
-configurationEditorMimeMapppingDialogMimeExtension=MIME extension:
+configurationEditorMimeMapppingDialogMimeType=MIME &type:
+configurationEditorMimeMapppingDialogMimeExtension=MIME &extension:
# Add/Edit Web Module dialog
configurationEditorWebModuleDialogTitleEdit=Edit Web Module
configurationEditorWebModuleDialogTitleAdd=Add Web Module
-configurationEditorWebModuleDialogProjects=Projects:
-configurationEditorWebModuleDialogPath=Path:
-configurationEditorWebModuleDialogDocumentBase=Document base:
-configurationEditorWebModuleDialogAutoReload=Auto reloading:
-configurationEditorWebModuleDialogReloadEnabled=Enabled
+configurationEditorWebModuleDialogProjects=&Projects:
+configurationEditorWebModuleDialogPath=P&ath:
+configurationEditorWebModuleDialogDocumentBase=&Document base:
+configurationEditorWebModuleDialogReloadEnabled=Auto &reloading enabled
configurationEditorWebModuleDialogSelectDirectory=Select the Web module directory.
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSection.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSection.java
index abd9dc4..625e295 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSection.java
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSection.java
@@ -407,6 +407,12 @@
try {
TreeItem item = mimeTypes.getSelection()[0];
Integer in = (Integer) item.getData();
+ if (in == null) {
+ index = -1;
+ remove.setEnabled(false);
+ edit.setEnabled(false);
+ return;
+ }
index = in.intValue();
remove.setEnabled(true);
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/WebModuleDialog.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/WebModuleDialog.java
index 2405613..6413ccf 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/WebModuleDialog.java
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/WebModuleDialog.java
@@ -171,7 +171,7 @@
// disable document base for project modules
if (isProject || (module.getMemento() != null && module.getMemento().length() > 0))
- docBase.setEnabled(false);
+ docBase.setEditable(false);
else {
docBase.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -218,7 +218,7 @@
new Label(composite, SWT.NONE).setText("");
// auto reload
- new Label(composite, SWT.NONE).setText(Messages.configurationEditorWebModuleDialogAutoReload);
+ new Label(composite, SWT.NONE).setText("");
final Button reloadable = new Button(composite, SWT.CHECK);
reloadable.setText(Messages.configurationEditorWebModuleDialogReloadEnabled);
data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
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 3d46948..b39096f 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
@@ -238,6 +238,7 @@
public static String serverEditorOverviewRuntime;
public static String serverEditorOverviewRuntimeEdit;
public static String serverEditorOverviewServerConfigurationPath;
+ public static String serverEditorOverviewPublishing;
public static String serverEditorOverviewAutoPublishDefault;
public static String serverEditorOverviewAutoPublishOverride;
public static String serverEditorOverviewAutoPublishDescription;
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 c1a310a..3fe245a 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
@@ -368,6 +368,7 @@
serverEditorOverviewRuntimeEdit=Edit runtime
serverEditorOverviewRuntimeCommand=set runtime
serverEditorOverviewRuntimeDescription=Set the runtime
+serverEditorOverviewPublishing=Publishing
serverEditorOverviewAutoPublishDefault=Use default auto-publish settings
serverEditorOverviewAutoPublishOverride=Auto-publish every:
serverEditorOverviewAutoPublishCommand=modify auto-publish settings
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 702de6c..005623d 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
@@ -27,6 +27,7 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.Text;
@@ -55,7 +56,7 @@
*/
public class OverviewEditorPart extends ServerEditorPart {
protected Text serverName;
- protected Label serverConfigurationName;
+ protected Text serverConfigurationName;
protected Text hostname;
protected Combo runtimeCombo;
protected Button autoPublishDefault;
@@ -214,8 +215,7 @@
toolkit.createLabel(composite, runtime.getName());
else {
runtimeCombo = new Combo(composite, SWT.READ_ONLY);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- runtimeCombo.setLayoutData(data);
+ runtimeCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
updateRuntimeCombo();
int size = runtimes.length;
@@ -269,29 +269,40 @@
IFolder folder = server.getServerConfiguration();
if (folder == null)
- serverConfigurationName = toolkit.createLabel(composite, Messages.elementUnknownName);
+ serverConfigurationName = toolkit.createText(composite, Messages.elementUnknownName);
else
- serverConfigurationName = toolkit.createLabel(composite, "" + server.getServerConfiguration().getFullPath());
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- serverConfigurationName.setLayoutData(data);
+ serverConfigurationName = toolkit.createText(composite, "" + server.getServerConfiguration().getFullPath());
+ serverConfigurationName.setEditable(false);
+ serverConfigurationName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
whs.setHelp(serverConfigurationName, ContextIds.EDITOR_CONFIGURATION);
}
// auto-publish
if (server != null) {
- //Label label = createLabel(toolkit, composite, Messages.serverEditorOverviewServerHostname"));
- //label.
-
- autoPublishDefault = toolkit.createButton(composite, Messages.serverEditorOverviewAutoPublishDefault, SWT.RADIO);
+ Group group = new Group(composite, SWT.NONE);
+ group.setBackground(composite.getBackground());
+ group.setText(Messages.serverEditorOverviewPublishing);
+ layout = new GridLayout();
+ layout.numColumns = 2;
+ layout.marginHeight = 5;
+ layout.marginWidth = 10;
+ layout.verticalSpacing = 5;
+ layout.horizontalSpacing = 15;
+ group.setLayout(layout);
GridData data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 2;
+ group.setLayoutData(data);
+
+ autoPublishDefault = toolkit.createButton(group, Messages.serverEditorOverviewAutoPublishDefault, SWT.RADIO);
+ data = new GridData(GridData.FILL_HORIZONTAL);
+ data.horizontalSpan = 2;
autoPublishDefault.setLayoutData(data);
Server svr = (Server) server;
autoPublishDefault.setSelection(svr.getAutoPublishDefault());
whs.setHelp(autoPublishDefault, ContextIds.EDITOR_AUTOPUBLISH_DEFAULT);
- autoPublishOverride = toolkit.createButton(composite, Messages.serverEditorOverviewAutoPublishOverride, SWT.RADIO);
+ autoPublishOverride = toolkit.createButton(group, Messages.serverEditorOverviewAutoPublishOverride, SWT.RADIO);
autoPublishOverride.setSelection(!svr.getAutoPublishDefault());
whs.setHelp(autoPublishOverride, ContextIds.EDITOR_AUTOPUBLISH_OVERRIDE);
@@ -307,7 +318,7 @@
});
//autoPublishTime = toolkit.createText(composite, svr.getAutoPublishTime() + "");
- autoPublishTime = new Spinner(composite, SWT.BORDER);
+ autoPublishTime = new Spinner(group, SWT.BORDER);
autoPublishTime.setMinimum(0);
autoPublishTime.setMaximum(120);
autoPublishTime.setSelection(svr.getAutoPublishTime());
