[jbosstools-commits] JBoss Tools SVN: r23761 - in trunk/ws/plugins: org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: Grid.Qian
Date: 2010-07-28 03:17:26 -0400 (Wed, 28 Jul 2010)
New Revision: 23761

Modified:
   trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java
   trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java
   trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java
Log:
JBIDE-6591: commit to trunk for M2

Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java	2010-07-28 06:29:05 UTC (rev 23760)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java	2010-07-28 07:17:26 UTC (rev 23761)
@@ -77,7 +77,7 @@
 				reader
 						.readWSDL(wsClient.getWebServiceClientInfo()
 								.getWsdlURL());
-				model.setCustomPackage(reader.packageFromTargetNamespace());
+				model.setCustomPackage(""); //$NON-NLS-1$
 				model.setServiceList(reader.getServiceList());
 				model.setPortTypeList(reader.getPortTypeList());
 			} catch (WSDLException e) {

Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java	2010-07-28 06:29:05 UTC (rev 23760)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java	2010-07-28 07:17:26 UTC (rev 23761)
@@ -37,16 +37,22 @@
 			throws ExecutionException {
 
 		try {
-			String location = JBossWSCreationUtils.getJBossWSRuntimeLocation(JBossWSCreationUtils.getProjectByName(model.getWebProjectName()));
+			String location = JBossWSCreationUtils
+					.getJBossWSRuntimeLocation(JBossWSCreationUtils
+							.getProjectByName(model.getWebProjectName()));
 			if (location.equals("")) { //$NON-NLS-1$
 				return StatusUtils
 						.errorStatus(JBossWSCreationCoreMessages.Error_WS_Location);
-			} else if(!new Path(location).append(JBossWSCreationCoreMessages.Bin).append(JBossWSCreationCoreMessages.Command).toFile().exists()){
+			} else if (!new Path(location)
+					.append(JBossWSCreationCoreMessages.Bin)
+					.append(JBossWSCreationCoreMessages.Command).toFile()
+					.exists()) {
 				return StatusUtils
-				.errorStatus(JBossWSCreationCoreMessages.Error_WS_Location);
+						.errorStatus(JBossWSCreationCoreMessages.Error_WS_Location);
 			}
 		} catch (CoreException e1) {
-			return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_WS_Location);
+			return StatusUtils
+					.errorStatus(JBossWSCreationCoreMessages.Error_WS_Location);
 		}
 		model.setTarget(JBossWSCreationCoreMessages.Value_Target_0);
 		if (scenario == WebServiceScenario.TOPDOWN) {
@@ -54,10 +60,9 @@
 				model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL());
 				WSDLPropertyReader reader = new WSDLPropertyReader();
 				reader.readWSDL(ws.getWebServiceInfo().getWsdlURL());
-				model.setCustomPackage(reader.packageFromTargetNamespace());
+				model.setCustomPackage(""); //$NON-NLS-1$
 				model.setServiceList(reader.getServiceList());
 				model.setPortTypeList(reader.getPortTypeList());
-
 			} catch (WSDLException e) {
 				JBossWSCreationCorePlugin.getDefault().logError(e);
 				return StatusUtils.errorStatus(e.getLocalizedMessage(), e);

Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java	2010-07-28 06:29:05 UTC (rev 23760)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java	2010-07-28 07:17:26 UTC (rev 23761)
@@ -58,7 +58,7 @@
 		configCom.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		// custom package name
-		Label lblCustomPakage = new Label(configCom, SWT.NONE);
+		final Label lblCustomPakage = new Label(configCom, SWT.NONE);
 		lblCustomPakage
 				.setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name);
 		final Text txtCustomPkgName = new Text(configCom, SWT.BORDER);
@@ -66,16 +66,16 @@
 		gd.horizontalSpan = 2;
 		txtCustomPkgName.setLayoutData(gd);
 		txtCustomPkgName.addModifyListener(new ModifyListener() {
-
 			public void modifyText(ModifyEvent e) {
-				if (validatePackage(txtCustomPkgName.getText())) {
+				if ("".equals(txtCustomPkgName.getText()) //$NON-NLS-1$
+						|| validatePackage(txtCustomPkgName.getText())) {
 					model.setCustomPackage(txtCustomPkgName.getText());
 				}
 				statusListener.handleEvent(null);
 			}
 		});
 		txtCustomPkgName.setText(model.getCustomPackage());
-
+		
 		// target
 		new Label(configCom, SWT.NONE)
 				.setText(JBossWSCreationCoreMessages.Label_JaxWS_Target);
@@ -191,8 +191,7 @@
 				public void widgetSelected(SelectionEvent e) {
 					model.setGenerateImplementatoin(btnGenDefaultImpl
 							.getSelection());
-					btnUpdateWebxml
-							.setEnabled(btnGenDefaultImpl.getSelection());
+					btnUpdateWebxml.setEnabled(btnGenDefaultImpl.getSelection());
 					if (!btnGenDefaultImpl.getSelection()) {
 						model.setUpdateWebxml(false);
 					} else {
@@ -223,7 +222,8 @@
 	}
 
 	private void updateExtensionButtonStatus() {
-		boolean a = JBossWSCreationUtils.supportSOAP12(model.getWebProjectName());
+		boolean a = JBossWSCreationUtils.supportSOAP12(model
+				.getWebProjectName());
 		btnExtension.setEnabled(a);
 		btnExtension.setSelection(a);
 	}
@@ -243,7 +243,7 @@
 			e1.printStackTrace();
 		}
 		if (status != null && status.getSeverity() == IStatus.ERROR) {
-				return false;
+			return false;
 		}
 		return true;
 	}