Author: bfitzpat Date: 2010-09-20 12:20:55 -0400 (Mon, 20 Sep 2010) New Revision: 25029 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 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/wizards/JBossRSGenerateWizardPage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java Log: OPEN - issue JBIDE-6754: [restwizard] name should be changed to Path or URI https://jira.jboss.org/browse/JBIDE-6754 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-09-20 15:38:14 UTC (rev 25028) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-09-20 16:20:55 UTC (rev 25029) @@ -24,18 +24,18 @@ org.eclipse.core.filesystem, com.ibm.icu, org.apache.axis, - javax.xml.soap, javax.xml.rpc, org.eclipse.wst.internet.monitor.core, org.eclipse.wst.internet.monitor.ui, - javax.wsdl;bundle-version="1.6.2", + javax.wsdl, org.jdom, javax.xml.ws, org.eclipse.ui.forms, org.eclipse.emf.common, org.eclipse.jdt.ui, org.eclipse.osgi, - org.apache.commons.codec + org.apache.commons.codec, + javax.xml.soap;version="1.2.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.ui, org.jboss.tools.ws.ui.messages, Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 2010-09-20 15:38:14 UTC (rev 25028) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 2010-09-20 16:20:55 UTC (rev 25029) @@ -9,5 +9,5 @@ restful.wizard.name = Create a Sample RESTful Web Service restful.wizard.description = Create a Sample RESTful Web Service ws_bottom_up.wizard.name = Simple Web Service -ws_bottom_up.wizard.description = Create a Sample RESTful Web Service +ws_bottom_up.wizard.description = Create a Web Service from existing class jbossws.page.name = JBossWS Runtime \ No newline at end of file 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 2010-09-20 15:38:14 UTC (rev 25028) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-09-20 16:20:55 UTC (rev 25029) @@ -10,6 +10,7 @@ JBossRSGenerateWizardPage_Error_RestEasyJarsNotFoundInRuntime=RESTEasy jars not found in the runtime associated with the selected project. Make sure RESTEasy is installed and try again. JBossRSGenerateWizardPage_Label_Application_Class_Name=Application Class Name: JBossRSGenerateWizardPage_Page_title=Specify the Dynamic Web Project, service, package and class name for the sample web service and web service classes. +JBossRSGenerateWizardPage_ServiceName_Tooltip=Name added to the generated annotated JAX-WS service class as part of the service URI JBossRSGenerateWizardPage_UpdateWebXMLCheckbox=Update web.xml JBossRSGenerateWizardValidator_ERROR_Can_Only_Add_Sample_Once=Project already has a RESTful service installed. The sample can only be installed in an empty project. JBossRuntimeListFieldEditor_ActionAdd=&Add 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 2010-09-20 15:38:14 UTC (rev 25028) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-09-20 16:20:55 UTC (rev 25029) @@ -42,6 +42,7 @@ public static String JBossRSGenerateWizardPage_Error_RestEasyJarsNotFoundInRuntime; public static String JBossRSGenerateWizardPage_Label_Application_Class_Name; public static String JBossRSGenerateWizardPage_Page_title; + public static String JBossRSGenerateWizardPage_ServiceName_Tooltip; public static String JBossRSGenerateWizardPage_UpdateWebXMLCheckbox; public static String JBossRSGenerateWizardValidator_ERROR_Can_Only_Add_Sample_Once; public static String JBossRuntimeListFieldEditor_ActionAdd; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java 2010-09-20 15:38:14 UTC (rev 25028) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java 2010-09-20 16:20:55 UTC (rev 25029) @@ -106,6 +106,7 @@ gd = new GridData(GridData.FILL_HORIZONTAL); name.setLayoutData(gd); name.setText(updateDefaultName()); + name.setToolTipText(JBossWSUIMessages.JBossRSGenerateWizardPage_ServiceName_Tooltip); name.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java 2010-09-20 15:38:14 UTC (rev 25028) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java 2010-09-20 16:20:55 UTC (rev 25029) @@ -589,8 +589,10 @@ .getCustomClassName(), wizard.getProject()); if (classNameStatus != null) { if (classNameStatus.getSeverity() == IStatus.ERROR) { - setErrorMessage(classNameStatus.getMessage()); - return false; + setMessage(classNameStatus.getMessage(), DialogPage.WARNING); + setErrorMessage(null); +// setErrorMessage(classNameStatus.getMessage()); + return true; } else if (classNameStatus.getSeverity() == IStatus.WARNING) { setMessage(classNameStatus.getMessage(), DialogPage.WARNING); setErrorMessage(null); @@ -660,8 +662,11 @@ .getCustomClassName(), wizard.getProject()); if (classNameStatus != null) { if (classNameStatus.getSeverity() == IStatus.ERROR) { - setErrorMessage(classNameStatus.getMessage()); - return false; + setMessage(classNameStatus.getMessage(), DialogPage.WARNING); + setErrorMessage(null); + return true; +// setErrorMessage(classNameStatus.getMessage()); +// return false; } else if (classNameStatus.getSeverity() == IStatus.WARNING) { setMessage(classNameStatus.getMessage(), DialogPage.WARNING); setErrorMessage(null);