Attachment 129757 Details for Bug 247535 – proposed patch

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

[patch] proposed patch

247535.patch (text/plain), 6.55 KB, created by Mark Hutchinson

on 2009-03-24 16:35:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Hutchinson

Created: 2009-03-24 16:35:56 EDT

Size: 6.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.consumption.ui
>Index: src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java,v
>retrieving revision 1.33
>diff -u -r1.33 GenSampleWidgetBinding.java
>--- src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java	19 Jun 2008 16:01:54 -0000	1.33
>+++ src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java	24 Mar 2009 20:19:24 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2008 IBM Corporation and others.
>+ * Copyright (c) 2004, 2009 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
>@@ -21,6 +21,7 @@
>  * 20080425   221232 gilberta@ca.ibm.com - Gilbert Andrews
>  * 20080616   237298 gilberta@ca.ibm.com - Gilbert Andrews
>  * 20080619   237797 gilberta@ca.ibm.com - Gilbert Andrews
>+ * 20090324   247535 mahutch@ca.ibm.com - Mark Hutchinson, Wrong server instance(s) is chosen during JAX-RPC sample generation
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
> 
>@@ -204,7 +205,7 @@
> 	{    
> 		IEnvironment env = getEnvironment();
> 	    IStatus status = Status.OK_STATUS;	
>-	  
>+
> 	    // Split up the project and module
> 	    int index = module_.indexOf("/");
> 	    if (index!=-1){
>@@ -231,6 +232,7 @@
> 	  	clientInfo.setState(WebServiceState.UNKNOWN_LITERAL);
> 	  	clientInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
> 	  	clientInfo.setWsdlURL(wsdlURI_);
>+	  	/*
> 	  	if (clientInfo.getServerInstanceId()==null)
> 	  	{
> 	  		CreateServerCommand createServerCommand = new CreateServerCommand();
>@@ -251,9 +253,9 @@
> 	  	}
> 	  	else {
> 	  		canRunTestClient_ = true;
>-	  	}
>-	  	
>+	  	}*/
> 	  	
>+	  	canRunTestClient_ = true;
> 	  	IProject[] earproject = J2EEProjectUtilities.getReferencingEARProjects(project);
> 	  	boolean earNull = false;
> 	  	if (earproject.length<1) earNull = true;
>@@ -264,7 +266,7 @@
> 	  	
> 	  	if (j2eeProject && earNull)
> 	  		canRunTestClient_ = false;
>-	  		  	
>+	  /*		  	
> 		if (!earNull && clientInfo.getServerInstanceId() != null){
> 	  		
> 	  		AddModuleToServerCommand command = new AddModuleToServerCommand();
>@@ -277,7 +279,7 @@
> 	  		{
> 	  			env.getStatusHandler().reportError(status);
> 	  		}     
>-	  	}
>+	  	}*/
> 	  	webServiceClient_ = new TestWebServiceClient(clientInfo);
> 	  	return status;
>   	}
>Index: src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java,v
>retrieving revision 1.23
>diff -u -r1.23 ClientTestWidget.java
>--- src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java	4 Mar 2009 15:55:34 -0000	1.23
>+++ src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java	24 Mar 2009 20:19:24 -0000
>@@ -21,6 +21,7 @@
>  * 20080723   241303 gilberta@ca.ibm.com - Gilbert Andrews
>  * 20080808   243602 rkklai@ca.ibm.com   - Raymond Lai, fix NPE when changing runtime (the server combo)
>  * 20090302   242462 ericdp@ca.ibm.com - Eric D. Peters, Save Web services wizard settings
>+ * 20090324   247535 mahutch@ca.ibm.com - Mark Hutchinson, Wrong server instance(s) is chosen during JAX-RPC sample generation
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
> 
>@@ -423,13 +424,14 @@
> 	  IServer[] servers = org.eclipse.wst.server.core.ServerCore.getServers();
> 	  for(int j =0; j<servers.length;j++){
> 			String id = runtimes_.getId(selection);
>-			if(id.equals(servers[j].getRuntime().getId())){
>+			if(id.equals(servers[j].getServerType().getId())){
> 				serverInstances_.add(servers[j].getId(), servers[j].getName());
> 				serverInstanceTypeCombo_.add(servers[j].getName());
> 			}
> 	  }
> 	  serverInstanceTypeCombo_.select(0);
>-	 
>+	  
>+	  serverInstanceTypeCombo_.setEnabled(serverInstances_.size() > 0 );
>   }  
>   
>   // Here are the getters and setters for this widget.
>@@ -481,6 +483,16 @@
> 	  return project;
>   }
>   
>+  private String getServerTypeIdForRuntime(IRuntime rt) {
>+	  IServerType[] serverTypes = ServerCore.getServerTypes();
>+	  for (IServerType sType : serverTypes) {
>+		  if (sType.getRuntimeType() == rt.getRuntimeType() ){
>+			  return sType.getId();
>+
>+		  }
>+	  }
>+	  return null;
>+  }
>   
>   public void initServersTypes() 
>   {
>@@ -488,9 +500,6 @@
> 		runtimes_ = new LabelsAndIds();
> 	IServer[] servers = org.eclipse.wst.server.core.ServerCore.getServers();
> 	IRuntime[] runtimes = org.eclipse.wst.server.core.ServerCore.getRuntimes();
>-	IServerType[] serverTypes = ServerCore.getServerTypes();
>-	
>-	
> 	
> 	String projectName = projectCombo_.getText();
> 	
>@@ -513,12 +522,12 @@
> 			if(isWebProject){
> 				org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = FacetUtil.getRuntime(runtimes[i]);
> 				if(FacetUtils.doesRuntimeSupportFacets(runtime, projectFacets)){
>-					runtimes_.add(runtimes[i].getId(), runtimes[i].getName());
>+					runtimes_.add(getServerTypeIdForRuntime(runtimes[i]), runtimes[i].getName());
> 					runtimesCombo.add( runtimes[i].getName() );
> 				}
> 			}
> 			else{
>-				runtimes_.add(runtimes[i].getId(), runtimes[i].getName());
>+				runtimes_.add(getServerTypeIdForRuntime(runtimes[i]), runtimes[i].getName());
> 				runtimesCombo.add( runtimes[i].getName() );	
> 			}
> 		}
>@@ -532,8 +541,8 @@
> 	String id = runtimes_.getId(0);
> 	if(id != null){
> 		for(int k =0; k<servers.length;k++){
>-			if(servers[k].getRuntime() != null){
>-				if(id.equals(servers[k].getRuntime().getId())&& canRunTestClient_){
>+			if(servers[k].getServerType() != null){
>+				if(id.equals(servers[k].getServerType().getId())&& canRunTestClient_){
> 					serverInstances_.add(servers[k].getId(), servers[k].getName());
> 					serverInstanceTypeCombo_.add(servers[k].getName());
> 				}

Flags:

keith.chong.ca: iplog+

Actions: View | Diff

Attachments on bug 247535: 129746 | 129757