From: Robert S. <ra...@gm...> - 2006-06-07 20:16:20
|
User: rawb Date: 06/06/07 14:00:57 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server JBossServer.java Log: Fixed a twice-published error by moving publish calls from modifyModules into saveConfiguration. Much more reliable and in less dodgy altogether. Revision Changes Path 1.4 +10 -9 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServer.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- JBossServer.java 2 Jun 2006 16:47:56 -0000 1.3 +++ JBossServer.java 7 Jun 2006 18:00:57 -0000 1.4 @@ -28,6 +28,7 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerPort; +import org.eclipse.wst.server.core.internal.PublishServerJob; import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; import org.eclipse.wst.server.core.model.ServerDelegate; @@ -75,6 +76,11 @@ public void saveConfiguration(IProgressMonitor monitor) throws CoreException { debug("saveConfiguration"); rtConfig.save(); + + // Re-publish in case the configuration change has not been published yet. + PublishServerJob publishJob = new PublishServerJob(getServer(), IServer.PUBLISH_INCREMENTAL, false); + publishJob.schedule(); + } public void configurationChanged() { @@ -131,18 +137,13 @@ public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException { + + // Do nothing for now, just display to know I've been called. + if( add == null ) add = new IModule[0]; if( remove == null ) add = new IModule[0]; debug("****** modifyModules, " + add.length + " added, " + remove.length + " removed."); - Object o = getServer().loadAdapter(JBossServerBehavior.class, monitor); - if( o != null ) { - JBossServerBehavior behavior = (JBossServerBehavior)o; - behavior.publishStart(monitor); - behavior.publishModule(IServer.PUBLISH_INCREMENTAL, ServerBehaviourDelegate.REMOVED, remove, monitor); - behavior.publishModule(IServer.PUBLISH_INCREMENTAL, ServerBehaviourDelegate.ADDED, add, monitor); - behavior.publishFinish(monitor); - } } public ServerPort[] getServerPorts() { |