svn commit: r463396 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core: GeronimoServerBehaviourDelegate.java operations/SharedLibEntryCreationOperation.java

[sp...@apache.org]

Author: sppatel
Date: Thu Oct 12 12:50:52 2006
New Revision: 463396

URL: http://svn.apache.org/viewvc?view=rev&rev=463396
Log:
add progress monitoring

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/operations/SharedLibEntryCreationOperation.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=463396&r1=463395&r2=463396
==============================================================================
--- 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 Thu Oct 12 12:50:52 2006
@@ -205,7 +205,7 @@
 				}
 			}
 			IModule[] toProcess = (IModule[])rootModules.toArray(new IModule[rootModules.size()]);
-			status = updateSharedLib(toProcess, monitor);
+			status = updateSharedLib(toProcess, ProgressUtil.getSubMonitorFor(monitor, 1000));
 		}
 		if(status.isOK()) {
 			super.publishModules(kind, modules, deltaKind, multi, 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=463396&r1=463395&r2=463396
==============================================================================
--- 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 Thu Oct 12 12:50:52 2006
@@ -18,7 +18,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.MalformedURLException;
@@ -66,6 +65,7 @@
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.ProgressUtil;
 import org.eclipse.wst.server.core.model.ModuleDelegate;
 
 public class SharedLibEntryCreationOperation extends AbstractDataModelOperation implements ISharedLibEntryCreationDataModelProperties {
@@ -95,7 +95,9 @@
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 		Trace.trace(Trace.INFO, ">> SharedLibEntryCreationOperation.execute()");
 		
-		this.monitor = monitor;
+		this.monitor = ProgressUtil.getMonitorFor(monitor);
+		this.monitor.beginTask("Processing in-place shared libraries.", 100);
+		
 		IModule[] modules = (IModule[]) model.getProperty(MODULES);
 		this.server = (IServer) model.getProperty(SERVER);
 		
@@ -153,7 +155,9 @@
 		} catch (Exception e) {
 			Trace.trace(Trace.SEVERE, "Failure in updating shared library.", e);
 			throw new ExecutionException("Failure in updating shared library", e);
-		} 
+		} finally {
+			monitor.done();
+		}
 		
 		Trace.trace(Trace.INFO, "<< SharedLibEntryCreationOperation.execute()");
 		return Status.OK_STATUS;