Attachment 156907 Details for Bug 198937 – Patch for Servlet/Filter/Listener wizards

[patch] Patch for Servlet/Filter/Listener wizards

198937_patch.txt (text/plain), 38.59 KB, created by Kaloyan Raev

on 2010-01-22 04:30:07 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kaloyan Raev

Created: 2010-01-22 04:30:07 EST

Size: 38.59 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.servlet.ui
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java,v
>retrieving revision 1.26
>diff -u -r1.26 AddServletWizardPage.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java	9 Jun 2009 19:29:08 -0000	1.26
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java	22 Jan 2010 09:28:24 -0000
>@@ -17,18 +17,21 @@
> import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
> import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
> import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_A;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_D;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_DESC;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_LABEL;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_TITLE;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_E;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_T;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_LABEL;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_LABEL;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_TITLE;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NO_WEB_PROJECTS;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_R;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_V;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_MAPPINGS_LABEL;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_MAPPINGS_TITLE;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_PATTERN_LABEL;
>@@ -96,9 +99,9 @@
> 				composite, 
> 				INIT_PARAM_LABEL, 
> 				INIT_PARAM_TITLE, 
>-				ADD_BUTTON_LABEL, 
>-				EDIT_BUTTON_LABEL, 
>-				REMOVE_BUTTON_LABEL, 
>+				ADD_BUTTON_LABEL_A, 
>+				EDIT_BUTTON_LABEL_E, 
>+				REMOVE_BUTTON_LABEL_R, 
> 				new String[] { NAME_TITLE, VALUE_TITLE, DESCRIPTION_TITLE }, 
> 				new String[] { NAME_LABEL, VALUE_LABEL, DESCRIPTION_LABEL }, 
> 				null,// WebPlugin.getDefault().getImage("initializ_parameter"),
>@@ -109,9 +112,9 @@
> 				composite, 
> 				URL_MAPPINGS_LABEL, 
> 				URL_MAPPINGS_TITLE, 
>-				ADD_BUTTON_LABEL, 
>-				EDIT_BUTTON_LABEL, 
>-				REMOVE_BUTTON_LABEL,
>+				ADD_BUTTON_LABEL_D, 
>+				EDIT_BUTTON_LABEL_T, 
>+				REMOVE_BUTTON_LABEL_V,
> 				new String[] { URL_PATTERN_TITLE }, 
> 				new String[] { URL_PATTERN_LABEL }, 
> 				null,// WebPlugin.getDefault().getImage("url_type"),
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java,v
>retrieving revision 1.15
>diff -u -r1.15 MultiSelectFilteredFileSelectionDialog.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java	9 Jun 2009 21:18:21 -0000	1.15
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java	22 Jan 2010 09:28:24 -0000
>@@ -294,7 +294,7 @@
> 		fServletButton.addSelectionListener(this);
> 
> 		fJSPButton = new Button(fChild, SWT.RADIO);
>-		fJSPButton.setText("JSP"); //$NON-NLS-1$
>+		fJSPButton.setText(WebAppEditResourceHandler.getString("JSP_UI_")); //$NON-NLS-1$ = JSP
> 		gd = new GridData();
> 		fJSPButton.setLayoutData(gd);
> 		fJSPButton.addSelectionListener(this);
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java,v
>retrieving revision 1.19
>diff -u -r1.19 NewServletClassOptionsWizardPage.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java	9 Jun 2009 19:29:08 -0000	1.19
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java	22 Jan 2010 09:28:24 -0000
>@@ -116,23 +116,23 @@
> 		comp.setLayoutData(data);
> 		
> 		initButton = new Button(comp, SWT.CHECK);
>-		initButton.setText("&init"); //$NON-NLS-1$
>+		initButton.setText("init"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(initButton, INewServletClassDataModelProperties.INIT, null);
> 
> 		destroyButton = new Button(comp, SWT.CHECK);
>-		destroyButton.setText("destro&y"); //$NON-NLS-1$
>+		destroyButton.setText("destroy"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(destroyButton, INewServletClassDataModelProperties.DESTROY, null);
> 
> 		getConfigButton = new Button(comp, SWT.CHECK);
>-		getConfigButton.setText("getServlet&Config"); //$NON-NLS-1$
>+		getConfigButton.setText("getServletConfig"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(getConfigButton, INewServletClassDataModelProperties.GET_SERVLET_CONFIG, null);
> 
> 		getInfoButton = new Button(comp, SWT.CHECK);
>-		getInfoButton.setText("getServletI&nfo"); //$NON-NLS-1$
>+		getInfoButton.setText("getServletInfo"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(getInfoButton, INewServletClassDataModelProperties.GET_SERVLET_INFO, null);
> 		
> 		serviceButton = new Button(comp, SWT.CHECK);
>-		serviceButton.setText("&service"); //$NON-NLS-1$
>+		serviceButton.setText("service"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(serviceButton, INewServletClassDataModelProperties.SERVICE, null);
> 		
> 		doGetButton = new Button(comp, SWT.CHECK);
>@@ -152,7 +152,7 @@
> 		synchHelper.synchCheckbox(doDeleteButton, INewServletClassDataModelProperties.DO_DELETE, null);
> 
> 		doHeadButton = new Button(comp, SWT.CHECK);
>-		doHeadButton.setText("do&Head"); //$NON-NLS-1$
>+		doHeadButton.setText("doH&ead"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(doHeadButton, INewServletClassDataModelProperties.DO_HEAD, null);
> 
> 		doOptionsButton = new Button(comp, SWT.CHECK);
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java,v
>retrieving revision 1.5
>diff -u -r1.5 NewFilterClassOptionsWizardPage.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java	25 Mar 2008 14:47:24 -0000	1.5
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java	22 Jan 2010 09:28:24 -0000
>@@ -56,15 +56,15 @@
> 		comp.setLayoutData(data);
> 		
> 		initButton = new Button(comp, SWT.CHECK);
>-		initButton.setText("&init"); //$NON-NLS-1$
>+		initButton.setText("init"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(initButton, INIT, null);
> 
> 		destroyButton = new Button(comp, SWT.CHECK);
>-		destroyButton.setText("destro&y"); //$NON-NLS-1$
>+		destroyButton.setText("destroy"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(destroyButton, DESTROY, null);
> 
> 		doFilterButton = new Button(comp, SWT.CHECK);
>-		doFilterButton.setText("do&Filter"); //$NON-NLS-1$
>+		doFilterButton.setText("doFilter"); //$NON-NLS-1$
> 		synchHelper.synchCheckbox(doFilterButton, DO_FILTER, null);
> 		
> 		interfaceViewer.addSelectionChangedListener(this);
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java,v
>retrieving revision 1.10
>diff -u -r1.10 IWebWizardConstants.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java	17 Dec 2007 18:12:07 -0000	1.10
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java	22 Jan 2010 09:28:24 -0000
>@@ -68,14 +68,26 @@
> 	public final static String ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS = WEBUIMessages.ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS;
> 	public final static String ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS = WEBUIMessages.ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS;
> 	public final static String ADD_LISTENER_WIZARD_LIFECYCLE = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE;
>+	public final static String ADD_LISTENER_WIZARD_LIFECYCLE_L = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_L;
>+	public final static String ADD_LISTENER_WIZARD_LIFECYCLE_I = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_I;
>+	public final static String ADD_LISTENER_WIZARD_LIFECYCLE_Y = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_Y;
> 	public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES;
>+	public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C;
>+	public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H;
>+	public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G;
> 	public final static String ADD_LISTENER_WIZARD_SESSION_MIGRATION = WEBUIMessages.ADD_LISTENER_WIZARD_SESSION_MIGRATION;
> 	public final static String ADD_LISTENER_WIZARD_OBJECT_BINDING = WEBUIMessages.ADD_LISTENER_WIZARD_OBJECT_BINDING;
> 	
> 	// common
> 	public final static String ADD_BUTTON_LABEL = WEBUIMessages.ADD_BUTTON_LABEL;
>+	public final static String ADD_BUTTON_LABEL_A = WEBUIMessages.ADD_BUTTON_LABEL_A;
>+	public final static String ADD_BUTTON_LABEL_D = WEBUIMessages.ADD_BUTTON_LABEL_D;
> 	public final static String EDIT_BUTTON_LABEL = WEBUIMessages.EDIT_BUTTON_LABEL;
>+	public final static String EDIT_BUTTON_LABEL_E = WEBUIMessages.EDIT_BUTTON_LABEL_E;
>+	public final static String EDIT_BUTTON_LABEL_T = WEBUIMessages.EDIT_BUTTON_LABEL_T;
> 	public final static String REMOVE_BUTTON_LABEL = WEBUIMessages.REMOVE_BUTTON_LABEL;
>+	public final static String REMOVE_BUTTON_LABEL_R = WEBUIMessages.REMOVE_BUTTON_LABEL_R;
>+	public final static String REMOVE_BUTTON_LABEL_V = WEBUIMessages.REMOVE_BUTTON_LABEL_V;
> 	public final static String URL_PATTERN_TITLE = WEBUIMessages.URL_PATTERN_TITLE;
> 	public final static String URL_PATTERN_LABEL = WEBUIMessages.URL_PATTERN_LABEL;
> 	public final static String FOLDER_LABEL = WEBUIMessages.FOLDER_LABEL;
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java,v
>retrieving revision 1.11
>diff -u -r1.11 AddFilterWizardPage.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java	9 Jun 2009 21:13:16 -0000	1.11
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java	22 Jan 2010 09:28:24 -0000
>@@ -15,18 +15,18 @@
> import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
> import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
> import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_A;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_PAGE_DESC;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_PAGE_TITLE;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_LABEL;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_TITLE;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_E;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_LABEL;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_LABEL;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_TITLE;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NO_WEB_PROJECTS;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_R;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_LABEL;
> import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_TITLE;
> import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME;
>@@ -88,9 +88,9 @@
> 				composite, 
> 				INIT_PARAM_LABEL, 
> 				INIT_PARAM_TITLE, 
>-				ADD_BUTTON_LABEL, 
>-				EDIT_BUTTON_LABEL, 
>-				REMOVE_BUTTON_LABEL, 
>+				ADD_BUTTON_LABEL_A, 
>+				EDIT_BUTTON_LABEL_E, 
>+				REMOVE_BUTTON_LABEL_R, 
> 				new String[] { NAME_TITLE, VALUE_TITLE, DESCRIPTION_TITLE }, 
> 				new String[] { NAME_LABEL, VALUE_LABEL, DESCRIPTION_LABEL }, 
> 				null,// WebPlugin.getDefault().getImage("initializ_parameter"),
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java,v
>retrieving revision 1.9
>diff -u -r1.9 AddEditFilterMappingDialog.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java	9 Jun 2009 21:13:16 -0000	1.9
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java	22 Jan 2010 09:28:24 -0000
>@@ -362,7 +362,7 @@
>         messageLabel = new Label(composite, SWT.NONE);
>         gd = new GridData();
>         messageLabel.setLayoutData(gd);
>-        messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_servlet__2")); //$NON-NLS-1$
>+        messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_servlet__1")); //$NON-NLS-1$
> 
>         fUpperList = createUpperList(composite);
> 
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java,v
>retrieving revision 1.6
>diff -u -r1.6 AddListenerWizardPage.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java	9 Jun 2009 19:29:08 -0000	1.6
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java	22 Jan 2010 09:28:24 -0000
>@@ -20,17 +20,7 @@
> import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_LISTENER;
> import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER;
> import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_LISTENER;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_LIFECYCLE;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_OBJECT_BINDING;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_PAGE_DESC;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_PAGE_TITLE;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_SESSION_MIGRATION;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CLEAR_BUTTON;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.SELECT_ALL_BUTTON;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.*;
> 
> import java.util.ArrayList;
> import java.util.Arrays;
>@@ -105,12 +95,12 @@
> 		Group group = createGroup(parent, ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS);
> 
> 		createEventListenerRow(group, 
>-				ADD_LISTENER_WIZARD_LIFECYCLE, 
>+				ADD_LISTENER_WIZARD_LIFECYCLE_L, 
> 				QUALIFIED_SERVLET_CONTEXT_LISTENER,
> 				INTERFACES);
> 
> 		createEventListenerRow(group, 
>-				ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES, 
>+				ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C, 
> 				QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER, 
> 				INTERFACES);
> 	}
>@@ -119,12 +109,12 @@
> 		Group group = createGroup(parent, ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS);
> 		
> 		createEventListenerRow(group, 
>-				ADD_LISTENER_WIZARD_LIFECYCLE, 
>+				ADD_LISTENER_WIZARD_LIFECYCLE_I, 
> 				QUALIFIED_HTTP_SESSION_LISTENER, 
> 				INTERFACES);
> 		
> 		createEventListenerRow(group, 
>-				ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES, 
>+				ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H, 
> 				QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER, 
> 				INTERFACES);
> 		
>@@ -143,12 +133,12 @@
> 		Group group = createGroup(parent, ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS);
> 		
> 		createEventListenerRow(group, 
>-				ADD_LISTENER_WIZARD_LIFECYCLE, 
>+				ADD_LISTENER_WIZARD_LIFECYCLE_Y, 
> 				QUALIFIED_SERVLET_REQUEST_LISTENER, 
> 				INTERFACES);
> 
> 		createEventListenerRow(group, 
>-				ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES, 
>+				ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G, 
> 				QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER, 
> 				INTERFACES);
> 	}
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java,v
>retrieving revision 1.8
>diff -u -r1.8 FilterMappingsArrayTableWizardSection.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java	9 Jun 2009 21:13:16 -0000	1.8
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java	22 Jan 2010 09:28:24 -0000
>@@ -11,12 +11,7 @@
> package org.eclipse.jst.servlet.ui.internal.wizard;
> 
> import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DISPATCHERS_LABEL;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.FILTER_MAPPINGS_LABEL;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL;
>-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_SERVLET_LABEL;
>+import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.*;
> 
> import java.net.URL;
> import java.util.ArrayList;
>@@ -153,7 +148,7 @@
>         buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
> 
>         addButton = new Button(buttonCompo, SWT.PUSH);
>-        addButton.setText(ADD_BUTTON_LABEL);
>+        addButton.setText(ADD_BUTTON_LABEL_D);
>         addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
>         addButton.addSelectionListener(new SelectionListener() {
>             public void widgetSelected(SelectionEvent event) {
>@@ -165,7 +160,7 @@
>         });
> 
>         editButton = new Button(buttonCompo, SWT.PUSH);
>-        editButton.setText(EDIT_BUTTON_LABEL);
>+        editButton.setText(EDIT_BUTTON_LABEL_T);
>         editButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
>         editButton.addSelectionListener(new SelectionListener() {
>             public void widgetSelected(SelectionEvent event) {
>@@ -178,7 +173,7 @@
>         editButton.setEnabled(false);
> 
>         removeButton = new Button(buttonCompo, SWT.PUSH);
>-        removeButton.setText(REMOVE_BUTTON_LABEL);
>+        removeButton.setText(REMOVE_BUTTON_LABEL_V);
>         removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
>         removeButton.addSelectionListener(new SelectionListener() {
>             public void widgetSelected(SelectionEvent event) {
>Index: property_files/web_ui.properties
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties,v
>retrieving revision 1.23
>diff -u -r1.23 web_ui.properties
>--- property_files/web_ui.properties	9 Oct 2008 01:06:58 -0000	1.23
>+++ property_files/web_ui.properties	22 Jan 2010 09:28:24 -0000
>@@ -13,7 +13,7 @@
> _2=Servlet version:
> _3=Dynamic Web Project
> _4=Create a standalone Dynamic Web project or add it to a new or existing Enterprise Application.
>-_5=Web project:
>+_5=Web &project:
> _6=WAR file:
> _7=Import a WAR file from the file system
> _8=WAR Import
>@@ -39,24 +39,24 @@
> ADD_LISTENER_WIZARD_PAGE_TITLE=Create Listener
> ADD_LISTENER_WIZARD_PAGE_DESC=Select the application lifecycle events to listen to. 
> 
>-DISPATCHER_REQUEST=REQUEST
>-DISPATCHER_FORWARD=FORWARD
>-DISPATCHER_INCLUDE=INCLUDE
>-DISPATCHER_ERROR=ERROR
>+DISPATCHER_REQUEST=&REQUEST
>+DISPATCHER_FORWARD=&FORWARD
>+DISPATCHER_INCLUDE=&INCLUDE
>+DISPATCHER_ERROR=&ERROR
> 
> DEFAULT_PACKAGE=(default package)
> SELECT_CLASS_TITLE=Select Class
> MAP_CLASS_NAME_TO_CLASS_ERROR_MSG=IWAE0060E Could not uniquely map the class name to a class.
> EMPTY_LIST_MSG=Empty List
> ADD_LABEL=Add
>-USE_EXISTING_SERVLET_CLASS=Use an existing Servlet class or JSP
>-USE_EXISTING_FILTER_CLASS=Use existing Filter class
>-USE_EXISTING_LISTENER_CLASS=Use existing Listener class
>+USE_EXISTING_SERVLET_CLASS=&Use an existing Servlet class or JSP
>+USE_EXISTING_FILTER_CLASS=&Use existing Filter class
>+USE_EXISTING_LISTENER_CLASS=&Use existing Listener class
> INIT_PARAM_TITLE=Initialization Parameters
>-INIT_PARAM_LABEL=Initialization Parameters:
>+INIT_PARAM_LABEL=Initialization &parameters:
> URL_MAPPINGS_TITLE=URL Mappings
>-URL_MAPPINGS_LABEL=URL Mappings:
>-CHOOSE_SERVLET_CLASS=Choose a servlet class:
>+URL_MAPPINGS_LABEL=&URL mappings:
>+CHOOSE_SERVLET_CLASS=&Choose a JSP file:
> 
> NEW_SERVLET_WIZARD_WINDOW_TITLE=New Servlet
> NEW_SERVLET_WIZARD_PAGE_TITLE=Servlet
>@@ -66,26 +66,38 @@
> 
> NEW_FILTER_WIZARD_WINDOW_TITLE=New Filter
> CHOOSE_FILTER_CLASS=Choose a filter class
>-SERVLET_MAPPINGS_LABEL=Servlet Mappings:
>-FILTER_MAPPINGS_LABEL=Filter Mappings:
>+SERVLET_MAPPINGS_LABEL=Servlet mappings:
>+FILTER_MAPPINGS_LABEL=Fi&lter mappings:
> 
>-ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS=Servlet Context Events
>-ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS=HTTP Session Events
>-ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS=Servlet Request Events
>+ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS=Servlet context events
>+ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS=HTTP session events
>+ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS=Servlet request events
> ADD_LISTENER_WIZARD_LIFECYCLE=Lifecycle
>+ADD_LISTENER_WIZARD_LIFECYCLE_L=&Lifecycle
>+ADD_LISTENER_WIZARD_LIFECYCLE_I=L&ifecycle
>+ADD_LISTENER_WIZARD_LIFECYCLE_Y=Lifec&ycle
> ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES=Changes to attributes
>-ADD_LISTENER_WIZARD_SESSION_MIGRATION=Session migration
>-ADD_LISTENER_WIZARD_OBJECT_BINDING=Object binding
>+ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C=&Changes to attributes
>+ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H=C&hanges to attributes
>+ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G=Chan&ges to attributes
>+ADD_LISTENER_WIZARD_SESSION_MIGRATION=Session &migration
>+ADD_LISTENER_WIZARD_OBJECT_BINDING=&Object binding
> 
> ADD_BUTTON_LABEL=Add...
>+ADD_BUTTON_LABEL_A=&Add...
>+ADD_BUTTON_LABEL_D=A&dd...
> EDIT_BUTTON_LABEL=Edit...
>+EDIT_BUTTON_LABEL_E=&Edit...
>+EDIT_BUTTON_LABEL_T=Edi&t...
> REMOVE_BUTTON_LABEL=Remove
>+REMOVE_BUTTON_LABEL_R=&Remove
>+REMOVE_BUTTON_LABEL_V=Remo&ve
> URL_PATTERN_TITLE=URL Patterns
>-URL_PATTERN_LABEL=Pattern:
>+URL_PATTERN_LABEL=&Pattern:
> FOLDER_LABEL=Folder:
> JAVA_PACKAGE_LABEL=Java package:
>-CLASS_NAME_LABEL=Class name:
>-SUPERCLASS_LABEL=Superclass:
>+CLASS_NAME_LABEL=Class na&me:
>+SUPERCLASS_LABEL=&Superclass:
> CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
> CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
> CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose the Web Content Folder or its subfolder
>@@ -98,30 +110,30 @@
> INTERFACE_SELECTION_DIALOG_DESC=Choose interfaces:
> INTERFACE_SELECTION_DIALOG_MSG_NONE=''{0}'' added.
> JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
>-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=Public
>-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abstract
>-JAVA_CLASS_FINAL_CHECKBOX_LABEL=Final
>-JAVA_CLASS_INTERFACES_LABEL=Interfaces:
>+JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=&Public
>+JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abs&tract
>+JAVA_CLASS_FINAL_CHECKBOX_LABEL=fina&l
>+JAVA_CLASS_INTERFACES_LABEL=&Interfaces:
> JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
> JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
>-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=Constructors from superclass
>-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=Inherited abstract methods
>+JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=&Constructors from superclass
>+JAVA_CLASS_INHERIT_CHECKBOX_LABEL=In&herited abstract methods
> JAVA_CLASS_BROWER_DIALOG_TITLE=Java Class Browser
> JAVA_CLASS_BROWER_DIALOG_MESSAGE=Browse for a Java class
> 
> NAME_TITLE=Name
>-NAME_LABEL=Name:
>+NAME_LABEL=Na&me:
> DESCRIPTION_TITLE=Description
>-DESCRIPTION_LABEL=Description:
>+DESCRIPTION_LABEL=De&scription:
> VALUE_TITLE=Value
>-VALUE_LABEL=Value:
>+VALUE_LABEL=&Value:
> URL_SERVLET_LABEL=URL Pattern / Servlet Name
> DISPATCHERS_LABEL=Dispatchers
> 
>-BROWSE_BUTTON_LABEL=Browse...
>+BROWSE_BUTTON_LABEL=Bro&wse...
> REMOVE_BUTTON=Remove
>-SELECT_ALL_BUTTON=Select &All
>-CLEAR_BUTTON=&Clear
>+SELECT_ALL_BUTTON=&Select All
>+CLEAR_BUTTON=&Deselect All
> 
> NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specify class file destination.
> NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC=Specify modifiers, interfaces to implement, and method stubs to generate.
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java,v
>retrieving revision 1.18
>diff -u -r1.18 WEBUIMessages.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java	5 Mar 2008 17:07:25 -0000	1.18
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java	22 Jan 2010 09:28:24 -0000
>@@ -98,12 +98,18 @@
> 	public static String PACKAGE_SELECTION_DIALOG_TITLE;
> 	public static String _12;
> 	public static String ADD_BUTTON_LABEL;
>+	public static String ADD_BUTTON_LABEL_A; 
>+	public static String ADD_BUTTON_LABEL_D;
> 	public static String EDIT_BUTTON_LABEL;
>+	public static String EDIT_BUTTON_LABEL_E;
>+	public static String EDIT_BUTTON_LABEL_T;
> 	public static String _11;
> 	public static String _10;
> 	public static String SUPERCLASS_SELECTION_DIALOG_DESC;
> 	public static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
> 	public static String REMOVE_BUTTON_LABEL;
>+	public static String REMOVE_BUTTON_LABEL_R;
>+	public static String REMOVE_BUTTON_LABEL_V;
> 	public static String NEW_SERVLET_WIZARD_WINDOW_TITLE;
>     public static String NEW_FILTER_WIZARD_WINDOW_TITLE;
> 	public static String INTERFACE_SELECTION_DIALOG_TITLE;
>@@ -135,7 +141,13 @@
> 	public static String ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS;
> 	public static String ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS;
> 	public static String ADD_LISTENER_WIZARD_LIFECYCLE;
>+	public static String ADD_LISTENER_WIZARD_LIFECYCLE_L;
>+	public static String ADD_LISTENER_WIZARD_LIFECYCLE_I;
>+	public static String ADD_LISTENER_WIZARD_LIFECYCLE_Y;
> 	public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES;
>+	public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C;
>+	public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H;
>+	public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G;
> 	public static String ADD_LISTENER_WIZARD_SESSION_MIGRATION;
> 	public static String ADD_LISTENER_WIZARD_OBJECT_BINDING;
> 	
>#P org.eclipse.jst.j2ee.ui
>Index: property_files/j2ee_ui.properties
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties,v
>retrieving revision 1.58
>diff -u -r1.58 j2ee_ui.properties
>--- property_files/j2ee_ui.properties	20 Aug 2009 17:38:53 -0000	1.58
>+++ property_files/j2ee_ui.properties	22 Jan 2010 09:28:26 -0000
>@@ -40,7 +40,7 @@
> 29=Available dependent JARs:
> 30=Manifest Class-Path:
> 31=JAR/Module
>-32=Project:
>+32=&Project:
> 33=New
> 34=Import an Application Client project from the file System
> 35=Application Client Import
>@@ -100,7 +100,7 @@
> 94=Na&me:
> 95=Create a default Main class
> 96=Create a default stateless session bean
>-98=Generate a XDoclet annotated class
>+98=&Generate a XDoclet annotated class
> 
> 97=Select the utility JARs from the list to be imported as utility projects or jars.
> 99=Project Name:
>@@ -298,11 +298,14 @@
> DefaultJ2EEComponentCreationWizard.page.label.appclient=Application client module
> DefaultJ2EEComponentCreationWizard.page.button.select=Create default modules
> 
>-FOLDER_LABEL=Source folder:
>+FOLDER_LABEL=Source fol&der:
> BROWSE_BUTTON_LABEL=Browse...
>-JAVA_PACKAGE_LABEL=Java package:
>-CLASS_NAME_LABEL=Class name:
>-SUPERCLASS_LABEL=Superclass:
>+BROWSE_BUTTON_LABEL_O=Br&owse...
>+BROWSE_BUTTON_LABEL_W=Bro&wse...
>+BROWSE_BUTTON_LABEL_E=Brows&e...
>+JAVA_PACKAGE_LABEL=Java pac&kage:
>+CLASS_NAME_LABEL=Class na&me:
>+SUPERCLASS_LABEL=&Superclass:
> CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
> CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
> CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose a valid java source folder for the selected module.
>@@ -312,16 +315,16 @@
> SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
> SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
> JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
>-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=Public
>-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abstract
>-JAVA_CLASS_FINAL_CHECKBOX_LABEL=Final
>-JAVA_CLASS_INTERFACES_LABEL=Interfaces:
>+JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=&public
>+JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=abs&tract
>+JAVA_CLASS_FINAL_CHECKBOX_LABEL=fina&l
>+JAVA_CLASS_INTERFACES_LABEL=&Interfaces:
> JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
>-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
>-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=Constructors from superclass
>-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=Inherited abstract methods
>-ADD_BUTTON_LABEL=Add...
>-REMOVE_BUTTON=Remove
>+JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void &main(String[] args)
>+JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=&Constructors from superclass
>+JAVA_CLASS_INHERIT_CHECKBOX_LABEL=In&herited abstract methods
>+ADD_BUTTON_LABEL=&Add...
>+REMOVE_BUTTON=&Remove
> YES_BUTTON=Yes
> NO_BUTTON=No
> OK_BUTTON=OK
>Index: j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java,v
>retrieving revision 1.55
>diff -u -r1.55 NewJavaClassWizardPage.java
>--- j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java	10 Jun 2009 21:42:03 -0000	1.55
>+++ j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java	22 Jan 2010 09:28:26 -0000
>@@ -310,7 +310,7 @@
> 		}
> 		
> 		folderButton = new Button(composite, SWT.PUSH);
>-		folderButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
>+		folderButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL_O);
> 		folderButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
> 		folderButton.addSelectionListener(new SelectionListener() {
> 			public void widgetSelected(SelectionEvent e) {
>@@ -347,7 +347,7 @@
> 		}
> 
> 		packageButton = new Button(composite, SWT.PUSH);
>-		packageButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
>+		packageButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL_W);
> 		packageButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
> 		packageButton.addSelectionListener(new SelectionListener() {
> 			public void widgetSelected(SelectionEvent e) {
>@@ -416,7 +416,7 @@
> 		synchHelper.synchText(superText, INewJavaClassDataModelProperties.SUPERCLASS, null);
> 
> 		superButton = new Button(composite, SWT.PUSH);
>-		superButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL);
>+		superButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL_E);
> 		superButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
> 		superButton.addSelectionListener(new SelectionListener() {
> 			public void widgetSelected(SelectionEvent e) {
>Index: j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java,v
>retrieving revision 1.31
>diff -u -r1.31 J2EEUIMessages.java
>--- j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java	20 Jul 2009 15:26:27 -0000	1.31
>+++ j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java	22 Jan 2010 09:28:26 -0000
>@@ -154,6 +154,9 @@
> 	public final static String EMPTY_STRING = ""; //$NON-NLS-1$
> 	public final static String FOLDER_LABEL = getResourceString("FOLDER_LABEL"); //$NON-NLS-1$
> 	public final static String BROWSE_BUTTON_LABEL = getResourceString("BROWSE_BUTTON_LABEL"); //$NON-NLS-1$
>+	public final static String BROWSE_BUTTON_LABEL_O = getResourceString("BROWSE_BUTTON_LABEL_O"); //$NON-NLS-1$
>+	public final static String BROWSE_BUTTON_LABEL_W = getResourceString("BROWSE_BUTTON_LABEL_W"); //$NON-NLS-1$
>+	public final static String BROWSE_BUTTON_LABEL_E = getResourceString("BROWSE_BUTTON_LABEL_E"); //$NON-NLS-1$
> 	public final static String JAVA_PACKAGE_LABEL = getResourceString("JAVA_PACKAGE_LABEL"); //$NON-NLS-1$
> 	public final static String CLASS_NAME_LABEL = getResourceString("CLASS_NAME_LABEL"); //$NON-NLS-1$
> 	public final static String SUPERCLASS_LABEL = getResourceString("SUPERCLASS_LABEL"); //$NON-NLS-1$
>#P org.eclipse.jst.j2ee.web
>Index: property_files/webedit.properties
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties,v
>retrieving revision 1.7
>diff -u -r1.7 webedit.properties
>--- property_files/webedit.properties	14 Aug 2009 19:01:29 -0000	1.7
>+++ property_files/webedit.properties	22 Jan 2010 09:28:27 -0000
>@@ -16,7 +16,7 @@
> DISPATCHER_I=I
> DISPATCHER_E=E
> LISTENER=Listener
>-Select_Dispatchers_UI_=Select Dispatchers
>+Select_Dispatchers_UI_=Select dispatchers
> Container_Selection_UI_=Folder Selection
> Choose_a_Container__UI_=Choose a Folder:
> Container__UI_=Folder:
>@@ -302,9 +302,10 @@
> <servlet>_UI_=<servlet>
> UrlPattern_UI_=UrlPattern
> The_urlPattern_property_UI_=The urlPattern property
>-Servlet_UI_=Servlet
>+Servlet_UI_=&Servlet
>+JSP_UI_=&JSP
> The_servlet_property_UI_=The servlet property
>-URL_pattern_UI_=URL Pattern
>+URL_pattern_UI_=&URL pattern
> ?_UI_=?
> SessionTimeout_UI_=SessionTimeout
> The_sessionTimeout_propert_UI_=The sessionTimeout property
>@@ -699,12 +700,12 @@
> The_LocalTransaction_property_4=The LocalTransaction property
> The_MarkupLanguage_property_6=The MarkupLanguage property
> Define_Authorization_Constraint_1=Define Authorization Constraint
>-Choose_a_servlet__1=Choose a servlet:
>+Choose_a_servlet__1=&Choose a servlet:
> Choose_a_servlet__2=Choose a Servlet:
>-Matching_servlets__2=Matching servlets:
>-Choose_a_filter__1=Choose a filter:
>-Matching_filters__2=Matching filters:
>-Qualifier__3=Qualifier:
>+Matching_servlets__2=&Matching servlets:
>+Choose_a_filter__1=&Choose a filter:
>+Matching_filters__2=&Matching filters:
>+Qualifier__3=&Qualifier:
> Add_or_Remove_EJB_Local_Reference_1=Add or Remove EJB Local Reference
> Add_or_Remove_Markup_Language_2=Add or Remove Markup Language
> Close_editor_3=Close editor

Actions: View | Diff

Attachments on bug 198937: 75428 | 75733 | 156907