JBoss Tools SVN: r3752 - in trunk: seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-09-21 03:57:02 -0400 (Fri, 21 Sep 2007)
New Revision: 3752
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BasePlugin.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BaseUIPlugin.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-916
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BasePlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BasePlugin.java 2007-09-21 07:53:33 UTC (rev 3751)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BasePlugin.java 2007-09-21 07:57:02 UTC (rev 3752)
@@ -55,4 +55,4 @@
public void logInfo(String message) {
LogHelper.logInfo(this, message);
}
-}
+}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BaseUIPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BaseUIPlugin.java 2007-09-21 07:53:33 UTC (rev 3751)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BaseUIPlugin.java 2007-09-21 07:57:02 UTC (rev 3752)
@@ -10,6 +10,10 @@
******************************************************************************/
package org.jboss.tools.common.log;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -56,4 +60,11 @@
public void logWarning(Throwable t) {
LogHelper.logWarning(this, t);
}
-}
+
+ public void showError(String message, Throwable t) {
+ logError(message, t);
+ Shell shell = Display.getDefault().getActiveShell();
+ IStatus s = StatusFactory.getInstance(IStatus.ERROR, this.getBundle().getSymbolicName(), message, t);
+ ErrorDialog.openError(shell, "Hibernate Console", message, s);
+ }
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-09-21 07:53:33 UTC (rev 3751)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-09-21 07:57:02 UTC (rev 3752)
@@ -115,7 +115,7 @@
launchManager.addLaunch(wc.launch(ILaunchManager.RUN_MODE, monitor));
} catch (CoreException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
+ SeamCorePlugin.getDefault().showError("Can't generate seam entities", e);
}
return Status.OK_STATUS;
}
17 years, 3 months
JBoss Tools SVN: r3751 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-21 03:53:33 -0400 (Fri, 21 Sep 2007)
New Revision: 3751
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-906
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-09-21 07:53:31 UTC (rev 3750)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-09-21 07:53:33 UTC (rev 3751)
@@ -71,7 +71,7 @@
*
*/
boolean seamHomeRequiresSave = SeamFacetPreference.getStringPreference(
- SeamFacetPreference.SEAM_HOME_FOLDER).equals("");
+ SeamFacetPreference.SEAM_RUNTIME_NAME).equals("");
/**
*
*/
@@ -227,7 +227,7 @@
public void transferStateToConfig() {
if (seamHomeRequiresSave) {
SeamCorePlugin.getDefault().getPluginPreferences().setValue(
- SeamFacetPreference.SEAM_HOME_FOLDER,
+ SeamFacetPreference.SEAM_RUNTIME_NAME,
jBossSeamHomeEditor.getValueAsString());
}
if ("".equals(SeamCorePlugin.getDefault().getPluginPreferences()
17 years, 3 months
JBoss Tools SVN: r3750 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-21 03:53:31 -0400 (Fri, 21 Sep 2007)
New Revision: 3750
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-906
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java 2007-09-21 07:50:58 UTC (rev 3749)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java 2007-09-21 07:53:31 UTC (rev 3750)
@@ -18,7 +18,7 @@
*
*/
public class SeamFacetPreference {
- public static final String SEAM_HOME_FOLDER = SeamCorePlugin.PLUGIN_ID + ".project.facet.seamhome";
+ public static final String SEAM_RUNTIME_NAME = SeamCorePlugin.PLUGIN_ID + ".project.facet.runtime.name";
public static final String SEAM_DEFAULT_CONNECTION_PROFILE = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.conn.profile";
public static final String RUNTIME_CONFIG_FORMAT_VERSION = SeamCorePlugin.PLUGIN_ID + ".runtime.config.format.version";
public static final String RUNTIME_LIST = SeamCorePlugin.PLUGIN_ID+".runtime.list";
17 years, 3 months
JBoss Tools SVN: r3749 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-21 03:50:58 -0400 (Fri, 21 Sep 2007)
New Revision: 3749
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java
Log:
fix compilation problems
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-09-21 03:07:18 UTC (rev 3748)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-09-21 07:50:58 UTC (rev 3749)
@@ -240,5 +240,23 @@
break;
}
}
+
+ /**
+ * @param project
+ * @param monitor
+ * @throws JavaModelException
+ */
+ public static void setClasspathEntryAsExported(final IProject project,IPath path,
+ IProgressMonitor monitor) throws JavaModelException {
+ IJavaProject jProject = JavaCore.create(project);
+ IClasspathEntry[] cps = jProject.getRawClasspath();
+ for (int i=0;i<cps.length;i++) {
+ if(cps[i].getEntryKind()==IClasspathEntry.CPE_CONTAINER
+ && cps[i].getPath().equals(path)) {
+ cps[i]=JavaCore.newContainerEntry(cps[i].getPath(),true);
+ }
+ }
+ jProject.setRawClasspath(cps, monitor);
+ }
}
17 years, 3 months
JBoss Tools SVN: r3748 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-20 23:07:18 -0400 (Thu, 20 Sep 2007)
New Revision: 3748
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
OH SO FAST DEPLOYMENT!
(and accurate, too!)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2007-09-21 01:11:28 UTC (rev 3747)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2007-09-21 03:07:18 UTC (rev 3748)
@@ -82,40 +82,69 @@
if (ServerBehaviourDelegate.REMOVED == deltaKind) {
status = unpublish(server, module, monitor);
} else if (kind == IServer.PUBLISH_FULL || kind == IServer.PUBLISH_CLEAN) {
- status = fullPublishPackIntoFolder(module, root, monitor);
+ status = fullPublishPackIntoFolder(new ArrayList<IModule>(), root, module, monitor);
} else if (kind == IServer.PUBLISH_INCREMENTAL) {
- status = incrementalPublish(new ArrayList(), root, module, monitor);
+ status = incrementalPublish(new ArrayList<IModule>(), root, module, monitor);
}
return status;
}
- protected void fullWebPublish(IModule module, IPath root, IProgressMonitor monitor ) throws CoreException {
- ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
- IModuleResource[] members = md.members();
- IWebModule webmodule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
- IPath moduleDeployPath = root.append(webmodule.getContextRoot() + ".war");
- FileUtil.safeDelete(moduleDeployPath.toFile());
- PublishUtil.publishSmart(members, moduleDeployPath, monitor);
- IWebModule webModule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
- IModule[] childModules = webModule.getModules();
- for (int i = 0; i < childModules.length; i++) {
- IModule module2 = childModules[i];
- packModuleIntoJar(module, webModule.getURI(module2), moduleDeployPath);
+
+ protected IStatus fullPublishPackIntoFolder(ArrayList<IModule> moduleTree, IPath root, IModule module, IProgressMonitor monitor) throws CoreException {
+ if( module.getModuleType().getId().equals("jst.ear")) {
+ fullEarPublish(moduleTree, module, root, monitor);
+ } else if( module.getModuleType().getId().equals("jst.web")) {
+ fullWebPublish(moduleTree, module, root, monitor);
+ } else if( module.getModuleType().getId().equals("jst.ejb")) {
+ // This should be an ejb. Utility projects should not be published in a folder
+ ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
+ IModuleResource[] members = md.members();
+ IPath moduleDeployPath = root.append(module.getProject().getName() + ".jar");
+ FileUtil.safeDelete(moduleDeployPath.toFile());
+ PublishUtil.publishSmart(members, moduleDeployPath, monitor);
+
+ // if we're nested, save our resources
+ if( moduleTree.size() > 1 )
+ NestedPublishInfo.getDefault().getServerPublishInfo(server.getServer()).getPublishInfo(moduleTree, module).setResources(md.members());
+
+ // can ejb jars have children? I don't know
+ // TODO: FIND OUT!
}
+ return null;
}
- protected void fullEarPublish(IModule module, IPath root, IProgressMonitor monitor) throws CoreException {
+
+
+
+ /*
+ * Full publish methods are here
+ */
+
+ protected void fullEarPublish(ArrayList<IModule> moduleTree, IModule module, IPath root, IProgressMonitor monitor) throws CoreException {
if( module instanceof DeletedModule ) {
// TODO FIX ME
return;
}
-
ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
IModuleResource[] members = md.members();
IEnterpriseApplication earModule = (IEnterpriseApplication)module.loadAdapter(IEnterpriseApplication.class, monitor);
IPath moduleDeployPath = root.append(module.getProject().getName() + ".ear");
FileUtil.safeDelete(moduleDeployPath.toFile());
PublishUtil.publishFull(members, moduleDeployPath, monitor);
+
+ // Add this module to the tree, so that when we get to the war or ejb
+ // child, it knows it is the child of an ear and not a root deployment
+ ArrayList<IModule> newTree = new ArrayList<IModule>();
+ newTree.addAll(moduleTree);
+ newTree.add(module);
+
+ // if we're not the root (unlikely), save our resources
+ boolean isRoot = moduleTree.size() == 1;
+ if( !isRoot ) {
+ NestedPublishInfo.getDefault().getServerPublishInfo(server.getServer()).getPublishInfo(newTree, module).setResources(md.members());
+ }
+
+ // now lets fully publish the children
IModule[] childModules = earModule.getModules();
for (int i = 0; i < childModules.length; i++) {
IModule module2 = childModules[i];
@@ -125,35 +154,156 @@
throw new CoreException(status);
}
if( module2.getModuleType().getId().equals("jst.utility")) {
+ // utility gets packed into a jar
packModuleIntoJar(module2, uri, moduleDeployPath);
} else {
- fullPublishPackIntoFolder(module2, moduleDeployPath, monitor);
+ // otherwise it's an ejb, a war, etc, and gets sent exploded
+ fullPublishPackIntoFolder(newTree, moduleDeployPath, module2, monitor);
}
}
}
+
- protected IStatus fullPublishPackIntoFolder(IModule module, IPath root, IProgressMonitor monitor) throws CoreException {
- if( module.getModuleType().getId().equals("jst.web")) {
- fullWebPublish(module, root, monitor);
- } else if( module.getModuleType().getId().equals("jst.ear")) {
- fullEarPublish(module, root, monitor);
- } else {
+
+ protected void fullWebPublish(ArrayList<IModule> moduleTree, IModule module, IPath root, IProgressMonitor monitor ) throws CoreException {
+ ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
+ IModuleResource[] members = md.members();
+ IWebModule webmodule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
+ IPath moduleDeployPath = root.append(webmodule.getContextRoot() + ".war");
+ FileUtil.safeDelete(moduleDeployPath.toFile());
+ PublishUtil.publishSmart(members, moduleDeployPath, monitor);
+
+ // save our resources if we're not a top level deployment
+ if( moduleTree.size() != 1 )
+ NestedPublishInfo.getDefault().getServerPublishInfo(server.getServer()).getPublishInfo(moduleTree, module).setResources(md.members());
+
+
+ IWebModule webModule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
+ IModule[] childModules = webModule.getModules();
+ for (int i = 0; i < childModules.length; i++) {
+ IModule module2 = childModules[i];
+ packModuleIntoJar(module, webModule.getURI(module2), moduleDeployPath);
+ }
+ }
+
+
+ /*
+ * Entry point for incremental publishing
+ */
+
+ protected IStatus incrementalPublish(ArrayList<IModule> moduleTree, IPath root, IModule module, IProgressMonitor monitor) throws CoreException {
+ if( module.getModuleType().getId().equals("jst.ear")) {
+ incrementalEarPublish(moduleTree, module, root, monitor);
+ } else if( module.getModuleType().getId().equals("jst.web")) {
+ incrementalWarPublish(moduleTree, module, root, monitor);
+ } else if( module.getModuleType().getId().equals("jst.ejb")){
+ ArrayList newTree = new ArrayList(); newTree.addAll(moduleTree); newTree.add(module);
+ IModuleResourceDelta[] deltas = getDelta(module, newTree);
ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
- IModuleResource[] members = md.members();
IPath moduleDeployPath = root.append(module.getProject().getName() + ".jar");
- FileUtil.safeDelete(moduleDeployPath.toFile());
- PublishUtil.publishSmart(members, moduleDeployPath, monitor);
+ PublishUtil.publishDelta(deltas, moduleDeployPath, monitor);
+
+ if( moduleTree.size() > 1 ) {
+ NestedPublishInfo.getDefault().getServerPublishInfo(server.getServer()).getPublishInfo(newTree, module).setResources(md.members());
+ }
+
+ // Can ears have libs in them? DO NOT KNOW
+ // TODO: FIGURE IT OUT
+ } else {
+ // cannot incrementally publish something unknown
+ // just package it normal
+ packModuleIntoJar(module, module.getName() + ".jar", root);
}
- return null;
+ return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
+ IStatus.OK, "", null);
}
+
+ protected void incrementalEarPublish(ArrayList<IModule> moduleTree, IModule module, IPath root, IProgressMonitor monitor) throws CoreException {
+ ArrayList<IModule> newTree = new ArrayList<IModule>();
+ newTree.addAll(moduleTree);
+ newTree.add(module);
- private boolean hasDelta( IModule module, ArrayList moduleTree ) {
+ IModuleResourceDelta[] deltas = getDelta(module, newTree);
+ IEnterpriseApplication earModule = (IEnterpriseApplication)module.loadAdapter(IEnterpriseApplication.class, monitor);
+ IPath moduleDeployPath = root.append(module.getProject().getName() + ".ear");
+ PublishUtil.publishDelta(deltas, moduleDeployPath, monitor);
+
+ // if not root, save child data
+ ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
+ if( moduleTree.size() > 1 )
+ NestedPublishInfo.getDefault().getServerPublishInfo(server.getServer()).getPublishInfo(newTree, module).setResources(md.members());
+
+ IModule[] childModules = earModule.getModules();
+ for (int i = 0; i < childModules.length; i++) {
+ IModule childModule = childModules[i];
+ String uri = earModule.getURI(childModule);
+ if(uri==null){
+ IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0, "unable to assemble module null uri",null ); //$NON-NLS-1$
+ throw new CoreException(status);
+ }
+
+ incrementalPublish(newTree, moduleDeployPath, childModule, monitor);
+ }
+
+ }
+
+ protected void incrementalWarPublish(ArrayList<IModule> moduleTree, IModule module, IPath root, IProgressMonitor monitor) throws CoreException {
+ ArrayList<IModule> newTree = new ArrayList<IModule>();
+ newTree.addAll(moduleTree); newTree.add(module);
+
+ IModuleResourceDelta[] deltas = getDelta(module, newTree);
+ ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
+ IWebModule webmodule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
+ IPath moduleDeployPath = root.append(webmodule.getContextRoot() + ".war");
+ PublishUtil.publishDelta(deltas, moduleDeployPath, monitor);
+
+ if( moduleTree.size() > 1 )
+ NestedPublishInfo.getDefault().getServerPublishInfo(server.getServer()).getPublishInfo(newTree, module).setResources(md.members());
+
+
+ IWebModule webModule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
+ IModule[] childModules = webModule.getModules();
+ for (int i = 0; i < childModules.length; i++) {
+ IModule module2 = childModules[i];
+ // if a lib .jar needs to be repacked, repack the whole thing
+ if( hasDelta(module2, newTree))
+ packModuleIntoJar(module, webModule.getURI(module2), moduleDeployPath);
+ }
+ }
+
+ protected IStatus unpublish(IDeployableServer jbServer, IModule module,
+ IProgressMonitor monitor) throws CoreException {
+
+ IPath root = new Path(jbServer.getDeployDirectory());
+ if( module.getModuleType().getId().equals("jst.web")) {
+ // copy the module first
+ IWebModule webmodule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
+ IPath moduleDeployPath = root.append(webmodule.getContextRoot() + ".war");
+ FileUtil.completeDelete(moduleDeployPath.toFile());
+ } else if( module.getModuleType().getId().equals("jst.ear")) {
+ IPath moduleDeployPath = root.append(module.getProject().getName() + ".ear");
+ FileUtil.completeDelete(moduleDeployPath.toFile());
+ }
+
+ return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
+ IStatus.OK, "", null);
+ }
+
+
+ /*
+ *
+ * Utility Methods
+ *
+ *
+ */
+
+ private boolean hasDelta( IModule module, ArrayList<IModule> moduleTree ) {
return getDelta(module, moduleTree).length > 0;
}
- public IModuleResourceDelta[] getDelta(IModule module, ArrayList moduleTree) {
+ public IModuleResourceDelta[] getDelta(IModule module, ArrayList<IModule> moduleTree) {
IModuleResourceDelta[] deltas;
- if( moduleTree.size() == 0 ) {
+ if( moduleTree.size() == 1 ) {
final IModule[] modules ={module};
deltas = ((Server)server.getServer()).getPublishedResourceDelta( modules );
} else {
@@ -161,8 +311,11 @@
}
return deltas;
}
-
+
+ /*
+ * Just package into a jar raw. Don't think about it, just do it
+ */
protected void packModuleIntoJar(IModule module, String deploymentUnitName, IPath destination)throws CoreException {
String dest = destination.append(deploymentUnitName).toString();
ModulePackager packager = null;
@@ -213,91 +366,4 @@
}
- protected IStatus incrementalPublish(ArrayList moduleTree, IPath root, IModule module, IProgressMonitor monitor) throws CoreException {
- if( module.getModuleType().getId().equals("jst.web")) {
- incrementalWarPublish(moduleTree, module, root, monitor);
- } else if( module.getModuleType().getId().equals("jst.ear")) {
- incrementalEarPublish(moduleTree, module, root, monitor);
- } else {
- // cannot incrementally publish something unknown
- // just package it
- packModuleIntoJar(module, module.getName() + ".jar", root);
- }
- return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
- IStatus.OK, "", null);
- }
-
- protected void incrementalWarPublish(ArrayList moduleTree, IModule module, IPath root, IProgressMonitor monitor) throws CoreException {
- ArrayList newTree = new ArrayList();
- newTree.addAll(moduleTree); newTree.add(module);
-
- IModule[] modules = new IModule[] {module};
- IModuleResourceDelta[] deltas = getDelta(module, moduleTree);
- //((Server)server.getServer()).getPublishedResourceDelta( modules );
- ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
- IModuleResource[] members = md.members();
- IWebModule webmodule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
- IPath moduleDeployPath = root.append(webmodule.getContextRoot() + ".war");
- PublishUtil.publishDelta(deltas, moduleDeployPath, monitor);
- IWebModule webModule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
- IModule[] childModules = webModule.getModules();
- for (int i = 0; i < childModules.length; i++) {
- IModule module2 = childModules[i];
- // if a lib .jar needs to be repacked, repack the whole thing
- if( hasDelta(module2, newTree))
- packModuleIntoJar(module, webModule.getURI(module2), moduleDeployPath);
- }
- if( moduleTree.size() > 0 ) {
- // published it
- NestedPublishInfo.getDefault().getServerPublishInfo(server.getServer()).getPublishInfo(moduleTree, module).setResources(md.members());
- }
- }
-
- protected void incrementalEarPublish(ArrayList moduleTree, IModule module, IPath root, IProgressMonitor monitor) throws CoreException {
- ArrayList newTree = new ArrayList();
- newTree.addAll(moduleTree);
- newTree.add(module);
-
- IModuleResourceDelta[] deltas = getDelta(module, moduleTree);
- //((Server)server.getServer()).getPublishedResourceDelta( modules );
- IEnterpriseApplication earModule = (IEnterpriseApplication)module.loadAdapter(IEnterpriseApplication.class, monitor);
- IPath moduleDeployPath = root.append(module.getProject().getName() + ".ear");
- PublishUtil.publishDelta(deltas, moduleDeployPath, monitor);
- IModule[] childModules = earModule.getModules();
- for (int i = 0; i < childModules.length; i++) {
- IModule childModule = childModules[i];
- String uri = earModule.getURI(childModule);
- if(uri==null){
- IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0, "unable to assemble module null uri",null ); //$NON-NLS-1$
- throw new CoreException(status);
- }
-
- incrementalPublish(newTree, moduleDeployPath, childModule, monitor);
- }
-
- }
-
- protected IStatus unpublish(IDeployableServer jbServer, IModule module,
- IProgressMonitor monitor) throws CoreException {
-
- IPath root = new Path(jbServer.getDeployDirectory());
- if( module.getModuleType().getId().equals("jst.web")) {
- // copy the module first
- ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
- IModuleResource[] members = md.members();
- IWebModule webmodule = (IWebModule)module.loadAdapter(IWebModule.class, monitor);
- IPath moduleDeployPath = root.append(webmodule.getContextRoot() + ".war");
- FileUtil.completeDelete(moduleDeployPath.toFile());
- } else if( module.getModuleType().getId().equals("jst.ear")) {
- ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
- IModuleResource[] members = md.members();
- IEnterpriseApplication earModule = (IEnterpriseApplication)module.loadAdapter(IEnterpriseApplication.class, monitor);
- IPath moduleDeployPath = root.append(module.getProject().getName() + ".ear");
- FileUtil.completeDelete(moduleDeployPath.toFile());
- }
-
- return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
- IStatus.OK, "", null);
- }
-
}
17 years, 3 months
JBoss Tools SVN: r3747 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-20 21:11:28 -0400 (Thu, 20 Sep 2007)
New Revision: 3747
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-906
Web App Libraries is marked as exported, to fix compilation errors in tests
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-21 00:54:51 UTC (rev 3746)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-21 01:11:28 UTC (rev 3747)
@@ -15,6 +15,8 @@
import java.io.FilenameFilter;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
import org.apache.tools.ant.types.FilterSet;
@@ -25,11 +27,16 @@
import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -336,8 +343,8 @@
if(model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH)!=null)
AntCopyUtils.copyFiles((String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH), webLibFolder);
-
-
+ WtpUtils.setClasspathEntryAsExported(project, new Path("org.eclipse.jst.j2ee.internal.web.container"), monitor);
+
Job create = new DataSourceXmlDeployer(project);
create.setRule(ResourcesPlugin.getWorkspace().getRoot());
create.schedule();
@@ -504,6 +511,8 @@
}
+
+
public static boolean isWarConfiguration(IDataModel model) {
return "war".equals(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS));
}
17 years, 3 months
JBoss Tools SVN: r3746 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-20 20:54:51 -0400 (Thu, 20 Sep 2007)
New Revision: 3746
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-931
Now it save order for validation.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-09-21 00:21:13 UTC (rev 3745)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-09-21 00:54:51 UTC (rev 3746)
@@ -10,7 +10,9 @@
******************************************************************************/
package org.jboss.tools.seam.ui.internal.project.facet;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.eclipse.jface.wizard.WizardPage;
@@ -43,6 +45,8 @@
* Map from property name to IValidator instance
*/
protected Map<String,IValidator> mapPropToValidator = new HashMap<String,IValidator>();
+
+ private List<String> validationOrder= new ArrayList<String>();
/**
*
@@ -90,7 +94,7 @@
* @return
*/
public String getFirstValidationError() {
- for (String validatorName : mapPropToValidator.keySet()) {
+ for (String validatorName : validationOrder) {
Map<String,String> errors = getValidator(validatorName).validate(
model.getProperty(validatorName),model);
String message = errors.get(validatorName);
@@ -118,5 +122,6 @@
*/
public void addValidatorForProperty(String name, IValidator validator) {
mapPropToValidator.put(name, validator);
+ validationOrder.add(name);
}
}
17 years, 3 months
JBoss Tools SVN: r3745 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-09-20 20:21:13 -0400 (Thu, 20 Sep 2007)
New Revision: 3745
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java
Log:
use getBaseProperties() as suggested by John DTP instead of using generic property name.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-09-20 23:49:06 UTC (rev 3744)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-09-21 00:21:13 UTC (rev 3745)
@@ -33,7 +33,7 @@
IDataModel model = (IDataModel)config;
if(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE)==null) return;
IConnectionProfile connProfile = ProfileManager.getInstance().getProfileByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE).toString());
- Properties props = connProfile.getProperties("org.eclipse.datatools.connectivity.db.generic.connectionProfile");
+ Properties props = connProfile.getBaseProperties(); //Properties("org.eclipse.datatools.connectivity.db.generic.connectionProfile");
// Collect properties name from DTP Connection Profile
model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME,
17 years, 3 months
JBoss Tools SVN: r3744 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-20 19:49:06 -0400 (Thu, 20 Sep 2007)
New Revision: 3744
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java
Log:
removing compiler warnings (generics)
removed unused code
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java 2007-09-20 23:47:41 UTC (rev 3743)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java 2007-09-20 23:49:06 UTC (rev 3744)
@@ -10,7 +10,6 @@
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.graphics.Image;
@@ -19,147 +18,17 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.jboss.ide.eclipse.as.ui.Messages;
-import org.jboss.ide.eclipse.as.ui.views.server.ExtensionTableViewer;
import org.jboss.ide.eclipse.as.ui.views.server.ExtensionTableViewer.ContentWrapper;
public class PropertySheetFactory {
- /**
- * Creates a JBossServersViewPropertySheetPage type property sheet.
- * It has a tree-table and a text box and the two can be moved around.
- * @return
- */
-// public static PropertiesTextSashPropertiesPage createPropertiesTextSashPropertiesPage() {
-// return new PropertiesTextSashPropertiesPage();
-// }
-//
-// public static class PropertiesTextSashPropertiesPage implements IPropertySheetPage {
-//
-// protected TreeViewer propertiesViewer;
-// protected SashForm propertiesForm;
-// protected Text propertiesText;
-// protected int[] propertyCols; // For the property columns
-// protected int[] sashCols; // for the properties sashform
-//
-//
-// public void createControl(Composite parent) {
-// setProperties();
-// addPropertyViewer(parent);
-// }
-//
-// private void setProperties() {
-// sashCols = new int[2];
-// sashCols[0] = 100;
-// sashCols[1] = 0;
-//
-// propertyCols = new int[2];
-// propertyCols[0] = 100;
-// propertyCols[1] = 100;
-// }
-//
-// private void addPropertyViewer(Composite form) {
-// propertiesForm = new SashForm(form, SWT.HORIZONTAL);
-// propertiesForm.setLayout(new FillLayout());
-//
-// Composite c1 = new Composite(propertiesForm, SWT.NONE);
-// c1.setLayout(new FillLayout());
-// Tree tTable = new Tree(c1, SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.NONE);
-// tTable.setHeaderVisible(true);
-// tTable.setLinesVisible(true);
-// tTable.setLayoutData(new GridData(GridData.FILL_BOTH));
-// tTable.setFont(c1.getFont());
-//
-// TreeColumn column = new TreeColumn(tTable, SWT.SINGLE);
-// column.setText(Messages.property);
-// column.setWidth(propertyCols[0]);
-//
-// TreeColumn column2 = new TreeColumn(tTable, SWT.SINGLE);
-// column2.setText(Messages.value);
-// column2.setWidth(propertyCols[1]);
-//
-// propertiesViewer = new TreeViewer(tTable);
-//
-// Composite c2 = new Composite(propertiesForm, SWT.NONE);
-// c2.setLayout(new FillLayout());
-// propertiesText = new Text(c2, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);
-//
-// propertiesForm.setWeights(sashCols);
-// }
-//
-//
-//
-// public void dispose() {
-// // TODO Auto-generated method stub
-//
-// }
-//
-// public Control getControl() {
-// return propertiesForm;
-// }
-//
-// public void setActionBars(IActionBars actionBars) {
-// }
-//
-// public void setFocus() {
-// }
-//
-// public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-// try {
-// propertiesViewer.setInput(((IStructuredSelection)selection).getFirstElement());
-// } catch( Exception e ) {
-// }
-// }
-//
-//
-// public void showTextOnly() {
-// sashCols[0] = 0;
-// sashCols[1] = 100;
-// propertiesForm.setWeights(sashCols);
-// }
-//
-// public void showPropertiesOnly() {
-// sashCols[0] = 100;
-// sashCols[1] = 0;
-// propertiesForm.setWeights(sashCols);
-// }
-//
-// public void setSashWeights(int properties, int text) {
-// sashCols[0] = properties;
-// sashCols[1] = text;
-// propertiesForm.setWeights(sashCols);
-// }
-//
-// public void setSashWeights(int[] weights) {
-// sashCols = weights;
-// propertiesForm.setWeights(weights);
-// }
-//
-// public void setContentProvider(ITreeContentProvider provider) {
-// propertiesViewer.setContentProvider(provider);
-// }
-//
-// public void setLabelProvider(ITableLabelProvider provider) {
-// propertiesViewer.setLabelProvider(provider);
-// }
-//
-//
-// public Text getText() {
-// return propertiesText;
-// }
-//
-// public TreeViewer getViewer() {
-// return propertiesViewer;
-// }
-// }
-
/**
* Simple properties sheet requiring just content and label providers.
* @return
17 years, 3 months
JBoss Tools SVN: r3743 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-20 19:47:41 -0400 (Thu, 20 Sep 2007)
New Revision: 3743
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLauncher.java
Log:
removing compiler warnings (generics)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2007-09-20 23:43:34 UTC (rev 3742)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2007-09-20 23:47:41 UTC (rev 3743)
@@ -121,11 +121,11 @@
return jbrt;
}
- protected static void addCPEntry(ArrayList list, JBossServer jbs, String relative) {
+ protected static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, JBossServer jbs, String relative) {
list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(getServerHome(jbs)).append(relative)));
}
- protected static ArrayList convertClasspath(ArrayList cp, IVMInstall vmInstall) {
+ protected static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
if (vmInstall != null) {
try {
cp.add(JavaRuntime.newRuntimeContainerClasspathEntry(
@@ -148,10 +148,10 @@
}
}
- Iterator cpi = cp.iterator();
- ArrayList list = new ArrayList();
+ Iterator<IRuntimeClasspathEntry> cpi = cp.iterator();
+ ArrayList<String> list = new ArrayList<String>();
while (cpi.hasNext()) {
- IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry) cpi.next();
+ IRuntimeClasspathEntry entry = cpi.next();
try {
list.add(entry.getMemento());
} catch (Exception e) {
@@ -163,7 +163,7 @@
return list;
}
- protected static void addDirectory(String serverHome, ArrayList classpath,
+ protected static void addDirectory(String serverHome, ArrayList<IRuntimeClasspathEntry> classpath,
String dirName) {
String libPath = serverHome + File.separator + dirName;
File libDir = new File(libPath);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2007-09-20 23:43:34 UTC (rev 3742)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2007-09-20 23:47:41 UTC (rev 3743)
@@ -36,6 +36,7 @@
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.ServerType;
@@ -71,15 +72,12 @@
IJBossServerRuntime jbrt = findJBossServerRuntime(server);
String serverHome = getServerHome(jbs);
- ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
- ILaunchConfigurationType launchConfigType = launchManager.getLaunchConfigurationType(LAUNCH_TYPE);
-
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getDefaultArgs(jbs));
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, START_MAIN_TYPE);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin");
- ArrayList classpath = new ArrayList();
+ ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
addCPEntry(classpath, jbs, START_JAR_LOC);
- ArrayList runtimeClassPaths = convertClasspath(classpath, jbrt.getVM());
+ ArrayList<String> runtimeClassPaths = convertClasspath(classpath, jbrt.getVM());
String cpKey = IJavaLaunchConfigurationConstants.ATTR_CLASSPATH;
wc.setAttribute(cpKey, runtimeClassPaths);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLauncher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLauncher.java 2007-09-20 23:43:34 UTC (rev 3742)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLauncher.java 2007-09-20 23:47:41 UTC (rev 3743)
@@ -51,7 +51,7 @@
*/
public static ProcessData[] launchTwiddles(String[] twiddleArgs, IServer server, boolean addPrefix) throws CoreException {
ILaunchConfigurationWorkingCopy wc;
- ArrayList list = new ArrayList();
+ ArrayList<ProcessData> list = new ArrayList<ProcessData>();
for( int i = 0; i < twiddleArgs.length; i++ ) {
String args2 = addPrefix ? TwiddleLaunchConfiguration.getDefaultArgs(server) + twiddleArgs[i] : twiddleArgs[i];
wc = TwiddleLaunchConfiguration.createLaunchConfiguration(server, args2);
17 years, 3 months