[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers ...

[Robert Stryker]

  User: rawb    
  Date: 07/03/08 20:52:25

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers  
                        ModuleViewProvider.java
                        DescriptorXPathViewProvider.java
  Log:
  Large cleaning up of the code to get rid of things that were useless...  
  - unused variables
  - minimally used classes
  - path factories (which will be reverted to some other API)
  - Created extension managers to manage extensions
  
  Revision  Changes    Path
  1.5       +4 -7      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ModuleViewProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ModuleViewProvider.java	4 Jan 2007 19:05:04 -0000	1.4
  +++ ModuleViewProvider.java	9 Mar 2007 01:52:25 -0000	1.5
  @@ -43,8 +43,7 @@
   import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
   import org.eclipse.wst.server.ui.ServerUICore;
   import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
  -import org.jboss.ide.eclipse.as.core.JBossServerCore;
  -import org.jboss.ide.eclipse.as.core.model.ModuleModel;
  +import org.jboss.ide.eclipse.as.core.ServerConverter;
   import org.jboss.ide.eclipse.as.core.server.JBossServer;
   import org.jboss.ide.eclipse.as.core.server.stripped.DeployableServerBehavior;
   import org.jboss.ide.eclipse.as.ui.Messages;
  @@ -94,8 +93,6 @@
   		
   		publishModuleAction = new Action() {
   			public void run() {
  -				for( int i = 0; i < selection.module.length; i++ ) 
  -					ModuleModel.getDefault().markModuleChanged(selection.module[i]);
   				DeployableServerBehavior behavior = (DeployableServerBehavior)
   					contentProvider.getServer().loadAdapter(DeployableServerBehavior.class, new NullProgressMonitor());
   				behavior.publishOneModule(IServer.PUBLISH_FULL, selection.module, ServerBehaviourDelegate.CHANGED, new NullProgressMonitor());
  @@ -231,13 +228,13 @@
   	private void addListeners() {
   		serverResourceListener = new IServerLifecycleListener() {
   			public void serverAdded(IServer server) {
  -				if( JBossServerCore.getJBossServer(server) != null ) 
  +				if( ServerConverter.getJBossServer(server) != null ) 
   					server.addServerListener(serverListener);
   			}
   			public void serverChanged(IServer server) {
   			}
   			public void serverRemoved(IServer server) {
  -				if( JBossServerCore.getJBossServer(server) != null ) 
  +				if( ServerConverter.getJBossServer(server) != null ) 
   					server.removeServerListener(serverListener);
   			}
   		};
  @@ -255,7 +252,7 @@
   			}
   		};
   		// add listeners to servers
  -		JBossServer[] servers = JBossServerCore.getAllJBossServers();
  +		JBossServer[] servers = ServerConverter.getAllJBossServers();
   		if (servers != null) {
   			int size = servers.length;
   			for (int i = 0; i < size; i++) {
  
  
  
  1.10      +3 -3      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DescriptorXPathViewProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- DescriptorXPathViewProvider.java	7 Mar 2007 22:15:10 -0000	1.9
  +++ DescriptorXPathViewProvider.java	9 Mar 2007 01:52:25 -0000	1.10
  @@ -88,7 +88,7 @@
   import org.eclipse.ui.internal.editors.text.JavaFileEditorInput;
   import org.eclipse.ui.views.properties.IPropertySheetPage;
   import org.eclipse.wst.server.core.IServer;
  -import org.jboss.ide.eclipse.as.core.JBossServerCore;
  +import org.jboss.ide.eclipse.as.core.ServerConverter;
   import org.jboss.ide.eclipse.as.core.model.DescriptorModel.ServerDescriptorModel.XPathTreeItem;
   import org.jboss.ide.eclipse.as.core.model.DescriptorModel.ServerDescriptorModel.XPathTreeItem2;
   import org.jboss.ide.eclipse.as.core.server.JBossServer;
  @@ -172,7 +172,7 @@
   		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
   			if( oldInput != newInput ) {
   				server = (IServer)newInput;
  -				jbServer = server == null ? null : JBossServerCore.getDeployableServer(server);
  +				jbServer = server == null ? null : ServerConverter.getDeployableServer(server);
   				root = null;
   			}
   		}
  @@ -405,7 +405,7 @@
   		protected void fillPortPreferences(Composite portComp) {
   			portComp.setLayout(new RowLayout(SWT.VERTICAL));
   			
  -			servers = JBossServerCore.getAllJBossServers();
  +			servers = ServerConverter.getAllJBossServers();
   			String[] serverNames = new String[servers.length];
   			for( int i = 0; i < servers.length; i++ )
   				serverNames[i] = servers[i].getServer().getName();