232534

232577
234387
234388

6 files changed, 13 insertions, 7 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
index 39694bd1a..bb5d87242 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
@@ -39,6 +39,8 @@ public final class EditorMessages extends NLS {
 	 */
 	public static String AddEditManagedPropertyDialog_Edit;
 
+	public static String AddEditMapEntryDialog_NullValue;
+
 	/**
 	 * see EditorMessages.properties
 	 */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
index adb0ac4be..28dc0a21c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
@@ -448,3 +448,4 @@ AlignmentAction_AlignMiddleAction_Tooltip=Align Middle
 AlignmentAction_AlignMiddleAction_Label=Align &Middle
 AddEditManagedPropertyDialog_Add=Add Managed Property
 AddEditManagedPropertyDialog_Edit=Edit Managed Property
+AddEditMapEntryDialog_NullValue=Null Value
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
index c50e9362f..e85e9a338 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
@@ -16,7 +16,6 @@ import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
 import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
 import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -114,7 +113,7 @@ public class AddEditMapEntryDialog extends Dialog {
 		keyField.setText(key);
 		if (this.isNullValue) {
 			nullValueTypeButton.setSelection(true);
-			valueField.setText("");
+			valueField.setText(""); //$NON-NLS-1$
 			valueField.setEnabled(false);
 		} else {
 			nullValueTypeButton.setSelection(false);
@@ -163,7 +162,7 @@ public class AddEditMapEntryDialog extends Dialog {
 		valueSection.setLayout(gl);
 
 		nullValueTypeButton = SWTUtils.createCheckBox(valueSection,
-				IFacesConfigConstants.NULL_VALUE, 2);
+				EditorMessages.AddEditMapEntryDialog_NullValue, 2);
 
 		nullValueTypeButton.addSelectionListener(new SelectionAdapter() {
 
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java
index 52790e622..b6d619936 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java
@@ -439,4 +439,6 @@ public final class PageflowMessages extends NLS {
 	 * see PageFlowMessages.properties
 	 */
 	public static String PageflowLinkEditPart_FromOutcome;
+
+	public static String ProjectWebPageSelectionDialog_Description;
 }
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
index 5be35092b..27e3f2994 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
@@ -144,3 +144,4 @@ ExistingPagePathDialogCellEdito_LabelText = Please enter or select a web page pa
 
 PageflowLinkEditPart_FromAction=fromAction:
 PageflowLinkEditPart_FromOutcome=fromOutcome:
+ProjectWebPageSelectionDialog_Description=Please select a Web Page
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java
index eb218e82e..7d668d7d1 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java
@@ -15,6 +15,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jst.jsf.common.ui.internal.dialogs.CommonResourceDialog;
+import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
 import org.eclipse.swt.widgets.Shell;
 
 /**
@@ -44,19 +45,19 @@ public class ProjectWebPageSelectionDialog extends CommonResourceDialog {
 	}
 
 	private void init() {
-		setResourceDescription("Web page");
-		setSuffixs(new String[] { "jsp", "jspx", "jsf", "html", "htm" });
+		setResourceDescription(PageflowMessages.ProjectWebPageSelectionDialog_Description);
+		setSuffixs(new String[] { "jsp", "jspx", "jsf", "html", "htm" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 	}
 
 	/**
 	 * @return the rseult file path
 	 */
 	public String getResultFilePath() {
-		String result = "";
+		String result = ""; //$NON-NLS-1$
 		IFile selectedFile = (IFile) getResult()[0];
 		IPath path = selectedFile.getProjectRelativePath();
 		path = path.removeFirstSegments(1);
-		result = "/" + path.toString();
+		result = "/" + path.toString(); //$NON-NLS-1$
 		return result;
 	}
 }