[116811] Javadoc cleanup
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModule.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModule.java
index 6e80ccd..91fc261 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModule.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModule.java
@@ -47,7 +47,7 @@
* (repeatedly) as the API evolves.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IModule extends IAdaptable {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModuleArtifact.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModuleArtifact.java
index ce88bee..9391398 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModuleArtifact.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModuleArtifact.java
@@ -19,7 +19,7 @@
* </p>
*
* @see org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IModuleArtifact {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModuleType.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModuleType.java
index 5b44bd6..98800b8 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModuleType.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModuleType.java
@@ -21,7 +21,7 @@
* (repeatedly) as the API evolves.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IModuleType {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IProjectProperties.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IProjectProperties.java
index 3dcb03c..d8dbeed 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IProjectProperties.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IProjectProperties.java
@@ -22,8 +22,6 @@
*
* @deprecated Project facet support should now be used instead of this API. @see
* org.eclipse.wst.common.project.facet.core.IFacetedProject#getRuntime()
- *
- * @plannedfor 1.0
*/
public interface IProjectProperties {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntime.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntime.java
index 02fb367..d187c8c 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntime.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntime.java
@@ -43,15 +43,9 @@
* Two runtimes are identical if and only if they have the same id.
* </p>
* <p>This interface is not intended to be implemented by clients.</p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
*
* @see IRuntimeWorkingCopy
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IRuntime extends IAdaptable {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeLifecycleListener.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeLifecycleListener.java
index 14a6202..e3067c8 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeLifecycleListener.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeLifecycleListener.java
@@ -22,7 +22,7 @@
*
* @see ServerCore
* @see IRuntime
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IRuntimeLifecycleListener {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeTargetHandler.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeTargetHandler.java
index 25dfee1..01712ff 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeTargetHandler.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeTargetHandler.java
@@ -27,7 +27,6 @@
* </p>
*
* @deprecated use project facets instead of runtime targets
- * @plannedfor 1.0
*/
public interface IRuntimeTargetHandler extends IAdaptable {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeType.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeType.java
index aba5d02..346cf34 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeType.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeType.java
@@ -39,14 +39,8 @@
* <p>
* Two runtime types are identical if and only if they have the same id.
* </p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IRuntimeType {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeWorkingCopy.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeWorkingCopy.java
index 5f79bd5..66e8de3 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeWorkingCopy.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IRuntimeWorkingCopy.java
@@ -22,15 +22,9 @@
* <p>
* This interface is not intended to be implemented by clients.
* </p>
- * <p>
- * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
*
* @see IRuntime
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IRuntimeWorkingCopy extends IRuntime {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServer.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServer.java
index 1280be8..6a7cf67 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServer.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServer.java
@@ -64,7 +64,7 @@
*
* <p>This interface is not intended to be implemented by clients.</p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IServer extends IServerAttributes {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerAttributes.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerAttributes.java
index 0b10a58..2b2aeb8 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerAttributes.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerAttributes.java
@@ -72,7 +72,7 @@
*
* <p>This interface is not intended to be implemented by clients.</p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IServerAttributes extends IAdaptable {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerLifecycleListener.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerLifecycleListener.java
index b093dc4..d2c20b8 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerLifecycleListener.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerLifecycleListener.java
@@ -22,7 +22,7 @@
*
* @see ServerCore
* @see IServer
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IServerLifecycleListener {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerListener.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerListener.java
index 8ca2958..3840581 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerListener.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerListener.java
@@ -22,7 +22,7 @@
* a server stopped event cannot directly trigger a start(). Doing this may
* cause the thread to hang.</p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IServerListener {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerType.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerType.java
index 97b538a..30a2d6e 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerType.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerType.java
@@ -31,7 +31,7 @@
* Two server types are identical if and only if they have the same id.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IServerType {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerWorkingCopy.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerWorkingCopy.java
index ae21ecb..8446512 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerWorkingCopy.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServerWorkingCopy.java
@@ -20,7 +20,7 @@
*
* <p>This interface is not intended to be implemented by clients.</p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IServerWorkingCopy extends IServerAttributes {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
index b0fc561..128846b 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
@@ -27,7 +27,7 @@
* It is not intended to be subclassed or instantiated.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class ServerCore {
private static final String EXTENSION_SERVER_TYPE = "serverTypes";
@@ -498,6 +498,12 @@
ModuleProperties.getInstance().setDefaultServer(module, server, monitor);
}
+ /**
+ * Handles a change to the server type extension point due to bundles getting added
+ * or removed dynamically at runtime.
+ *
+ * @param delta an extension delta
+ */
protected static void handleServerTypeDelta(IExtensionDelta delta) {
if (serverTypes == null) // not loaded yet
return;
@@ -524,6 +530,12 @@
getResourceManager().resolveServers();
}
+ /**
+ * Handles a change to the runtime type extension point due to bundles getting added
+ * or removed dynamically at runtime.
+ *
+ * @param delta an extension delta
+ */
protected static void handleRuntimeTypeDelta(IExtensionDelta delta) {
if (runtimeTypes == null) // not loaded yet
return;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerEvent.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerEvent.java
index cea36bd..ad6c85c 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerEvent.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerEvent.java
@@ -9,11 +9,10 @@
* IBM Corporation - Initial API and implementation
**********************************************************************/
package org.eclipse.wst.server.core;
-
/**
* An event fired when a server change or module changes.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class ServerEvent {
private IServer server;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerPort.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerPort.java
index f271e63..9914bf8 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerPort.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerPort.java
@@ -12,7 +12,7 @@
/**
* This class represents a port on a server.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class ServerPort {
private String id;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
index 366b543..2e3822d 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
@@ -24,7 +24,7 @@
* Server utility methods. These static methods can be used to perform
* common operations on server artifacts.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class ServerUtil {
/**
@@ -270,7 +270,7 @@
* @param remove an array of modules to remove, or <code>null</code> to not remove any
* @param monitor a progress monitor, or <code>null</code> if progress
* reporting and cancellation are not desired
- * @throws CoreException
+ * @throws CoreException if anything goes wrong
*/
public static void modifyModules(IServerWorkingCopy server, IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException {
if (server == null)
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/TaskModel.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/TaskModel.java
index c445222..816dbb4 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/TaskModel.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/TaskModel.java
@@ -22,7 +22,7 @@
* of another.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class TaskModel {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ClientDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ClientDelegate.java
index a86ebcf..c4031de 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ClientDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ClientDelegate.java
@@ -21,7 +21,7 @@
* to extend the <code>clients</code> extension point.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ClientDelegate {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleFile.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleFile.java
index f84f8d2..6b8f0ea 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleFile.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleFile.java
@@ -12,7 +12,7 @@
/**
* A file within a module.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IModuleFile extends IModuleResource {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleFolder.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleFolder.java
index e055fa8..b8c0820 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleFolder.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleFolder.java
@@ -12,7 +12,7 @@
/**
* A folder within a module.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IModuleFolder extends IModuleResource {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleResource.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleResource.java
index 46e87f7..fceca3d 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleResource.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleResource.java
@@ -15,7 +15,7 @@
/**
* A resource (file or folder) within a module.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IModuleResource extends IAdaptable {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleResourceDelta.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleResourceDelta.java
index 81c59eb..3650270 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleResourceDelta.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IModuleResourceDelta.java
@@ -12,8 +12,9 @@
import org.eclipse.core.runtime.IPath;
/**
+ * A module resource delta.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IModuleResourceDelta {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IURLProvider.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IURLProvider.java
index f088362..c8573e9 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IURLProvider.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/IURLProvider.java
@@ -14,8 +14,10 @@
import org.eclipse.wst.server.core.IModule;
/**
+ * An interface for a server delegate that can provide URLs for a module published
+ * to the server.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IURLProvider {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/LaunchableAdapterDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/LaunchableAdapterDelegate.java
index de3af5f..47fd4e8 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/LaunchableAdapterDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/LaunchableAdapterDelegate.java
@@ -23,7 +23,7 @@
* to extend the <code>launchableAdapters</code> extension point.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class LaunchableAdapterDelegate {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleArtifactAdapterDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleArtifactAdapterDelegate.java
index b6dffbb..c3528b7 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleArtifactAdapterDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleArtifactAdapterDelegate.java
@@ -23,7 +23,7 @@
* to extend the <code>moduleArtifactAdapters</code> extension point.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ModuleArtifactAdapterDelegate {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleDelegate.java
index 09f2be5..d63f7cd 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleDelegate.java
@@ -34,7 +34,7 @@
*
* @see org.eclipse.wst.server.core.IModule
* @see ModuleFactoryDelegate
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ModuleDelegate {
private IModule module;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleFactoryDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleFactoryDelegate.java
index 3a94ee9..2ebee80 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleFactoryDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleFactoryDelegate.java
@@ -35,7 +35,7 @@
*
* @see org.eclipse.wst.server.core.IModule
* @see ModuleDelegate
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ModuleFactoryDelegate {
private ModuleFactory factory;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublishOperation.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublishOperation.java
index 8ec1331..2922f62 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublishOperation.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublishOperation.java
@@ -22,7 +22,7 @@
* after the server is started the modules are added to the server; however, the EJB deploy task
* makes more sense to be run before adding the project to the server.]
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class PublishOperation {
private TaskModel model;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublishTaskDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublishTaskDelegate.java
index 2442c3b..3852736 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublishTaskDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublishTaskDelegate.java
@@ -22,7 +22,7 @@
* to extend the <code>publishTask</code> extension point.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class PublishTaskDelegate {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeDelegate.java
index 3a2e1c1..58a509a 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeDelegate.java
@@ -52,7 +52,7 @@
*
* @see IRuntime
* @see IRuntimeWorkingCopy
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class RuntimeDelegate {
private Runtime runtime;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeLocatorDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeLocatorDelegate.java
index 55b8b98..2a1a709 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeLocatorDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeLocatorDelegate.java
@@ -21,7 +21,7 @@
* to extend the <code>runtimeLocators</code> extension point.
* </p>
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class RuntimeLocatorDelegate {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeTargetHandlerDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeTargetHandlerDelegate.java
index 053085e..5f563e9 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeTargetHandlerDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/RuntimeTargetHandlerDelegate.java
@@ -30,7 +30,7 @@
* (repeatedly) as the API evolves.
* </p>
*
- * @plannedfor 1.0
+ * @deprecated This function is deprecated.
*/
public abstract class RuntimeTargetHandlerDelegate {
private IRuntimeTargetHandler handler;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java
index 278a8d2..a981476 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java
@@ -47,7 +47,7 @@
*
* @see org.eclipse.wst.server.core.IServer
* @see org.eclipse.wst.server.core.IServerWorkingCopy
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ServerBehaviourDelegate {
private Server server;
@@ -117,6 +117,9 @@
* This method is called by the server core framework.
* Clients should never call this method.
* </p>
+ *
+ * @param monitor a progress monitor, or <code>null</code> if progress
+ * reporting and cancellation are not desired
*/
protected void initialize(IProgressMonitor monitor) {
// do nothing
@@ -657,15 +660,15 @@
Trace.trace(Trace.FINEST, "Done publishing: " + module);
return status;
}
-
+
protected boolean hasBeenPublished(IModule[] module) {
return server.getServerPublishInfo().hasModulePublishInfo(module);
}
-
+
protected void addRemovedModules(List moduleList, List kindList) {
server.getServerPublishInfo().addRemovedModules(moduleList, kindList);
}
-
+
protected void updatePublishInfo(int deltaKind, IModule[] module) {
if (deltaKind == ServerBehaviourDelegate.REMOVED)
server.getServerPublishInfo().removeModulePublishInfo(module);
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerDelegate.java
index 94d5f8c..cddd7e2 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerDelegate.java
@@ -48,7 +48,7 @@
*
* @see IServer
* @see IServerWorkingCopy
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ServerDelegate {
private Server server;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/HttpLaunchable.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/HttpLaunchable.java
index 53bc493..da4acc5 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/HttpLaunchable.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/HttpLaunchable.java
@@ -12,8 +12,10 @@
import java.net.URL;
/**
- *
- * @plannedfor 1.0
+ * An HTTP launchable object. Encapsulates a launch of a URL for the Run on Server
+ * support.
+ *
+ * @since 1.0
*/
public class HttpLaunchable {
private URL url;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/IStaticWeb.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/IStaticWeb.java
index cb7be7a..97471a4 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/IStaticWeb.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/IStaticWeb.java
@@ -13,7 +13,7 @@
* A static Web module that could be deployed to Apache or another
* HTTP server.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IStaticWeb {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/NullModuleArtifact.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/NullModuleArtifact.java
index 0f44e9a..88bf49b 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/NullModuleArtifact.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/NullModuleArtifact.java
@@ -13,8 +13,9 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IModuleArtifact;
/**
+ * A dummy module artifact.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class NullModuleArtifact implements IModuleArtifact {
private IModule module;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModule.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModule.java
index e5f3dd7..e984b4a 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModule.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModule.java
@@ -23,7 +23,7 @@
* A simple IModuleProject that maps a folder within a project
* (or the root of the project itself) to the module.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ProjectModule extends ModuleDelegate {
protected IProject project;
@@ -66,84 +66,6 @@
return root;
}
- /*
- * @see IModuleProject#getModuleResourceDelta(IResourceDelta)
- */
- /*public IModuleResourceDelta getModuleResourceDelta(IResourceDelta delta) {
- Trace.trace(Trace.FINEST, "> getModuleResourceDelta");
- IPath root2 = null;
- try {
- root2 = getRootFolder();
- } catch (Exception e) {
- Trace.trace(Trace.FINEST, "Error getting root2");
- }
- if (root2 == null) {
- return convertChildren(delta, null);
- }
- class Helper {
- boolean found = false;
- IModuleResourceDelta delta2;
- }
- final Helper helper = new Helper();
- final IPath root3 = root2;
- try {
- delta.accept(new IResourceDeltaVisitor() {
- public boolean visit(IResourceDelta visitDelta) {
- if (!helper.found && root3.equals(visitDelta.getProjectRelativePath())) {
- helper.delta2 = convertChildren(visitDelta, null);
- helper.found = true;
- return false;
- }
- return true;
- }
- });
- Trace.trace(Trace.FINEST, "< getModuleResourceDelta");
- return helper.delta2;
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could not get module resource delta");
- }
- Trace.trace(Trace.FINEST, "< getModuleResourceDelta null");
- return null;
- }*/
-
- /**
- *
- */
- /*protected IModuleResourceDelta convertChildren(IResourceDelta delta, IModuleFolder parent) {
- int flags = delta.getKind();
- int kind = IModuleResourceDelta.NO_CHANGE;
- if (flags == IResourceDelta.ADDED)
- kind = IModuleResourceDelta.ADDED;
- else if (flags == IResourceDelta.REMOVED)
- kind = IModuleResourceDelta.REMOVED;
- else if (flags == IResourceDelta.CHANGED)
- kind = IModuleResourceDelta.CHANGED;
-
- IResource resource = delta.getResource();
-
- IModuleResource pubResource = null;
- if (resource instanceof IContainer)
- pubResource = new ProjectModuleFolder(this, parent, (IContainer) resource);
- else if (resource instanceof IFile) {
- if (delta.getFlags() == IResourceDelta.MARKERS)
- return null;
- pubResource = new ProjectModuleFile(this, parent, (IFile) resource);
- }
-
- ModuleResourceDelta deployDelta = new ModuleResourceDelta(pubResource, kind);
-
- IResourceDelta[] children = delta.getAffectedChildren();
- if (children != null && pubResource instanceof IModuleFolder) {
- int size = children.length;
- for (int i = 0; i < size; i++) {
- IModuleResourceDelta childDelta = convertChildren(children[i], (IModuleFolder) pubResource);
- if (childDelta != null)
- deployDelta.addChild(childDelta);
- }
- }
- return deployDelta;
- }*/
-
/**
* Helper method - returns the module's id.
*
@@ -182,41 +104,41 @@
}
}
- protected IModuleResource[] getModuleResources(IPath path, IContainer container) throws CoreException {
- List list = new ArrayList();
+ /**
+ * Return the module resources for a given path.
+ *
+ * @param path a path
+ * @param container a container
+ * @return an array of module resources
+ * @throws CoreException
+ */
+ protected IModuleResource[] getModuleResources(IPath path, IContainer container) throws CoreException {
+ List list = new ArrayList();
- IResource[] resources = container.members();
- if (resources != null) {
- int size = resources.length;
- for (int i = 0; i < size; i++) {
- IResource resource = resources[i];
- if (resource instanceof IContainer) {
- IContainer container2 = getContainerResource(resource);
- if (container2 != null && container2.exists()) {
- ModuleFolder mf = new ModuleFolder(container, container2.getName(), path);
- mf.setMembers(getModuleResources(path.append(container2.getName()), container2));
- list.add(mf);
- }
- } else if (resource instanceof IFile) {
- IFile file = getFileResource(resource);
- if (file != null && file.exists())
- list.add(new ModuleFile(file, file.getName(), path, file.getModificationStamp()));
- }
- }
- }
-
- IModuleResource[] moduleResources = new IModuleResource[list.size()];
- list.toArray(moduleResources);
- return moduleResources;
- }
-
- protected IContainer getContainerResource(IResource resource){
- return (IContainer)resource;
- }
-
- protected IFile getFileResource(IResource resource){
- return (IFile)resource;
- }
+ IResource[] resources = container.members();
+ if (resources != null) {
+ int size = resources.length;
+ for (int i = 0; i < size; i++) {
+ IResource resource = resources[i];
+ if (resource instanceof IContainer) {
+ IContainer container2 = (IContainer) resource;
+ if (container2 != null && container2.exists()) {
+ ModuleFolder mf = new ModuleFolder(container, container2.getName(), path);
+ mf.setMembers(getModuleResources(path.append(container2.getName()), container2));
+ list.add(mf);
+ }
+ } else if (resource instanceof IFile) {
+ IFile file = (IFile) resource;
+ if (file != null && file.exists())
+ list.add(new ModuleFile(file, file.getName(), path, file.getModificationStamp()));
+ }
+ }
+ }
+
+ IModuleResource[] moduleResources = new IModuleResource[list.size()];
+ list.toArray(moduleResources);
+ return moduleResources;
+ }
/**
* Helper method - returns the module's name.
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java
index d2221b0..34d8a25 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java
@@ -21,17 +21,16 @@
import org.eclipse.wst.server.core.internal.Trace;
import org.eclipse.wst.server.core.model.ModuleFactoryDelegate;
/**
+ * A helper class for defining a module factory that provides modules
+ * based on projects.
*
- *
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ProjectModuleFactoryDelegate extends ModuleFactoryDelegate {
- protected static IResourceChangeListener listener;
-
private static List factories = new ArrayList();
// list of IModules
- private List projects;
+ private List modules;
/**
* Construct a new ProjectModuleFactoryDelegate.
@@ -46,21 +45,21 @@
* Cache any preexisting modules.
*/
private final void cacheModules() {
- if (projects != null)
+ if (modules != null)
return;
try {
clearCache();
IProject[] projects2 = getWorkspaceRoot().getProjects();
int size = projects2.length;
- projects = new ArrayList(size);
+ modules = new ArrayList(size);
for (int i = 0; i < size; i++) {
//Trace.trace("caching: " + this + " " + projects[i] + " " + isValidModule(projects[i]));
if (projects2[i].isAccessible()) {
try {
IModule module = createModule(projects2[i]);
if (module != null)
- projects.add(module);
+ modules.add(module);
} catch (Throwable t) {
Trace.trace(Trace.SEVERE, "Error creating module", t);
}
@@ -80,12 +79,17 @@
return ResourcesPlugin.getWorkspace().getRoot();
}
+ /**
+ * Return the modules provided by this factory.
+ *
+ * @return a possibly-empty array of modules
+ */
public final IModule[] getModules() {
cacheModules();
- IModule[] modules = new IModule[projects.size()];
- projects.toArray(modules);
- return modules;
+ IModule[] modules2 = new IModule[modules.size()];
+ modules.toArray(modules2);
+ return modules2;
}
/**
@@ -101,7 +105,7 @@
if (factories2[i].delegate != null && factories2[i].delegate instanceof ProjectModuleFactoryDelegate) {
ProjectModuleFactoryDelegate pmfd = (ProjectModuleFactoryDelegate) factories2[i].delegate;
if (pmfd.deltaAffectsModules(delta)) {
- pmfd.projects = null;
+ pmfd.modules = null;
factories2[i].clearModuleCache();
}
}
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/RuntimeLifecycleAdapter.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/RuntimeLifecycleAdapter.java
index 4f9480e..9c6cf8a 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/RuntimeLifecycleAdapter.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/RuntimeLifecycleAdapter.java
@@ -17,7 +17,7 @@
* with empty methods.
*
* @see org.eclipse.wst.server.core.IRuntimeLifecycleListener
- * @plannedfor 1.0
+ * @since 1.0
*/
public class RuntimeLifecycleAdapter implements IRuntimeLifecycleListener {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ServerLifecycleAdapter.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ServerLifecycleAdapter.java
index ad7980a..d55279d 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ServerLifecycleAdapter.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ServerLifecycleAdapter.java
@@ -17,7 +17,7 @@
* with empty methods.
*
* @see org.eclipse.wst.server.core.IServerLifecycleListener
- * @plannedfor 1.0
+ * @since 1.0
*/
public class ServerLifecycleAdapter implements IServerLifecycleListener {
/**
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/SocketUtil.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/SocketUtil.java
index 7ac7529..1c09a4c 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/SocketUtil.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/SocketUtil.java
@@ -23,7 +23,7 @@
* unused ports, check whether a port is in use, and check whether a given
* address is a local(host) address.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class SocketUtil {
private static final Random rand = new Random(System.currentTimeMillis());
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/WebResource.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/WebResource.java
index de97aa8..4863f75 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/WebResource.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/WebResource.java
@@ -15,8 +15,9 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IModuleArtifact;
/**
+ * A Web module resource.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class WebResource implements IModuleArtifact {
private IModule module;
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerLaunchConfigurationTab.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerLaunchConfigurationTab.java
index 92f540b..477733f 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerLaunchConfigurationTab.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerLaunchConfigurationTab.java
@@ -35,20 +35,20 @@
/**
* Server launch configuration tab.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class ServerLaunchConfigurationTab extends AbstractLaunchConfigurationTab {
- protected String[] serverTypeIds;
+ private String[] serverTypeIds;
- protected Combo serverCombo;
-
- protected Label runtimeLabel;
- protected Label hostname;
-
- protected IServer server;
-
+ private Combo serverCombo;
+
+ private Label runtimeLabel;
+ private Label hostname;
+
+ private IServer server;
+
// list of servers that are in combo
- protected List servers;
+ private List servers;
// flag to be used to decide whether to enable combo in launch config dialog
// after the user requests a launch, they cannot change it
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerUICore.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerUICore.java
index 2ab8f61..5a1bc0e 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerUICore.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerUICore.java
@@ -16,7 +16,7 @@
/**
* Server UI core.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class ServerUICore {
private static ServerLabelProvider labelProvider;
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerUIUtil.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerUIUtil.java
index 2a3ccf5..927eb84 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerUIUtil.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerUIUtil.java
@@ -16,7 +16,7 @@
/**
* Server UI utility methods.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public class ServerUIUtil {
/**
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/IServerEditorPartInput.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/IServerEditorPartInput.java
index 078c236..114c9d7 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/IServerEditorPartInput.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/IServerEditorPartInput.java
@@ -16,7 +16,7 @@
/**
* An input into a server part or section editor.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IServerEditorPartInput extends IEditorInput {
/**
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java
index 91929ed..6516e2c 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java
@@ -30,7 +30,7 @@
* This class also provides each editor page with an error message which
* will be displayed on the status bar of the editor.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ServerEditorPart extends EditorPart {
/**
@@ -291,7 +291,7 @@
* Get a form toolkit to create widgets. It will automatically be disposed
* when the editor is disposed.
*
- * @param display
+ * @param display the display
* @return FormToolkit
*/
protected FormToolkit getFormToolkit(Display display) {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java
index 4d249f3..218d922 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java
@@ -24,7 +24,7 @@
/**
* An abstract server editor section.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class ServerEditorSection {
private String errorMessage = null;
@@ -122,7 +122,7 @@
/**
* Set an error message for this page.
*
- * @param error java.lang.String
+ * @param error an error message
*/
public void setErrorMessage(String error) {
if (error == null && errorMessage == null)
@@ -140,7 +140,7 @@
* Get a form toolkit to create widgets. It will automatically be disposed
* when the editor is disposed.
*
- * @param display
+ * @param display the display
* @return FormToolkit
*/
protected FormToolkit getFormToolkit(Display display) {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/wizard/IWizardHandle.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/wizard/IWizardHandle.java
index 2f70f25..85c9752 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/wizard/IWizardHandle.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/wizard/IWizardHandle.java
@@ -16,9 +16,9 @@
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
/**
+ * A wizard handle.
*
- *
- * @plannedfor 1.0
+ * @since 1.0
*/
public interface IWizardHandle extends IMessageProvider {
/**
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/wizard/WizardFragment.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/wizard/WizardFragment.java
index c4c1982..d6e4d7b 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/wizard/WizardFragment.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/wizard/WizardFragment.java
@@ -37,7 +37,7 @@
* be called multiple times as the tree is updated and it must return the
* same instance of any children that have previously been returned.
*
- * @plannedfor 1.0
+ * @since 1.0
*/
public abstract class WizardFragment {
private TaskModel taskModel;
@@ -58,8 +58,8 @@
* Creates the composite associated with this fragment.
* This method is only called when hasComposite() returns true.
*
- * @param parent
- * @param handle
+ * @param parent a parent composite
+ * @param handle a wizard handle
* @return the created composite
*/
public Composite createComposite(Composite parent, IWizardHandle handle) {