Attachment 34863 Details for Bug 115144 – Patch for org.eclipse.jst.ws.axis.consumption.ui plugin

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for org.eclipse.jst.ws.axis.consumption.ui plugin

P0216_jst_axis_cons_ui.txt (text/plain), 26.61 KB, created by Peter Moogk

on 2006-02-16 14:01:35 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Moogk

Created: 2006-02-16 14:01:35 EST

Size: 26.61 KB

patch

obsolete

>Index: src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
>===================================================================
>RCS file: /home/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java,v
>retrieving revision 1.17
>diff -u -r1.17 DefaultsForClientJavaWSDLCommand.java
>--- src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java	8 Nov 2005 17:56:11 -0000	1.17
>+++ src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java	16 Feb 2006 19:00:43 -0000
>@@ -1,16 +1,18 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2004 IBM Corporation and others.
>+ * Copyright (c) 2003, 2006 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>- * 
>+ *
>  * Contributors:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
> 
>-
> import org.eclipse.core.resources.IFolder;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
>@@ -18,6 +20,7 @@
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.JavaCore;
>@@ -31,127 +34,153 @@
> import org.eclipse.wst.common.environment.IEnvironment;
> import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
> 
>+public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation
>+{
>+	private JavaWSDLParameter	javaWSDLParam_;
>+	private IProject					proxyProject_;
>+	private String						WSDLServiceURL_;
>+	private String						WSDLServicePathname_;
>+	private String						outputFolder_;
> 
>-public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation {
>-
>-	private JavaWSDLParameter javaWSDLParam_;
>-	private IProject proxyProject_;
>-	private String WSDLServiceURL_;
>-	private String WSDLServicePathname_;
>-	
>-	public DefaultsForClientJavaWSDLCommand( ) {
>+	public DefaultsForClientJavaWSDLCommand()
>+	{
> 	}
>-	
>-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
>+
>+	public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
> 	{
> 		IEnvironment environment = getEnvironment();
> 		IStatus status;
>-		if (javaWSDLParam_ == null) {
>-			status = StatusUtils.errorStatus(
>-					AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
>+		
>+		if( outputFolder_ == null )
>+		{
>+			IPath[] paths = ResourceUtils.getAllJavaSourceLocations(proxyProject_);
>+			outputFolder_ = paths[0].toString();
>+		}
>+		
>+		if (javaWSDLParam_ == null)
>+		{
>+			status = StatusUtils
>+					.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
> 			environment.getStatusHandler().reportError(status);
> 			return status;
> 		}
>-
> 		javaWSDLParam_.setMetaInfOnly(false);
> 		javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
>-		
>-	    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(proxyProject_);
>-	    if (mn!=null)
>-	    {
>-			IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_ );
>-			//String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
>-			String output =	ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
>-//			String output = ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
>-			javaWSDLParam_.setJavaOutput(output);
>-
>-
>+		ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(proxyProject_);
>+		if (mn != null)
>+		{
>+			IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
>+			// String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
>+			String output = ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
>+			// String output =
>+			// ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
>+			IPath javaOutput = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
>+			javaWSDLParam_.setJavaOutput(javaOutput.toString());
>+			
> 			IFolder webModuleContainer = ResourceUtils.getWebComponentServerRoot(proxyProject_);
>-			if (webModuleContainer !=null)
>+			if (webModuleContainer != null)
> 			{
>-			  IPath webModulePath = webModuleContainer.getFullPath();
>-			  //output =  PlatformUtils.getPlatformURL(webModulePath);
>-			  IResource res = ResourceUtils.findResource(webModulePath);
>-			  if (res!=null){
>-				  output = res.getLocation().toString();
>-			  } 
>-			  javaWSDLParam_.setOutput(output);
>-			}	
>-	    }
>-	    else
>-	    {
>-	    	//Check if it's a plain old Java project
>-	    	IJavaProject javaProject = null;
>-	  
>-	 		 javaProject = JavaCore.create(proxyProject_);    
>-	 		 if (javaProject != null)
>-	 		 {
>-	 			IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
>-				String output =	ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
>-				javaWSDLParam_.setJavaOutput(output);
>+				IPath webModulePath = webModuleContainer.getFullPath();
>+				// output = PlatformUtils.getPlatformURL(webModulePath);
>+				IResource res = ResourceUtils.findResource(webModulePath);
>+				if (res != null)
>+				{
>+					output = res.getLocation().toString();
>+				}
> 				javaWSDLParam_.setOutput(output);
>-	 		 }
>-	 		 else
>-	 		 {
>-	 			 //Not familiar with this kind of project
>-	 	 		 status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);	
>-	 	 		 environment.getStatusHandler().reportError(status);
>-	 	 		 return status;
>-	 			 
>-	 		 }
>-	    }
>-
>-
>-
>-		if (WSDLServicePathname_ == null) {
>-			
>-			if (WSDLServiceURL_ == null) {
>-				status = StatusUtils.errorStatus(
>-						AxisConsumptionUIMessages.MSG_ERROR_WSDL_LOCATION_NOT_SET);
>+			}
>+		}
>+		else
>+		{
>+			// Check if it's a plain old Java project
>+			IJavaProject javaProject = null;
>+			javaProject = JavaCore.create(proxyProject_);
>+			if (javaProject != null)
>+			{
>+				IPath output = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
>+				javaWSDLParam_.setJavaOutput(output.toString());
>+				javaWSDLParam_.setOutput(output.toString());
>+			}
>+			else
>+			{
>+				// Not familiar with this kind of project
>+				status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);
>+				environment.getStatusHandler().reportError(status);
>+				return status;
>+			}
>+		}
>+		if (WSDLServicePathname_ == null)
>+		{
>+			if (WSDLServiceURL_ == null)
>+			{
>+				status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_WSDL_LOCATION_NOT_SET);
> 				environment.getStatusHandler().reportError(status);
> 				return status;
> 			}
>-		} else {
>+		}
>+		else
>+		{
> 			WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
> 		}
>-
> 		javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
>-
> 		return Status.OK_STATUS;
> 	}
> 
> 	/**
> 	 * Returns the javaWSDLParam.
>+	 * 
> 	 * @return JavaWSDLParameter
> 	 */
>-	public JavaWSDLParameter getJavaWSDLParam() {
>+	public JavaWSDLParameter getJavaWSDLParam()
>+	{
> 		return javaWSDLParam_;
> 	}
> 
> 	/**
> 	 * Sets the javaWSDLParam.
>-	 * @param javaWSDLParam The javaWSDLParam to set
>+	 * 
>+	 * @param javaWSDLParam
>+	 *          The javaWSDLParam to set
> 	 */
>-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
>+	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
>+	{
> 		this.javaWSDLParam_ = javaWSDLParam;
> 	}
> 
> 	/**
>-	 * @param proxyProject_ The proxyProject_ to set.
>+	 * @param proxyProject_
>+	 *          The proxyProject_ to set.
> 	 */
>-	public void setProxyProject(IProject proxyProject) {
>+	public void setProxyProject(IProject proxyProject)
>+	{
> 		this.proxyProject_ = proxyProject;
> 	}
>+
> 	/**
>-	 * @param serviceURL_ The wSDLServiceURL_ to set.
>+	 * @param serviceURL_
>+	 *          The wSDLServiceURL_ to set.
> 	 */
>-	public void setWSDLServiceURL(String serviceURL) {
>+	public void setWSDLServiceURL(String serviceURL)
>+	{
> 		WSDLServiceURL_ = serviceURL;
> 	}
>+
> 	/**
>-	 * @param servicePathname_ The wSDLServicePathname_ to set.
>+	 * @param servicePathname_
>+	 *          The wSDLServicePathname_ to set.
> 	 */
>-	public void setWSDLServicePathname(String servicePathname) {
>+	public void setWSDLServicePathname(String servicePathname)
>+	{
> 		WSDLServicePathname_ = servicePathname;
> 	}
>+
>+	public String getOutputFolder()
>+	{
>+	  return outputFolder_;	
>+	}
>+	
>+	public void setOutputFolder(String outputFolder)
>+	{
>+		outputFolder_ = outputFolder;
>+	}
> }
>Index: src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
>===================================================================
>RCS file: /home/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java,v
>retrieving revision 1.17
>diff -u -r1.17 Stub2BeanCommand.java
>--- src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java	30 Nov 2005 20:36:21 -0000	1.17
>+++ src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java	16 Feb 2006 19:00:44 -0000
>@@ -1,12 +1,15 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2004 IBM Corporation and others.
>+ * Copyright (c) 2003, 2006 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>- * 
>+ *
>  * Contributors:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
>  *******************************************************************************/
> 
> package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
>@@ -18,14 +21,12 @@
> import java.util.List;
> import java.util.Map;
> import java.util.Vector;
>-
> import javax.wsdl.Definition;
> import javax.wsdl.Port;
> import javax.wsdl.PortType;
> import javax.wsdl.Service;
> import javax.wsdl.extensions.soap.SOAPAddress;
> import javax.xml.namespace.QName;
>-
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IAdaptable;
>@@ -51,6 +52,7 @@
>   private String discoveredWsdlPortElementName;
>   private Vector portTypes_;
>   private String proxyBean_;
>+  private String outputFolder_;
>   
>   private IProject clientProject_;
>   
>@@ -150,6 +152,7 @@
>             portTypes_.add(portTypeID.toString());
>             Stub2BeanInfo stub2BeanInfo = new Stub2BeanInfo();
>             stub2BeanInfo.setClientProject(clientProject_);
>+            stub2BeanInfo.setOutputFolder( outputFolder_ );
>             String portTypePkgName = NameMappingUtils.getPackageName(portType.getQName().getNamespaceURI(), pkg2nsMapping);
>             String portTypeClassName = computeClassName(portTypeQName.getLocalPart());
>             stub2BeanInfo.setPackage(portTypePkgName);
>@@ -237,4 +240,9 @@
> 	public String getProxyBean() {
> 		return proxyBean_;
> 	}	
>+	
>+	public void setOutputFolder( String outputFolder )
>+	{
>+		outputFolder_ = outputFolder;
>+	}
> }
>Index: src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
>===================================================================
>RCS file: /home/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java,v
>retrieving revision 1.20
>diff -u -r1.20 Stub2BeanInfo.java
>--- src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java	30 Nov 2005 20:36:21 -0000	1.20
>+++ src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java	16 Feb 2006 19:00:44 -0000
>@@ -1,12 +1,15 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2004 IBM Corporation and others.
>+ * Copyright (c) 2003, 2006 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>- * 
>+ *
>  * Contributors:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
>  *******************************************************************************/
> 
> package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
>@@ -19,25 +22,19 @@
> import java.util.List;
> import java.util.StringTokenizer;
> import java.util.Vector;
>-
>-import org.eclipse.core.resources.IFolder;
> import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.Path;
>-import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jem.java.JavaClass;
> import org.eclipse.jem.java.JavaHelpers;
> import org.eclipse.jem.java.JavaParameter;
> import org.eclipse.jem.java.JavaVisibilityKind;
> import org.eclipse.jem.java.Method;
> import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
>-import org.eclipse.jst.ws.internal.common.ResourceUtils;
> import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
> import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
>-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
> import org.eclipse.wst.common.environment.IStatusHandler;
> 
> public class Stub2BeanInfo
>@@ -56,6 +53,7 @@
>   private Vector usedNames;
>   
>   private IProject clientProject_;
>+  private String   outputFolder_;
>   
>   public Stub2BeanInfo()
>   {
>@@ -74,6 +72,11 @@
>   	this.clientProject_ =  clientProject;
>   }
>   
>+  public void setOutputFolder( String outputFolder )
>+  {
>+  	outputFolder_ = outputFolder;
>+  }
>+  
>   public void setPackage(String pkgName)
>   {
> 	  package_ = pkgName;
>@@ -169,35 +172,10 @@
>     sb.append(".java");
> 
>     ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
>-    IPath sourceFolderPath = null;
>-    IPath filePath = null;
>-    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
>-    if (mn!=null)
>-    {
>-    	sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_);
>-        IFolder sourceFolder = (IFolder)ResourceUtils.findResource(sourceFolderPath);
>-        filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();    	
>-    }
>-    else
>-    {
>-        // It's a plain old Java project
>-    	JavaCore.create(clientProject_);
>-
>-		sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_);
>-		IResource sourceFolderResource = ResourceUtils.findResource(sourceFolderPath);
>-		if (sourceFolderResource instanceof IFolder) 
>-		{
>-				IFolder sourceFolder = (IFolder) sourceFolderResource;
>-				filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();
>-		} else 
>-		{
>-			// The source must be going directly in the project
>-			filePath = clientProject_.getFile(new Path(sb.toString())).getFullPath();
>-		}
>-		
>-    }
>-
>-    FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), filePath, bais, progressMonitor, statusMonitor);
>+    
>+    IPath newFilePath = new Path(outputFolder_).append( sb.toString() );
>+    
>+    FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), newFilePath, bais, progressMonitor, statusMonitor);
>   }
> 
>   private void writePackage(Writer w) throws IOException
>Index: src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
>===================================================================
>RCS file: /home/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java,v
>retrieving revision 1.6
>diff -u -r1.6 AxisProxyWidget.java
>--- src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java	8 Nov 2005 17:56:11 -0000	1.6
>+++ src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java	16 Feb 2006 19:00:44 -0000
>@@ -1,24 +1,30 @@
> /*******************************************************************************
>- * Copyright (c) 2004 IBM Corporation and others.
>+ * Copyright (c) 2004, 2006 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>- * 
>+ *
>  * Contributors:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
> 
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.runtime.IPath;
> import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
>+import org.eclipse.jst.ws.internal.common.ResourceUtils;
> import org.eclipse.jst.ws.internal.ui.common.UIUtils;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Combo;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Listener;
>-import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
> import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
>@@ -31,7 +37,7 @@
>   /*CONTEXT_ID PWJB0001 for the WSDL to Java Bindings Page*/
>   private final String INFOPOP_PWJB_PAGE = "PWJB0001";	//$NON-NLS-1$
> 		
>-  private Text folderText_;
>+  private Combo outputFolderCombo_;
>   /*CONTEXT_ID PWJB0003 for the Folder field of the WSDL to Java Bindings Page*/
>   private final String INFOPOP_PWJB_TEXT_FOLDER = "PWJB0003";	//$NON-NLS-1$
> 
>@@ -54,7 +60,6 @@
>     											AxisConsumptionUIMessages.TOOLTIP_PWJB_CHECKBOX_GENPROXY,
>                                                 INFOPOP_PWJB_CHECKBOX_GENPROXY );
>     genProxyCheckbox_.addListener( SWT.Selection, statusListener );
>-    
>     genProxyCheckbox_.addSelectionListener( new SelectionAdapter()
>                                             {
>                                               public void widgetSelected( SelectionEvent evt )
>@@ -65,11 +70,10 @@
>     
>     Composite textGroup = uiUtils.createComposite( parent, 2, 5, 0 );
>     
>-    folderText_ = uiUtils.createText( textGroup, AxisConsumptionUIMessages.LABEL_FOLDER_NAME,
>+    outputFolderCombo_ = uiUtils.createCombo( textGroup, AxisConsumptionUIMessages.LABEL_FOLDER_NAME,
>     									AxisConsumptionUIMessages.TOOLTIP_PWJB_TEXT_FOLDER,
>     									INFOPOP_PWJB_TEXT_FOLDER,
>     									SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
>-    folderText_.addListener( SWT.Modify, statusListener );
>     
>     showMappingsCheckbox_ = uiUtils.createCheckbox( parent, AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
>     									AxisConsumptionUIMessages.TOOLTIP_N2P_SHOW_MAPPINGS,
>@@ -85,20 +89,30 @@
>   {
>     boolean enabled = genProxyCheckbox_.getSelection();
>     
>-    folderText_.setEnabled( enabled );
>+    outputFolderCombo_.setEnabled( enabled );
>     showMappingsCheckbox_.setEnabled( enabled );
>   }
>   
>-  public void setProxyFolder( String proxyFolder )
>-  {
>-    folderText_.setText( proxyFolder );  
>+  public void setClientProject(IProject clientProject)
>+  {  	
>+    IPath[] paths = ResourceUtils.getAllJavaSourceLocations(clientProject);
>+    
>+    for (int i = 0; i < paths.length ; i++)
>+    {
>+      outputFolderCombo_.add(paths[i].toString());
>+    }
>+    
>+    if( paths.length > 0 )
>+    {
>+    	outputFolderCombo_.select(0);
>+    }
>   }
>   
>-  public String getProxyFolder()
>+  public String getOutputFolder()
>   {
>-     return folderText_.getText();  
>+  	return outputFolderCombo_.getText();
>   }
>-  
>+        
>   public void setGenerateProxy( Boolean genProxy )
>   {
>     genProxyCheckbox_.setSelection( genProxy.booleanValue() );
>Index: src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
>===================================================================
>RCS file: /home/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java,v
>retrieving revision 1.7
>diff -u -r1.7 WebServiceClientAxisType.java
>--- src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java	8 Nov 2005 17:56:12 -0000	1.7
>+++ src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java	16 Feb 2006 19:00:44 -0000
>@@ -1,12 +1,15 @@
> /*******************************************************************************
>- * Copyright (c) 2004 IBM Corporation and others.
>+ * Copyright (c) 2004, 2006 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>- * 
>+ *
>  * Contributors:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;
> 
>@@ -49,10 +52,12 @@
>     dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ProxyProjectFolder", AxisProxyWidget.class, "ProxyFolder", null );
>     dataRegistry.addMapping( AxisClientDefaultingCommand.class, "GenerateProxy", AxisProxyWidget.class);    
>     dataRegistry.addMapping( AxisClientDefaultingCommand.class, "IsClientScenario", AxisProxyWidget.class);    
>+    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ClientProject", AxisProxyWidget.class );
>     dataRegistry.addMapping( AxisClientDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
>     
>     // AxisProxyWidget
>     dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.class );
>+    dataRegistry.addMapping( AxisProxyWidget.class, "OutputFolder", DefaultsForClientJavaWSDLCommand.class );
>     
>     //AxisMappingsWidget
> 	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForHTTPBasicAuthCommand.class, "JavaWSDLParam", null); //OK
>Index: src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
>===================================================================
>RCS file: /home/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java,v
>retrieving revision 1.20
>diff -u -r1.20 AxisWebServiceClient.java
>--- src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java	30 Nov 2005 18:44:17 -0000	1.20
>+++ src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java	16 Feb 2006 19:00:44 -0000
>@@ -1,12 +1,15 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2005 IBM Corporation and others.
>+ * Copyright (c) 2000, 2006 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>- * 
>+ *
>  * Contributors:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
>  *******************************************************************************/
> 
> package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
>@@ -143,6 +146,7 @@
> 		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
> 		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
> 		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.class);
>+		registry.addMapping(DefaultsForClientJavaWSDLCommand.class, "OutputFolder", Stub2BeanCommand.class );
> 		// BuildProjectCommand()
> 		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
> 		registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);

Actions: View | Diff

Attachments on bug 115144: 34863