Author: Grid.Qian Date: 2008-06-10 02:35:14 -0400 (Tue, 10 Jun 2008) New Revision: 8659 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java Log: JBIDE-2261: improve the runtime location validation Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties 2008-06-10 05:58:36 UTC (rev 8658) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties 2008-06-10 06:35:14 UTC (rev 8659) @@ -2,6 +2,9 @@ Command=wsconsume.sh Bin=bin +Client=client +Lib=lib +Endorsed=endorsed Error_JBossWS_Basic_Editor_Composite=Parent control should be Composite Error_JBossWS_Basic_Editor_Support=Editor supports only grid layout Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java 2008-06-10 05:58:36 UTC (rev 8658) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java 2008-06-10 06:35:14 UTC (rev 8659) @@ -29,6 +29,9 @@ public static String Bin; public static String Command; + public static String Client; + public static String Lib; + public static String Endorsed; public static String Error_JBossWS_Basic_Editor_Composite; public static String Error_JBossWS_Basic_Editor_Support; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-10 05:58:36 UTC (rev 8658) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-10 06:35:14 UTC (rev 8659) @@ -580,7 +580,15 @@ JbossWSUIMessages.Command }; String jbosswsBinPath = UIUtils.addNodesToPath(jbosswsHomeDir .getAbsolutePath(), newNode); - if (new File(jbosswsBinPath).isFile()) { + if (new File(jbosswsBinPath).isFile() + && new File(UIUtils.addAnotherNodeToPath(jbosswsHomeDir + .getAbsolutePath(), JbossWSUIMessages.Client)) + .isDirectory() + && new File(UIUtils + .addNodesToPath(jbosswsHomeDir.getAbsolutePath(), + new String[] { JbossWSUIMessages.Lib, + JbossWSUIMessages.Endorsed })) + .isDirectory()) { return true; } return false; @@ -617,19 +625,19 @@ JbossWSRuntime rt = page1.getRuntime(); added.add(rt); value.add(rt); - + return true; } - - protected JbossWSRuntime getRuntime(){ + + protected JbossWSRuntime getRuntime() { return page1.getRuntime(); } - + } /** - * Wizard for editing JbossWS Runtime parameters: name and path to - * home folder + * Wizard for editing JbossWS Runtime parameters: name and path to home + * folder * */ public static class JbossWSRuntimeEditWizard extends Wizard {