Author: rob.stryker(a)jboss.com Date: 2007-05-04 19:27:38 -0400 (Fri, 04 May 2007) New Revision: 2002 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProvider.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java Log: Removed non-essential system print statements. Fixed bug in edit fileset wizard. Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2007-05-04 15:04:22 UTC (rev 2001) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2007-05-04 23:27:38 UTC (rev 2002) @@ -15,17 +15,6 @@ </extension> <extension - point="org.jboss.ide.eclipse.archives.ui.nodePopupMenus"> - <nodeContribution - class="org.jboss.ide.eclipse.archives.ui.actions.NodePropertiesAction" - enablesForNodeType="any" - icon="icons/prop_ps.gif" - id="org.jboss.ide.eclipse.archives.ui.propertyContribution" - label="Properties" - weight="99"/> - </extension> - - <extension point="org.jboss.ide.eclipse.archives.ui.newArchiveActions"> <newPackageAction class="org.jboss.ide.eclipse.archives.ui.actions.NewJARAction" Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProvider.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProvider.java 2007-05-04 15:04:22 UTC (rev 2001) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProvider.java 2007-05-04 23:27:38 UTC (rev 2002) @@ -69,9 +69,6 @@ } public boolean hasChildren(Object element) { - if( element == null || getChildren(element) == null ) { - System.out.println("pause"); - } return getChildren(element).length > 0; } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java 2007-05-04 15:04:22 UTC (rev 2001) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java 2007-05-04 23:27:38 UTC (rev 2002) @@ -212,7 +212,7 @@ }; contextMenuManager.add(action); } - } catch( Exception e) { e.getMessage(); } + } catch( Exception e) { System.out.println(e.getMessage()); } } } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java 2007-05-04 15:04:22 UTC (rev 2001) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java 2007-05-04 23:27:38 UTC (rev 2002) @@ -76,7 +76,6 @@ protected ISelectionListener createSelectionListener() { return new INullSelectionListener() { public void selectionChanged(IWorkbenchPart part, ISelection selection) { - System.out.println("selection changed: " + selection); if (!(selection instanceof IStructuredSelection)) return; Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2007-05-04 15:04:22 UTC (rev 2001) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2007-05-04 23:27:38 UTC (rev 2002) @@ -68,7 +68,6 @@ new Label(pkgNameComposite, SWT.NONE).setImage(ArchivesSharedImages.getImage(ArchivesSharedImages.IMG_PACKAGE)); packageNameText = new Text(pkgNameComposite, SWT.BORDER); - System.out.println(wizard.getProject()); packageName = wizard.getProject().getName(); packageName += "." + wizard.getArchiveExtension(); packageNameText.setText(packageName); 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-05-04 15:04:22 UTC (rev 2001) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2007-05-04 23:27:38 UTC (rev 2002) @@ -44,6 +44,10 @@ private ArchiveNodeDestinationComposite destinationComposite; private String includes, excludes; + + /** + * This variable must at all times be global. ALWAYS + */ private IPath rootDir; private boolean rootDirIsWorkspaceRelative, fileIsWorkspaceRelative; private FilesetPreviewComposite previewComposite; @@ -293,12 +297,12 @@ rootProjectLabel.setText(parentNode.getProject().getName()); fileIsWorkspaceRelative = true; rootDirIsWorkspaceRelative = true; - rootDir = ResourcesPlugin.getWorkspace().getRoot().getProject(parentNode.getProject().getName()).getFullPath(); + rootDir = ResourcesPlugin.getWorkspace().getRoot().getProject(parentNode.getProject().getName()).getLocation(); } } private void changePreview() { - IPath root = isRootDirWorkspaceRelative() ? ResourcesPlugin.getWorkspace().getRoot().getLocation().append(rootDir) : rootDir; + IPath root = rootDir; //isRootDirWorkspaceRelative() ? ResourcesPlugin.getWorkspace().getRoot().getLocation().append(rootDir) : rootDir; IPath paths[] = ArchivesCore.findMatchingPaths(root, includesText.getText(), excludesText.getText()); previewComposite.setInput(paths); } @@ -320,7 +324,7 @@ IPath relativePath = path.removeFirstSegments(1); rootProjectLabel.setText(project.getName()); - rootDir = path; + rootDir = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(path); if (!relativePath.isEmpty()) { rootDirText.setText(relativePath.toString()); } else {