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

Robert Stryker rob.stryker at jboss.com
Thu Mar 8 20:52:25 EST 2007


  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  
                        JBossServerUIPlugin.java
  Added:       as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui  
                        ExtensionManager.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.16      +5 -41     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerUIPlugin.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- JBossServerUIPlugin.java	10 Nov 2006 00:30:21 -0000	1.15
  +++ JBossServerUIPlugin.java	9 Mar 2007 01:52:25 -0000	1.16
  @@ -32,7 +32,7 @@
   import org.eclipse.core.runtime.Platform;
   import org.eclipse.ui.IStartup;
   import org.eclipse.ui.plugin.AbstractUIPlugin;
  -import org.jboss.ide.eclipse.as.core.JBossServerCore;
  +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
   import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider;
   import org.osgi.framework.BundleContext;
   
  @@ -102,60 +102,24 @@
   	}
   
   	public void earlyStartup() {
  -		JBossServerCore.getDefault();
  +		JBossServerCorePlugin.getDefault();
   	}
   	
   
   	
  -	private ServerViewProvider[] serverViewExtensions;
   	public ServerViewProvider[] getEnabledViewProviders() {
  -		getAllServerViewProviders();
  +		ServerViewProvider[] serverViewExtensions = getAllServerViewProviders();
   		ArrayList list = new ArrayList();
   		for( int i = 0; i < serverViewExtensions.length; i++ ) {
   			if( serverViewExtensions[i].isEnabled()) {
   				list.add(serverViewExtensions[i]);
   			}
   		}
  -		ServerViewProvider[] providers = new ServerViewProvider[list.size()];
  -		list.toArray(providers);
  -		
  -		Arrays.sort(providers, new Comparator() {
  -			public int compare(Object arg0, Object arg1) {
  -				if( arg0 instanceof ServerViewProvider && arg1 instanceof ServerViewProvider) {
  -					return ((ServerViewProvider)arg0).getWeight() - ((ServerViewProvider)arg1).getWeight();
  -				}
  -				return 0;
  -			}
  -		});
  -
  -		return providers;
  +		return (ServerViewProvider[]) list.toArray(new ServerViewProvider[list.size()]);
   	}
   	
   	public ServerViewProvider[] getAllServerViewProviders() {
  -		if( serverViewExtensions == null ) {
  -			loadAllServerViewProviders();
  -		}
  -		Arrays.sort(serverViewExtensions, new Comparator() {
  -			public int compare(Object arg0, Object arg1) {
  -				if( arg0 instanceof ServerViewProvider && arg1 instanceof ServerViewProvider) {
  -					return ((ServerViewProvider)arg0).getWeight() - ((ServerViewProvider)arg1).getWeight();
  -				}
  -				return 0;
  -			}
  -		});
  -		return serverViewExtensions;
  -	}
  -	private void loadAllServerViewProviders() {
  -
  -		// Create the extensions from the registry
  -		
  -		IExtensionRegistry registry = Platform.getExtensionRegistry();
  -		IConfigurationElement[] elements = registry.getConfigurationElementsFor(JBossServerUIPlugin.PLUGIN_ID, "ServerViewExtension");
  -		serverViewExtensions = new ServerViewProvider[elements.length];
  -		for( int i = 0; i < elements.length; i++ ) {
  -			serverViewExtensions[i] = new ServerViewProvider(elements[i]);
  -			//serverViewExtensions[i].setEnabled(true);
  -		}
  +		return ExtensionManager.getDefault().getAllServerViewProviders();
   	}
   	
   	
  
  
  
  1.1      date: 2007/03/09 01:52:25;  author: rawb;  state: Exp;jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/ExtensionManager.java
  
  Index: ExtensionManager.java
  ===================================================================
  /**
   * JBoss, a Division of Red Hat
   * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
   * by the @authors tag. See the copyright.txt in the distribution for a
   * full listing of individual contributors.
   *
  * This is free software; you can redistribute it and/or modify it
   * under the terms of the GNU Lesser General Public License as
   * published by the Free Software Foundation; either version 2.1 of
   * the License, or (at your option) any later version.
   *
   * This software is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
   * License along with this software; if not, write to the Free
   * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   */
  package org.jboss.ide.eclipse.as.ui;
  
  import java.util.Arrays;
  import java.util.Comparator;
  
  import org.eclipse.core.runtime.IConfigurationElement;
  import org.eclipse.core.runtime.IExtensionRegistry;
  import org.eclipse.core.runtime.Platform;
  import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider;
  
  /**
   *
   * @author rob.stryker at jboss.com
   */
  public class ExtensionManager {
  	private static ExtensionManager instance;
  	public static ExtensionManager getDefault() {
  		if( instance == null ) 
  			instance = new ExtensionManager();
  		return instance;
  	}
  	
  	private ServerViewProvider[] serverViewExtensions;
  	public ServerViewProvider[] getAllServerViewProviders() {
  		if( serverViewExtensions == null ) 
  			loadAllServerViewProviders();
  		Arrays.sort(serverViewExtensions, new Comparator() {
  			public int compare(Object arg0, Object arg1) {
  				if( arg0 instanceof ServerViewProvider && arg1 instanceof ServerViewProvider) {
  					return ((ServerViewProvider)arg0).getWeight() - ((ServerViewProvider)arg1).getWeight();
  				}
  				return 0;
  			}
  		});
  		return serverViewExtensions;
  	}
  	private void loadAllServerViewProviders() {
  		// Create the extensions from the registry
  		IExtensionRegistry registry = Platform.getExtensionRegistry();
  		IConfigurationElement[] elements = registry.getConfigurationElementsFor(JBossServerUIPlugin.PLUGIN_ID, "ServerViewExtension");
  		serverViewExtensions = new ServerViewProvider[elements.length];
  		for( int i = 0; i < elements.length; i++ ) {
  			serverViewExtensions[i] = new ServerViewProvider(elements[i]);
  			//serverViewExtensions[i].setEnabled(true);
  		}
  	}
  
  }
  
  
  



More information about the jboss-cvs-commits mailing list