code cleanup
diff --git a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
index d2fb2b7..5d82748 100644
--- a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Bundle-Localization: plugin
Export-Package: org.eclipse.jst.server.generic.core.internal;x-internal:=true,
org.eclipse.jst.server.generic.core.internal.publishers;x-internal:=true,
- org.eclipse.jst.server.generic.internal.core.util;x-internal:=true,
+ org.eclipse.jst.server.generic.internal.core.util;x-friends:="org.eclipse.jst.server.generic.ui",
org.eclipse.jst.server.generic.internal.servertype.definition;x-internal:=true,
org.eclipse.jst.server.generic.internal.servertype.definition.impl;x-internal:=true,
org.eclipse.jst.server.generic.internal.servertype.definition.util;x-internal:=true,
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
index 30ef7f1..2aea3aa 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
@@ -184,9 +184,9 @@
port = getHttpPort();
port =ServerUtil.getMonitoredPort(getServer(), port, "web"); //$NON-NLS-1$
if (port != 80)
- url += ":" + port; //$NON-NLS-1$
+ url += ':' + port;
- url += "/"+webModule.getContextRoot(); //$NON-NLS-1$
+ url += '/'+webModule.getContextRoot();
if (!url.endsWith("/")) //$NON-NLS-1$
url += "/"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
index e600db8..e1c917a 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
@@ -58,7 +58,7 @@
private static final String ATTR_STOP = "stop-server"; //$NON-NLS-1$
// the thread used to ping the server to check for startup
- protected transient PingThread ping = null;
+ protected transient PingThread ping;
protected transient IDebugEventSetListener processListener;
protected transient IProcess process;
@@ -438,7 +438,7 @@
}
int port = sp.getPort();
if (port != 80)
- url += ":" + port; //$NON-NLS-1$
+ url += ':' + port;
ping = new PingThread(getServer(), url, this);
} catch (Exception e) {
Trace.trace(Trace.SEVERE, "Can't ping for server startup."); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchConfigurationDelegate.java
index f71a296..b61f488 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchConfigurationDelegate.java
@@ -83,8 +83,8 @@
genericServer.stopImpl();
throw new CoreException(new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, GenericServerCoreMessages.noProfiler, null));
}
- String vmArgs2 = sp[0].getVMArgs(); //$NON-NLS-1$
- vmArgs = vmArgs + " " + vmArgs2; //$NON-NLS-1$
+ String vmArgs2 = sp[0].getVMArgs();
+ vmArgs = vmArgs + ' ' + vmArgs2;
}
ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
index 159f0b0..b5242bc 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
@@ -31,7 +31,7 @@
// maximum number of pings before giving up
private int maxPings = 56; // total: 16 seconds + connection time
- private boolean stop = false;
+ private boolean stop;
private String fUrl;
private IServer fServer;
private GenericServerBehaviour fGenericServer;
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/Trace.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/Trace.java
index 385cbac..18e8c75 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/Trace.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/Trace.java
@@ -17,23 +17,23 @@
/**
* Trace level CONFIG
*/
- public static byte CONFIG = 0;
+ public static final byte CONFIG = 0;
/**
* Trace level WARNING
*/
- public static byte WARNING = 1;
+ public static final byte WARNING = 1;
/**
* Trace level SEVERE
*/
- public static byte SEVERE = 2;
+ public static final byte SEVERE = 2;
/**
* Trace level FINEST
*/
- public static byte FINEST = 3;
+ public static final byte FINEST = 3;
/**
* Trace level FINER
*/
- public static byte FINER = 4;
+ public static final byte FINER = 4;
/**
* Trace constructor comment.
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java
index 78d05e7..8703fab 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java
@@ -27,7 +27,7 @@
* Packages resources to a .zip file
*/
public class ModulePackager {
- private static final String JAR_FILE_SEPERATOR = "/";
+ private static final String JAR_FILE_SEPERATOR = "/"; //$NON-NLS-1$
private JarOutputStream outputStream;
// private StringBuffer manifestContents;
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/LaunchConfigurationImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/LaunchConfigurationImpl.java
index dd4089f..b2713a4 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/LaunchConfigurationImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/LaunchConfigurationImpl.java
@@ -624,12 +624,15 @@
return concatList(getVmParameters());
}
+ /**
+ * @generated NOT
+ */
private String concatList(List list){
StringBuffer concatString = new StringBuffer();
Iterator iterator = list.iterator();
while(iterator.hasNext()){
concatString.append(iterator.next());
- concatString.append(" ");
+ concatString.append(' ');
}
return concatString.toString();
}
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java
index 84ef27a..2d2578d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java
@@ -111,7 +111,7 @@
private int skipToProperty(String str,HashMap cache) {
int start = -1;
int end = 0;
- String key=new String();
+ String key=""; //$NON-NLS-1$
do {
start = str.indexOf(PROP_START,end);
if( start < 0)
