geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r517774 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ org.apache.geronimo.st.ui/src/org/apache/gero...
Date Tue, 13 Mar 2007 17:01:16 GMT
Author: sppatel
Date: Tue Mar 13 10:01:14 2007
New Revision: 517774

URL: http://svn.apache.org/viewvc?view=rev&rev=517774
Log:
parameterize lists

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/EMFEditorContext.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?view=diff&rev=517774&r1=517773&r2=517774
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
Tue Mar 13 10:01:14 2007
@@ -200,7 +200,7 @@
 	protected void publishModules(int kind, List modules, List deltaKind, MultiStatus multi,
IProgressMonitor monitor) {
 		IStatus status = Status.OK_STATUS;
 		if (modules != null && modules.size() > 0 && getGeronimoServer().isInPlaceSharedLib())
{
-			List rootModules = new ArrayList();
+			List rootModules = new ArrayList<IModule>();
 			for(int i = 0; i < modules.size(); i++) {
 				IModule[] module = (IModule[]) modules.get(i);
 				if(!rootModules.contains(module[0])) {
@@ -221,7 +221,7 @@
 			if (monitor.isCanceled())
 				return;
 			
-			List rootModulesPublished = new ArrayList();
+			List rootModulesPublished = new ArrayList<IModule>();
 			for (int i = 0; i < size; i++) {
 				IModule[] module = (IModule[]) modules.get(i);
 				int moduleDeltaKind = ((Integer)deltaKind.get(i)).intValue();
@@ -563,7 +563,7 @@
 	}
 
 	protected void setupLaunchClasspath(ILaunchConfigurationWorkingCopy wc, IVMInstall vmInstall)
throws CoreException {
-		List cp = new ArrayList();
+		List<IRuntimeClasspathEntry> cp = new ArrayList<IRuntimeClasspathEntry>();
 		IPath serverJar = getServer().getRuntime().getLocation().append("/bin/server.jar");
 		cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(serverJar));
 		// merge existing classpath with server classpath
@@ -578,7 +578,7 @@
 	}
 
 	private List convertCPEntryToMemento(List cpEntryList) {
-		List list = new ArrayList(cpEntryList.size());
+		List<String> list = new ArrayList<String>(cpEntryList.size());
 		Iterator iterator = cpEntryList.iterator();
 		while (iterator.hasNext()) {
 			IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry) iterator.next();

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java?view=diff&rev=517774&r1=517773&r2=517774
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
Tue Mar 13 10:01:14 2007
@@ -125,7 +125,7 @@
 	}
 
 	private IModule[] doGetParentModules(IModule module) {
-		ArrayList parents = new ArrayList();
+		ArrayList<IModule> parents = new ArrayList<IModule>();
 		parents.addAll(getApplicationModules(module));
 
 		// also check to see if the module is a utility module for a stand-alone
@@ -139,9 +139,9 @@
 		return (IModule[]) parents.toArray(new IModule[parents.size()]);
 	}
 
-	private List getApplicationModules(IModule module) {
+	private List<IModule> getApplicationModules(IModule module) {
 		IModule[] ears = ServerUtil.getModules(IModuleConstants.JST_EAR_MODULE);
-		ArrayList list = new ArrayList();
+		ArrayList<IModule> list = new ArrayList<IModule>();
 		for (int i = 0; i < ears.length; i++) {
 			IEnterpriseApplication ear = (IEnterpriseApplication) ears[i].loadAdapter(IEnterpriseApplication.class,
null);
 			IModule[] childs = ear.getModules();
@@ -192,7 +192,7 @@
 	 * @see org.eclipse.wst.server.core.model.ServerDelegate#getServerPorts()
 	 */
 	public ServerPort[] getServerPorts() {
-		List ports = new ArrayList();
+		List<ServerPort> ports = new ArrayList<ServerPort>();
 		ports.add(new ServerPort(PROPERTY_HTTP_PORT, "Web Connector", Integer.parseInt(getHTTPPort()),
"http"));
 		ports.add(new ServerPort(PROPERTY_RMI_PORT, "RMI Naming", Integer.parseInt(getRMINamingPort()),
"rmi"));
 		return (ServerPort[]) ports.toArray(new ServerPort[ports.size()]);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java?view=diff&rev=517774&r1=517773&r2=517774
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
Tue Mar 13 10:01:14 2007
@@ -55,7 +55,7 @@
 
 	public IClasspathEntry[] getServerClassPathEntry(IRuntime runtime) {
 		
-		List list = new ArrayList();
+		List<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
 		IPath path = runtime.getLocation().append("lib");
 		addLibraryEntries(list, path.toFile(), true);
 		

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java?view=diff&rev=517774&r1=517773&r2=517774
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
Tue Mar 13 10:01:14 2007
@@ -66,7 +66,7 @@
 		IServer server = ServerUtil.getServer(configuration);
 		IModule[] modules = server.getModules();
 
-		List javaProjectList = new ArrayList();
+		List<IJavaProject> javaProjectList = new ArrayList<IJavaProject>();
 		// populate list of java projects and their source folders
 		processModules(modules, javaProjectList, server, monitor);
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java?view=diff&rev=517774&r1=517773&r2=517774
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java
Tue Mar 13 10:01:14 2007
@@ -105,8 +105,8 @@
 		IModule[] modules = (IModule[]) model.getProperty(MODULES);
 		this.server = (IServer) model.getProperty(SERVER);
 		
-		HashMap addList = new HashMap();
-		List deleteList = new ArrayList();
+		HashMap<File, File> addList = new HashMap<File, File>();
+		List<File> deleteList = new ArrayList<File>();
 		
 		try {
 			String sharedLibPath = getSharedLibPath();

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?view=diff&rev=517774&r1=517773&r2=517774
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
Tue Mar 13 10:01:14 2007
@@ -88,7 +88,7 @@
 
 	private IWizardHandle fWizard;
 
-	protected List installedJREs;
+	protected List<IVMInstall> installedJREs;
 
 	protected String[] jreNames;
 
@@ -474,7 +474,7 @@
 	}
 
 	protected void updateJREs() {
-		installedJREs = new ArrayList();
+		installedJREs = new ArrayList<IVMInstall>();
 		IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes();
 		int size = vmInstallTypes.length;
 		for (int i = 0; i < size; i++) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java?view=diff&rev=517774&r1=517773&r2=517774
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/EMFEditorContext.java
Tue Mar 13 10:01:14 2007
@@ -26,6 +26,7 @@
 import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
 import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory;
 import org.apache.geronimo.xml.ns.security.provider.SecurityItemProviderAdapterFactory;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.openejb.xml.ns.openejb.jar.provider.JarItemProviderAdapterFactory;
 import org.openejb.xml.ns.pkgen.provider.PkgenItemProviderAdapterFactory;
@@ -38,7 +39,7 @@
 	private static ComposedAdapterFactory factory;
 
 	static {
-		List factories = new ArrayList();
+		List<AdapterFactoryImpl> factories = new ArrayList<AdapterFactoryImpl>();
 		factories.add(new DeploymentItemProviderAdapterFactory());
 		factories.add(new ClientItemProviderAdapterFactory());
 		factories.add(new ApplicationItemProviderAdapterFactory());

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/EMFEditorContext.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/EMFEditorContext.java?view=diff&rev=517774&r1=517773&r2=517774
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/EMFEditorContext.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/org/apache/geronimo/st/v11/ui/internal/EMFEditorContext.java
Tue Mar 13 10:01:14 2007
@@ -26,6 +26,7 @@
 import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
 import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory;
 import org.apache.geronimo.xml.ns.security.provider.SecurityItemProviderAdapterFactory;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.openejb.xml.ns.openejb.jar.provider.JarItemProviderAdapterFactory;
 import org.openejb.xml.ns.pkgen.provider.PkgenItemProviderAdapterFactory;
@@ -35,7 +36,7 @@
 	private static ComposedAdapterFactory factory;
 
 	static {
-		List factories = new ArrayList();
+		List<AdapterFactoryImpl> factories = new ArrayList<AdapterFactoryImpl>();
 		factories.add(new DeploymentItemProviderAdapterFactory());
 		factories.add(new ClientItemProviderAdapterFactory());
 		factories.add(new ApplicationItemProviderAdapterFactory());



Mime
View raw message