[128738] Program argument changes don't take
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericPublisher.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericPublisher.java
index 47395e0..faa8789 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericPublisher.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericPublisher.java
@@ -84,7 +84,7 @@
* Returns the module associated with this publisher instance
* @return module
*/
- public IModule[] getModule() {
+ protected IModule[] getModule() {
return fModule;
}
@@ -92,22 +92,22 @@
* Generic server instance
* @return server
*/
- public GenericServer getServer(){
+ protected GenericServer getServer(){
return fServer;
}
/**
* a handle to server definition.
* @return serverdef
*/
- public GenericServerRuntime getServerRuntime() {
+ protected GenericServerRuntime getServerRuntime() {
return fServerRuntime;
}
- public int getDeltaKind() {
+ protected int getDeltaKind() {
return fDeltaKind;
}
- public int getKind() {
+ protected int getKind() {
return fKind;
}
}
\ No newline at end of file
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 e1c917a..2230489 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
@@ -382,12 +382,12 @@
String existingProgArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
String serverProgArgs = getProgramArguments();
- if(existingProgArgs==null || existingProgArgs.indexOf(serverProgArgs)<0) {
+ if( existingProgArgs==null ) {
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,serverProgArgs);
}
String existingVMArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,(String)null);
String serverVMArgs= getVmArguments();
- if(existingVMArgs==null || existingVMArgs.indexOf(serverVMArgs)<0) {
+ if( existingVMArgs==null ) {
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,serverVMArgs);
}
}