Increased warnings and error level on code and Javadoc compliance.

Fixed new errors and some warnings.

16 files changed, 107 insertions, 172 deletions

diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PaletteViewAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PaletteViewAction.java
index a167800ec..f04b3b15a 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PaletteViewAction.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PaletteViewAction.java
@@ -21,14 +21,15 @@ import org.w3c.dom.Element;
  */
 public class PaletteViewAction extends ShowViewAction {
 	public final static String ID = "org.eclipse.jst.pagedesigner.editors.actions.PaletteViewAction"; //$NON-NLS-1$
-	private final Element   _element;
-    private final EditDomain _editDomain;
+	// TODO: dead?
+	//private final Element   _element;
+    //private final EditDomain _editDomain;
     
 	public PaletteViewAction(Element element, EditDomain editDomain) {
         super(ActionsMessages.getString("PaletteViewAction.Menu.PaletteView")
                 , PaletteView.ID); //$NON-NLS-1$
-        _element = element;
-        _editDomain = editDomain;
+        //_element = element;
+        //_editDomain = editDomain;
 	}
     
     /** 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java
index dfdf38589..4434cf46a 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java
@@ -78,8 +78,8 @@ public class RelatedViewActionGroup extends ActionGroup
 							.get(views[0]));
 					manager.add(action);
 				}
-				if (manager.find(PaletteViewAction.ID) == null) {
                     ISelection selection = context.getSelection();
+                    if (manager.find(PaletteViewAction.ID) == null) {
                     if (selection instanceof IStructuredSelection)
                     {
                         IStructuredSelection strucSelection = 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizer.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizer.java
index 34f67fb1e..e55a75d6d 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizer.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizer.java
@@ -14,19 +14,11 @@ package org.eclipse.jst.pagedesigner.editors.palette;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.gef.palette.PaletteDrawer;
 import org.eclipse.gef.palette.PaletteEntry;
 import org.eclipse.gef.ui.palette.PaletteCustomizer;
 import org.eclipse.gef.ui.palette.customize.PaletteSeparatorFactory;
 import org.eclipse.gef.ui.palette.customize.PaletteStackFactory;
-import org.eclipse.jst.pagedesigner.PDPlugin;
 import org.eclipse.jst.pagedesigner.editors.palette.impl.PaletteItemManager;
-import org.eclipse.jst.pagedesigner.editors.palette.impl.TaglibPaletteDrawer;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
 
 /**
  * @author mengbo
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java
index eeee0a196..e50573a37 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java
@@ -21,8 +21,6 @@ import org.eclipse.gef.palette.PaletteGroup;
 import org.eclipse.gef.palette.PaletteRoot;
 import org.eclipse.gef.palette.SelectionToolEntry;
 import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.pagedesigner.PDPlugin;
 import org.eclipse.jst.pagedesigner.editors.pagedesigner.PageDesignerResources;
 import org.eclipse.jst.pagedesigner.tools.RangeSelectionTool;
 
@@ -32,13 +30,14 @@ import org.eclipse.jst.pagedesigner.tools.RangeSelectionTool;
 public class DesignerPaletteRoot extends PaletteRoot {
 	private IPaletteItemManager _manager;
 
-	private final static ImageDescriptor DEFAULT_SMALL_ICON = PDPlugin
-			.getDefault().getImageDescriptor(
-					"palette/GENERIC/small/PD_Palette_Default.gif");
-
-	private final static ImageDescriptor DEFAULT_LARGE_ICON = PDPlugin
-			.getDefault().getImageDescriptor(
-					"palette/GENERIC/large/PD_Palette_Default.gif");
+	// FIXME: unused
+//	private final static ImageDescriptor DEFAULT_SMALL_ICON = PDPlugin
+//			.getDefault().getImageDescriptor(
+//					"palette/GENERIC/small/PD_Palette_Default.gif");
+//
+//	private final static ImageDescriptor DEFAULT_LARGE_ICON = PDPlugin
+//			.getDefault().getImageDescriptor(
+//					"palette/GENERIC/large/PD_Palette_Default.gif");
 
     // how many characters to truncate a palette item's description to.
     // TODO: add preference?
@@ -49,8 +48,8 @@ public class DesignerPaletteRoot extends PaletteRoot {
     // and min(HARD_LENGTH, str.length()).  If found, we truncate there.  If not,
     // we truncate to HARD_LENGTH-" ...".length() and append the ellipsis.
     // In all cases the truncated description string returned should <= HARD_LENGTH.
-    private final static int  DESCRIPTION_TRUNCATE_SOFT_LENGTH = 150;
-    private final static int  DESCRIPTION_TRUNCATE_HARD_LENGTH = 250;
+// FIXME: unused    private final static int  DESCRIPTION_TRUNCATE_SOFT_LENGTH = 150;
+//    private final static int  DESCRIPTION_TRUNCATE_HARD_LENGTH = 250;
     
 	// _showAll will be initialized in init()
 	// private boolean _showAll;
@@ -105,64 +104,64 @@ public class DesignerPaletteRoot extends PaletteRoot {
 		// remove other things first.
 		removeItems();
 
-		PaletteEntry entry;
+		// FIXME: unused PaletteEntry entry;
 
 		List categories = _manager.getAllCategories();
-		List drawers = new ArrayList(categories.size());
+		// FIXME: unused List drawers = new ArrayList(categories.size());
 		this.addAll(categories);
 	}
 
-
-	private String formatDescription(String desc) {
-        // first, truncate the string
-        if (desc.length() > DESCRIPTION_TRUNCATE_SOFT_LENGTH)
-        {
-            // find the closest period to the soft length but before the hard length
-            // TODO: note that this is not localizable
-            String softDesc = desc.substring(0, DESCRIPTION_TRUNCATE_SOFT_LENGTH);
-            String ellipsis = "";
-            int truncPos = softDesc.lastIndexOf('.');
-            if (truncPos<0)
-            {
-                int endPos = Math.min(DESCRIPTION_TRUNCATE_HARD_LENGTH, desc.length()-1);
-                String fuzzyString = desc.substring(DESCRIPTION_TRUNCATE_SOFT_LENGTH, endPos);
-                truncPos = fuzzyString.lastIndexOf('.');
-                if (truncPos<0)
-                {
-                    ellipsis = " ...";
-                    truncPos = endPos-ellipsis.length();
-                }
-            }
-
-            desc = desc.substring(0, truncPos+1);
-            desc+=ellipsis;
-        }
-        StringBuffer result = new StringBuffer();
-        
-		if (desc.indexOf("\n") != -1) {
-			String[] fragments = desc.split("\n");
-			
-			for (int i = 0, n = fragments.length; i < n; i++) {
-				result.append(fragments[i].trim()).append(' ');
-			}
-		}
-        
-		return result.toString().trim();
-	}
+// FIXME: unused
+//	private String formatDescription(String desc) {
+//        // first, truncate the string
+//        if (desc.length() > DESCRIPTION_TRUNCATE_SOFT_LENGTH)
+//        {
+//            // find the closest period to the soft length but before the hard length
+//            // TODO: note that this is not localizable
+//            String softDesc = desc.substring(0, DESCRIPTION_TRUNCATE_SOFT_LENGTH);
+//            String ellipsis = "";
+//            int truncPos = softDesc.lastIndexOf('.');
+//            if (truncPos<0)
+//            {
+//                int endPos = Math.min(DESCRIPTION_TRUNCATE_HARD_LENGTH, desc.length()-1);
+//                String fuzzyString = desc.substring(DESCRIPTION_TRUNCATE_SOFT_LENGTH, endPos);
+//                truncPos = fuzzyString.lastIndexOf('.');
+//                if (truncPos<0)
+//                {
+//                    ellipsis = " ...";
+//                    truncPos = endPos-ellipsis.length();
+//                }
+//            }
+//
+//            desc = desc.substring(0, truncPos+1);
+//            desc+=ellipsis;
+//        }
+//        StringBuffer result = new StringBuffer();
+//        
+//		if (desc.indexOf("\n") != -1) {
+//			String[] fragments = desc.split("\n");
+//			
+//			for (int i = 0, n = fragments.length; i < n; i++) {
+//				result.append(fragments[i].trim()).append(' ');
+//			}
+//		}
+//        
+//		return result.toString().trim();
+//	}
 
 	/**
-	 * @return
+	 * @return FIXME: unused
 	 */
-	private ImageDescriptor getDefaultLargeIcon() {
-		return DEFAULT_LARGE_ICON;
-	}
+//	private ImageDescriptor getDefaultLargeIcon() {
+//		return DEFAULT_LARGE_ICON;
+//	}
 
 	/**
-	 * @return
+	 * @return FIXME: unused
 	 */
-	private ImageDescriptor getDefaultSmallIcon() {
-		return DEFAULT_SMALL_ICON;
-	}
+//	private ImageDescriptor getDefaultSmallIcon() {
+//		return DEFAULT_SMALL_ICON;
+//	}
 
 	/**
 	 * remove everything from the paletteroot
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java
index 491c974be..4f7b80ba3 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java
@@ -20,18 +20,13 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.eclipse.jst.jsf.common.ui.internal.utils.StringUtil;
-import org.eclipse.jst.pagedesigner.IJMTConstants;
-import org.eclipse.jst.pagedesigner.dom.EditModelQuery;
 import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo;
-import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate;
 import org.eclipse.jst.pagedesigner.utils.JSPUtil;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -43,7 +38,7 @@ import org.xml.sax.SAXException;
  * @author mengbo
  */
 public class PaletteElementTemplateHelper {
-	private static final String TEMPLATE_ITEM_NAME = "template";
+	//private static final String TEMPLATE_ITEM_NAME = "template";
 
 	private static final String PREFIX_ATTRIBUTE = "_uri_";
 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java
index 318286916..4d12207d8 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java
@@ -12,7 +12,6 @@
 package org.eclipse.jst.pagedesigner.editors.palette.impl;
 
 import java.io.InputStream;
-import java.net.URL;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -31,14 +30,12 @@ import org.eclipse.jst.jsf.common.metadata.internal.IImageDescriptorProvider;
 import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
 import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper;
 import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity;
-import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataFactory;
 import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model;
 import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait;
 import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext;
 import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper;
 import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
 import org.eclipse.jst.jsf.common.ui.internal.utils.StringUtil;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager;
 import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
 import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
 import org.eclipse.jst.pagedesigner.IHTMLConstants;
@@ -366,16 +363,13 @@ private final static ImageDescriptor DEFAULT_LARGE_ICON = PDPlugin
 		String tagName = eledecl.getElementName();
 		String label = null;
 		String desc = null;
-		ImageDescriptor smallIcon = null;
 
 		if (eledecl instanceof TLDElementDeclaration){
 			TLDElementDeclaration tag = (TLDElementDeclaration)eledecl;			
 			label = tag.getDisplayName();			
 			desc = tag.getDescription();						
 		}
-		else {
-			
-		}
+		
 		if (label == null || label.equals(""))
 			label = tagName;
 		
@@ -463,23 +457,14 @@ private final static ImageDescriptor DEFAULT_LARGE_ICON = PDPlugin
 				}
 			});
 			for (int i = 0, size = elements.length; i < size; i++) {
-				IConfigurationElement ce = elements[i];
-				String id = ce.getDeclaringExtension().getNamespaceIdentifier();
-				Bundle bundle = Platform.getBundle(id);
-				String path = ce
-						.getAttribute(IJMTConstants.ATTRIBUTE_PATH_PALETTEITEMCONFIG);
-				readConfig(manager, bundle, path);
+				//IConfigurationElement ce = elements[i];
+				//String id = ce.getDeclaringExtension().getNamespaceIdentifier();
+				//readConfig(manager, bundle, path);
 			}
 		}
 
 	}
 
-	static void readConfig(IPaletteItemManager manager, Bundle bundle, String path) {
-		
-		
-		
-	}
-	
 	static void readConfigX(IPaletteItemManager manager, Bundle bundle,
 			String path) {
 		try {
@@ -496,13 +481,13 @@ private final static ImageDescriptor DEFAULT_LARGE_ICON = PDPlugin
 					.getElementsByTagName(IPaletteConstants.CATEGORY_TAG);
 			for (int i = 0, ilength = categories.getLength(); i < ilength; i++) {
 				Element cat = (Element) categories.item(i);
-				String prefix = cat.getAttribute(IPaletteConstants.ICONPREFIX);
+//				String prefix = cat.getAttribute(IPaletteConstants.ICONPREFIX);
 				String uri = cat.getAttribute(IPaletteConstants.URI);
 				String catlabel = cat.getAttribute(IPaletteConstants.LABEL);
-				TaglibPaletteDrawer category = manager.findOrCreateCategory(
+				/*FIXME: TaglibPaletteDrawer category =*/ manager.findOrCreateCategory(
 						uri, catlabel);
 				
-	//FIX ME			
+	//FIXME			
 //				String jsfComponentCategory = cat
 //						.getAttribute(IPaletteConstants.JSFCOMPONENTCATEGORY);
 //				boolean bJSF = Boolean.TRUE.toString().equalsIgnoreCase(
@@ -513,8 +498,8 @@ private final static ImageDescriptor DEFAULT_LARGE_ICON = PDPlugin
 //					category.setJSFComponentCategory(bJSF);
 //				}
 
-				NodeList items = cat
-						.getElementsByTagName(IPaletteConstants.ITEM_TAG);
+// FIXME:				NodeList items = cat
+//						.getElementsByTagName(IPaletteConstants.ITEM_TAG);
 //FIX ME
 //				for (int j = 0, jlength = items.getLength(); j < jlength; j++) {
 //					Element item = (Element) items.item(j);
@@ -590,15 +575,16 @@ private final static ImageDescriptor DEFAULT_LARGE_ICON = PDPlugin
 	 * @param smallIcon2
 	 * @return
 	 */
-	private static ImageDescriptor getImageDescriptor(Bundle bundle,
-			String prefix, String u) {
-		if (u == null || u.length() == 0) {
-			return null;
-		}
-		String path = (prefix == null ? "" : prefix) + u;
-		URL url = bundle.getEntry(path);
-		return ImageDescriptor.createFromURL(url);
-	}
+	// FIXME: dead?
+//	private static ImageDescriptor getImageDescriptor(Bundle bundle,
+//			String prefix, String u) {
+//		if (u == null || u.length() == 0) {
+//			return null;
+//		}
+//		String path = (prefix == null ? "" : prefix) + u;
+//		URL url = bundle.getEntry(path);
+//		return ImageDescriptor.createFromURL(url);
+//	}
 	
 	/**
 	 * @return
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java
index 6c9a30823..078546d03 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Timer;
 
 import javax.xml.parsers.DocumentBuilder;
 
@@ -71,8 +70,9 @@ public class PaletteItemManager implements IPaletteItemManager,
 
 	private static PaletteItemManager _currentInstance;
 
-	private boolean isUpdateNeeded;
-	private Timer _refreshTimer;
+	// FIXME: unused
+//	private boolean isUpdateNeeded;
+//	private Timer _refreshTimer;
 
 //	private IPath classpath, webinf;
 
@@ -99,11 +99,11 @@ public class PaletteItemManager implements IPaletteItemManager,
 	}
 
 	/**
-	 * 
+	 * FIXME dead?  
 	 */
-	public void dispose() {
-		
-	}
+//	public void dispose() {
+//		
+//	}
 
 	private IProject getCurProject() {
 		return _curProject;
@@ -111,7 +111,7 @@ public class PaletteItemManager implements IPaletteItemManager,
 
 	public static synchronized void removePaletteItemManager(
 			PaletteItemManager manager) {
-		manager.dispose();
+		// FIXME: does nothing? manager.dispose();
 		_managers.remove(manager.getCurProject());
 	}
 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/internal/metadata/HTMLContentModelMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/internal/metadata/HTMLContentModelMetaDataTranslator.java
index d568fc84b..3bf58f641 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/internal/metadata/HTMLContentModelMetaDataTranslator.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/internal/metadata/HTMLContentModelMetaDataTranslator.java
@@ -11,11 +11,9 @@
  ********************************************************************************/
 package org.eclipse.jst.pagedesigner.editors.palette.internal.metadata;
 
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jst.jsf.common.metadata.internal.AbstractTagLibDomainContentModelMetaDataTranslator;
 import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant;
 import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataTranslator;
-import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java
index 5ebd37eee..f1ac7426a 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java
@@ -2,35 +2,25 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PaletteInfoImpl.java,v 1.2 2007/03/10 00:08:07 gkessler Exp $
+ * $Id: PaletteInfoImpl.java,v 1.3 2007/04/09 02:23:03 cbateman Exp $
  */
 package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl;
 
 import java.util.Iterator;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.eclipse.jst.jsf.common.metadata.internal.IResourceBundleProvider;
 import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper;
 import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity;
 import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model;
 import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait;
-import org.eclipse.jst.jsf.contentmodel.annotation.internal.Messages;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo;
-import org.eclipse.osgi.util.NLS;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java
index fe430882a..0cfd00c77 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java
@@ -2,22 +2,22 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PaletteInfosFactoryImpl.java,v 1.1 2007/02/28 05:04:41 gkessler Exp $
+ * $Id: PaletteInfosFactoryImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $
  */
 package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl;
 
-import org.apache.xerces.dom.DocumentFragmentImpl;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.*;
-import org.w3c.dom.NodeList;
+import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo;
+import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos;
+import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosFactory;
+import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage;
+import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute;
+import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo;
+import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java
index ef408e000..98dcd217b 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java
@@ -2,25 +2,20 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PaletteInfosImpl.java,v 1.1 2007/02/28 05:04:41 gkessler Exp $
+ * $Id: PaletteInfosImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $
  */
 package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl;
 
 import java.util.Collection;
-import org.eclipse.emf.common.notify.NotificationChain;
 import java.util.Iterator;
 
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage;
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java
index 6c2687907..5f206f86c 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java
@@ -2,23 +2,17 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PaletteInfosPackageImpl.java,v 1.1 2007/02/28 05:04:41 gkessler Exp $
+ * $Id: PaletteInfosPackageImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $
  */
 package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl;
 
-import org.apache.xerces.dom.DocumentFragmentImpl;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage;
-
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosFactory;
@@ -26,7 +20,6 @@ import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provis
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate;
-import org.w3c.dom.NodeList;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java
index 7a6e41140..6bc4b8c02 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TagCreationInfoImpl.java,v 1.1 2007/02/28 05:04:41 gkessler Exp $
+ * $Id: TagCreationInfoImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $
  */
 package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl;
 
@@ -10,22 +10,16 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo;
-import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java
index bcc3a1397..721b7387a 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java
@@ -2,24 +2,19 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TagCreationTemplateImpl.java,v 1.1 2007/02/28 05:04:41 gkessler Exp $
+ * $Id: TagCreationTemplateImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $
  */
 package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl;
 
-import org.apache.xerces.dom.DocumentFragmentImpl;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage;
 import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate;
-import org.w3c.dom.NodeList;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfosPackage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfosPackage.java
index 235d6fed2..cb1834f44 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfosPackage.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfosPackage.java
@@ -2,13 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PaletteInfosPackage.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $
+ * $Id: PaletteInfosPackage.java,v 1.2 2007/04/09 02:23:05 cbateman Exp $
  */
 package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationTemplate.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationTemplate.java
index 3f0176c7c..729986467 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationTemplate.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationTemplate.java
@@ -2,13 +2,11 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TagCreationTemplate.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $
+ * $Id: TagCreationTemplate.java,v 1.2 2007/04/09 02:23:05 cbateman Exp $
  */
 package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional;
 
-import org.apache.xerces.dom.DocumentFragmentImpl;
 import org.eclipse.emf.ecore.EObject;
-import org.w3c.dom.NodeList;
 
 /**
  * <!-- begin-user-doc -->