[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards ...

[Robert Stryker]

  User: rawb    
  Date: 06/08/15 13:35:44

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards 
                        NewMBeanWizard.java
  Log:
  Added progress monitors to completion of wizard
  
  Revision  Changes    Path
  1.4       +47 -20    jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/NewMBeanWizard.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NewMBeanWizard.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/NewMBeanWizard.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- NewMBeanWizard.java	15 Aug 2006 16:05:30 -0000	1.3
  +++ NewMBeanWizard.java	15 Aug 2006 17:35:44 -0000	1.4
  @@ -4,6 +4,7 @@
   import java.io.ByteArrayOutputStream;
   import java.io.OutputStreamWriter;
   import java.io.PrintWriter;
  +import java.lang.reflect.InvocationTargetException;
   import java.net.URI;
   import java.util.List;
   
  @@ -41,18 +42,20 @@
   import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
   import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;
   import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
  +import org.eclipse.jface.dialogs.ProgressMonitorDialog;
  +import org.eclipse.jface.operation.IRunnableWithProgress;
   import org.eclipse.jface.viewers.IStructuredSelection;
   import org.eclipse.jface.wizard.IWizardPage;
   import org.eclipse.swt.SWT;
   import org.eclipse.swt.layout.GridLayout;
   import org.eclipse.swt.widgets.Composite;
  +import org.eclipse.swt.widgets.Shell;
   import org.eclipse.swt.widgets.Text;
   import org.eclipse.ui.INewWizard;
   import org.eclipse.ui.IWorkbench;
   import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
   import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
   import org.eclipse.wst.xml.ui.internal.wizards.NewModelWizard;
  -import org.jboss.ide.eclipse.as.core.util.ASDebug;
   
   public class NewMBeanWizard extends NewModelWizard implements INewWizard {
   
  @@ -74,10 +77,22 @@
   	
   	public boolean performFinish() {
   		if( !canFinish() ) return false;
  +		
  +		
  +		IRunnableWithProgress op = new IRunnableWithProgress() {
  +			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
   		try {
  -			interfacePage.createType(new NullProgressMonitor());
  -			mbeanPage.createType(new NullProgressMonitor());
   			
  +					monitor.beginTask("Creating Files", 100);
  +					SubProgressMonitor interfaceMonitor = new SubProgressMonitor(monitor, 40);
  +					SubProgressMonitor mbeanMonitor = new SubProgressMonitor(monitor, 40);
  +					SubProgressMonitor xmlMonitor = new SubProgressMonitor(monitor, 20);
  +					
  +					
  +					interfacePage.createType(interfaceMonitor);
  +					mbeanPage.createType(mbeanMonitor);
  +					
  +					xmlMonitor.beginTask("XMLDescriptor", 1);
   			if( mbeanPage.shouldCreateDescriptor()) {
   				newFilePage.setFileName(mbeanPage.getCreatedType().getElementName() + "-service.xml");
   				
  @@ -93,10 +108,22 @@
   				createStubServiceDescriptor(newFile);
   			} else {
   			}
  +					xmlMonitor.worked(1);
  +					xmlMonitor.done();
   		} catch( Throwable jme) {
   			jme.printStackTrace();
   		}
   		
  +				monitor.done();
  +			}
  +		};
  +		try {
  +			new ProgressMonitorDialog(new Shell()).run(false, true, op);
  +		} catch( Exception e) {
  +			e.printStackTrace();
  +		}
  +
  +		
   		return true;
   	}