[210531] fix label and title names in the New Servlet and New Filter wizards

4 files changed, 47 insertions, 10 deletions

diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
index be8ee455f..0bd880a42 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
@@ -23,6 +23,7 @@ public class WEBUIMessages extends NLS {
 
 	public static String NEW_SERVLET_WIZARD_PAGE_TITLE;
 	public static String FOLDER_LABEL;
+	public static String URL_MAPPINGS_TITLE;
 	public static String URL_MAPPINGS_LABEL;
 	public static String SERVLET_MAPPINGS_LABEL;
 	public static String FILTER_MAPPINGS_LABEL;
@@ -54,6 +55,7 @@ public class WEBUIMessages extends NLS {
 	public static String WEB_CONT_NAME;
 	public static String URL_PATTERN_TITLE;
 	public static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
+	public static String DESCRIPTION_TITLE;
 	public static String DESCRIPTION_LABEL;
 	public static String USE_EXISTING_SERVLET_CLASS;
     public static String USE_EXISTING_FILTER_CLASS;
@@ -81,6 +83,7 @@ public class WEBUIMessages extends NLS {
 	public static String _3;
 	public static String _2;
 	public static String _1;
+	public static String INIT_PARAM_TITLE;
 	public static String INIT_PARAM_LABEL;
 	public static String SERVLET_NAME_LABEL;
 	public static String _0;
@@ -103,7 +106,9 @@ public class WEBUIMessages extends NLS {
 	public static String NEW_SERVLET_WIZARD_WINDOW_TITLE;
     public static String NEW_FILTER_WIZARD_WINDOW_TITLE;
 	public static String INTERFACE_SELECTION_DIALOG_TITLE;
+	public static String NAME_TITLE;
 	public static String NAME_LABEL;
+	public static String VALUE_TITLE;
 	public static String VALUE_LABEL;
 	public static String WEB_CONT_PAGE_COMP_LABEL;
 	public static String CHOOSE_SERVLET_CLASS;
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
index 33502a12e..e6be8a429 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
@@ -62,9 +62,18 @@ public class AddFilterWizardPage extends DataModelWizardPage {
 		createNameDescription(composite);
 		
 		StringArrayTableWizardSectionCallback callback = new StringArrayTableWizardSectionCallback();
-		StringArrayTableWizardSection initSection = new StringArrayTableWizardSection(composite, IWebWizardConstants.INIT_PARAM_LABEL, IWebWizardConstants.ADD_BUTTON_LABEL, IWebWizardConstants.EDIT_BUTTON_LABEL, 
-				IWebWizardConstants.REMOVE_BUTTON_LABEL, new String[]{IWebWizardConstants.NAME_LABEL, IWebWizardConstants.VALUE_LABEL, IWebWizardConstants.DESCRIPTION_LABEL}, null,// WebPlugin.getDefault().getImage("initializ_parameter"),
-				model, INewFilterClassDataModelProperties.INIT_PARAM);
+		StringArrayTableWizardSection initSection = new StringArrayTableWizardSection(
+				composite, 
+				IWebWizardConstants.INIT_PARAM_LABEL, 
+				IWebWizardConstants.INIT_PARAM_TITLE, 
+				IWebWizardConstants.ADD_BUTTON_LABEL, 
+				IWebWizardConstants.EDIT_BUTTON_LABEL, 
+				IWebWizardConstants.REMOVE_BUTTON_LABEL, 
+				new String[] { IWebWizardConstants.NAME_TITLE, IWebWizardConstants.VALUE_TITLE, IWebWizardConstants.DESCRIPTION_TITLE }, 
+				new String[] { IWebWizardConstants.NAME_LABEL, IWebWizardConstants.VALUE_LABEL, IWebWizardConstants.DESCRIPTION_LABEL }, 
+				null,// WebPlugin.getDefault().getImage("initializ_parameter"),
+				model, 
+				INewFilterClassDataModelProperties.INIT_PARAM);
 		initSection.setCallback(callback);
 		
 		String[] buttons = new String[] {
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
index 3f515932b..101848f4e 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
@@ -66,13 +66,31 @@ public class AddServletWizardPage extends DataModelWizardPage {
 		createNameDescription(composite);
 		
 		StringArrayTableWizardSectionCallback callback = new StringArrayTableWizardSectionCallback();
-		StringArrayTableWizardSection initSection = new StringArrayTableWizardSection(composite, IWebWizardConstants.INIT_PARAM_LABEL, IWebWizardConstants.ADD_BUTTON_LABEL, IWebWizardConstants.EDIT_BUTTON_LABEL, 
-				IWebWizardConstants.REMOVE_BUTTON_LABEL, new String[]{IWebWizardConstants.NAME_LABEL, IWebWizardConstants.VALUE_LABEL, IWebWizardConstants.DESCRIPTION_LABEL}, null,// WebPlugin.getDefault().getImage("initializ_parameter"),
-				model, INewServletClassDataModelProperties.INIT_PARAM);
+		StringArrayTableWizardSection initSection = new StringArrayTableWizardSection(
+				composite, 
+				IWebWizardConstants.INIT_PARAM_LABEL, 
+				IWebWizardConstants.INIT_PARAM_TITLE, 
+				IWebWizardConstants.ADD_BUTTON_LABEL, 
+				IWebWizardConstants.EDIT_BUTTON_LABEL, 
+				IWebWizardConstants.REMOVE_BUTTON_LABEL, 
+				new String[] { IWebWizardConstants.NAME_TITLE, IWebWizardConstants.VALUE_TITLE, IWebWizardConstants.DESCRIPTION_TITLE }, 
+				new String[] { IWebWizardConstants.NAME_LABEL, IWebWizardConstants.VALUE_LABEL, IWebWizardConstants.DESCRIPTION_LABEL }, 
+				null,// WebPlugin.getDefault().getImage("initializ_parameter"),
+				model, 
+				INewServletClassDataModelProperties.INIT_PARAM);
 		initSection.setCallback(callback);
-		urlSection = new StringArrayTableWizardSection(composite, IWebWizardConstants.URL_MAPPINGS_LABEL, IWebWizardConstants.ADD_BUTTON_LABEL, IWebWizardConstants.EDIT_BUTTON_LABEL, IWebWizardConstants.REMOVE_BUTTON_LABEL,
-				new String[]{IWebWizardConstants.URL_PATTERN_LABEL}, null,// WebPlugin.getDefault().getImage("url_type"),
-				model, INewServletClassDataModelProperties.URL_MAPPINGS);
+		urlSection = new StringArrayTableWizardSection(
+				composite, 
+				IWebWizardConstants.URL_MAPPINGS_LABEL, 
+				IWebWizardConstants.URL_MAPPINGS_TITLE, 
+				IWebWizardConstants.ADD_BUTTON_LABEL, 
+				IWebWizardConstants.EDIT_BUTTON_LABEL, 
+				IWebWizardConstants.REMOVE_BUTTON_LABEL,
+				new String[] { IWebWizardConstants.URL_PATTERN_TITLE }, 
+				new String[] { IWebWizardConstants.URL_PATTERN_LABEL }, 
+				null,// WebPlugin.getDefault().getImage("url_type"),
+				model, 
+				INewServletClassDataModelProperties.URL_MAPPINGS);
 		urlSection.setCallback(callback);
 		
 		String text = displayNameText.getText();
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
index c69b17ec9..df6c48e07 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
@@ -25,7 +25,9 @@ public interface IWebWizardConstants {
 	public final static String EMPTY_LIST_MSG = WEBUIMessages.EMPTY_LIST_MSG;
 	public final static String ADD_LABEL = WEBUIMessages.ADD_LABEL;
 	public final static String USE_EXISTING_SERVLET_CLASS = WEBUIMessages.USE_EXISTING_SERVLET_CLASS;
+	public final static String INIT_PARAM_TITLE = WEBUIMessages.INIT_PARAM_TITLE;
 	public final static String INIT_PARAM_LABEL = WEBUIMessages.INIT_PARAM_LABEL;
+	public final static String URL_MAPPINGS_TITLE = WEBUIMessages.URL_MAPPINGS_TITLE;
 	public final static String URL_MAPPINGS_LABEL = WEBUIMessages.URL_MAPPINGS_LABEL;
 	public final static String CHOOSE_SERVLET_CLASS = WEBUIMessages.CHOOSE_SERVLET_CLASS;
 	
@@ -101,9 +103,12 @@ public interface IWebWizardConstants {
 	public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
 	public final static String JAVA_CLASS_BROWER_DIALOG_TITLE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_TITLE;
 	public final static String JAVA_CLASS_BROWER_DIALOG_MESSAGE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_MESSAGE;
-	
+
+	public final static String NAME_TITLE = WEBUIMessages.NAME_TITLE;
 	public final static String NAME_LABEL = WEBUIMessages.NAME_LABEL;
+	public final static String DESCRIPTION_TITLE = WEBUIMessages.DESCRIPTION_TITLE;
 	public final static String DESCRIPTION_LABEL = WEBUIMessages.DESCRIPTION_LABEL;
+	public final static String VALUE_TITLE = WEBUIMessages.VALUE_TITLE;
 	public final static String VALUE_LABEL = WEBUIMessages.VALUE_LABEL;
 	public final static String EMPTY_STRING = ""; //$NON-NLS-1$
 	public final static String BROWSE_BUTTON_LABEL = WEBUIMessages.BROWSE_BUTTON_LABEL;