240526 unused messages in org.eclipse.wst.common.ui.internal.Messages
diff --git a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
index acd3167..555714d 100644
--- a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.ui; singleton:=true
-Bundle-Version: 1.1.302.qualifier
+Bundle-Version: 1.1.402.qualifier
 Bundle-Activator: org.eclipse.wst.common.ui.internal.UIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ScopedComponentSearchListDialog.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ScopedComponentSearchListDialog.java
index 212fc75..16ca611 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ScopedComponentSearchListDialog.java
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ScopedComponentSearchListDialog.java
@@ -144,11 +144,13 @@
 			if ( dialog.open() == Window.OK){
 				workingSets = dialog.getSelection();
 				valueForWorkingSetsText = "";
-				for (int i = 0; i < workingSets.length; i++){
-					valueForWorkingSetsText += workingSets[i].getLabel();
-					// if not the last item, we add a comma
-					if ( i != workingSets.length - 1) 
-						valueForWorkingSetsText += ", ";
+				if (workingSets != null) {
+					for (int i = 0; i < workingSets.length; i++){
+						valueForWorkingSetsText += workingSets[i].getLabel();
+						// if not the last item, we add a comma
+						if ( i != workingSets.length - 1) 
+							valueForWorkingSetsText += ", ";
+					}
 				}
 				workingSetsText.setText(valueForWorkingSetsText);
 			}
@@ -194,9 +196,11 @@
 			  // Constructs the working sets scope from the working sets the user
 			  // selected
 			  WorkingSetSearchScope workingSetsScope = new WorkingSetSearchScope();
-			  for (int i = 0; i < workingSets.length; i++){
-				  workingSetsScope.addAWorkingSetToScope(workingSets[i].getElements());
-			  }			  
+			  if (workingSets != null) {
+				  for (int i = 0; i < workingSets.length; i++){
+					  workingSetsScope.addAWorkingSetToScope(workingSets[i].getElements());
+				  }
+			  }
 			  scope = workingSetsScope;
 		  }
 		  
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/CommonUIMessages.properties b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/CommonUIMessages.properties
new file mode 100644
index 0000000..742e35b
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/CommonUIMessages.properties
@@ -0,0 +1,143 @@
+! SelectSingleFilePage and SelectMultiFilePage
+_UI_LABEL_SOURCE_FILES   = Workspace Files
+_UI_LABEL_SELECTED_FILES = Selected Files
+_UI_POPUP_EXPAND_ALL	 = Expand All
+_UI_POPUP_COLLAPSE_ALL	 = Collapse All
+	
+_UI_IMPORT_BUTTON          = Import Files...
+_UI_IMPORT_BUTTON_TOOL_TIP = Import files from file system
+
+
+! SelectMultiFilePage
+! NOTE TO TRANSLATOR: the following three lines refers to _UI_LABEL_SELECTED_FILES label above
+_UI_ADD_BUTTON_TOOL_TIP    = Add files to Selected Files list.
+_UI_REMOVE_BUTTON_TOOL_TIP = Remove files from Selected Files list.
+_UI_REMOVE_ALL_BUTTON_TOOL_TIP =  Remove all files from Selected Files list.
+
+! NOTE TO TRANSLATOR: No translation needed of following three lines
+_UI_ADD_BUTTON             = >
+_UI_REMOVE_BUTTON          = <
+_UI_REMOVE_ALL_BUTTON      = <<
+
+! SelectJavaProjectView
+_UI_LABEL_CHOOSE_FOLDER = Select a project or folder:
+
+! SelectJavaProjectDialog
+_UI_LABEL_FOLDER_SELECTION = Container Selection
+
+! TextViewerOperationAction
+_UI_MENU_COPY         = &Copy
+_UI_MENU_CUT          = Cu&t
+_UI_MENU_DELETE       = Delete
+_UI_MENU_PASTE        = &Paste
+_UI_MENU_PREFIX       = Prefix
+_UI_MENU_REDO         = Redo
+_UI_MENU_SELECT_ALL   = Select All
+_UI_MENU_SHIFT_LEFT   = Shift Left
+_UI_MENU_SHIFT_RIGHT  = Shift Right
+_UI_MENU_STRIP_PREFIX = Strip Prefix
+_UI_MENU_UNDO         = Undo
+
+! SourceViewerGotoLineAction
+_UI_MENU_GOTO_LINE           = Go To Line...
+_UI_GOTO_LINE_DIALOG_TITLE   = Go To Line
+_UI_GOTO_LINE_DIALOG_TEXT    = Enter Line Number
+
+_UI_FILE_CHANGED_TITLE = File Changed
+_UI_FILE_DELETED_SAVE_CHANGES = The file has been deleted from the file system. Do you want to save your changes or close the editor without saving?
+_UI_FILE_DELETED_EDITOR_CLOSED = The file has been deleted from the file system. This editor will be closed.
+_UI_FILE_CHANGED_LOAD_CHANGES = The file has been changed on the file system. Do you want to load the changes?
+_UI_SAVE_BUTTON = Save
+_UI_CLOSE_BUTTON = Close
+
+
+! XSL Prefererence
+_UI_XSLT_SELECT     = Select which element to use for your stylesheet
+_UI_XSLT_STYLESHEET = &Use <xsl:stylesheet>
+_UI_XSLT_TRANSFORM  = U&se <xsl:transform>
+
+! XSL Debug Prefererence
+_UI_XSL_DEBUG_SELECT_LAUNCHER = Set the default XSL launcher for the XSL Debugging and Transformation tool
+_UI_XSL_DEBUG_LOCAL           = &XSL application
+_UI_XSL_DEBUG_REMOTE          = XS&L remote application
+_UI_XSL_TILE_EDITOR           = &Show all debugging files in a tile editor
+_UI_XSL_DEBUG_AND_TRANSFORM   = &Run transformation and open a debugging session
+_UI_XSL_CONTEXT_URI           = Context Path 
+_UI_XSL_CONTEXT               = Specify a &context path for resolving URIs in xsl:import, xsl:include or document()
+
+
+_UI_OVERRIDE_FILE    = Overwrite existing files
+_UI_JAVA_EXIST_FILE1 = The following Java classes already exist.
+_UI_JAVA_EXIST_FILE2 = Do you want to overwrite the existing file?
+      
+! some options strings common to several plugins
+_UI_ERROR_CREATING_FILE_TITLE = Error Creating File
+_UI_ERROR_CREATING_FILE_SHORT_DESC = Error creating file "{0}"
+_UI_ERROR_CREATING_FILE_LONG_DESC = An error occured while attempting to create the file "{0}".
+_UI_PARENT_FOLDER_IS_READ_ONLY = The parent directory "{0}" is read only.
+_UI_UNKNOWN_ERROR_WITH_HINT = Unknown error. Ensure that the parent directory "{0}" is writeable.
+_UI_UNKNOWN_ERROR = Unknown error. Ensure that the parent directory "{0}" is writeable.
+
+! usage - this label is followed by two radio button options for the file location
+_UI_LABEL_INCLUDE_URL_FILE = Select file location
+_UI_RADIO_FILE             = Workspace projects
+_UI_RADIO_URL              = HTTP
+
+_UI_LABEL_COMPONENTS				   = Components:
+_UI_LABEL_QUALIFIER					   = Qualifier:
+
+!- component selection dialogs 
+_UI_LABEL_COMPONENT_NAME			   = Component Name:
+_UI_LABEL_MATCHING_COMPONENTS		   = Matching Components:
+_UI_LABEL_SPECIFIED_FILE			   = Specified File
+_UI_LABEL_ENCLOSING_PROJECT			   = Enclosing Project
+_UI_LABEL_WORKSPACE					   = Workspace
+_UI_LABEL_CURRENT_RESOURCE			   = Current Resource
+_UI_LABEL_SEARCH_SCOPE				   = Search Scope
+_UI_LABEL_NARROW_SEARCH_SCOPE_RESOURCE = Use resource view to narrow search scope
+_UI_LABEL_AVAILABLE_TYPES			   = Available Types
+_UI_LABEL_WORKING_SETS                 = Working Sets
+
+_UI_LABEL_New=New...
+_UI_LABEL_DECLARATION_LOCATION=Declaration Location:
+_UI_LABEL_CHOOSE=Choose...
+
+!======================================================================================
+!
+! Here is the list of Error string that have message IDs - make sure they are unique
+!  Range for b2bgui messageIDs: IWAX1201 - IWAX1400
+!
+!======================================================================================
+
+_ERROR_THE_CONTAINER_NAME = The specified container must exist in the workspace and its path must start at the workspace root.
+
+_ERROR_LOCAL_LOCATION     = The local location of this container cannot be resolved.
+_ERROR_NOT_JAVA_PROJECT   = The specified project is not a Java project.
+
+!NOTE TO TRANSLATOR: this error message text is followed by a message from another plugin
+_ERROR_INVALID_JAVA_PACKAGE = IWAX1201E Invalid package name error:
+
+!NOTE TO TRANSLATOR: (_ERROR_BAD_FILENAME_EXTENSION + string + _UI_LABEL_OR + string) or (_ERROR_BAD_FILENAME_EXTENSION)
+_ERROR_BAD_FILENAME_EXTENSION         = The file name must end with
+_ERROR_FILE_ALREADY_EXISTS            = The same name already exists.
+
+_ERROR_CONTAINER_NOT_JAVA_BUILDPATH = The container is not a Java source folder for this project
+_ERROR_USE_PROJECT_JAVA_SOURCE_FOLDER = The project is not on the build path.  Select a Java source folder for the project.
+
+_UI_ERROR             = Error
+
+!NOTE TO TRANSLATOR: this warning message text is followed by a message from another plugin
+_WARN_INVALID_JAVA_PACKAGE = Invalid package name warning:
+
+_ERROR_ROOT_ELEMENT = The XML schema does not contain any global elements that can be used as a root element.
+_ERROR_SAVING_FILE = Error saving file "{0}"
+
+! File Validator
+_UI_ERROR_VALIDATE_FAIL_TITLE = Failed to check out necessary files
+_UI_ERROR_VALIDATE_FAIL_MESSAGE = Generation failed. Necessary files could not be checked out. 
+
+! PropertyDirtyChangeListener and PropertyResourceChangeListener
+_UI_ERROR_VALIDATE_EDIT_FAIL_ONE_FILE = Error
+
+SaveFilesDialog_save_all_resources=Save All Modified Resources
+SaveFilesDialog_must_save=All modified resources must be saved before this operation.
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/Messages.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/Messages.java
index ce13bb8..0cd816a 100644
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/Messages.java
+++ b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2001, 2008 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
@@ -13,7 +13,7 @@
 import org.eclipse.osgi.util.NLS;
 
 public class Messages {
-	private static final String BUNDLE_NAME = "plugin"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.wst.common.ui.internal.CommonUIMessages"; //$NON-NLS-1$
 
 	static {
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class); //$NON-NLS-1$
@@ -149,6 +149,8 @@
 
 	public static String _UI_ERROR;
 
+	public static String _WARN_INVALID_JAVA_PACKAGE;
+	
 	public static String _ERROR_ROOT_ELEMENT;
 	public static String _ERROR_SAVING_FILE;
 
@@ -159,18 +161,6 @@
 //	 PropertyDirtyChangeListener and PropertyResourceChangeListener
 	public static String _UI_ERROR_VALIDATE_EDIT_FAIL_ONE_FILE;
 
-//	public static String ExampleProjectCreationWizard.title;
-//	public static String ExampleProjectCreationWizard.op_error.title;
-//	public static String ExampleProjectCreationWizard.op_error.message;
-//
-//	public static String ExampleProjectCreationWizard.overwritequery.title;
-//	public static String ExampleProjectCreationWizard.overwritequery.message;
-//
-//
-//	public static String ExampleProjectCreationOperation.op_desc;
-//	public static String ExampleProjectCreationOperation.op_desc_proj;
-//
-//	public static String ExampleProjectCreationWizardPage.error.alreadyexists;
 	public static String SaveFilesDialog_save_all_resources;
 	public static String SaveFilesDialog_must_save;
 }