[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages ...
Marshall Culpepper
mculpepper at jboss.com
Wed Dec 20 14:56:42 EST 2006
User: mculpepper
Date: 06/12/20 14:56:42
Modified: core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages
FilesetInfoWizardPage.java
PackageInfoWizardPage.java
Added: core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages
DefaultJARConfigWizardPage.java
Log:
got rid of the working copies idea, and eliminated the model bridge as it was making things too complicated. package nodes now keep references to their parents and children, (just like delegates). there shouldn't be any need for synch as addChild/removeChild take care of all the details there. the way to create a package node that isn't attached to the model yet is:
pkg = PackagesCore.createDetachedPackage(project, true);
pkg.setXXX..
PackagesCore.attach(pkg, monitor);
Revision Changes Path
1.4 +2 -3 jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages/FilesetInfoWizardPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FilesetInfoWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages/FilesetInfoWizardPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- FilesetInfoWizardPage.java 6 Dec 2006 17:02:58 -0000 1.3
+++ FilesetInfoWizardPage.java 20 Dec 2006 19:56:42 -0000 1.4
@@ -42,7 +42,6 @@
import org.eclipse.ui.part.PageBook;
import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
-import org.jboss.ide.eclipse.packages.core.model.IPackageNodeBase;
import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
import org.jboss.ide.eclipse.packages.ui.PackagesUIMessages;
import org.jboss.ide.eclipse.packages.ui.PackagesUIPlugin;
@@ -51,7 +50,7 @@
public class FilesetInfoWizardPage extends WizardPage {
private IPackageFileSet fileset;
- private IPackageNodeBase parentNode;
+ private IPackageNode parentNode;
private Text includesText;
private Text excludesText;
private TableViewer previewTable;
@@ -78,7 +77,7 @@
private Composite singleFileComposite;
private Label singleFileProjectLabel;
- public FilesetInfoWizardPage (Shell parent, IPackageFileSet fileset, IPackageNodeBase parentNode)
+ public FilesetInfoWizardPage (Shell parent, IPackageFileSet fileset, IPackageNode parentNode)
{
super(PackagesUIMessages.FilesetInfoWizardPage_new_title, PackagesUIMessages.FilesetInfoWizardPage_new_title, null);
1.3 +64 -4 jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages/PackageInfoWizardPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageInfoWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages/PackageInfoWizardPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PackageInfoWizardPage.java 29 Nov 2006 18:58:45 -0000 1.2
+++ PackageInfoWizardPage.java 20 Dec 2006 19:56:42 -0000 1.3
@@ -2,7 +2,8 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -16,13 +17,17 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.jboss.ide.eclipse.packages.core.Trace;
+import org.jboss.ide.eclipse.packages.core.model.IPackage;
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
+import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
import org.jboss.ide.eclipse.packages.ui.PackagesUIMessages;
import org.jboss.ide.eclipse.packages.ui.util.PackageDestinationComposite;
-import org.jboss.ide.eclipse.packages.ui.util.PackageNodeDestinationComposite;
import org.jboss.ide.eclipse.packages.ui.wizards.AbstractPackageWizard;
+import org.jboss.ide.eclipse.ui.wizards.WizardPageWithNotification;
+import org.jboss.ide.eclipse.ui.wizards.WizardWithNotification;
-public class PackageInfoWizardPage extends WizardPage {
+public class PackageInfoWizardPage extends WizardPageWithNotification {
private AbstractPackageWizard wizard;
private Text packageNameText;
@@ -36,6 +41,7 @@
private boolean manifestEnabled;
private IFile manifestFile;
private PackageDestinationComposite destinationComposite;
+ private IPackage pkg;
public PackageInfoWizardPage (AbstractPackageWizard wizard)
{
@@ -156,6 +162,55 @@
return true;
}
+
+ public void pageExited(int button) {
+ Trace.trace(getClass(), "pageExited");
+ if (button == WizardWithNotification.NEXT || button == WizardWithNotification.FINISH)
+ {
+ createPackage();
+ }
+ }
+
+ private void createPackage ()
+ {
+ Trace.trace(getClass(), "creating package");
+
+ Object destContainer = getPackageDestination();
+
+ boolean isTopLevel = (destContainer == null || (!(destContainer instanceof IPackageNode)));
+
+ IProject project = null;
+
+ if (destContainer instanceof IPackageNode)
+ {
+ project = ((IPackageNode)destContainer).getProject();
+ }
+ else if (destContainer instanceof IContainer)
+ {
+ project = ((IContainer)destContainer).getProject();
+ }
+ else {
+ project = wizard.getProject();
+ }
+
+ pkg = PackagesCore.createDetachedPackage(project, isTopLevel);
+
+ pkg.setName(getPackageName());
+ pkg.setExploded(isPackageExploded());
+ if (isManifestEnabled())
+ {
+ pkg.setManifest(getManifestFile());
+ }
+
+ if (!destContainer.equals(wizard.getProject()) && destContainer instanceof IContainer) {
+ pkg.setDestinationContainer((IContainer)destContainer);
+ }
+ else if (destContainer instanceof IPath)
+ {
+ pkg.setDestinationFolder((IPath) destContainer);
+ }
+ }
+
private void expand(Control control)
{
control.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -185,4 +240,9 @@
{
this.wizard = wizard;
}
+
+ public IPackage getPackage ()
+ {
+ return pkg;
+ }
}
1.1 date: 2006/12/20 19:56:42; author: mculpepper; state: Exp;jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages/DefaultJARConfigWizardPage.java
Index: DefaultJARConfigWizardPage.java
===================================================================
package org.jboss.ide.eclipse.packages.ui.wizards.pages;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
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.packages.ui.wizards.AbstractPackageWizard;
import org.jboss.ide.eclipse.ui.wizards.WizardPageWithNotification;
import org.jboss.ide.eclipse.ui.wizards.WizardWithNotification;
public class DefaultJARConfigWizardPage extends WizardPageWithNotification {
private AbstractPackageWizard wizard;
public DefaultJARConfigWizardPage (AbstractPackageWizard wizard)
{
super ("Default JAR Configuration", "Default JAR Configuration", PackagesUIPlugin.getImageDescriptor(PackagesUIPlugin.IMG_NEW_JAR_WIZARD));
this.wizard = wizard;
}
public void createControl(Composite parent) {
Composite main = new Composite(parent, SWT.NONE);
main.setLayout(new GridLayout(1, false));
Button createDefaultConfig = new Button(main, SWT.CHECK);
createDefaultConfig.setText("Use default JAR configuration");
new Label(main, SWT.NONE).setText("Preview");
TreeViewer previewTree = new TreeViewer(main);
previewTree.setContentProvider(new PackagesContentProvider());
previewTree.setLabelProvider(new PackagesLabelProvider());
previewTree.setInput(wizard.getPackage());
setControl(main);
}
}
More information about the jboss-cvs-commits
mailing list