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

Robert Stryker rob.stryker at jboss.com
Fri Apr 20 19:45:05 EDT 2007


  User: rawb    
  Date: 07/04/20 19:45:05

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages    
                        NewWARAction.java NewWARWizard.java
                        WARInfoWizardPage.java PublishAction.java
  Log:
  It Compiles!  Not sure on if it *works* yet
  
  Revision  Changes    Path
  1.3       +4 -4      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NewWARAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- NewWARAction.java	2 Mar 2007 21:37:04 -0000	1.2
  +++ NewWARAction.java	20 Apr 2007 23:45:05 -0000	1.3
  @@ -6,15 +6,15 @@
   import org.eclipse.ui.IViewActionDelegate;
   import org.eclipse.ui.IViewPart;
   import org.eclipse.ui.PlatformUI;
  -import org.jboss.ide.eclipse.packages.ui.PackagesUIPlugin;
  -import org.jboss.ide.eclipse.packages.ui.views.ProjectPackagesView;
  +import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
  +import org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesView;
   import org.jboss.ide.eclipse.ui.util.ActionWithDelegate;
   
   public class NewWARAction extends ActionWithDelegate implements IViewActionDelegate {
   
   	public void run() {
   		NewWARWizard wizard = new NewWARWizard();
  -		wizard.init(PlatformUI.getWorkbench(), ProjectPackagesView.instance().getSelection());
  +		wizard.init(PlatformUI.getWorkbench(), ProjectArchivesView.getInstance().getSelection());
   		
   		WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
   		int response = dialog.open();
  @@ -25,7 +25,7 @@
   	}
   	
   	public ImageDescriptor getImageDescriptor() {
  -		return PackagesUIPlugin.getImageDescriptor(PackagesUIPlugin.IMG_WAR);
  +		return ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_WAR);
   	}
   	
   	public String getText() {
  
  
  
  1.4       +7 -7      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARWizard.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NewWARWizard.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARWizard.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- NewWARWizard.java	2 Mar 2007 21:37:04 -0000	1.3
  +++ NewWARWizard.java	20 Apr 2007 23:45:05 -0000	1.4
  @@ -2,11 +2,11 @@
   
   import org.eclipse.jface.resource.ImageDescriptor;
   import org.eclipse.jface.wizard.WizardPage;
  -import org.jboss.ide.eclipse.packages.core.model.IPackage;
  -import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
  -import org.jboss.ide.eclipse.packages.ui.wizards.AbstractPackageWizard;
  +import org.jboss.ide.eclipse.archives.core.model.ArchivesCore;
  +import org.jboss.ide.eclipse.archives.core.model.IArchive;
  +import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard;
   
  -public class NewWARWizard extends AbstractPackageWizard {
  +public class NewWARWizard extends AbstractArchiveWizard {
   
   	private WARInfoWizardPage warInfoPage;
   	
  @@ -25,12 +25,12 @@
   		return new WizardPage[] { warInfoPage };
   	}
   
  -	public boolean performFinish(IPackage pkg) {
  -		pkg.setPackageType(PackagesCore.getPackageType("org.jboss.ide.eclipse.as.core.packages.warPackage"));
  +	public boolean performFinish(IArchive pkg) {
  +		pkg.setArchiveType(ArchivesCore.getArchiveType("org.jboss.ide.eclipse.as.core.packages.warPackage"));
   		return true;
   	}
   	
  -	public String getPackageExtension() {
  +	public String getArchiveExtension() {
   		return "war";
   	}
   
  
  
  
  1.7       +33 -32    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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- WARInfoWizardPage.java	19 Mar 2007 22:49:40 -0000	1.6
  +++ WARInfoWizardPage.java	20 Apr 2007 23:45:05 -0000	1.7
  @@ -12,7 +12,6 @@
   import org.eclipse.core.resources.ResourcesPlugin;
   import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.NullProgressMonitor;
  -import org.eclipse.core.runtime.Path;
   import org.eclipse.jface.viewers.ILabelProvider;
   import org.eclipse.jface.viewers.ILabelProviderListener;
   import org.eclipse.jface.viewers.ITreeContentProvider;
  @@ -37,17 +36,17 @@
   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.archives.core.model.ArchivesCore;
  +import org.jboss.ide.eclipse.archives.core.model.IArchive;
  +import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
  +import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
  +import org.jboss.ide.eclipse.archives.core.model.types.IArchiveType;
  +import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
  +import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProvider;
  +import org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider;
  +import org.jboss.ide.eclipse.as.core.packages.J2EEArchiveType;
  +import org.jboss.ide.eclipse.as.core.packages.WarArchiveType;
   import org.jboss.ide.eclipse.as.ui.Messages;
  -import org.jboss.ide.eclipse.packages.core.model.IPackage;
  -import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
  -import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
  -import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
  -import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
  -import org.jboss.ide.eclipse.packages.ui.PackagesUIPlugin;
  -import org.jboss.ide.eclipse.packages.ui.providers.PackagesContentProvider;
  -import org.jboss.ide.eclipse.packages.ui.providers.PackagesLabelProvider;
   import org.jboss.ide.eclipse.ui.wizards.WizardPageWithNotification;
   
   public class WARInfoWizardPage extends WizardPageWithNotification {
  @@ -59,7 +58,7 @@
   	private Text webinfFolders;
   	private Button webinfFoldersButton;
   	public WARInfoWizardPage (NewWARWizard wizard) {
  -		super("WAR information", "WAR Information", PackagesUIPlugin.getImageDescriptor(PackagesUIPlugin.IMG_NEW_WAR_WIZARD));
  +		super("WAR information", "WAR Information", ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_WAR_WIZARD));
   		this.wizard = wizard;
   	}
   	
  @@ -93,8 +92,8 @@
   		previewGroup.setLayoutData(previewData);
   		previewGroup.setLayout(new FormLayout());
   		warPreview = new TreeViewer(previewGroup);
  -		warPreview.setLabelProvider(new PackagesLabelProvider());
  -		warPreview.setContentProvider(new PackagesContentProvider(false));
  +		warPreview.setLabelProvider(new ArchivesLabelProvider());
  +		warPreview.setContentProvider(new ArchivesContentProvider());
   		FormData warPreviewData = new FormData();
   		warPreviewData.left = new FormAttachment(0,5);
   		warPreviewData.right = new FormAttachment(100,-5);
  @@ -131,10 +130,11 @@
   						selectedFolders.add(((IResource)o[i]).getFullPath().toOSString());
   					}
   
  -					IPackageFolder webinf = getFolder(wizard.getPackage(), ObscurelyNamedPackageTypeSuperclass.WEBINF);
  -					IPackageFileSet[] sets = webinf.getFileSets();
  +					IArchiveFolder webinf = getFolder(wizard.getArchive(), J2EEArchiveType.WEBINF);
  +					IArchiveFileSet[] sets = webinf.getFileSets();
   					for( int i = 0; i < sets.length; i++ ) {
  -						String path = sets[i].getSourceContainer().getFullPath().toOSString();
  +						//String path = sets[i].getSourceContainer.getFullPath().toOSString();
  +						String path = sets[i].getSourcePath().toOSString();
   						if( selectedFolders.contains(path)) {
   							selectedFolders.remove(path); // already added
   						} else {
  @@ -144,10 +144,10 @@
   					}
   					// add whatever's left as new filesets
   					for( int i = 0; i < selectedFolders.size(); i++ ) {
  -						ObscurelyNamedPackageTypeSuperclass.addFileset(wizard.getProject(), 
  +						J2EEArchiveType.addFileset(wizard.getProject(), 
   								webinf, (String)selectedFolders.get(i), "**/*");
   					}
  -					fillWidgets(wizard.getPackage());
  +					fillWidgets(wizard.getArchive());
   				}
   			}  
   		});
  @@ -160,7 +160,7 @@
       		addToPackage();
       		hasCreated = true;
       	}
  -    	fillWidgets(wizard.getPackage());
  +    	fillWidgets(wizard.getArchive());
       	
       	// if it's already a module type project, hide the meta inf stuff
   		IModuleArtifact moduleArtifact = ServerPlugin.loadModuleArtifact(wizard.getProject());
  @@ -176,26 +176,27 @@
       
       protected void addToPackage() {
       	// fill it
  -    	IPackageType type = PackagesCore.getPackageType("org.jboss.ide.eclipse.as.core.packages.warPackage");
  -    	if( type instanceof WarPackageType ) {
  -    		((WarPackageType)type).fillDefaultConfiguration(wizard.getProject(), wizard.getPackage(), new NullProgressMonitor());
  +    	IArchiveType type = ArchivesCore.getArchiveType("org.jboss.ide.eclipse.as.core.packages.warPackage");
  +    	if( type instanceof WarArchiveType ) {
  +    		((WarArchiveType)type).fillDefaultConfiguration(wizard.getProject(), wizard.getArchive(), new NullProgressMonitor());
       	}
       }
  -    protected void fillWidgets(IPackage pkg) {
  -    	warPreview.setInput(new IPackage[] {pkg});
  +    protected void fillWidgets(IArchive pkg) {
  +    	warPreview.setInput(new IArchive[] {pkg});
       	warPreview.expandAll();
       	
       	fillWebinfText(pkg);
       }
       
  -    protected void fillWebinfText(IPackage pkg) {
  +    protected void fillWebinfText(IArchive pkg) {
       	// set webinf text
  -    	IPackageFolder webinf = getFolder(pkg, ObscurelyNamedPackageTypeSuperclass.WEBINF);
  +    	IArchiveFolder webinf = getFolder(pkg, J2EEArchiveType.WEBINF);
       	String s = "";
       	if( webinf != null ) {
  -    		IPackageFileSet[] filesets = webinf.getFileSets();
  +    		IArchiveFileSet[] filesets = webinf.getFileSets();
       		for( int i = 0; i < filesets.length; i++ ) {
  -    			String path = filesets[i].getSourceContainer().getFullPath().toOSString();
  +//    			String path = filesets[i].getSourceContainer().getFullPath().toOSString();
  +    			String path = filesets[i].getSourcePath().toOSString();
       			s += path + ",";
       		}
       		if( s.length() > 0 ) 
  @@ -204,9 +205,9 @@
       	webinfFolders.setText(s);
       }
       
  -    protected IPackageFolder getFolder(IPackage pkg, String folderName) {
  -    	IPackageFolder result = null;
  -    	IPackageFolder[] folders = pkg.getFolders();
  +    protected IArchiveFolder getFolder(IArchive pkg, String folderName) {
  +    	IArchiveFolder result = null;
  +    	IArchiveFolder[] folders = pkg.getFolders();
       	for( int i = 0; i < folders.length; i++ ) {
       		if( folders[i].getName().equals(folderName)) {
       			result = folders[i];
  
  
  
  1.10      +23 -52    jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PublishAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- PublishAction.java	9 Mar 2007 01:52:26 -0000	1.9
  +++ PublishAction.java	20 Apr 2007 23:45:05 -0000	1.10
  @@ -22,46 +22,43 @@
   import org.eclipse.swt.widgets.Composite;
   import org.eclipse.swt.widgets.Shell;
   import org.eclipse.wst.server.core.IServer;
  +import org.jboss.ide.eclipse.archives.core.model.IArchive;
  +import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
  +import org.jboss.ide.eclipse.archives.ui.actions.INodeActionDelegate;
   import org.jboss.ide.eclipse.as.core.ServerConverter;
  -import org.jboss.ide.eclipse.as.core.model.PackagesListener;
  +import org.jboss.ide.eclipse.as.core.model.ArchivesBuildListener;
   import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
  -import org.jboss.ide.eclipse.packages.core.model.IPackage;
  -import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
  -import org.jboss.ide.eclipse.packages.ui.actions.AbstractNodeActionDelegate;
   
  -public class PublishAction extends AbstractNodeActionDelegate {
  +public class PublishAction implements INodeActionDelegate {
   
   	
   	public PublishAction() {
   	}
   
  -	public void run (IPackageNode node) {
  -		if (node.getNodeType() == IPackageNode.TYPE_PACKAGE)	
  +	public void run (IArchiveNode node) {
  +		if (node.getNodeType() == IArchiveNode.TYPE_ARCHIVE)	
   		{
  -			IPackage pkg = (IPackage)node;
  -			String servers = node.getProperty(PackagesListener.DEPLOY_SERVERS);
  -			if( !new Boolean(pkg.getProperty(PackagesListener.DEPLOY_AFTER_BUILD)).booleanValue()  ||
  +			IArchive pkg = (IArchive)node;
  +			String servers = node.getProperty(ArchivesBuildListener.DEPLOY_SERVERS);
  +			if( !new Boolean(pkg.getProperty(ArchivesBuildListener.DEPLOY_AFTER_BUILD)).booleanValue()  ||
   					servers == null || "".equals(servers)) {
   				servers = showSelectServersDialog(pkg);
   			}
  -			PackagesListener.publish(pkg, servers, IServer.PUBLISH_FULL);
  +			ArchivesBuildListener.publish(pkg, servers, IServer.PUBLISH_FULL);
   		}
   	}
   	
  -	public boolean isEnabledFor(IPackageNode node) {
  -		if (node.getNodeType() == IPackageNode.TYPE_PACKAGE
  -			|| node.getNodeType() == IPackageNode.TYPE_PACKAGE_REFERENCE)
  -		{
  -			IPackage pkg = (IPackage) node;
  -			if (pkg.isTopLevel())
  -			{
  +	public boolean isEnabledFor(IArchiveNode node) {
  +		if (node.getNodeType() == IArchiveNode.TYPE_ARCHIVE ) {
  +			IArchive pkg = (IArchive) node;
  +			if (pkg.isTopLevel()) {
   				return true;
   			}
   		}
   		return false;
   	}
   	
  -	protected String showSelectServersDialog(IPackage node) {
  +	protected String showSelectServersDialog(IArchive node) {
   		SelectServerWizard wiz = new SelectServerWizard(node);
   		new WizardDialog(new Shell(), wiz).open();
   		return wiz.getServers();
  @@ -70,16 +67,16 @@
   	
   	protected class SelectServerWizard extends Wizard {
   		private SelectServerWizardPage page;
  -		private IPackage pack;
  -		protected SelectServerWizard(IPackage pack) {
  +		private IArchive pack;
  +		protected SelectServerWizard(IArchive pack) {
   			this.pack = pack;
   		}
   		public boolean performFinish() {
   			System.out.println("servers: " + getServers());
   			System.out.println("autodeploy: " + getAutoDeploy());
   			System.out.println("always publish to these: " + getAlwaysPublish());
  -			pack.setProperty(PackagesListener.DEPLOY_SERVERS, getServers());
  -			pack.setProperty(PackagesListener.DEPLOY_AFTER_BUILD, getAutoDeploy());
  +			pack.setProperty(ArchivesBuildListener.DEPLOY_SERVERS, getServers());
  +			pack.setProperty(ArchivesBuildListener.DEPLOY_AFTER_BUILD, getAutoDeploy());
   			return true;
   		}
   		public void addPages() {
  @@ -99,14 +96,14 @@
   	}
   	
   	protected class SelectServerWizardPage extends WizardPage {
  -		protected IPackage pack;
  +		protected IArchive pack;
   		protected ListViewer viewer;
   		protected Button autoDeploy, alwaysPublish;
   		protected String viewerResult = "";
   		protected String deployResult = Boolean.toString(false);
   		protected String alwaysPublishResult = Boolean.toString(false);
   		
  -		protected SelectServerWizardPage(IPackage pack) {
  +		protected SelectServerWizardPage(IArchive pack) {
   			super("Wizard Page Name");
   			setDescription("Wizard Page Description");
   			setTitle("Wizard Page Title");
  @@ -145,34 +142,8 @@
   			add.top = new FormAttachment(alwaysPublish, 5);
   			autoDeploy.setLayoutData(add);
   			autoDeploy.setText("Auto-deploy to selected servers after builds");
  -			
  -			
  -//			this.alwaysPublish = new Button(mainComposite, SWT.CHECK);
  -//			FormData always = new FormData();
  -//			always.left = new FormAttachment(15,0);
  -//			always.top = new FormAttachment(viewer.getList(), 5);
  -//			alwaysPublish.setLayoutData(always);
  -//			
  -//			Label alwaysPublishLabel = new Label(mainComposite, SWT.NONE);
  -//			FormData apl = new FormData();
  -//			apl.top = new FormAttachment(viewer.getList(), 5);
  -//			apl.left = new FormAttachment(alwaysPublish, 5);
  -//			alwaysPublishLabel.setLayoutData(apl);
  -//			alwaysPublishLabel.setText("Always publish to these servers");
  -//
  -//			autoDeploy = new Button(mainComposite, SWT.CHECK);
  -//			FormData add = new FormData();
  -//			add.left = new FormAttachment(15,0);
  -//			add.top = new FormAttachment(alwaysPublish, 5);
  -//			autoDeploy.setLayoutData(add);
  -//			
  -//			Label autoDeployLabel = new Label(mainComposite, SWT.NONE);
  -//			FormData adl = new FormData();
  -//			adl.top = new FormAttachment(alwaysPublishLabel, 7);
  -//			adl.left = new FormAttachment(autoDeploy, 5);
  -//			autoDeployLabel.setLayoutData(adl);
  -//			autoDeployLabel.setText("Auto-deploy to selected servers after builds");
   		}
  +
   		protected void addListeners() {
   			autoDeploy.addSelectionListener(new SelectionListener() {
   				public void widgetDefaultSelected(SelectionEvent e) {
  
  
  



More information about the jboss-cvs-commits mailing list