geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1083939 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
Date Mon, 21 Mar 2011 20:28:27 GMT
Author: gawor
Date: Mon Mar 21 20:28:26 2011
New Revision: 1083939

URL: http://svn.apache.org/viewvc?rev=1083939&view=rev
Log:
GERONIMODEVTOOLS-715: Display modified instead of synchronized for a module of an application
when the module is changed

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java?rev=1083939&r1=1083938&r2=1083939&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
Mon Mar 21 20:28:26 2011
@@ -306,9 +306,11 @@ abstract public class GeronimoServerBeha
                 status = publishModule(kind, moduleList.getRootModule(), moduleList.getDelta(),
ProgressUtil.getSubMonitorFor(monitor, 3000));
                 if (status != null && !status.isOK()) {
                     multi.add(status);
-                }
-                for (IModule[] module : moduleList.getModules()) {
-                    setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
+                } else {
+                    for (IModule[] module : moduleList.getModules()) {
+                        setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
+                        setModuleStatus(module, null);
+                    }
                 }
             }
             /*
@@ -478,9 +480,13 @@ abstract public class GeronimoServerBeha
                 
                 IModule[] modules = event.getModule();
                 if (modules.length > 1) {
-                    int publishState = (getServer().getServerState() == IServer.STATE_STARTED)
? IServer.PUBLISH_STATE_NONE : IServer.PUBLISH_STATE_UNKNOWN;
-                    // reset child module publish state
-                    setModulePublishState(event.getModule(), publishState);
+                    if (getServer().getServerState() == IServer.STATE_STARTED) {
+                        setModulePublishState(event.getModule(), IServer.PUBLISH_STATE_NONE);
+                        setModuleStatus(event.getModule(), new Status(IStatus.OK, Activator.PLUGIN_ID,
"Modified"));
+                    } else {
+                        setModulePublishState(event.getModule(), IServer.PUBLISH_STATE_UNKNOWN);
+                        setModuleStatus(event.getModule(), null);
+                    }
 
                     IModule[] newModules = new IModule[modules.length - 1];             
      
                     System.arraycopy(modules, 0, newModules, 0, newModules.length);



Mime
View raw message