Fixed some warnings.

7 files changed, 191 insertions, 159 deletions

diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java
index db4bbbba2..603c271f9 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.core.internal.resources.ResourceException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -521,8 +520,11 @@ public final class HTMLEditor extends PostSelectionMultiPageEditorPart implement
 			if (fileDoesNotExist((IFileEditorInput) input, coreExceptionArray)) {
 				// todo use message formatter for {0}
 				Throwable coreException = coreExceptionArray[0];
-				// FIXME: WTF?
-				if (coreException instanceof ResourceException) {
+
+				// C.B: this is a strange piece of logic.  It was referenceing
+				// the internal sub-class of CoreException, ResourceException.
+				// need to review fileDoesNotExist.
+				if (coreException instanceof CoreException) {
 					// I'm assuming this is always 'does not exist'
 					// we'll refresh local go mimic behavior of default
 					// editor, where the
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java
index 6a5fe6ce5..4e3c9c12a 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java
@@ -13,7 +13,6 @@ package org.eclipse.jst.pagedesigner.itemcreation;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.gef.EditPart;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.SharedCursors;
 import org.eclipse.gef.commands.Command;
@@ -115,7 +114,7 @@ public class ItemCreationTool extends TargetingTool {
 	 * button in a right-handed world). If any other button is pressed, the tool
 	 * goes into an invalid state. Otherwise, it goes into the drag state,
 	 * updates the request's location and calls
-	 * {@link TargetingTool#lockTargetEditPart(EditPart)}with the edit part
+	 * {@link TargetingTool#lockTargetEditPart(org.eclipse.gef.EditPart)}with the edit part
 	 * that was just clicked on.
 	 * 
 	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java
index 0ae21ade3..a5bfea327 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java
@@ -13,10 +13,9 @@ package org.eclipse.jst.pagedesigner.itemcreation.internal;
 import org.eclipse.jst.pagedesigner.itemcreation.AbstractTagCreator;
 import org.eclipse.jst.pagedesigner.itemcreation.CreationData;
 import org.eclipse.jst.pagedesigner.itemcreation.ITagCreationAdvisor;
-import org.eclipse.jst.pagedesigner.itemcreation.ITagCreator;
 
 /**
- * {@link ITagCreator} used by the Web Page Editor palette. 
+ * {@link org.eclipse.jst.pagedesigner.itemcreation.ITagCreator} used by the Web Page Editor palette. 
  * 
  * Uses org.eclipse.jst.jsf.common.metadata 
  */
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/TagCreationFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/TagCreationFactory.java
index 7f62239f6..6304e8559 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/TagCreationFactory.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/TagCreationFactory.java
@@ -12,72 +12,81 @@ package org.eclipse.jst.pagedesigner.itemcreation.internal;
 
 import org.eclipse.jst.jsf.common.dom.TagIdentifier;
 import org.eclipse.jst.pagedesigner.PDPlugin;
-import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry;
 import org.eclipse.jst.pagedesigner.elementedit.ElementEditFactoryRegistry;
 import org.eclipse.jst.pagedesigner.elementedit.IElementEdit;
 import org.eclipse.jst.pagedesigner.itemcreation.AbstractTagCreator;
 import org.eclipse.jst.pagedesigner.itemcreation.ITagCreator;
 
 /**
- * Creates instances of {@link ITagCreator}s for a the given {@link TagToolPaletteEntry}
- * (Eventually) Will use TagCreavtorFactories registered using org.eclipse.jst.jsf.pagedesigner.tagcreationfactories ext-pt.  
- * Currently only using DefaultTagCreator.
+ * Creates instances of
+ * {@link org.eclipse.jst.pagedesigner.itemcreation.ITagCreator}s for a the
+ * given
+ * {@link org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry}
+ * (Eventually) Will use TagCreavtorFactories registered using
+ * org.eclipse.jst.jsf.pagedesigner.tagcreationfactories ext-pt. Currently only
+ * using DefaultTagCreator.
  */
-public class TagCreationFactory {
-	private static TagCreationFactory INSTANCE = null;
-	
-	/**
-	 * @return singleton instance
-	 */
-	public synchronized static TagCreationFactory getInstance(){
-		if (INSTANCE == null){
-			INSTANCE = new TagCreationFactory();
-		}
-		return INSTANCE;
-	}
+public class TagCreationFactory
+{
+    private static TagCreationFactory INSTANCE = null;
 
-	/**
-	 * Using the TagToolPaletteEntry, locate the factory to use for tag creation
-	 * @param tagId 
-	 * 
-	 * @return ITagCreator
-	 */
-	public ITagCreator createTagCreator(final TagIdentifier tagId) 
-	{
-	    
-	    IElementEdit elementEdit = ElementEditFactoryRegistry.getInstance().createElementEdit(tagId);
+    /**
+     * @return singleton instance
+     */
+    public synchronized static TagCreationFactory getInstance()
+    {
+        if (INSTANCE == null)
+        {
+            INSTANCE = new TagCreationFactory();
+        }
+        return INSTANCE;
+    }
 
-	    if (elementEdit != null)
-	    {
-//    	    for (ITagCreatorFactory factory : factories)
-//    	    {
-    	        ITagCreator tagCreator = null;
-    	        try
-    	        {
-    	            tagCreator = elementEdit.getTagCreator(tagId);
-    	        }
-    	        catch (Exception e)
-    	        {
-    	            PDPlugin.getLogger(getClass()).error
-    	                ("Error.ProblemLoadingTagCreatorFactory"
-    	                 ,elementEdit.getClass().toString(), e);  
-    	        }
-    	        
-    	        if (tagCreator != null)
-    	        {
-    	            if (tagCreator instanceof AbstractTagCreator)
-    	            {
-    	                return tagCreator;
-    	            }
-    	            // if non-null, skipped, log the issue
-	                PDPlugin.getLogger(getClass()).error
-	                   ("Error.ProblemLoadingTagCreatorFactory",
-	                   "Tag creator must extend AbstractTagCreator", new Throwable());
-	        }
-	    }
-	    
-	    // all else fails, use the internal default
-		return new DefaultTagCreator();	
-	}
+    /**
+     * Using the TagToolPaletteEntry, locate the factory to use for tag creation
+     * 
+     * @param tagId
+     * 
+     * @return ITagCreator
+     */
+    public ITagCreator createTagCreator(final TagIdentifier tagId)
+    {
+
+        IElementEdit elementEdit = ElementEditFactoryRegistry.getInstance()
+                .createElementEdit(tagId);
+
+        if (elementEdit != null)
+        {
+            // for (ITagCreatorFactory factory : factories)
+            // {
+            ITagCreator tagCreator = null;
+            try
+            {
+                tagCreator = elementEdit.getTagCreator(tagId);
+            }
+            catch (Exception e)
+            {
+                PDPlugin.getLogger(getClass()).error(
+                        "Error.ProblemLoadingTagCreatorFactory",
+                        elementEdit.getClass().toString(), e);
+            }
+
+            if (tagCreator != null)
+            {
+                if (tagCreator instanceof AbstractTagCreator)
+                {
+                    return tagCreator;
+                }
+                // if non-null, skipped, log the issue
+                PDPlugin.getLogger(getClass()).error(
+                        "Error.ProblemLoadingTagCreatorFactory",
+                        "Tag creator must extend AbstractTagCreator",
+                        new Throwable());
+            }
+        }
+
+        // all else fails, use the internal default
+        return new DefaultTagCreator();
+    }
 
 }
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DefaultPropertyPageDescriptor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DefaultPropertyPageDescriptor.java
index 415e447fd..2d8511593 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DefaultPropertyPageDescriptor.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DefaultPropertyPageDescriptor.java
@@ -16,7 +16,6 @@ import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
 import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
 import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
 import org.eclipse.jst.jsf.metadataprocessors.MetaDataContext;
-import org.eclipse.jst.jsf.taglibprocessing.attributevalues.StringType;
 import org.eclipse.jst.pagedesigner.editors.properties.IPropertyPageDescriptor;
 import org.eclipse.jst.pagedesigner.meta.EditorCreator;
 import org.eclipse.jst.pagedesigner.meta.IAttributeRuntimeValueType;
@@ -26,92 +25,116 @@ import org.eclipse.swt.widgets.Composite;
 import org.w3c.dom.Element;
 
 /**
- * Property descriptor implementation for when meta data is available,
- * but the meta data type is not adaptable to a {@link IPropertyPageDescriptor}.
+ * Property descriptor implementation for when meta data is available, but the
+ * meta data type is not adaptable to a {@link IPropertyPageDescriptor}.
  * 
- * It is assumed that the  value type is {@link StringType}.
+ * It is assumed that the value type is
+ * {@link org.eclipse.jst.jsf.taglibprocessing.attributevalues.StringType}.
  */
-public class DefaultPropertyPageDescriptor implements IPropertyPageDescriptor {
-	private Entity _tagEntity;
-	private Entity _attrEntity;
-	
-	private IStructuredDocumentContext 	_sdContext;
-	private MetaDataContext 			_mdContext;
-	
-	/**
-	 * Constructor
-	 * @param tagEntity
-	 * @param attrEntity
-	 */
-	public DefaultPropertyPageDescriptor(Entity tagEntity, Entity attrEntity) {
-		_tagEntity 	= tagEntity;
-		_attrEntity = attrEntity;
-	}
-
-	public String getAttributeName() {
-		return _attrEntity.getId();
-	}
-
-	public String getCategory() {
-		return ITabbedPropertiesConstants.OTHER_CATEGORY;
-	}
-
-	public CellEditor getCellEditor(Composite parent) {
-		Element element = (Element)IStructuredDocumentContextResolverFactory.INSTANCE.getDOMContextResolver(getStructuredDocumentContext()).getNode();		
-		return CellEditorFactoryRegistry.getInstance().createCellEditor(parent, this, element);
-	}
-
-	public String getDescription() {
-		return null;
-	}
-
-	public DialogField getDialogFieldEditor() {
-		EditorCreator creator = EditorCreator.getInstance();
-		return creator.createDialogFieldWithWrapper(getUri(),
-				getTagName(),this, null);
-	}
-
-	public String getLabel() {
-		return getAttributeName()+ ":";
-	}
-
-	public String getTagName() {
-		return _tagEntity.getId();
-	}
-
-	public String getUri() {
-		return _tagEntity.getModel().getCurrentModelContext().getUri();
-	}
-
-	public String getValueType() {
-		return IAttributeRuntimeValueType.STRING;
-	}
-
-	public boolean isRequired() {
-		return false;
-	}
-
-	public MetaDataContext getMetaDataContext() {
-		return _mdContext;
-	}
-
-	public IStructuredDocumentContext getStructuredDocumentContext() {
-		return _sdContext;
-	}
-
-	public void setMetaDataContext(MetaDataContext context) {
-		_mdContext = context;
-	}
-
-	public void setStructuredDocumentContext(IStructuredDocumentContext context) {
-		_sdContext = context;
-	}
-
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-
-	public String toString() {
-		return getUri()+"/"+getTagName()+"/"+getAttributeName()+" (Default Descriptor)"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
+public class DefaultPropertyPageDescriptor implements IPropertyPageDescriptor
+{
+    private Entity _tagEntity;
+    private Entity _attrEntity;
+
+    private IStructuredDocumentContext _sdContext;
+    private MetaDataContext _mdContext;
+
+    /**
+     * Constructor
+     * 
+     * @param tagEntity
+     * @param attrEntity
+     */
+    public DefaultPropertyPageDescriptor(Entity tagEntity, Entity attrEntity)
+    {
+        _tagEntity = tagEntity;
+        _attrEntity = attrEntity;
+    }
+
+    public String getAttributeName()
+    {
+        return _attrEntity.getId();
+    }
+
+    public String getCategory()
+    {
+        return ITabbedPropertiesConstants.OTHER_CATEGORY;
+    }
+
+    public CellEditor getCellEditor(Composite parent)
+    {
+        Element element = (Element) IStructuredDocumentContextResolverFactory.INSTANCE
+                .getDOMContextResolver(getStructuredDocumentContext())
+                .getNode();
+        return CellEditorFactoryRegistry.getInstance().createCellEditor(parent,
+                this, element);
+    }
+
+    public String getDescription()
+    {
+        return null;
+    }
+
+    public DialogField getDialogFieldEditor()
+    {
+        EditorCreator creator = EditorCreator.getInstance();
+        return creator.createDialogFieldWithWrapper(getUri(), getTagName(),
+                this, null);
+    }
+
+    public String getLabel()
+    {
+        return getAttributeName() + ":";
+    }
+
+    public String getTagName()
+    {
+        return _tagEntity.getId();
+    }
+
+    public String getUri()
+    {
+        return _tagEntity.getModel().getCurrentModelContext().getUri();
+    }
+
+    public String getValueType()
+    {
+        return IAttributeRuntimeValueType.STRING;
+    }
+
+    public boolean isRequired()
+    {
+        return false;
+    }
+
+    public MetaDataContext getMetaDataContext()
+    {
+        return _mdContext;
+    }
+
+    public IStructuredDocumentContext getStructuredDocumentContext()
+    {
+        return _sdContext;
+    }
+
+    public void setMetaDataContext(MetaDataContext context)
+    {
+        _mdContext = context;
+    }
+
+    public void setStructuredDocumentContext(IStructuredDocumentContext context)
+    {
+        _sdContext = context;
+    }
+
+    public Object getAdapter(Class adapter)
+    {
+        return null;
+    }
+
+    public String toString()
+    {
+        return getUri()
+                + "/" + getTagName() + "/" + getAttributeName() + " (Default Descriptor)"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
 }
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java
index 07923fe27..6a5382625 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java
@@ -20,10 +20,10 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IJarEntryResource;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.core.JarEntryFile;
 import org.eclipse.jdt.ui.JavaElementLabelProvider;
 import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -128,9 +128,9 @@ public class ResourceOnClasspathDialog extends TreeViewerSelectionDialog {
 				}
 				return false;
 			}
-			// XXX: JarEntryFile is for internal use.
-			if (element instanceof JarEntryFile) {
-				String ext = ((JarEntryFile) element).getFullPath()
+
+			if (element instanceof IJarEntryResource) {
+				String ext = ((IJarEntryResource) element).getFullPath()
 						.getFileExtension();
 				if (ext != null && Arrays.asList(_suffixs).contains(ext)) {
 					return true;
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JavaUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JavaUtil.java
index 17347070f..7d554c636 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JavaUtil.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JavaUtil.java
@@ -16,8 +16,8 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJarEntryResource;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.internal.core.JarEntryFile;
 import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
 import org.eclipse.jst.pagedesigner.PDPlugin;
 
@@ -81,8 +81,8 @@ public class JavaUtil {
 					}
 				}
 			}
-		} else if (parent instanceof JarEntryFile) {
-			IPath elementPath = ((JarEntryFile) parent).getFullPath();
+		} else if (parent instanceof IJarEntryResource) {
+			IPath elementPath = ((IJarEntryResource) parent).getFullPath();
 			if (elementPath.getFileExtension().equalsIgnoreCase(
 					IFileFolderConstants.EXT_PROPERTIES)) {
 				result = elementPath;