*** empty log message ***

18 files changed, 117 insertions, 89 deletions

diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/GlobalCommandManager.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/GlobalCommandManager.java
index cca193a29..280cd175f 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/GlobalCommandManager.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/GlobalCommandManager.java
@@ -236,6 +236,9 @@ public class GlobalCommandManager {
 
 	/**
 	 * Returns true if there is only one command manager.
+	 * 
+	 * @param id an id
+	 * @return <code>true</code> if the only command manager
 	 */
 	public boolean isOnlyCommandManager(String id) {
 		CommandManagerInfo info = getExistingCommandManagerInfo(id);
@@ -274,7 +277,8 @@ public class GlobalCommandManager {
 	 * If the command cannot be undone, the user will be notifed
 	 * before it is executed.
 	 *
-	 * @param command ICommand
+	 * @param id an id
+	 * @param command a task
 	 */
 	public void executeCommand(String id, ITask command) {
 		if (!command.canUndo() && !undoList.isEmpty() && ServerUIPlugin.getPreferences().getPromptBeforeIrreversibleChange()) {
@@ -398,7 +402,8 @@ public class GlobalCommandManager {
 	/**
 	 * Returns the command that would be undone next.
 	 * 
-	 * @return org.eclipse.wst.server.ui.editor.ICommand
+	 * @param a an id
+	 * @return a task
 	 */
 	public ITask getUndoCommand(String a) {
 		int size = undoList.size();
@@ -413,7 +418,8 @@ public class GlobalCommandManager {
 	/**
 	 * Returns the command that would be redone next.
 	 * 
-	 * @return org.eclipse.wst.server.ui.editor.ICommand
+	 * @param a an id
+	 * @return a task
 	 */
 	public ITask getRedoCommand(String a) {
 		int size = redoList.size();
@@ -428,7 +434,8 @@ public class GlobalCommandManager {
 	/**
 	 * Returns true if the server resource is "dirty".
 	 *
-	 * @return boolean
+	 * @param id an id
+	 * @return a task
 	 */
 	public boolean isDirty(String id) {
 		CommandManagerInfo info = getExistingCommandManagerInfo(id);
@@ -441,6 +448,7 @@ public class GlobalCommandManager {
 	/**
 	 * Returns true if the server resource is read-only.
 	 *
+	 * @param id an id
 	 * @return boolean
 	 */
 	public boolean isReadOnly(String id) {
@@ -451,7 +459,10 @@ public class GlobalCommandManager {
 	}
 	
 	/**
-	 * Returns the server resource read-only flag.
+	 * Sets the server resource read-only flag.
+	 * 
+	 * @param id an id
+	 * @param readOnly <code>true</code> to set read-only, <code>false</code> otherwise
 	 */
 	public void setReadOnly(String id, boolean readOnly) {
 		CommandManagerInfo info = getExistingCommandManagerInfo(id);
@@ -467,7 +478,8 @@ public class GlobalCommandManager {
 	/**
 	 * Returns true if the server resource files are read-only.
 	 *
-	 * @return boolean
+	 * @param id an id
+	 * @return <code>true</code> if the files are read-only
 	 */
 	public boolean areFilesReadOnly(String id) {
 		CommandManagerInfo info = getExistingCommandManagerInfo(id);
@@ -543,6 +555,8 @@ public class GlobalCommandManager {
 
 	/**
 	 * Clears the history list.
+	 * 
+	 * @param id an id
 	 */
 	public void resourceSaved(String id) {
 		CommandManagerInfo info = getExistingCommandManagerInfo(id);
@@ -553,7 +567,10 @@ public class GlobalCommandManager {
 	}
 	
 	/**
+	 * Return an array of read-only files.
 	 * 
+	 * @param server a server
+	 * @return a possibly empty array of files
 	 */
 	public static IFile[] getReadOnlyFiles(IServerAttributes server) {
 		try {
@@ -604,7 +621,9 @@ public class GlobalCommandManager {
 	}
 
 	/**
+	 * Update the timestamps.
 	 * 
+	 * @param id an id
 	 */
 	public void updateTimestamps(String id) {
 		CommandManagerInfo info = getExistingCommandManagerInfo(id);
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/IServerEditorPageSectionFactory.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/IServerEditorPageSectionFactory.java
index 109eb6e00..07ba81e53 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/IServerEditorPageSectionFactory.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/IServerEditorPageSectionFactory.java
@@ -18,7 +18,9 @@ import org.eclipse.wst.server.ui.editor.IServerEditorSection;
  */
 public interface IServerEditorPageSectionFactory extends IOrdered {
 	/**
+	 * Returns the id.
 	 * 
+	 * @return the id
 	 */
 	public String getId();
 
@@ -27,6 +29,7 @@ public interface IServerEditorPageSectionFactory extends IOrdered {
 	 * id) can be opened with this editor. This result is based on
 	 * the result of the types attribute.
 	 *
+	 * @param id the type id
 	 * @return boolean
 	 */
 	public boolean supportsType(String id);
@@ -37,11 +40,16 @@ public interface IServerEditorPageSectionFactory extends IOrdered {
 	 * Returns true if this editor page section should be visible with the given server.
 	 * This allows (for instance) complex configuration pages to only be shown when used
 	 * with non-unittest servers.
+	 * 
+	 * @param server a server
+	 * @return <code>true</code> if the section should be shown, and <code>false</code> otherwise
 	 */
 	public boolean shouldCreateSection(IServerWorkingCopy server);
 
 	/**
 	 * Create the editor page section.
+	 * 
+	 * @return the section
 	 */
 	public IServerEditorSection createSection();
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/IServerEditorPartFactory.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/IServerEditorPartFactory.java
index 64d42476f..2fbac3e8d 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/IServerEditorPartFactory.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/IServerEditorPartFactory.java
@@ -19,12 +19,16 @@ import org.eclipse.wst.server.ui.editor.IOrdered;
  */
 public interface IServerEditorPartFactory extends IOrdered {
 	/**
+	 * Returns the id.
 	 * 
+	 * @return the id
 	 */
 	public String getId();
 	
 	/**
+	 * Return the displayable name.
 	 * 
+	 * @return the name
 	 */
 	public String getName();
 
@@ -32,22 +36,34 @@ public interface IServerEditorPartFactory extends IOrdered {
 	 * Returns true if the given server resource type (given by the
 	 * id) can be opened with this editor. This result is based on
 	 * the result of the types attribute.
-	 *
-	 * @return boolean
+	 * 
+	 * @param id a server type id
+	 * @return <code>true</code> if the type is supported
 	 */
 	public boolean supportsType(String id);
-	
+
+	/**
+	 * Returns true if a given insertion id is supported.
+	 * 
+	 * @param id
+	 * @return <code>true</code> if the insertion id is supported
+	 */
 	public boolean supportsInsertionId(String id);
 	
 	/**
 	 * Returns true if this editor page should be visible with the given server.
 	 * This allows (for instance) complex configuration pages to only be shown when used
 	 * with non-unittest servers.
+	 * 
+	 * @param server a server
+	 * @return <code>true</code> if the page should be visible
 	 */
 	public boolean shouldCreatePage(IServerWorkingCopy server);
 
 	/**
 	 * Create the editor page.
+	 * 
+	 * @return the editor page
 	 */
 	public IEditorPart createPage();
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java
index 4b4f78b42..252fef3c0 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java
@@ -368,7 +368,9 @@ public class ServerEditor extends MultiPageEditorPart {
 	}
 
 	/**
+	 * Return the global command manager.
 	 * 
+	 * @return the global command manager
 	 */
 	public GlobalCommandManager getCommandManager() {
 		return commandManager;
@@ -508,7 +510,10 @@ public class ServerEditor extends MultiPageEditorPart {
 	}
 	
 	/**
+	 * Set the status.
 	 * 
+	 * @param status a status line manager
+	 * @param item a status contribution item
 	 */
 	public void setStatus(IStatusLineManager status, StatusLineContributionItem item) {
 		this.status = status;
@@ -904,7 +909,9 @@ public class ServerEditor extends MultiPageEditorPart {
 	}
 	
 	/**
-	 * Set the tooltip.
+	 * Set the title tooltip.
+	 * 
+	 * @return the title tooltip
 	 */
 	public String getTitleToolTip() {
 		Server server2 = (Server) server;
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorActionFactory.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorActionFactory.java
index afe2af22f..5b8f3be72 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorActionFactory.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorActionFactory.java
@@ -30,7 +30,9 @@ public class ServerEditorActionFactory implements IServerEditorActionFactory {
 	private ServerEditorActionFactoryDelegate delegate;
 
 	/**
-	 * ServerEditorActionFactory constructor comment.
+	 * ServerEditorActionFactory constructor.
+	 * 
+	 * @param element a configuration element
 	 */
 	public ServerEditorActionFactory(IConfigurationElement element) {
 		super();
@@ -40,7 +42,7 @@ public class ServerEditorActionFactory implements IServerEditorActionFactory {
 	/**
 	 * 
 	 */
-	public IConfigurationElement getConfigurationElement() {
+	protected IConfigurationElement getConfigurationElement() {
 		return element;
 	}
 
@@ -101,11 +103,7 @@ public class ServerEditorActionFactory implements IServerEditorActionFactory {
 	}
 	
 	/**
-	 * Returns true if the given server resource type (given by the
-	 * id) can be opened with this editor. This result is based on
-	 * the result of the getServerResources() method.
-	 *
-	 * @return boolean
+	 * @see IServerEditorActionFactory#supportsServerElementType(String)
 	 */
 	public boolean supportsServerElementType(String id) {
 		if (id == null || id.length() == 0)
@@ -127,7 +125,7 @@ public class ServerEditorActionFactory implements IServerEditorActionFactory {
 	}
 
 	/*
-	 * @see IPublishManager#getDelegate()
+	 * 
 	 */
 	public ServerEditorActionFactoryDelegate getDelegate() {
 		if (delegate == null) {
@@ -141,10 +139,7 @@ public class ServerEditorActionFactory implements IServerEditorActionFactory {
 	}
 	
 	/**
-	 * Returns true if this editor page should be visible with the given
-	 * server instance. This allows (for
-	 * instance) complex configuration pages to only be shown when used
-	 * with non-unittest servers.
+	 * @see IServerEditorActionFactory#shouldDisplay(IServerWorkingCopy)
 	 */
 	public boolean shouldDisplay(IServerWorkingCopy server) {
 		try {
@@ -156,7 +151,7 @@ public class ServerEditorActionFactory implements IServerEditorActionFactory {
 	}
 
 	/**
-	 * Create the editor page.
+	 * @see IServerEditorActionFactory#createAction(IEditorSite, IServerEditorPartInput)
 	 */
 	public IAction createAction(IEditorSite site, IServerEditorPartInput input) {
 		try {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorInput.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorInput.java
index dc517d0c0..31861ac4c 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorInput.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorInput.java
@@ -43,6 +43,8 @@ public class ServerEditorInput implements IServerEditorInput, IPersistableElemen
 
 	/**
 	 * ServerEditorInput constructor comment.
+	 * 
+	 * @param serverId a server id
 	 */
 	public ServerEditorInput(String serverId) {
 		super();
@@ -58,8 +60,7 @@ public class ServerEditorInput implements IServerEditorInput, IPersistableElemen
 	}
 
 	/**
-	 * Indicates whether some other object is "equal to" this one.
-	 * In this case it means that the underlying IFolders are equal.
+	 * @see Object#equals(Object)
 	 */
 	public boolean equals(Object obj) {
 		if (this == obj)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorInputFactory.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorInputFactory.java
index 6ef4721a3..70bbc7480 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorInputFactory.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorInputFactory.java
@@ -43,6 +43,7 @@ public class ServerEditorInputFactory implements IElementFactory {
 	 * Saves the state of an element within a memento.
 	 *
 	 * @param memento the storage area for element state
+	 * @param input server editor input
 	 */
 	public static void saveState(IMemento memento, ServerEditorInput input) {
 		if (input == null)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorPageSectionFactory.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorPageSectionFactory.java
index 384003b0d..6b99427d3 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorPageSectionFactory.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorPageSectionFactory.java
@@ -27,7 +27,9 @@ public class ServerEditorPageSectionFactory implements IServerEditorPageSectionF
 	private ServerEditorPageSectionFactoryDelegate delegate;
 
 	/**
-	 * ServerEditorPageSectionFactory constructor comment.
+	 * ServerEditorPageSectionFactory constructor.
+	 * 
+	 * @param element a configuration element
 	 */
 	public ServerEditorPageSectionFactory(IConfigurationElement element) {
 		super();
@@ -37,7 +39,7 @@ public class ServerEditorPageSectionFactory implements IServerEditorPageSectionF
 	/**
 	 * 
 	 */
-	public IConfigurationElement getConfigurationElement() {
+	protected IConfigurationElement getConfigurationElement() {
 		return element;
 	}
 
@@ -98,11 +100,7 @@ public class ServerEditorPageSectionFactory implements IServerEditorPageSectionF
 	}
 	
 	/**
-	 * Returns true if the given server resource type (given by the
-	 * id) can be opened with this editor. This result is based on
-	 * the result of the getServerResources() method.
-	 *
-	 * @return boolean
+	 * @see IServerEditorPageSectionFactory#supportsType(String)
 	 */
 	public boolean supportsType(String id) {
 		if (id == null || id.length() == 0)
@@ -138,13 +136,7 @@ public class ServerEditorPageSectionFactory implements IServerEditorPageSectionF
 	}
 	
 	/**
-	 * Returns true if this editor page should be visible with the given
-	 * server instance and configuration combination. This allows (for
-	 * instance) complex configuration pages to only be shown when used
-	 * with non-unittest servers.
-	 *
-	 * <p>If the instance or configuration is being opened by itself, the
-	 * other value (instance or configuration) will be null.
+	 * @see IServerEditorPageSectionFactory#shouldCreateSection(IServerWorkingCopy)
 	 */
 	public boolean shouldCreateSection(IServerWorkingCopy server) {
 		try {
@@ -156,7 +148,7 @@ public class ServerEditorPageSectionFactory implements IServerEditorPageSectionF
 	}
 
 	/**
-	 * Create the editor page.
+	 * @see IServerEditorPageSectionFactory#createSection()
 	 */
 	public IServerEditorSection createSection() {
 		try {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorPartFactory.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorPartFactory.java
index 52c2eb0bb..817114f92 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorPartFactory.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditorPartFactory.java
@@ -27,7 +27,9 @@ public class ServerEditorPartFactory implements IServerEditorPartFactory {
 	private ServerEditorPartFactoryDelegate delegate;
 
 	/**
-	 * ServerEditorPartFactory constructor comment.
+	 * ServerEditorPartFactory constructor.
+	 * 
+	 * @param element a configuration element
 	 */
 	public ServerEditorPartFactory(IConfigurationElement element) {
 		super();
@@ -37,7 +39,7 @@ public class ServerEditorPartFactory implements IServerEditorPartFactory {
 	/**
 	 * 
 	 */
-	public IConfigurationElement getConfigurationElement() {
+	protected IConfigurationElement getConfigurationElement() {
 		return element;
 	}
 
@@ -76,7 +78,10 @@ public class ServerEditorPartFactory implements IServerEditorPartFactory {
 			return null;
 		}
 	}
-	
+
+	/**
+	 * @see IServerEditorPartFactory#supportsInsertionId(String)
+	 */
 	public boolean supportsInsertionId(String id) {
 		if (id == null || id.length() == 0)
 			return false;
@@ -95,7 +100,7 @@ public class ServerEditorPartFactory implements IServerEditorPartFactory {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * Returns the order.
 	 *
@@ -135,11 +140,7 @@ public class ServerEditorPartFactory implements IServerEditorPartFactory {
 	}
 	
 	/**
-	 * Returns true if the given server or server configuration type id
-	 * can be opened with this editor. This result is based on
-	 * the result of the getTypeIds() method.
-	 *
-	 * @return boolean
+	 * @see IServerEditorPartFactory#supportsType(String)
 	 */
 	public boolean supportsType(String id) {
 		if (id == null || id.length() == 0)
@@ -172,9 +173,7 @@ public class ServerEditorPartFactory implements IServerEditorPartFactory {
 	}
 	
 	/**
-	 * Returns true if this editor page should be visible with the given server.
-	 * This allows (for instance) complex configuration pages to only be shown when used
-	 * with non-unittest servers.
+	 * @see IServerEditorPartFactory#shouldCreatePage(IServerWorkingCopy)
 	 */
 	public boolean shouldCreatePage(IServerWorkingCopy server) {
 		try {
@@ -186,7 +185,7 @@ public class ServerEditorPartFactory implements IServerEditorPartFactory {
 	}
 
 	/**
-	 * Create the editor page.
+	 * @see IServerEditorPartFactory#createPage()
 	 */
 	public IEditorPart createPage() {
 		try {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ConnectedUIDecorator.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ConnectedUIDecorator.java
index 63f70322e..040c0c3b1 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ConnectedUIDecorator.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ConnectedUIDecorator.java
@@ -48,9 +48,7 @@ public class ConnectedUIDecorator extends UIDecorator {
 	};
 
 	/**
-	 * Returns a string representing the given state.
-	 *
-	 * @return java.lang.String
+	 * @see UIDecorator#getStateLabel(int, String, int)
 	 */
 	public String getStateLabel(int state, String mode, int count) {
 		if (state == IServer.STATE_UNKNOWN)
@@ -73,9 +71,7 @@ public class ConnectedUIDecorator extends UIDecorator {
 	}
 
 	/**
-	 * Returns an image representing the given state.
-	 * 
-	 * @return org.eclipse.jface.parts.IImage
+	 * @see UIDecorator#getStateImage(int, String, int)
 	 */
 	public Image getStateImage(int state, String mode, int count) {
 		if (state == IServer.STATE_UNKNOWN)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ManagedUIDecorator.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ManagedUIDecorator.java
index aaa2bd637..623b4fdf0 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ManagedUIDecorator.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ManagedUIDecorator.java
@@ -47,9 +47,7 @@ public class ManagedUIDecorator extends UIDecorator {
 	};
 
 	/**
-	 * Returns a string representing the given state.
-	 *
-	 * @return java.lang.String
+	 * @see UIDecorator#getStateLabel(int, String, int)
 	 */
 	public String getStateLabel(int state, String mode, int count) {
 		if (state == IServer.STATE_UNKNOWN)
@@ -72,9 +70,7 @@ public class ManagedUIDecorator extends UIDecorator {
 	}
 
 	/**
-	 * Returns an image representing the given state.
-	 * 
-	 * @return org.eclipse.jface.parts.IImage
+	 * @see UIDecorator#getStateImage(int, String, int)
 	 */
 	public Image getStateImage(int state, String mode, int count) {
 		if (state == IServer.STATE_UNKNOWN)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/PublishedUIDecorator.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/PublishedUIDecorator.java
index e4089ac85..0735907b6 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/PublishedUIDecorator.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/PublishedUIDecorator.java
@@ -47,9 +47,7 @@ public class PublishedUIDecorator extends UIDecorator {
 	};
 
 	/**
-	 * Returns a string representing the given state.
-	 *
-	 * @return java.lang.String
+	 * @see UIDecorator#getStateLabel(int, String, int)
 	 */
 	public String getStateLabel(int state, String mode, int count) {
 		if (state == IServer.STATE_UNKNOWN)
@@ -72,9 +70,7 @@ public class PublishedUIDecorator extends UIDecorator {
 	}
 
 	/**
-	 * Returns an image representing the given state.
-	 * 
-	 * @return org.eclipse.jface.parts.IImage
+	 * @see UIDecorator#getStateImage(int, String, int)
 	 */
 	public Image getStateImage(int state, String mode, int count) {
 		if (state == IServer.STATE_UNKNOWN)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/UIDecorator.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/UIDecorator.java
index 756d3d7b1..6e5d04ef1 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/UIDecorator.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/UIDecorator.java
@@ -21,6 +21,9 @@ public abstract class UIDecorator {
 	/**
 	 * Returns a string representing the given state.
 	 *
+	 * @param state a server state
+	 * @param mode a launch mode
+	 * @param count a timer count
 	 * @return java.lang.String
 	 */
 	public abstract String getStateLabel(int state, String mode, int count);
@@ -28,6 +31,9 @@ public abstract class UIDecorator {
 	/**
 	 * Returns an image representing the given state.
 	 * 
+	 * @param state a server state
+	 * @param mode a launch mode
+	 * @param count a timer count
 	 * @return org.eclipse.jface.parts.IImage
 	 */
 	public abstract Image getStateImage(int state, String mode, int count);
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTableLabelProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTableLabelProvider.java
index 35c0cedac..e1e711fe0 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTableLabelProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTableLabelProvider.java
@@ -27,13 +27,7 @@ public class RuntimeTableLabelProvider extends BaseLabelProvider implements ITab
 	}
 
 	/**
-	 * Returns the label image for the given column of the given element.
-	 *
-	 * @param element the object representing the entire row, or 
-	 *    <code>null</code> indicating that no input object is set
-	 *    in the viewer
-	 * @param columnIndex the zero-based index of the column in which
-	 *   the label appears
+	 * @see ITableLabelProvider#getColumnImage(Object, int)
 	 */
 	public Image getColumnImage(Object element, int columnIndex) {
 		if (columnIndex == 0) {
@@ -46,12 +40,7 @@ public class RuntimeTableLabelProvider extends BaseLabelProvider implements ITab
 	}
 
 	/**
-	 * Returns the label text for the given column of the given element.
-	 *
-	 * @param element the object representing the entire row, or
-	 *   <code>null</code> indicating that no input object is set
-	 *   in the viewer
-	 * @param columnIndex the zero-based index of the column in which the label appears
+	 * @see ITableLabelProvider#getColumnText(Object, int)
 	 */
 	public String getColumnText(Object element, int columnIndex) {
 		IRuntime runtime = (IRuntime) element;
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTreeContentProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTreeContentProvider.java
index 14b0bb7e8..05a89596e 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTreeContentProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTreeContentProvider.java
@@ -26,7 +26,9 @@ public class RuntimeTreeContentProvider extends AbstractTreeContentProvider {
 	public static final byte STYLE_TYPE = 3;
 
 	/**
-	 * RuntimeTreeContentProvider constructor comment.
+	 * RuntimeTreeContentProvider constructor.
+	 * 
+	 * @param style a style
 	 */
 	public RuntimeTreeContentProvider(byte style) {
 		super(style);
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTypeTreeContentProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTypeTreeContentProvider.java
index b7d969a14..42b7ccde7 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTypeTreeContentProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/RuntimeTypeTreeContentProvider.java
@@ -28,7 +28,10 @@ public class RuntimeTypeTreeContentProvider extends AbstractTreeContentProvider
 	protected String runtimeTypeId;
 
 	/**
-	 * RuntimeTypeContentProvider constructor comment.
+	 * RuntimeTypeContentProvider constructor.
+	 * 
+	 * @param style a style
+	 * @param creation true to include runtimes that can be created
 	 */
 	public RuntimeTypeTreeContentProvider(byte style, boolean creation) {
 		super(style);
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTreeContentProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTreeContentProvider.java
index af0ec4692..1adf73964 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTreeContentProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTreeContentProvider.java
@@ -34,7 +34,9 @@ public class ServerTreeContentProvider extends AbstractTreeContentProvider {
 	protected boolean includeIncompatibleVersions;
 
 	/**
-	 * ServerTreeContentProvider constructor comment.
+	 * ServerTreeContentProvider constructor.
+	 * 
+	 * @param style a style
 	 */
 	public ServerTreeContentProvider(byte style) {
 		super(style);
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTreeLabelProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTreeLabelProvider.java
index c2dcda105..e56944cd2 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTreeLabelProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/ServerTreeLabelProvider.java
@@ -25,7 +25,7 @@ public class ServerTreeLabelProvider extends AbstractTreeLabelProvider {
 	}
 
 	/**
-	 * 
+	 * @see AbstractTreeLabelProvider#getImageImpl(Object)
 	 */
 	public Image getImageImpl(Object element) {
 		IServer server = (IServer) element;
@@ -33,7 +33,7 @@ public class ServerTreeLabelProvider extends AbstractTreeLabelProvider {
 	}
 
 	/**
-	 * 
+	 * @see AbstractTreeLabelProvider#getTextImpl(Object)
 	 */
 	public String getTextImpl(Object element) {
 		IServer server = (IServer) element;