[279627] Tighten compiler and move up to Java 1.5

4 files changed, 20 insertions, 29 deletions

diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
index 6003d55c0..eb041f6da 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
@@ -69,7 +69,7 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements
 	
 	private static class TypeRenderer extends LabelProvider {
         private final Image SERVLET_ICON = 
-            ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage();
+            ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage(); //$NON-NLS-1$
 
         @Override
 		public String getText(Object element) {
@@ -129,7 +129,7 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements
 			setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
 		else setTitle(title);
 		
-		Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null);
+		Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null); //$NON-NLS-1$
 		
 		updateStatus(currStatus);
 		fElementRenderer = new TypeRenderer();
@@ -158,7 +158,7 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements
                 }
             }
     
-            fServletNames = (String[]) servletsList.toArray(new String[servletsList.size()]);
+            fServletNames = servletsList.toArray(new String[servletsList.size()]);
             servletsList = null;
         } catch (Exception e) {
             ServletUIPlugin.log(e);
@@ -331,7 +331,7 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements
         Label messageLabel = new Label(composite, SWT.NONE);
         gd = new GridData();
         messageLabel.setLayoutData(gd);
-        messageLabel.setText(URL_PATTERN_LABEL); //$NON-NLS-1$
+        messageLabel.setText(URL_PATTERN_LABEL);
 
         fURLText = new Text(composite, SWT.BORDER);
         GridData spec = new GridData();
@@ -370,7 +370,7 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements
 
         //Create Dispatchers control
         Group dispatchers = new Group(fChild, SWT.SHADOW_IN);
-        dispatchers.setText(WebAppEditResourceHandler.getString("Select_Dispatchers_UI_"));
+        dispatchers.setText(WebAppEditResourceHandler.getString("Select_Dispatchers_UI_")); //$NON-NLS-1$
         dispatchers.setLayout(new CellLayout(2).setMargins(10,10).setSpacing(5,5));
         GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
         gridData.horizontalSpan = 2;
@@ -539,8 +539,11 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements
 	}
 
 	public void setElements(Object[] elements) {
-	    if (elements == null) elements = new Object[0]; 
-		fElements = elements;
+	    Object [] innerElements = elements;
+		if (innerElements == null){
+			innerElements = new Object[0];
+	    }
+		fElements = innerElements;
 		fRenderedStrings = renderStrings(fElements);
 	}
 
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 085b81075..5fe95cefb 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
@@ -20,7 +20,6 @@ import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD
 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.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.INIT_PARAM_LABEL;
 import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE;
@@ -28,7 +27,6 @@ import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAM
 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.URL_SERVLET_LABEL;
 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;
@@ -100,16 +98,6 @@ public class AddFilterWizardPage extends DataModelWizardPage {
 				INIT_PARAM);
 		initSection.setCallback(callback);
 		
-		String[] buttons = new String[] {
-		        ADD_BUTTON_LABEL, 
-		        EDIT_BUTTON_LABEL, 
-		        REMOVE_BUTTON_LABEL
-		};
-		String[] columnNames = new String[] {
-		        null,
-		        URL_SERVLET_LABEL,
-		        DISPATCHERS_LABEL
-		};
 		mappingSection = new FilterMappingsArrayTableWizardSection(composite, 
 		         model, FILTER_MAPPINGS);
 
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
index f9f3ab562..d08acfd8b 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
@@ -80,9 +80,9 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements
 	}
 	protected class StringArrayListLabelProvider extends LabelProvider implements ITableLabelProvider {
         private final Image URL_PATTERN_ICON = 
-            ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("url_mapping")).createImage();
+            ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("url_mapping")).createImage(); //$NON-NLS-1$
         private final Image SERVLET_ICON = 
-            ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage();
+            ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage(); //$NON-NLS-1$
 
         public Image getColumnImage(Object element, int columnIndex) {
 		    if (columnIndex == 0) {
@@ -110,9 +110,9 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements
 	
 	final static int ICON_WIDTH = 25;
 	final static int DISPATCHERS_WIDTH = 100;
-	private final static String ICON_PROP = "ICON_PROP";
-	private final static String NAME_PROP = "NAME_PROP";
-	private final static String DISPATCHERS_PROP = "DISPATCHERS_PROP";
+	private final static String ICON_PROP = "ICON_PROP"; //$NON-NLS-1$
+	private final static String NAME_PROP = "NAME_PROP"; //$NON-NLS-1$
+	private final static String DISPATCHERS_PROP = "DISPATCHERS_PROP"; //$NON-NLS-1$
 	
 	private TableViewer viewer;
 	private Button addButton;
@@ -255,11 +255,11 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements
 		    }
 		});
 		
-		viewer.setInput((List) model.getProperty(propertyName));
+		viewer.setInput(model.getProperty(propertyName));
 	}
 
 	private void handleAddButtonSelected() {
-	    String title = WebAppEditResourceHandler.getString("Add_Filter_Mapping_Title_UI_");
+	    String title = WebAppEditResourceHandler.getString("Add_Filter_Mapping_Title_UI_"); //$NON-NLS-1$
 	    IProject p = (IProject) model.getProperty(PROJECT);
 	    List valueList = (List) viewer.getInput();
 	    AddEditFilterMappingDialog dialog = 
@@ -271,7 +271,7 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements
 	}
 
      private void handleEditButtonSelected() {
-         String title = WebAppEditResourceHandler.getString("Edit_Filter_Mapping_Title_UI_");
+         String title = WebAppEditResourceHandler.getString("Edit_Filter_Mapping_Title_UI_"); //$NON-NLS-1$
 		ISelection s = viewer.getSelection();
 		if (!(s instanceof IStructuredSelection))
 			return;
@@ -348,7 +348,7 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements
 
 	public void propertyChanged(DataModelEvent event) {
 		if (this.propertyName.equals(event.getPropertyName())) {
-			viewer.setInput((List) event.getProperty());
+			viewer.setInput(event.getProperty());
 		}
 	}
 
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java
index b35eb2405..d1fe45658 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java
@@ -62,7 +62,7 @@ public abstract class NewWebArtifactWizard extends NewWebWizard {
 	protected abstract ImageDescriptor getImage();
 	
 	protected ImageDescriptor getImageFromJ2EEPlugin(String key) {
-		URL url = (URL) J2EEPlugin.getDefault().getImage(key); //$NON-NLS-1$
+		URL url = (URL) J2EEPlugin.getDefault().getImage(key);
 		return ImageDescriptor.createFromURL(url);
 	}