Author: rob.stryker(a)jboss.com Date: 2007-12-12 16:44:07 -0500 (Wed, 12 Dec 2007) New Revision: 5272 Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveFilesetDestinationComposite.java Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/dialogs/ArchiveNodeDestinationDialog.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveDestinationComposite.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveNodeDestinationComposite.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java Log: Cleanup of fileset and archive creation dialogs. Preparing for possibility of variables ${currentProject} etc Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/dialogs/ArchiveNodeDestinationDialog.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/dialogs/ArchiveNodeDestinationDialog.java 2007-12-12 19:15:41 UTC (rev 5271) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/dialogs/ArchiveNodeDestinationDialog.java 2007-12-12 21:44:07 UTC (rev 5272) @@ -31,49 +31,32 @@ public class ArchiveNodeDestinationDialog extends ElementTreeSelectionDialog { - private boolean showWorkspace, showNodes; - - public ArchiveNodeDestinationDialog(Shell parent, Object destination, boolean showWorkspace, boolean showNodes) { - super(parent, new DestinationLabelProvider(), new DestinationContentProvider()); - setAllowMultiple(false); - setTitle(ArchivesUIMessages.PackageNodeDestinationDialog_title); - - this.showWorkspace = showWorkspace; - this.showNodes = showNodes; - setupDestinationList(); + public ArchiveNodeDestinationDialog(Shell parent, Object destination, + boolean showWorkspace, boolean showNodes) { + super(parent, new DestinationLabelProvider(), + new DestinationContentProvider(showWorkspace, showNodes)); + setAllowMultiple(false); + setTitle(ArchivesUIMessages.PackageNodeDestinationDialog_title); + setInput(ResourcesPlugin.getWorkspace()); } - - private void setupDestinationList () { - ArrayList destinations = new ArrayList(); - if (showWorkspace) { - destinations.addAll(Arrays.asList(ResourcesPlugin.getWorkspace().getRoot().getProjects())); - } - - IProgressMonitor monitor = new NullProgressMonitor(); - - if( showNodes ) { - // add ALL packages from ALL projects - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for( int i = 0; i < projects.length; i++ ) { - if( projects[i].isAccessible()) { - destinations.addAll(Arrays.asList( - ArchivesModel.instance().getProjectArchives(projects[i].getLocation(), true, monitor))); - } - } - } - - setInput(destinations); - } - - private static class DestinationContentProvider implements ITreeContentProvider { - private static final Object[] NO_CHILDREN = new Object[0]; - + private static class DestinationContentProvider implements + ITreeContentProvider { + private static final Object[] NO_CHILDREN = new Object[0]; + private boolean showWorkspace, showNodes; + + public DestinationContentProvider(boolean showWorkspace, + boolean showNodes) { + this.showWorkspace = showWorkspace; + this.showNodes = showNodes; + } + public Object[] getChildren(Object parentElement) { if (parentElement instanceof IArchiveNode) { IArchiveNode node = (IArchiveNode) parentElement; - List children = new ArrayList(Arrays.asList(node.getAllChildren())); - for (Iterator iter = children.iterator(); iter.hasNext(); ) { + List children = new ArrayList(Arrays.asList(node + .getAllChildren())); + for (Iterator iter = children.iterator(); iter.hasNext();) { IArchiveNode child = (IArchiveNode) iter.next(); if (child.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FILESET) iter.remove(); @@ -81,17 +64,24 @@ return children.toArray(); } else if (parentElement instanceof IContainer) { IContainer container = (IContainer) parentElement; - try { - IResource members[] = container.members(); - List folders = new ArrayList(); - for (int i = 0; i < members.length; i++) { - if (members[i].getType() == IResource.FOLDER) folders.add(members[i]); + ArrayList result = new ArrayList(); + if (showWorkspace) { + try { + IResource members[] = container.members(); + for (int i = 0; i < members.length; i++) { + if (members[i].getType() == IResource.FOLDER) + result.add(members[i]); + } + } catch (CoreException e) { } - - return folders.toArray(); - } catch (CoreException e) { - // swallow } + if (showNodes && parentElement instanceof IProject) { + result.addAll(Arrays.asList(ArchivesModel.instance() + .getProjectArchives( + ((IProject) parentElement).getLocation(), + true, new NullProgressMonitor()))); + } + return result.toArray(); } return NO_CHILDREN; } @@ -112,30 +102,52 @@ } public Object[] getElements(Object inputElement) { - if (inputElement instanceof Collection) - return ((Collection)inputElement).toArray(); - - return NO_CHILDREN; + ArrayList destinations = new ArrayList(); + + if (showWorkspace) { + destinations.addAll(Arrays.asList(ResourcesPlugin.getWorkspace().getRoot().getProjects())); + } + + IProgressMonitor monitor = new NullProgressMonitor(); + + if( showNodes ) { + // add ALL packages from ALL projects + IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); + for( int i = 0; i < projects.length; i++ ) { + if( projects[i].isAccessible()) { + List tmp = Arrays.asList( + ArchivesModel.instance().getProjectArchives(projects[i].getLocation(), true, monitor)); + if( tmp.size() > 0 && !destinations.contains(projects[i])) + destinations.add(projects[i]); + } + } + } + return destinations.toArray(); } - public void dispose() {} - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} - } - - private static class DestinationLabelProvider implements ILabelProvider { + public void dispose() { + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + } + + private static class DestinationLabelProvider implements ILabelProvider { private ArchivesLabelProvider delegate; - - public DestinationLabelProvider () { + + public DestinationLabelProvider() { delegate = new ArchivesLabelProvider(); } - + public Image getImage(Object element) { if (element instanceof IArchiveNode) { return delegate.getImage(element); } else if (element instanceof IProject) { - return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT); + return PlatformUI.getWorkbench().getSharedImages().getImage( + IDE.SharedImages.IMG_OBJ_PROJECT); } else if (element instanceof IFolder) { - return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER); + return PlatformUI.getWorkbench().getSharedImages().getImage( + ISharedImages.IMG_OBJ_FOLDER); } return null; } @@ -144,7 +156,7 @@ if (element instanceof IArchiveNode) { return delegate.getText(element); } else if (element instanceof IContainer) { - return ((IContainer)element).getName(); + return ((IContainer) element).getName(); } return ""; } @@ -161,6 +173,6 @@ public void removeListener(ILabelProviderListener listener) { } - - } + + } } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveDestinationComposite.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveDestinationComposite.java 2007-12-12 19:15:41 UTC (rev 5271) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveDestinationComposite.java 2007-12-12 21:44:07 UTC (rev 5272) @@ -3,6 +3,7 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -13,6 +14,7 @@ import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages; +import org.jboss.ide.eclipse.archives.ui.dialogs.ArchiveNodeDestinationDialog; public class ArchiveDestinationComposite extends ArchiveNodeDestinationComposite { @@ -23,11 +25,6 @@ super(parent, style, destination); } -// public PackageDestinationComposite (Composite parent, int style, GridData textLayoutData, GridData buttonLayoutData, Object destination) -// { -// super (parent, style, textLayoutData, buttonLayoutData, destination); -// } -// protected void fillBrowseComposite(Composite parent) { Composite browseComposite = new Composite(parent, SWT.NONE); browseComposite.setLayout(new GridLayout(2, false)); @@ -49,44 +46,37 @@ }); } - protected void browseFilesystem () - { + protected void openDestinationDialog() { + ArchiveNodeDestinationDialog dialog = new ArchiveNodeDestinationDialog(getShell(), nodeDestination, true, true); + if (nodeDestination != null) + dialog.setInitialSelection(nodeDestination); + + if (dialog.open() == Dialog.OK) + setPackageNodeDestination(dialog.getResult()[0]); + } + + protected void browseFilesystem () { DirectoryDialog dialog = new DirectoryDialog(getShell()); String currentPath = destinationText.getText(); - if (currentPath != null && currentPath.length() > 0 && !inWorkspace) - { + if (currentPath != null && currentPath.length() > 0 && !inWorkspace) { dialog.setFilterPath(destinationText.getText()); } String path = dialog.open(); - if (path != null) - { - nodeDestination = new Path(path); - updateDestinationViewer(); - } + if (path != null) + setPackageNodeDestination(new Path(path)); } - protected void updateDestinationViewer() - { + protected void updateDestinationViewer() { super.updateDestinationViewer(); - if (nodeDestination instanceof IPath) - { + if (nodeDestination instanceof IPath) { inWorkspace = false; IPath path = (IPath) nodeDestination; - setDestinationText(path.toString()); - setDestinationImage(ArchivesSharedImages.getImage(ArchivesSharedImages.IMG_EXTERNAL_FILE)); - } - else if (nodeDestination instanceof IContainer || nodeDestination instanceof IArchiveNode) - { + destinationText.setText(path.toString()); + destinationImage.setImage(ArchivesSharedImages.getImage(ArchivesSharedImages.IMG_EXTERNAL_FILE)); + } else if (nodeDestination instanceof IContainer || nodeDestination instanceof IArchiveNode) { inWorkspace = true; } } - - public void setEditable(boolean editable) { - super.setEditable(editable); - - workspaceBrowseButton.setEnabled(editable); - filesystemBrowseButton.setEnabled(editable); - } } Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveFilesetDestinationComposite.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveFilesetDestinationComposite.java (rev 0) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveFilesetDestinationComposite.java 2007-12-12 21:44:07 UTC (rev 5272) @@ -0,0 +1,41 @@ +package org.jboss.ide.eclipse.archives.ui.util.composites; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages; +import org.jboss.ide.eclipse.archives.ui.dialogs.ArchiveNodeDestinationDialog; + +public class ArchiveFilesetDestinationComposite extends ArchiveNodeDestinationComposite { + protected Button filesystemBrowseButton; + public ArchiveFilesetDestinationComposite(Composite parent, int style, + Object destination) { + super(parent, style, destination); + } + + protected void fillBrowseComposite(Composite parent) { + Composite browseComposite = new Composite(parent, SWT.NONE); + browseComposite.setLayout(new GridLayout(2, false)); + + filesystemBrowseButton = new Button(browseComposite, SWT.PUSH); + filesystemBrowseButton.setText(ArchivesUIMessages.PackageDestinationComposite_workspaceBrowseButton_label); + filesystemBrowseButton.addSelectionListener(new SelectionAdapter () { + public void widgetSelected(SelectionEvent e) { + openDestinationDialog(); + } + }); + } + + protected void openDestinationDialog() { + ArchiveNodeDestinationDialog dialog = new ArchiveNodeDestinationDialog(getShell(), nodeDestination, false, true); + if (nodeDestination != null) + dialog.setInitialSelection(nodeDestination); + + if (dialog.open() == Dialog.OK) + setPackageNodeDestination(dialog.getResult()[0]); + } +} Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveNodeDestinationComposite.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveNodeDestinationComposite.java 2007-12-12 19:15:41 UTC (rev 5271) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveNodeDestinationComposite.java 2007-12-12 21:44:07 UTC (rev 5272) @@ -5,11 +5,7 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; -import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; @@ -25,26 +21,21 @@ import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder; import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; -import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages; -import org.jboss.ide.eclipse.archives.ui.dialogs.ArchiveNodeDestinationDialog; import org.jboss.ide.eclipse.archives.ui.util.DestinationChangeListener; -public class ArchiveNodeDestinationComposite extends Composite { +public abstract class ArchiveNodeDestinationComposite extends Composite { protected Composite parent; protected Label destinationImage; protected Text destinationText; - protected Button destinationBrowseButton; protected Object nodeDestination; - protected boolean editable; - protected ArrayList listeners; + protected ArrayList<DestinationChangeListener> listeners; public ArchiveNodeDestinationComposite(Composite parent, int style, Object destination) { super(parent, style); this.parent = parent; this.nodeDestination = destination; - this.editable = true; - this.listeners = new ArrayList(); + this.listeners = new ArrayList<DestinationChangeListener>(); createComposite(); } @@ -73,16 +64,7 @@ updateDestinationViewer(); } - protected void fillBrowseComposite(Composite browseComposite) { - destinationBrowseButton = new Button(browseComposite, SWT.PUSH); - destinationBrowseButton.setText(ArchivesUIMessages.PackageNodeDestinationComposite_destinationBrowseButton_label); - destinationBrowseButton.addSelectionListener(new SelectionAdapter () { - public void widgetSelected(SelectionEvent e) { - openDestinationDialog(); - } - }); - destinationBrowseButton.setEnabled(editable); - } + protected abstract void fillBrowseComposite(Composite browseComposite); private FormData createFormData(Object topStart, int topOffset, Object bottomStart, int bottomOffset, Object leftStart, int leftOffset, Object rightStart, int rightOffset) { @@ -110,110 +92,66 @@ return data; } - - protected void openDestinationDialog () - { - ArchiveNodeDestinationDialog dialog = new ArchiveNodeDestinationDialog(getShell(), nodeDestination, true, true); - if (nodeDestination != null) - dialog.setInitialSelection(nodeDestination); - - int response = dialog.open(); - if (response == Dialog.OK) - { - Object object = dialog.getResult()[0]; - nodeDestination = object; - - updateDestinationViewer(); - fireDestinationChanged(); - } - } - - public void setPackageNodeDestination (Object destination) - { + + public void setPackageNodeDestination (Object destination) { + System.out.println("setting destination to " + destination); nodeDestination = destination; updateDestinationViewer(); + fireDestinationChanged(); } - protected void setDestinationImage (Image image) - { - destinationImage.setImage(image); - } - - protected void setDestinationText (String text) - { - destinationText.setText(text); - } - - protected void updateDestinationViewer () - { + protected void updateDestinationViewer () { if (nodeDestination == null) return; destinationText.setText(""); - if (nodeDestination instanceof IArchive) - { + if (nodeDestination instanceof IArchive) { IArchive pkg = (IArchive) nodeDestination; - - if (pkg.isTopLevel()) - { - setDestinationText(pkg.getName()); - } else { - setDestinationText(pkg.getRootArchiveRelativePath().toOSString()); - } - if (pkg.isExploded()) { - setDestinationImage(ArchivesSharedImages.getImage(ArchivesSharedImages.IMG_PACKAGE_EXPLODED)); - } else { - setDestinationImage(ArchivesSharedImages.getImage(ArchivesSharedImages.IMG_PACKAGE)); - } - } - else if (nodeDestination instanceof IArchiveFolder) - { + String txt = pkg.isTopLevel() ? pkg.getName() : pkg.getRootArchiveRelativePath().toOSString(); + String imgKey = pkg.isExploded() ? ArchivesSharedImages.IMG_PACKAGE_EXPLODED : ArchivesSharedImages.IMG_PACKAGE; + + destinationText.setText(txt); + destinationImage.setImage(ArchivesSharedImages.getImage(imgKey)); + } else if (nodeDestination instanceof IArchiveFolder) { IArchiveFolder folder = (IArchiveFolder) nodeDestination; - setDestinationText(folder.getRootArchiveRelativePath().toString()); - setDestinationImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER)); - } - else if (nodeDestination instanceof IProject) - { + destinationText.setText(folder.getRootArchiveRelativePath().toString()); + destinationImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER)); + } else if (nodeDestination instanceof IProject) { IProject project = (IProject) nodeDestination; - setDestinationText(project.getName()); - setDestinationImage(PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT)); - } - else if (nodeDestination instanceof IFolder) - { + destinationText.setText(project.getName()); + destinationImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT)); + } else if (nodeDestination instanceof IFolder) { IFolder folder = (IFolder) nodeDestination; - setDestinationText("/" + folder.getProject().getName() + "/" + folder.getProjectRelativePath().toString()); - setDestinationImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER)); + destinationText.setText("/" + folder.getProject().getName() + "/" + folder.getProjectRelativePath().toString()); + destinationImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER)); } } - public Object getPackageNodeDestination () - { + + /** + * The current destination + * @return + */ + + public Object getPackageNodeDestination () { return nodeDestination; } - - public void setEditable(boolean editable) { - this.editable = editable; - if (destinationBrowseButton != null) - { - destinationBrowseButton.setEnabled(editable); - } - } - public void addDestinationChangeListener (DestinationChangeListener listener) - { + + /* + * Destination change listeners + */ + + public void addDestinationChangeListener (DestinationChangeListener listener) { listeners.add(listener); } - public void removeDestinationChangeListener (DestinationChangeListener listener) - { + public void removeDestinationChangeListener (DestinationChangeListener listener) { listeners.remove(listener); } - private void fireDestinationChanged () - { - for (Iterator iter = listeners.iterator(); iter.hasNext(); ) - { - DestinationChangeListener listener = (DestinationChangeListener) iter.next(); - listener.destinationChanged(nodeDestination); + private void fireDestinationChanged () { + for (Iterator<DestinationChangeListener> iter = listeners.iterator(); iter.hasNext(); ) { + ((DestinationChangeListener) iter.next()).destinationChanged(nodeDestination); } } } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2007-12-12 19:15:41 UTC (rev 5271) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2007-12-12 21:44:07 UTC (rev 5272) @@ -33,6 +33,7 @@ import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages; +import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveFilesetDestinationComposite; import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveNodeDestinationComposite; import org.jboss.ide.eclipse.archives.ui.util.composites.FilesetPreviewComposite; @@ -128,6 +129,7 @@ previewGroup.setText(ArchivesUIMessages.FilesetInfoWizardPage_previewGroup_label); return previewGroup; } + private Group createInfoGroup(Composite mainComposite) { Group infoGroup = new Group(mainComposite, SWT.NONE); infoGroup.setText(ArchivesUIMessages.FilesetInfoWizardPage_infoGroup_title); @@ -143,7 +145,7 @@ // destination row Label destinationKey = new Label(infoGroup, SWT.NONE); - destinationComposite = new ArchiveNodeDestinationComposite(infoGroup, SWT.NONE, parentNode); + destinationComposite = new ArchiveFilesetDestinationComposite(infoGroup, SWT.NONE, parentNode); destinationKey.setLayoutData(createFormData(0,10,null,0,null,5, 0, max)); destinationComposite.setLayoutData(createFormData(0,5,null,0,destinationKey,5, 100, -5));