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

[Robert Stryker]

  User: rawb    
  Date: 07/03/19 18:49:40

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages 
                        WARInfoWizardPage.java
  Log:
  Integration with packages
  Removal of path publisher for individual files
  Changes to event log label providers
  
  Revision  Changes    Path
  1.6       +14 -2     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/WARInfoWizardPage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WARInfoWizardPage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/WARInfoWizardPage.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- WARInfoWizardPage.java	5 Mar 2007 19:44:33 -0000	1.5
  +++ WARInfoWizardPage.java	19 Mar 2007 22:49:40 -0000	1.6
  @@ -35,6 +35,8 @@
   import org.eclipse.ui.PlatformUI;
   import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
   import org.eclipse.ui.ide.IDE;
  +import org.eclipse.wst.server.core.IModuleArtifact;
  +import org.eclipse.wst.server.core.internal.ServerPlugin;
   import org.jboss.ide.eclipse.as.core.packages.ObscurelyNamedPackageTypeSuperclass;
   import org.jboss.ide.eclipse.as.core.packages.WarPackageType;
   import org.jboss.ide.eclipse.as.ui.Messages;
  @@ -151,7 +153,7 @@
   		});
   	}
   	public boolean isPageComplete() {
  -		return true;
  +		return hasCreated;
   	}
       public void pageEntered(int button) {
       	if( !hasCreated ) {
  @@ -159,6 +161,17 @@
       		hasCreated = true;
       	}
       	fillWidgets(wizard.getPackage());
  +    	
  +    	// if it's already a module type project, hide the meta inf stuff
  +		IModuleArtifact moduleArtifact = ServerPlugin.loadModuleArtifact(wizard.getProject());
  +		if( moduleArtifact.getModule() != null ) {
  +			webinfGroup.setVisible(false);
  +			FormData d = (FormData)previewGroup.getLayoutData();
  +			d.top = new FormAttachment(0,5);
  +			previewGroup.setLayoutData(d);
  +			((Composite)getControl()).layout();
  +		}
  +		getWizard().getContainer().updateButtons();
       }
       
       protected void addToPackage() {
  @@ -169,7 +182,6 @@
       	}
       }
       protected void fillWidgets(IPackage pkg) {
  -    	System.out.println("filling widgets");
       	warPreview.setInput(new IPackage[] {pkg});
       	warPreview.expandAll();