Author: rob.stryker(a)jboss.com
Date: 2011-01-24 17:28:56 -0500 (Mon, 24 Jan 2011)
New Revision: 28585
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/util/composites/ArchiveSourceDestinationComposite.java
Log:
JBIDE-7788 - fileset wizard layout issues
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 2011-01-24
21:43:26 UTC (rev 28584)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2011-01-24
22:28:56 UTC (rev 28585)
@@ -11,8 +11,8 @@
Workspace=Workspace...
Variables=Variables...
RelativeTo=Relative to
-Workspace2=workspace
-Filesystem2=file system
+Workspace2=workspace\nrelative
+Filesystem2=filesystem\nrelative
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 2011-01-24
21:43:26 UTC (rev 28584)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2011-01-24
22:28:56 UTC (rev 28585)
@@ -19,7 +19,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IStringVariable;
import org.eclipse.debug.ui.StringVariableSelectionDialog;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.window.Window;
@@ -29,8 +28,6 @@
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
@@ -103,14 +100,14 @@
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));
+ relativeTo.setLayoutData(createFormData(text,8,null,0,0,5,0,5));
}
protected void setWidgetData() {
filesystemButton.setText(ArchivesUIMessages.Filesystem);
workspaceButton.setText(ArchivesUIMessages.Workspace);
variablesButton.setText(ArchivesUIMessages.Variables);
- wsRadioButton.setText(ArchivesUIMessages.Workspace2);
+ wsRadioButton.setText(ArchivesUIMessages.Workspace2 );
fsRadioButton.setText(ArchivesUIMessages.Filesystem2);
relativeTo.setText(ArchivesUIMessages.RelativeTo);
pathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER));