[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 Mar 2 16:37:04 EST 2007
User: rawb
Date: 07/03/02 16:37:04
Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages
NewWARAction.java NewWARWizard.java
WARInfoWizardPage.java
Log:
recent changes for integration w./ packaging
Revision Changes Path
1.2 +2 -1 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewWARAction.java 25 Jan 2007 23:01:10 -0000 1.1
+++ NewWARAction.java 2 Mar 2007 21:37:04 -0000 1.2
@@ -7,13 +7,14 @@
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.ui.util.ActionWithDelegate;
public class NewWARAction extends ActionWithDelegate implements IViewActionDelegate {
public void run() {
NewWARWizard wizard = new NewWARWizard();
- wizard.init(PlatformUI.getWorkbench(), getSelection());
+ wizard.init(PlatformUI.getWorkbench(), ProjectPackagesView.instance().getSelection());
WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
int response = dialog.open();
1.3 +4 -4 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewWARWizard.java 27 Feb 2007 18:07:56 -0000 1.2
+++ NewWARWizard.java 2 Mar 2007 21:37:04 -0000 1.3
@@ -3,7 +3,7 @@
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.ui.PackagesUIPlugin;
+import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
import org.jboss.ide.eclipse.packages.ui.wizards.AbstractPackageWizard;
public class NewWARWizard extends AbstractPackageWizard {
@@ -16,17 +16,17 @@
}
public ImageDescriptor getImageDescriptor() {
- return PackagesUIPlugin.getImageDescriptor(PackagesUIPlugin.IMG_NEW_WAR_WIZARD);
+ return null;
}
public WizardPage[] createWizardPages() {
- warInfoPage = new WARInfoWizardPage();
+ warInfoPage = new WARInfoWizardPage(this);
return new WizardPage[] { warInfoPage };
}
public boolean performFinish(IPackage pkg) {
- //pkg.setPackageType("war");
+ pkg.setPackageType(PackagesCore.getPackageType("org.jboss.ide.eclipse.as.core.packages.warPackage"));
return true;
}
1.2 +56 -7 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- WARInfoWizardPage.java 27 Feb 2007 18:07:56 -0000 1.1
+++ WARInfoWizardPage.java 2 Mar 2007 21:37:04 -0000 1.2
@@ -1,25 +1,74 @@
package org.jboss.ide.eclipse.as.ui.packages;
-import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.jboss.ide.eclipse.as.core.packages.WarPackageType;
+import org.jboss.ide.eclipse.packages.core.model.IPackage;
+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 WizardPage {
+public class WARInfoWizardPage extends WizardPageWithNotification {
- public WARInfoWizardPage ()
- {
+ private Group webinfGroup, classesGroup, libGroup;
+ private NewWARWizard wizard;
+ private TreeViewer warPreview;
+ private boolean hasCreated = false;
+ public WARInfoWizardPage (NewWARWizard wizard) {
super("WAR information", "WAR Information", PackagesUIPlugin.getImageDescriptor(PackagesUIPlugin.IMG_NEW_WAR_WIZARD));
+ this.wizard = wizard;
}
public void createControl(Composite parent) {
- setMessage("Information for the setup of your WAR");
+ setMessage("Information for the setup of your WAR. \n" +
+ "Later, you can customize this packaging structure further.");
Composite main = new Composite(parent, SWT.NONE);
-
+ main.setLayout(new FormLayout());
+ warPreview = new TreeViewer(main);
+ warPreview.setLabelProvider(new PackagesLabelProvider());
+ warPreview.setContentProvider(new PackagesContentProvider());
+ FormData warPreviewData = new FormData();
+ warPreviewData.left = new FormAttachment(0,5);
+ warPreviewData.right = new FormAttachment(100,-5);
+ warPreviewData.top = new FormAttachment(0,5);
+ warPreviewData.bottom = new FormAttachment(100,-5);
+ warPreview.getTree().setLayoutData(warPreviewData);
setControl(main);
}
public boolean isPageComplete() {
- return false;
+ return true;
+ }
+ public void pageEntered(int button) {
+ if( !hasCreated ) {
+ addToPackage();
+ hasCreated = true;
+ }
+ fillWidgets(wizard.getPackage());
+ }
+
+ 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());
+ System.out.println("filling package");
+ }
}
+ protected void fillWidgets(IPackage pkg) {
+ System.out.println("filling widgets");
+ warPreview.setInput(new IPackage[] {pkg});
+ warPreview.expandAll();
+ }
+ public void pageExited(int button) {}
+
}
More information about the jboss-cvs-commits
mailing list