Author: bfitzpat Date: 2010-09-03 12:12:28 -0400 (Fri, 03 Sep 2010) New Revision: 24706 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/views/WSDLBrowseDialog.java Log: OPEN - issue JBIDE-6999: [Tester] Can't test a valid WSDL with no services, but user gets no feedback in WSDL browse dialog https://jira.jboss.org/browse/JBIDE-6999 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-03 16:07:40 UTC (rev 24705) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-09-03 16:12:28 UTC (rev 24706) @@ -153,6 +153,8 @@ WSDLBrowseDialog_FS_Browse=File system... WSDLBrowseDialog_Group_Title=Select the service operation: WSDLBrowseDialog_Message=Select the source WSDL in the workspace or file system, or provide a URL from which to download the WSDL. +WSDLBrowseDialog_No_Services_Available=No Services Available in WSDL +WSDLBrowseDialog_No_Services_Available_Warning=There are no services available in the selected WSDL. Please select a WSDL with services to test against. WSDLBrowseDialog_Operation_Field=Operation: WSDLBrowseDialog_Port_Field=Port: WSDLBrowseDialog_Service_Field=Service: 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-03 16:07:40 UTC (rev 24705) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-09-03 16:12:28 UTC (rev 24706) @@ -114,6 +114,24 @@ public static String JBossWS_DelimitedStringList_EditValue_Dialog_Title; public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message; + public static String JBossWSAnnotatedClassWizard_Annotated_Class_WS_Wizard_Title; + public static String JBossWSAnnotatedClassWizardPage_Application_Class_Browse_btn; + public static String JBossWSAnnotatedClassWizardPage_Application_Class_field; + public static String JBossWSAnnotatedClassWizardPage_JAXRS_Button; + public static String JBossWSAnnotatedClassWizardPage_JAXWS_Button; + public static String JBossWSAnnotatedClassWizardPage_package_browse_btn; + public static String JBossWSAnnotatedClassWizardPage_package_name_field; + public static String JBossWSAnnotatedClassWizardPage_PageDescription; + public static String JBossWSAnnotatedClassWizardPage_PageTitle; + public static String JBossWSAnnotatedClassWizardPage_Project_Group; + public static String JBossWSAnnotatedClassWizardPage_Projects_Combo_Tooltip; + public static String JBossWSAnnotatedClassWizardPage_Service_class_Browse_btn; + public static String JBossWSAnnotatedClassWizardPage_Service_class_field; + public static String JBossWSAnnotatedClassWizardPage_Service_implementation_group; + public static String JBossWSAnnotatedClassWizardPage_Service_Name_field; + public static String JBossWSAnnotatedClassWizardPage_Update_Web_xml_checkbox; + public static String JBossWSAnnotatedClassWizardPage_Web_Service_Group; + public static String JBossWSAnnotatedClassWizardPage_WS_Tech_Group; public static String JAXRSWSTestView_Action_URL_Label; public static String JAXRSWSTestView_Button_Get_From_WSDL; public static String JAXRSWSTestView_Configure_Monitor_Button; @@ -173,6 +191,8 @@ public static String WSDLBrowseDialog_FS_Browse; public static String WSDLBrowseDialog_Group_Title; public static String WSDLBrowseDialog_Message; + public static String WSDLBrowseDialog_No_Services_Available; + public static String WSDLBrowseDialog_No_Services_Available_Warning; public static String WSDLBrowseDialog_Operation_Field; public static String WSDLBrowseDialog_Port_Field; public static String WSDLBrowseDialog_Service_Field; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java 2010-09-03 16:07:40 UTC (rev 24705) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java 2010-09-03 16:12:28 UTC (rev 24706) @@ -567,9 +567,13 @@ } private void updateServiceCombo () { + serviceCombo.setEnabled(true); + portCombo.setEnabled(true); + opList.setEnabled(true); serviceCombo.removeAll(); portCombo.removeAll(); opList.removeAll(); + getButton(IDialogConstants.OK_ID).setEnabled(true); if (wsdlDefinition != null && wsdlDefinition.getServices() != null && !wsdlDefinition.getServices().isEmpty()) { Iterator<?> iter = wsdlDefinition.getServices().values().iterator(); @@ -583,6 +587,15 @@ serviceTextValue = serviceCombo.getText(); } updatePortCombo(); + } else { + // no services + serviceCombo.add(JBossWSUIMessages.WSDLBrowseDialog_No_Services_Available); + serviceCombo.select(0); + setMessage(JBossWSUIMessages.WSDLBrowseDialog_No_Services_Available_Warning, IMessageProvider.WARNING); + serviceCombo.setEnabled(false); + portCombo.setEnabled(false); + opList.setEnabled(false); + getButton(IDialogConstants.OK_ID).setEnabled(false); } }