Javadoc warnings fixes, reduced visibililty, removed dead code.

16 files changed, 316 insertions, 59 deletions

diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java
index 4d0e649ef..b5da9485e 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java
@@ -28,6 +28,10 @@ public class ActionsMessages {
         // no external instantiation
 	}
 
+	/**
+	 * @param key
+	 * @return the resource for the key
+	 */
 	public static String getString(String key) {
 		try {
 			return RESOURCE_BUNDLE.getString(key);
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DataBindingViewAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DataBindingViewAction.java
index a3350c853..17fb7d703 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DataBindingViewAction.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DataBindingViewAction.java
@@ -25,11 +25,13 @@ import org.eclipse.ui.PlatformUI;
  * @version 1.5
  */
 public class DataBindingViewAction extends Action {
-	public final static String ID = "org.eclipse.jst.pagedesigner.editors.actions.DataBindingViewAction"; //$NON-NLS-1$
 
 	private static Logger _log = PDPlugin
 			.getLogger(DataBindingViewAction.class);
 
+	/**
+	 * Default constructor
+	 */
 	public DataBindingViewAction() {
 		setText(ActionsMessages
 				.getString("DataBindingViewAction.Menu.DataBinding")); //$NON-NLS-1$
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java
index 03fb36c64..0b9971fae 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java
@@ -28,6 +28,9 @@ public class DesignActionBarFactory {
         // no external instantiation
 	}
 
+	/**
+	 * @return get the factory singleton
+	 */
 	public static DesignActionBarFactory getInstance() {
 		if (_instance == null) {
 			_instance = new DesignActionBarFactory();
@@ -35,6 +38,10 @@ public class DesignActionBarFactory {
 		return _instance;
 	}
 
+	/**
+	 * @param name
+	 * @return the tool bar action
+	 */
 	public DesignerToolBarAction getStyleAction(String name) {
 		DesignerToolBarAction action = null;
 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java
index e6fd7cd90..131ec1bbe 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java
@@ -43,10 +43,17 @@ public class DesignPageActionContributor extends EditorActionBarContributor {
 	private static final Logger _log = PDPlugin
 			.getLogger(DesignPageActionContributor.class);
 
+	/**
+	 * paragraph
+	 */
 	public static final String PARAGRAPH_ACTION_ID = "paragraph";
 
-	protected IEditorPart _editorPart;
+	private IEditorPart _editorPart;
 
+	/**
+	 * @param manager
+	 * @param id
+	 */
 	protected void doRemove(IContributionManager manager, String id) {
 		try {
 			if (manager.find(id) != null) {
@@ -91,12 +98,20 @@ public class DesignPageActionContributor extends EditorActionBarContributor {
 		// toolbar.add(action);
 	}
 
+	/**
+	 * @param menuManager
+	 * @param action
+	 * @param id
+	 */
 	protected void addActionWithId(IMenuManager menuManager, Action action,
 			String id) {
 		action.setId(id);
 		menuManager.add(action);
 	}
 
+	/**
+	 * @param enabled
+	 */
 	public void setViewerSpecificContributionsEnabled(boolean enabled) {
 		HTMLEditor htmlEditor = null;
 		if (_editorPart instanceof HTMLEditor) {
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerStyleActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerStyleActionGroup.java
index a3d6fa903..7db3a434d 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerStyleActionGroup.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerStyleActionGroup.java
@@ -69,6 +69,9 @@ public class DesignerStyleActionGroup {
 			_mode = mode;
 		}
 
+		/**
+		 * @return the mode
+		 */
 		public int getMode() {
 			return _mode;
 		}
@@ -131,12 +134,8 @@ public class DesignerStyleActionGroup {
 				_designAction, _sourceAction };
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.actions.ActionGroup#updateActionBars()
-	 */
-	public void updateActionBars() {
+
+	private void updateActionBars() {
 		if (_htmlEditor == null) {
 			for (int i = 0; i < _actions.length; i++) {
 				_actions[i].setEnabled(false);
@@ -150,6 +149,9 @@ public class DesignerStyleActionGroup {
 		}
 	}
 
+	/**
+	 * @param editor
+	 */
 	public void setHTMLEditor(HTMLEditor editor) {
 		this._htmlEditor = editor;
 		if (editor != null) {
@@ -162,10 +164,9 @@ public class DesignerStyleActionGroup {
 		updateActionBars();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
+
+	/**
+	 * @param actionBars
 	 */
 	public void fillActionBars(IActionBars actionBars) {
 		IToolBarManager toolbar = actionBars.getToolBarManager();
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerUndoRedoAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerUndoRedoAction.java
index c441f649c..3d563acdf 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerUndoRedoAction.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerUndoRedoAction.java
@@ -33,9 +33,11 @@ import org.eclipse.wst.sse.core.internal.undo.IStructuredTextUndoManager;
 public class DesignerUndoRedoAction extends Action implements UpdateAction {
 	private boolean _undo = true; // if false means redo
 
-	private SimpleGraphicalEditor _designer;
+	private final SimpleGraphicalEditor _designer;
 
 	/**
+	 * @param undo 
+	 * @param designer 
 	 * 
 	 */
 	public DesignerUndoRedoAction(boolean undo, SimpleGraphicalEditor designer) {
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/OutlineViewAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/OutlineViewAction.java
index 030626d9b..987bc4f85 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/OutlineViewAction.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/OutlineViewAction.java
@@ -12,10 +12,20 @@ package org.eclipse.jst.pagedesigner.editors.actions;
 
 import org.eclipse.ui.IPageLayout;
 
+/**
+ * A show view action that shows the outline view
+ *
+ */
 public class OutlineViewAction extends ShowViewAction 
 {
+    /**
+     * the action id
+     */
     public final static String ID = "org.eclipse.jst.pagedesigner.editors.actions.OutlineViewAction"; //$NON-NLS-1$
 
+    /**
+     * Default constructor
+     */
     public OutlineViewAction() 
     {
         super(ActionsMessages
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java
index d5bbe2de3..4457d646d 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java
@@ -35,11 +35,11 @@ import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
 public class PageDesignerActionBarContributor2 extends
 		NestedEditorActionBarContributor implements IExtendedContributor {
 
-	protected DesignPageActionContributor _designViewerActionBarContributor = null;
+	private DesignPageActionContributor _designViewerActionBarContributor = null;
 
-	protected ISourceViewerActionBarContributor _sourceViewerActionContributor = null;
+	private ISourceViewerActionBarContributor _sourceViewerActionContributor = null;
 
-	protected HTMLEditor _htmlEditor = null;
+	private HTMLEditor _htmlEditor = null;
 
 	// EditorExtension
 	private static final String EDITOR_ID = IJMTConstants.EDITORID_HTML;
@@ -48,14 +48,9 @@ public class PageDesignerActionBarContributor2 extends
 
 	DesignerStyleActionGroup _group = new DesignerStyleActionGroup();
 
-//	private IHTMLGraphicalViewer _viewer = null;
-//
-//	private IStructuredModel _model = null;
-
-//	private final static Action action = new Action() {
-//        
-//	};
-
+	/**
+	 * Default constructor
+	 */
 	public PageDesignerActionBarContributor2() {
 		super();
 
@@ -84,11 +79,17 @@ public class PageDesignerActionBarContributor2 extends
 		_group.fillActionBars(actionBars);
 	}
 
+	/**
+	 * @param actionBars
+	 */
 	protected void initDesignViewerActionBarContributor(IActionBars actionBars) {
 		if (_designViewerActionBarContributor != null)
 			_designViewerActionBarContributor.init(actionBars, getPage());
 	}
 
+	/**
+	 * @param actionBars
+	 */
 	protected void initSourceViewerActionContributor(IActionBars actionBars) {
 		if (_sourceViewerActionContributor != null)
 			_sourceViewerActionContributor.init(actionBars, getPage());
@@ -120,7 +121,7 @@ public class PageDesignerActionBarContributor2 extends
 			_extendedContributor.contributeToMenu(menu);
 	}
 
-	protected void addToMenu(IMenuManager menu) {
+	private void addToMenu(IMenuManager menu) {
 		// IMenuManager menuMgr = new MenuManager(PD_EDITOR_MENU_LABEL,
 		// IJMTConstants.PD_EDITOR_MENU_ID);
 		// menu.insertBefore(IWorkbenchActionConstants.M_NAVIGATE, menuMgr);
@@ -230,6 +231,7 @@ public class PageDesignerActionBarContributor2 extends
 	}
 
 	/**
+	 * @param activeEditor 
 	 * 
 	 */
 	protected void deactivateSourceAndDesignPage(IEditorPart activeEditor) {
@@ -245,6 +247,9 @@ public class PageDesignerActionBarContributor2 extends
 		}
 	}
 
+	/**
+	 * @param activeEditor
+	 */
 	protected void activateDesignPage(SimpleGraphicalEditor activeEditor) {
 
 		if (_sourceViewerActionContributor != null /*
@@ -270,6 +275,9 @@ public class PageDesignerActionBarContributor2 extends
 		}
 	}
 
+	/**
+	 * @param activeEditor
+	 */
 	protected void activateSourcePage(StructuredTextEditor activeEditor) {
 		if (_designViewerActionBarContributor != null /*
 														 * &&
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 f04b3b15a..49f264594 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
@@ -20,11 +20,15 @@ import org.w3c.dom.Element;
  * @version 1.5
  */
 public class PaletteViewAction extends ShowViewAction {
+	/**
+	 * the action id
+	 */
 	public final static String ID = "org.eclipse.jst.pagedesigner.editors.actions.PaletteViewAction"; //$NON-NLS-1$
-	// TODO: dead?
-	//private final Element   _element;
-    //private final EditDomain _editDomain;
     
+	/**
+	 * @param element
+	 * @param editDomain
+	 */
 	public PaletteViewAction(Element element, EditDomain editDomain) {
         super(ActionsMessages.getString("PaletteViewAction.Menu.PaletteView")
                 , PaletteView.ID); //$NON-NLS-1$
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PropertiesViewAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PropertiesViewAction.java
index 77a085d9a..67abf6525 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PropertiesViewAction.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PropertiesViewAction.java
@@ -17,8 +17,14 @@ import org.eclipse.ui.IPageLayout;
  * @author mengbo
  */
 public class PropertiesViewAction extends ShowViewAction {
+	/**
+	 * the id
+	 */
 	public final static String ID = "org.eclipse.jst.pagedesigner.editors.actions.PropertiesViewAction"; //$NON-NLS-1$
 
+	/**
+	 * Default constructor
+	 */
 	public PropertiesViewAction() 
     {
 		super(ActionsMessages
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 4434cf46a..b7e6e4e28 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
@@ -42,6 +42,9 @@ public class RelatedViewActionGroup extends ActionGroup
 {
     private final EditDomain  _editDomain;
     
+    /**
+     * @param editDomain
+     */
     public RelatedViewActionGroup(EditDomain editDomain)
     {
         _editDomain = editDomain;
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ShowViewAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ShowViewAction.java
index 52f0b0ae8..5422d609e 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ShowViewAction.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ShowViewAction.java
@@ -28,6 +28,10 @@ public class ShowViewAction extends Action {
     private static Logger _log = PDPlugin.getLogger(PropertiesViewAction.class);
     private final String _viewId;
     
+    /**
+     * @param text
+     * @param viewId
+     */
     public ShowViewAction(String text, String viewId) 
     {
         _viewId = viewId;
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/IPageDesignerConstants.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/IPageDesignerConstants.java
index 911d9d269..b586f9d2b 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/IPageDesignerConstants.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/IPageDesignerConstants.java
@@ -11,115 +11,280 @@
  *******************************************************************************/
 package org.eclipse.jst.pagedesigner.editors.pagedesigner;
 
-public interface IPageDesignerConstants {
+/**
+ * The designer constants
+ * 
+ * TODO: dead?
+ *
+ */
+interface IPageDesignerConstants {
 	/**
 	 * JSP UI Component Tag Node
 	 */
 	public static final String DEFAULT_TAG_NAME = "tagname";
 
+	/**
+	 * keyword
+	 */
 	public static final String ATTR_TYPE_CDATA = "CDATA";
 
+	/**
+	 * basename attribute
+	 */
 	public static final String ATTR_LOADBUNDLE_1 = "basename";
 
+	/**
+	 * var attribute
+	 */
 	public static final String ATTR_LOADBUNDLE_2 = "var";
 
+	/**
+	 * columns attribute
+	 */
 	public static final String ATTR_PANELGRID_1 = "columns";
 
+	/**
+	 * summary attribute
+	 */
 	public static final String ATTR_PANELGRID_2 = "summary";
 
+	/**
+	 * title attribute
+	 */
 	public static final String ATTR_PANELGRID_3 = "title";
 
+	/**
+	 * action attribute
+	 */
 	public static final String ATTR_BUTTON_1 = "action";
 
+	/**
+	 * value attribute
+	 */
 	public static final String ATTR_BUTTON_2 = "value";
 
+	/**
+	 * url attribute
+	 */
 	public static final String ATTR_GRAPHICIMAGE_1 = "url";
 
+	/**
+	 * binding attribute
+	 */
 	public static final String ATTR_GRAPHICIMAGE_2 = "binding";
 
+	/**
+	 * binding attribute
+	 */
 	public static final String ATTR_OUTPUTTEXT_1 = "binding";
 
+	/**
+	 * value attribute
+	 */
 	public static final String ATTR_OUTPUTTEXT_2 = "value";
 
+	/**
+	 * styleClass attribute
+	 */
 	public static final String ATTR_OUTPUTTEXT_3 = "styleClass";
 
+	/**
+	 * dataWindowBean attribute
+	 */
 	public static final String ATTR_DATAWINDOW_1 = "dataWindowBean";
 
+	/**
+	 * scriptName attribute
+	 */
 	public static final String ATTR_DATAWINDOW_2 = "scriptName";
 
+	/**
+	 * page attribute
+	 */
 	public static final String ATTR_INCLUDE = "page";
 
+	/**
+	 * prefix atttribute
+	 */
 	public static final String ATTR_TAGLIB_1 = "prefix";
 
+	/**
+	 * uri attribute
+	 */
 	public static final String ATTR_TAGLIB_2 = "uri";
 
+	/**
+	 * bundle attribute
+	 */
 	public static final String RESOURCE_BUNDLE_MARK = "bundle";
 
+	/**
+	 * value attribute
+	 */
 	public static final String ATTR_RESOURCE_BUNDLE = "value";
 
+	/**
+	 * value attribute
+	 */
 	public static final String ATTR_FACET = "value";
 
+	/**
+	 * view tag
+	 */
 	public static final String TAG_VIEW_TYPE = "view";
 
+	/**
+	 * for tag
+	 */
 	public static final String TAG_FORM_TYPE = "form";
 
+	/**
+	 * text tag
+	 */
 	public static final String TAG_TEXT_TYPE = "text";
 
+	/**
+	 * loadBundle tag
+	 */
 	public static final String TAG_LOADBUNDLE_TYPE = "loadBundle";
 
+	/**
+	 * panelGrid tag
+	 */
 	public static final String TAG_PANELGRID_TYPE = "panelGrid";
 
+	/**
+	 * 
+	 */
 	public static final String TAG_IMAGE_TYPE = "image";
 
-	public String TAG_OUTPUTTEXT_TYPE = "outputText";
+	/**
+	 * outputText tag
+	 */
+	public static final String TAG_OUTPUTTEXT_TYPE = "outputText";
 
-	public String TAG_BUTTON_TYPE = "button";
+	/**
+	 * 
+	 */
+	public static final String TAG_BUTTON_TYPE = "button";
 
-	public String TAG_DATAWINDOW_TYPE = "datawindow";
+	/**
+	 * 
+	 */
+	public static final String TAG_DATAWINDOW_TYPE = "datawindow";
 
-	public String TAG_TAGLIB_TYPE = "taglib";
+	/**
+	 * 
+	 */
+	public static final String TAG_TAGLIB_TYPE = "taglib";
 
-	public String TAG_INCLUDE_TYPE = "include";
+	/**
+	 * 
+	 */
+	public static final String TAG_INCLUDE_TYPE = "include";
 
-	public String TAG_OTHERS_TYPE = "";
+	/**
+	 * 
+	 */
+	public static final String TAG_OTHERS_TYPE = "";
 
-	public String TAG_NAME_VIEW = "view";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_VIEW = "view";
 
-	public String TAG_NAME_FORM = "form";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_FORM = "form";
 
-	public String TAG_NAME_PANELGRID = "panelGrid";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_PANELGRID = "panelGrid";
 
-	public String TAG_NAME_PANELGROUP = "panelGroup";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_PANELGROUP = "panelGroup";
 
-	public String TAG_NAME_FACET = "facet";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_FACET = "facet";
 
-	public String TAG_NAME_DATAWINDOW = "dataWindow";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_DATAWINDOW = "dataWindow";
 
-	public String TAG_NAME_OUTPUTTEXT = "outputText";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_OUTPUTTEXT = "outputText";
 
-	public String TAG_NAME_INCLUDE = "include";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_INCLUDE = "include";
 
-	public String TAG_NAME_LOADBUNDLE = "loadBundle";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_LOADBUNDLE = "loadBundle";
 
-	public String TAG_NAME_TAGLIB = "taglib";
+	/**
+	 * 
+	 */
+	public static final String TAG_NAME_TAGLIB = "taglib";
 
-	public String TAG_NAME_GRAPHICIMAGE = "graphicImage";
+	/**
+	 * graphicImage tag
+	 */
+	public static final String TAG_NAME_GRAPHICIMAGE = "graphicImage";
 
-	public String TAG_NAME_COMMANDBUTTON = "commandButton";
+	/**
+	 * commandButton tag
+	 */
+	public static final String TAG_NAME_COMMANDBUTTON = "commandButton";
 
-	public String REQUEST_TYPE_SELECT = "selection";
+	/**
+	 * 
+	 */
+	public static final String REQUEST_TYPE_SELECT = "selection";
 
+	/**
+	 * 
+	 */
 	public static final int EOF = -1;
 
-	public char CHAR_TAB = '\t';
+	/**
+	 * 
+	 */
+	public static final char CHAR_TAB = '\t';
 
-	public char CHAR_N_RETURN = '\n';
+	/**
+	 * 
+	 */
+	public static final char CHAR_N_RETURN = '\n';
 
-	public String STRING_N_RETURN = "\n";
+	/**
+	 * 
+	 */
+	public static final String STRING_N_RETURN = "\n";
 
-	public String STRING_BLANK = " ";
+	/**
+	 * 
+	 */
+	public static final String STRING_BLANK = " ";
 
-	public char CHAR_BLANK = ' ';
+	/**
+	 * 
+	 */
+	public static final char CHAR_BLANK = ' ';
 
-	public String FONT_NAME_HELVETICA = "Helvetica";
+	/**
+	 * 
+	 */
+	public static final String FONT_NAME_HELVETICA = "Helvetica";
 }
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/MessageFormater.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/MessageFormater.java
index d9beaaed5..5b4d95d4a 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/MessageFormater.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/MessageFormater.java
@@ -19,16 +19,15 @@ import org.eclipse.jst.pagedesigner.PDPlugin;
 /**
  * @A tool class for message format
  */
-public class MessageFormater {
+public final class MessageFormater {
 	private static Logger _log = PDPlugin.getLogger(MessageFormater.class);
 
 	/**
-	 * *
 	 * 
-	 * @param message:
+	 * @param message
 	 *            the parts for filling is {number}
 	 * @param o1
-	 * @return
+	 * @return the formatted string
 	 */
 	public static String format(String message, Object o1) {
 		try {
@@ -41,6 +40,12 @@ public class MessageFormater {
 		}
 	}
 
+	/**
+	 * @param message
+	 * @param o1
+	 * @param o2
+	 * @return the formatted string
+	 */
 	public static String format(String message, Object o1, Object o2) {
 		try {
 			Object[] args = new Object[] { o1, o2 };
@@ -52,6 +57,13 @@ public class MessageFormater {
 		}
 	}
 
+	/**
+	 * @param message
+	 * @param o1
+	 * @param o2
+	 * @param o3
+	 * @return the formatted string
+	 */
 	public static String format(String message, Object o1, Object o2, Object o3) {
 		try {
 			Object[] args = new Object[] { o1, o2, o3 };
@@ -63,6 +75,11 @@ public class MessageFormater {
 		}
 	}
 
+	/**
+	 * @param message
+	 * @param o
+	 * @return the formatted string
+	 */
 	public static String format(String message, Object o[]) {
 		try {
 			MessageFormat formater = new MessageFormat(message);
@@ -72,4 +89,9 @@ public class MessageFormater {
 			return "";
 		}
 	}
+	
+	private MessageFormater()
+	{
+	    // util class, no instantiation
+	}
 }
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/PageDesignerResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/PageDesignerResources.java
index 763273a36..ec8320445 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/PageDesignerResources.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/PageDesignerResources.java
@@ -45,6 +45,9 @@ public class PageDesignerResources extends ResourceUtils {
 		setBundle(_resources, IJMTConstants.PAGEDESIGNER_RESOURCE_BUNDLE_FILE);
 	}
 
+	/**
+	 * @return the singleton
+	 */
 	public static PageDesignerResources getInstance() {
 		if (_resource == null) {
 			_resource = new PageDesignerResources();
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosPackage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosPackage.java
index ec8258d88..a62302b6d 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosPackage.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosPackage.java
@@ -534,6 +534,7 @@ public interface PaletteInfosPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+    @SuppressWarnings("hiding")
 	interface Literals {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl.PaletteInfoImpl <em>Palette Info</em>}' class.
@@ -551,7 +552,7 @@ public interface PaletteInfosPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute PALETTE_INFO__ID = eINSTANCE.getPaletteInfo_Id();
+        EAttribute PALETTE_INFO__ID = eINSTANCE.getPaletteInfo_Id();
 
 		/**
 		 * The meta object literal for the '<em><b>Tag</b></em>' attribute feature.