[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core ...
Robert Stryker
rob.stryker at jboss.com
Thu Mar 8 20:52:27 EST 2007
User: rawb
Date: 07/03/08 20:52:27
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core
JBossServerCorePlugin.java
Added: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core
ServerConverter.java ExtensionManager.java
Removed: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core
JBossServerCore.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.7 +2 -4 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossServerCorePlugin.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- JBossServerCorePlugin.java 10 Nov 2006 00:26:26 -0000 1.6
+++ JBossServerCorePlugin.java 9 Mar 2007 01:52:27 -0000 1.7
@@ -29,6 +29,7 @@
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
+import org.jboss.ide.eclipse.as.core.model.PackagesListener;
import org.osgi.framework.BundleContext;
/**
@@ -40,9 +41,6 @@
//Resource bundle.
private ResourceBundle resourceBundle;
public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.core";
- public static final String MODULE_FACTORY_PREFIX = "org.jboss.ide.eclipse.as.core.factory";
-
- private JBossServerCore serverCore;
/**
* The constructor.
@@ -71,7 +69,7 @@
*/
public void start(BundleContext context) throws Exception {
super.start(context);
- serverCore = JBossServerCore.getDefault();
+ PackagesListener.getInstance();
}
/**
1.1 date: 2007/03/09 01:52:27; author: rawb; state: Exp;jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ServerConverter.java
Index: ServerConverter.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.core;
import java.util.ArrayList;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.server.JBossServer;
import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.stripped.DeployableServerBehavior;
/**
*
* @author rob.stryker at jboss.com
*/
public class ServerConverter {
public static JBossServer getJBossServer(IServer server) {
JBossServer jbServer = (JBossServer)server.getAdapter(JBossServer.class);
if (jbServer == null) {
jbServer = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor());
}
return jbServer;
}
public static IDeployableServer getDeployableServer(IServer server) {
IDeployableServer dep = (IDeployableServer)server.getAdapter(IDeployableServer.class);
if (dep == null) {
dep = (IDeployableServer) server.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
}
return dep;
}
public static DeployableServerBehavior getDeployableServerBehavior(IServer server) {
return (DeployableServerBehavior)server.loadAdapter(
DeployableServerBehavior.class, new NullProgressMonitor());
}
/**
* Return all JBossServer instances from the ServerCore
* @return
*/
public static JBossServer[] getAllJBossServers() {
ArrayList servers = new ArrayList();
IServer[] iservers = ServerCore.getServers();
for( int i = 0; i < iservers.length; i++ ) {
if( getJBossServer(iservers[i]) != null ) {
servers.add(getJBossServer(iservers[i]));
}
}
JBossServer[] ret = new JBossServer[servers.size()];
servers.toArray(ret);
return ret;
}
public static IServer[] getJBossServersAsIServers() {
ArrayList servers = new ArrayList();
IServer[] iservers = ServerCore.getServers();
for( int i = 0; i < iservers.length; i++ ) {
if( getJBossServer(iservers[i]) != null ) {
servers.add(iservers[i]);
}
}
IServer[] ret = new IServer[servers.size()];
servers.toArray(ret);
return ret;
}
public static IDeployableServer[] getAllDeployableServers() {
ArrayList servers = new ArrayList();
IServer[] iservers = ServerCore.getServers();
for( int i = 0; i < iservers.length; i++ ) {
if( getDeployableServer(iservers[i]) != null ) {
servers.add(getDeployableServer(iservers[i]));
}
}
IDeployableServer[] ret = new IDeployableServer[servers.size()];
servers.toArray(ret);
return ret;
}
public static IServer[] getDeployableServersAsIServers() {
ArrayList servers = new ArrayList();
IServer[] iservers = ServerCore.getServers();
for( int i = 0; i < iservers.length; i++ ) {
if( getDeployableServer(iservers[i]) != null ) {
servers.add(iservers[i]);
}
}
IServer[] ret = new IServer[servers.size()];
servers.toArray(ret);
return ret;
}
}
1.1 date: 2007/03/09 01:52:27; author: rawb; state: Exp;jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/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.core;
import java.util.ArrayList;
import java.util.HashMap;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.jboss.ide.eclipse.as.core.runtime.server.IServerPollerTimeoutListener;
/**
*
* @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 HashMap pollerListeners = null;
public IServerPollerTimeoutListener[] getTimeoutListeners(String pollerClass) {
if( pollerListeners == null )
loadTimeoutListeners();
ArrayList list = (ArrayList)pollerListeners.get(pollerClass);
if( list != null ) {
return (IServerPollerTimeoutListener[]) list.toArray(new IServerPollerTimeoutListener[list.size()]);
}
return new IServerPollerTimeoutListener[0];
}
protected void loadTimeoutListeners() {
pollerListeners = new HashMap();
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] cf = registry.getConfigurationElementsFor(JBossServerCorePlugin.PLUGIN_ID, "pollerTimeoutListener");
for( int i = 0; i < cf.length; i++ ) {
try {
String poller = cf[i].getAttribute("pollerType");
Object listener = cf[i].createExecutableExtension("listener");
ArrayList list = (ArrayList)pollerListeners.get(poller);
if( list == null ) list = new ArrayList();
list.add(listener);
pollerListeners.put(poller, list);
} catch( CoreException ce ) {
ce.printStackTrace();
}
}
}
}
More information about the jboss-cvs-commits
mailing list