Author: rob.stryker(a)jboss.com
Date: 2008-10-01 14:03:21 -0400 (Wed, 01 Oct 2008)
New Revision: 10610
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/util/composites/ArchiveSourceDestinationComposite.java
Log:
JBIDE-2649
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-10-01
17:46:06 UTC (rev 10609)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-01
18:03:21 UTC (rev 10610)
@@ -23,8 +23,9 @@
public static String Filesystem;
public static String Workspace;
public static String Variables;
- public static String WorkspaceRelative;
- public static String FilesystemRelative;
+ public static String Workspace2;
+ public static String Filesystem2;
+ public static String RelativeTo;
public static String PathDoesNotExistInFilesystem;
public static String ErrorConvertingPaths;
public static String ErrorStringSubstitution;
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-10-01
17:46:06 UTC (rev 10609)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-01
18:03:21 UTC (rev 10610)
@@ -8,8 +8,9 @@
Filesystem=Filesystem...
Workspace=Workspace...
Variables=Variables...
-WorkspaceRelative=Workspace Relative
-FilesystemRelative=Filesystem Relative
+RelativeTo=Relative to
+Workspace2=workspace
+Filesystem2=file system
PathDoesNotExistInFilesystem={0} does not exist in the filesystem
ErrorConvertingPaths=Unable to convert workspace path into global path: {0}
ErrorStringSubstitution=Error during string substitution: {0}
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-01
17:46:06 UTC (rev 10609)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-01
18:03:21 UTC (rev 10610)
@@ -60,7 +60,7 @@
*/
public class ArchiveSourceDestinationComposite extends Composite {
private Text text;
- private Label pathImage, translatedPath, translatedPathImage;
+ private Label pathImage, translatedPath, translatedPathImage, relativeTo;
private Button workspaceButton, filesystemButton, variablesButton,
wsRadioButton, fsRadioButton;
@@ -94,6 +94,7 @@
variablesButton = new Button(this, SWT.PUSH);
wsRadioButton = new Button(this, SWT.RADIO);
fsRadioButton = new Button(this, SWT.RADIO);
+ relativeTo = new Label(this, SWT.NONE);
}
protected void layoutWidgets() {
@@ -104,6 +105,7 @@
variablesButton.setLayoutData(createFormData(text,5,null,0,null,0,workspaceButton,-5));
fsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,variablesButton,-5));
wsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,fsRadioButton,-5));
+ relativeTo.setLayoutData(createFormData(text,8,null,0,null,0,wsRadioButton,-5));
translatedPathImage.setLayoutData(createFormData(filesystemButton,5,null,0,0,0,0,20));
translatedPath.setLayoutData(createFormData(filesystemButton,5,null,0,translatedPathImage,5,100,-5));
}
@@ -112,8 +114,9 @@
filesystemButton.setText(ArchivesUIMessages.Filesystem);
workspaceButton.setText(ArchivesUIMessages.Workspace);
variablesButton.setText(ArchivesUIMessages.Variables);
- wsRadioButton.setText(ArchivesUIMessages.WorkspaceRelative);
- fsRadioButton.setText(ArchivesUIMessages.FilesystemRelative);
+ wsRadioButton.setText(ArchivesUIMessages.Workspace2);
+ fsRadioButton.setText(ArchivesUIMessages.Filesystem2);
+ relativeTo.setText(ArchivesUIMessages.RelativeTo);
pathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER));
FontData[] translatedPathData = translatedPath.getFont().getFontData();
for( int i = 0; i < translatedPathData.length; i++ )
@@ -251,7 +254,7 @@
} else {
translated = getTranslatedGlobalPath();
if( translated == null || !new Path(translated).toFile().exists()) {
- translated= NLS.bind(translated, ArchivesUIMessages.PathDoesNotExistInFilesystem);
+ translated= NLS.bind(ArchivesUIMessages.PathDoesNotExistInFilesystem,translated);
img =
PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
} else {
img = null;