geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r453608 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/
Date Fri, 06 Oct 2006 14:22:43 GMT
Author: sppatel
Date: Fri Oct  6 07:22:42 2006
New Revision: 453608

URL: http://svn.apache.org/viewvc?view=rev&rev=453608
Log:
provide progress during shardlib update

Modified:
    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.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java

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=453608&r1=453607&r2=453608
==============================================================================
--- 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
Fri Oct  6 07:22:42 2006
@@ -65,6 +65,7 @@
 	
 	private TargetModuleID sharedLibTarget;
 	private IServer server;
+	private IProgressMonitor monitor;
 
 	public SharedLibEntryCreationOperation() {
 	}
@@ -83,6 +84,7 @@
 	 *      org.eclipse.core.runtime.IAdaptable)
 	 */
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
{
+		this.monitor = monitor;
 		IModule module = (IModule) model.getProperty(MODULE);
 		this.server = (IServer) model.getProperty(SERVER);
 		
@@ -92,19 +94,19 @@
 		if(j2eeModule instanceof IEnterpriseApplication) {
 			IModule[] modules = j2eeModule.getChildModules();
 			for(int i = 0; i < modules.length; i++) {
-				IStatus status = process(modules[i], monitor);
+				IStatus status = process(modules[i]);
 				if(status.isOK()) {
 					recycle = true;
 				}
 			}
 		} else {
-			return process(module, monitor);
+			return process(module);
 		}
 		
 		return recycle ? Status.OK_STATUS : Status.CANCEL_STATUS;
 	}
 	
-	private IStatus process(IModule module, IProgressMonitor monitor) throws ExecutionException
{
+	private IStatus process(IModule module) throws ExecutionException {
 		Trace.trace(Trace.INFO, "SharedLibEntryCreationOperation.process() " + module.getName());
 		IProject project = module.getProject();
 		try {
@@ -254,6 +256,7 @@
 				String url = f.toURL().toExternalForm();
 				if (!entries.contains(url)) {
 					Trace.trace(Trace.INFO, "Adding " + url);
+					monitor.subTask("Linking " + url + " to shared lib.");
 					entries.add(url);
 				}
 			} catch (MalformedURLException e1) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java?view=diff&rev=453608&r1=453607&r2=453608
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
Fri Oct  6 07:22:42 2006
@@ -237,7 +237,7 @@
 		model.setProperty(ISharedLibEntryCreationDataModelProperties.SERVER, getServer());
 		IDataModelOperation op = new SharedLibEntryCreationOperation(model);
 		try {
-			op.execute(new NullProgressMonitor(), null);
+			op.execute(_monitor, null);
 		} catch (ExecutionException e) {
 			throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, e.getMessage(),
e.getCause()));
 		}



Mime
View raw message