Author: rob.stryker(a)jboss.com Date: 2008-11-17 15:52:02 -0500 (Mon, 17 Nov 2008) New Revision: 11856 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java Log: JBIDE-3047 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-11-17 19:29:46 UTC (rev 11855) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-11-17 20:52:02 UTC (rev 11856) @@ -132,8 +132,8 @@ public static String ShowBuildErrorDialog; public static String EnableNodeAlways; public static String ProjectPackagesView; - public static String ShowFullOutputPath; - public static String ShowFullRootDirectory; + public static String ShowOutputPath; + public static String ShowRootDirectory; public static String ShowRootProject; public static String ShowAllProjects; public static String ArchivesVariables; Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-11-17 19:29:46 UTC (rev 11855) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-11-17 20:52:02 UTC (rev 11856) @@ -116,8 +116,8 @@ ShowBuildErrorDialog=Show build error dialog EnableNodeAlways=Show node in all projects ProjectPackagesView=Project Archives View -ShowFullOutputPath=Show full output path next to packages. -ShowFullRootDirectory=Show the full root directory of filesets. +ShowOutputPath=Show output path next to packages. +ShowRootDirectory=Show the root directory of filesets. ShowRootProject=Show project at the root ShowAllProjects=Show all projects that contain packages ArchivesVariables=Archives Variables Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2008-11-17 19:29:46 UTC (rev 11855) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2008-11-17 20:52:02 UTC (rev 11856) @@ -157,10 +157,10 @@ viewPrefGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); showPackageOutputPath = new Button(viewPrefGroup, SWT.CHECK); - showPackageOutputPath.setText(ArchivesUIMessages.ShowFullOutputPath); + showPackageOutputPath.setText(ArchivesUIMessages.ShowOutputPath); showFullFilesetRootDir = new Button(viewPrefGroup, SWT.CHECK); - showFullFilesetRootDir.setText(ArchivesUIMessages.ShowFullRootDirectory); + showFullFilesetRootDir.setText(ArchivesUIMessages.ShowRootDirectory); showProjectRoot = new Button(viewPrefGroup, SWT.CHECK); showProjectRoot.setText(ArchivesUIMessages.ShowRootProject); Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java 2008-11-17 19:29:46 UTC (rev 11855) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java 2008-11-17 20:52:02 UTC (rev 11856) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.archives.ui.providers; +import org.eclipse.core.runtime.Path; import org.eclipse.jface.viewers.BaseLabelProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.graphics.Image; @@ -124,7 +125,7 @@ private String getPackageText (IArchive pkg) { String text = pkg.getName(); if (PrefsInitializer.getBoolean( PrefsInitializer.PREF_SHOW_PACKAGE_OUTPUT_PATH)) { - text += " [" + PathUtils.getGlobalLocation(pkg) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ + text += " [" + PathUtils.getAbsoluteLocation(pkg) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } return text; } @@ -147,11 +148,11 @@ } if (showFullPath) { - text += PathUtils.getGlobalLocation(fileset); + text += PathUtils.getAbsoluteLocation(fileset); } else if( inWorkspace ){ text += fileset.getRawSourcePath(); } else { - text += PathUtils.getGlobalLocation(fileset).lastSegment(); + text += new Path(PathUtils.getAbsoluteLocation(fileset)).lastSegment(); } return text;