Author: snjeza Date: 2011-01-31 11:17:33 -0500 (Mon, 31 Jan 2011) New Revision: 28774 Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties branches/jbosstools-3.2.x/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 has wrong layout Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties =================================================================== --- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2011-01-31 16:04:33 UTC (rev 28773) +++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2011-01-31 16:17:33 UTC (rev 28774) @@ -11,8 +11,8 @@ Workspace=Workspace... Variables=Variables... RelativeTo=Relative to -Workspace2=workspace -Filesystem2=file system +Workspace2=Workspace relative +Filesystem2=Filesystem relative 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: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java =================================================================== --- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2011-01-31 16:04:33 UTC (rev 28773) +++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2011-01-31 16:17:33 UTC (rev 28774) @@ -98,11 +98,11 @@ protected void layoutWidgets() { pathImage.setLayoutData(createFormData(0,0,null,0,0,0,null,0)); text.setLayoutData(createFormData(0,0,null,0,pathImage,5,100,0)); - filesystemButton.setLayoutData(createFormData(text,5,null,0,null,0,100,-5)); - workspaceButton.setLayoutData(createFormData(text,5,null,0,null,0,filesystemButton,-5)); - 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)); + filesystemButton.setLayoutData(createFormData(text,5,null,0,workspaceButton,5,null,0)); + workspaceButton.setLayoutData(createFormData(text,5,null,0,variablesButton,5,null,0)); + variablesButton.setLayoutData(createFormData(text,5,null,0,wsRadioButton,5,null,0)); + fsRadioButton.setLayoutData(createFormData(text,5,null,0,0,0,null,0)); + wsRadioButton.setLayoutData(createFormData(text,5,null,0,fsRadioButton,5,null,0)); relativeTo.setLayoutData(createFormData(text,8,null,0,null,0,wsRadioButton,-5)); }