Author: rob.stryker(a)jboss.com Date: 2010-01-25 03:51:28 -0500 (Mon, 25 Jan 2010) New Revision: 19900 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/DefaultFilesetPreferencePage.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java Log: JBIDE-4875 - fileset dialog cleanup Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/Messages.java 2010-01-25 08:38:23 UTC (rev 19899) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/Messages.java 2010-01-25 08:51:28 UTC (rev 19900) @@ -45,6 +45,9 @@ public static String FilesetsCannotOpenFile; public static String FilesetsDialogTitle; public static String FilesetsDialogMessage; + public static String FilesetsDialogEmptyName; + public static String FilesetsDialogEmptyFolder; + public static String DefaultFilesetsAllServerTypes; public static String DefaultFilesetsLabel; Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/Messages.properties 2010-01-25 08:38:23 UTC (rev 19899) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/Messages.properties 2010-01-25 08:51:28 UTC (rev 19900) @@ -29,7 +29,9 @@ FilesetsNewPreview=Preview FilesetsCannotOpenFile=Cannot open file FilesetsDialogTitle=File filter -FilesetsDialogMessage=Creates a new file filter +FilesetsDialogMessage=Creates a new file filter. You may use any workspace string or dynamic variables in the root folder field. +FilesetsDialogEmptyName=Fileset must have a name +FilesetsDialogEmptyFolder=Root folder must be either a server-root relative, or absolute path. DefaultFilesetsAllServerTypes=All server types DefaultFilesetsLabel=This page will allow you to designate some default filesets to add to new servers. Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/DefaultFilesetPreferencePage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/DefaultFilesetPreferencePage.java 2010-01-25 08:38:23 UTC (rev 19899) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/DefaultFilesetPreferencePage.java 2010-01-25 08:51:28 UTC (rev 19900) @@ -79,11 +79,11 @@ viewer.setLabelProvider(getLabelProvider()); viewer.setContentProvider(getContentProvider()); - addButton = new Button(c, SWT.DEFAULT); + addButton = new Button(c, SWT.PUSH); addButton.setText(Messages.DefaultFilesetsAdd); addButton.setLayoutData(createFormData( servers,5,null,0,viewer.getTree(),5,100,-5)); - removeButton = new Button(c, SWT.DEFAULT); + removeButton = new Button(c, SWT.PUSH); removeButton.setText(Messages.DefaultFilesetsRemove); removeButton.setLayoutData(createFormData( addButton,5,null,0,viewer.getTree(),5,100,-5)); Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java 2010-01-25 08:38:23 UTC (rev 19899) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java 2010-01-25 08:51:28 UTC (rev 19900) @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -55,6 +56,7 @@ this.fileset = new Fileset(); this.fileset.setFolder(defaultLocation); this.fileset.setServer(server); + this.fileset.setFolder("server/${jboss_config}/"); //$NON-NLS-1$ this.fileset.setIncludesPattern("**/*.xml"); //$NON-NLS-1$ this.server = server; } @@ -148,8 +150,29 @@ fileset.setFolder(dir); fileset.setIncludesPattern(includes); fileset.setExcludesPattern(excludes); + validate(); updatePreview(); } + + protected void validate() { + String error = null; + if( name.equals("")) //$NON-NLS-1$ + error = Messages.FilesetsDialogEmptyName; + else if( dir.equals("")) //$NON-NLS-1$ + error = Messages.FilesetsDialogEmptyFolder; + else + error = null; + + setErrorMessage(error); + if(getButton(IDialogConstants.OK_ID) != null) + getButton(IDialogConstants.OK_ID).setEnabled(error == null); + } + + public void create() { + super.create(); + validate(); + } + protected void fillArea(Composite main) { Label nameLabel = new Label(main, SWT.NONE); nameLabel.setText(Messages.FilesetsNewName);