Attachment 64199 Details for Bug 165544 – Updated patch

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

[patch] Updated patch

165544_wsdl_import_operation.patch (text/plain), 22.94 KB, created by Saurabh Dravid

on 2007-04-18 11:27:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Saurabh Dravid

Created: 2007-04-18 11:27:02 EDT

Size: 22.94 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.wsdm.editor
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/capability/imports/wsdl/internal/OperationImportValidator.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/capability/imports/wsdl/internal/OperationImportValidator.java,v
>retrieving revision 1.1
>diff -u -r1.1 OperationImportValidator.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/capability/imports/wsdl/internal/OperationImportValidator.java	22 Mar 2007 13:49:48 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/capability/imports/wsdl/internal/OperationImportValidator.java	18 Apr 2007 15:13:19 -0000
>@@ -12,8 +12,10 @@
> 
> package org.eclipse.tptp.wsdm.tooling.editor.capability.imports.wsdl.internal;
> 
>+import java.util.ArrayList;
> import java.util.HashMap;
> import java.util.Iterator;
>+import java.util.List;
> import java.util.Map;
> 
> import javax.wsdl.Fault;
>@@ -41,6 +43,7 @@
> 	private Operation[] _operations;
> 	private Map _map = new HashMap();
> 	public static final String XMLSCHEMA_2001_URI = "http://www.w3.org/2001/XMLSchema";
>+	private Map _xsdElementReferredMap = new HashMap();
> 
> 	/**
> 	 * Creates new object of this class. 
>@@ -113,6 +116,7 @@
> 							new Object[]
> 							{ conflictedMessage, inputMessage });
> 				}
>+				collectReferredElement(inputMessage);
> 			}
> 			else
> 			{
>@@ -142,7 +146,7 @@
> 					return new ImportValidationStatus(errorMessage,
> 							new Object[]
> 							{ conflictedMessage, outputMessage });
>-				}
>+				}				
> 			}
> 			else
> 			{
>@@ -178,10 +182,33 @@
> 						return new ImportValidationStatus(errorMessage,
> 								new Object[]
> 								{ conflictedMessage, faultMessage });
>-					}
>+					}					
> 				}
> 			}
> 		}
>+		
>+		// Check if more than one input messages refer to same element
>+		// Then its invalid, because we are going to change the name of xsd element at import time for input message
>+		// Since Muse generates the Java Method name based on element name rather than operation name
>+		
>+		Iterator it = _xsdElementReferredMap.values().iterator();
>+		while(it.hasNext())
>+		{
>+			XSDElementReferred referred = (XSDElementReferred) it.next();
>+			Message[] referredMessages = referred.getReferringMessages();
>+			if(referredMessages.length > 1)
>+			{
>+				StringBuffer buffer = new StringBuffer();
>+				String newLine = System.getProperty("line.separator");
>+				buffer.append(Messages.SAME_ELEMENT_REFERRED_MESSAGE+newLine);
>+				for(int i=0; i<referredMessages.length; i++)
>+					buffer.append(referredMessages[i].getQName().getLocalPart()+newLine);				
>+				String errorMessage = buffer.toString();
>+				return new ImportValidationStatus(errorMessage,referredMessages);
>+			}
>+ 		}
>+		
>+		// Everyting is fine
> 		return null;
> 	}
> 
>@@ -221,5 +248,50 @@
> 		}
> 		return true;
> 	}
>+	
>+	private void collectReferredElement(Message message)
>+	{
>+		Map partsMap = message.getParts();
>+		if (partsMap == null || partsMap.size() != 1)
>+			return;
>+		Part part_0 = (Part) partsMap.values().iterator().next();
>+		QName elementQName = part_0.getElementName();
>+		if(elementQName!=null)
>+		{
>+			XSDElementReferred referred = (XSDElementReferred) _xsdElementReferredMap.get(elementQName);
>+			if(referred == null)
>+			{
>+				referred = new XSDElementReferred(elementQName);
>+				_xsdElementReferredMap.put(elementQName, referred);
>+			}
>+			referred.addReferringMessage(message);
>+		}
>+	}
>+}
>+
> 
>+class XSDElementReferred
>+{
>+	private QName _elementQName;
>+	private List _referringMessages = new ArrayList();
>+	
>+	XSDElementReferred(QName elementQName)
>+	{
>+		_elementQName = elementQName;
>+	}
>+	
>+	void addReferringMessage(Message message)
>+	{
>+		_referringMessages.add(message);
>+	}
>+	
>+	Message[] getReferringMessages()
>+	{
>+		return (Message[]) _referringMessages.toArray(new Message[_referringMessages.size()]);
>+	}
>+	
>+	QName getXSDElementReferred()
>+	{
>+		return _elementQName;
>+	}
> }
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/capability/imports/wsdl/internal/WsdlPortTypeLabelProvider.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/capability/imports/wsdl/internal/WsdlPortTypeLabelProvider.java,v
>retrieving revision 1.1
>diff -u -r1.1 WsdlPortTypeLabelProvider.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/capability/imports/wsdl/internal/WsdlPortTypeLabelProvider.java	22 Mar 2007 13:49:48 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/capability/imports/wsdl/internal/WsdlPortTypeLabelProvider.java	18 Apr 2007 15:13:19 -0000
>@@ -67,6 +67,8 @@
> 
> 	public String getText(Object element)
> 	{
>+		if (element == null)
>+			return "";		
> 		if (element instanceof PortType)
> 		{
> 			PortType port = (PortType) element;
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/internal/StartupCapabilitiesCollector.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/internal/StartupCapabilitiesCollector.java,v
>retrieving revision 1.5
>diff -u -r1.5 StartupCapabilitiesCollector.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/internal/StartupCapabilitiesCollector.java	5 Mar 2007 05:50:58 -0000	1.5
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/internal/StartupCapabilitiesCollector.java	18 Apr 2007 15:13:19 -0000
>@@ -20,6 +20,10 @@
> import javax.wsdl.xml.WSDLReader;
> 
> import org.apache.muse.ws.wsdl.WsdlUtils;
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IWorkspaceRoot;
>+import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.FileLocator;
> import org.eclipse.core.runtime.IConfigurationElement;
> import org.eclipse.core.runtime.IExtension;
>@@ -31,6 +35,9 @@
> import org.eclipse.tptp.wsdm.tooling.nls.messages.mrt.internal.Messages;
> import org.eclipse.tptp.wsdm.tooling.util.internal.CapUtils;
> import org.eclipse.tptp.wsdm.tooling.util.internal.Definition2Capability;
>+import org.eclipse.tptp.wsdm.tooling.util.internal.EclipseUtils;
>+import org.eclipse.tptp.wsdm.tooling.util.internal.IResourceChangeConsumer;
>+import org.eclipse.tptp.wsdm.tooling.util.internal.ResourceChangeListener;
> import org.eclipse.tptp.wsdm.tooling.util.internal.WsdmToolingLog;
> import org.eclipse.ui.IStartup;
> import org.osgi.framework.Bundle;
>@@ -39,10 +46,10 @@
> 
> /**
>  * This class will read all the capabilities at the eclipse startup using mrCapability extension point.<br>
>- * This class will not load the capabilities available in workspace. 
>+ * This class will also load the capabilities available in workspace. 
>  */
> 
>-public class StartupCapabilitiesCollector implements IStartup
>+public class StartupCapabilitiesCollector implements IStartup, IResourceChangeConsumer
> {
> 
> 	public static final String WSDL_EXTN = ".WSDL";
>@@ -54,11 +61,13 @@
> 	private static Category _resourceLifetimeCategory = new Category(
> 			"ResourceLifetime");
> 	private static Category _resourceTypeCategory = new Category("ResourceType");
>+	private static Category _userDefinedCategory = new Category("UserDefined");
> 	private static MRCapabilityExtensionPointInfo[] _registeredCapabilitiesInfo = new MRCapabilityExtensionPointInfo[0];
> 	static boolean _initialized = false;
> 	
> 	public void earlyStartup()
> 	{		
>+		new ResourceChangeListener().addResourceChangeConsumer(this);
> 		if(!_initialized) {
> 			initialize();
> 		}
>@@ -72,6 +81,7 @@
> 			loadResourcePropertyCapabilities();
> 			loadResourceLifetimeCapabilities();
> 			loadResourceTypeCapabilities();
>+			loadUserDefinedCapabilities();
> 			_initialized = true;
> 		}
> 	}
>@@ -203,6 +213,46 @@
> 			}
> 		}
> 	}
>+	
>+	/**
>+	 * Loads all the user defined capabilities from workspace.
>+	 */
>+	private static void loadUserDefinedCapabilities()
>+	{
>+		_userDefinedCategory.clearAllCapabilities();
>+		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
>+		IResource[] resources = EclipseUtils.getResourcesOfExtension(root,
>+				"mcap");
>+		for (int i = 0; i < resources.length; i++)
>+		{
>+			IFile mcapFile = (IFile) resources[i];
>+			CapabilityInfo capabilityInfo = loadCapability(mcapFile);
>+			_userDefinedCategory.addCapabilityInfo(capabilityInfo);
>+		}		
>+	}
>+	
>+	/**
>+	 *  Loads the capability from Eclipse workspace mcap file.
>+	 */
>+	private static CapabilityInfo loadCapability(IFile mcapFile)
>+	{
>+		CapabilityDefinition capabilityDefinition = null;
>+		try
>+		{
>+			capabilityDefinition = org.eclipse.tptp.wsdm.tooling.util.internal.WsdlUtils
>+					.getCapabilityDefinition(mcapFile);
>+		}
>+		catch (Exception e)
>+		{
>+			WsdmToolingLog.logError(e.getMessage(), e);
>+		}
>+		Definition definition = capabilityDefinition.getDefinition();
>+		URI uri = capabilityDefinition.getWSDLResourceProtocolURI();
>+		Definition2Capability def2cap = new Definition2Capability(definition);
>+		Capability capability = def2cap.getCapability(uri);
>+		CapabilityInfo capabilityInfo = new CapabilityInfo(capability);
>+		return capabilityInfo;
>+	}
> 
> 	/**
> 	 * Now returns a Collection (of String) of wsdlFileLocations (relative path
>@@ -302,6 +352,49 @@
> 	{
> 		return _resourceTypeCategory;
> 	}
>+	
>+	/**
>+	 * Returns User defined category. 
>+	 */
>+	public static Category getUserDefinedCategory()
>+	{
>+		return _userDefinedCategory;
>+	}
>+
>+	public void fileAdded(IFile addedFile) 
>+	{
>+		if(addedFile.getFileExtension().equals("mcap"))
>+		{
>+			CapabilityInfo capability = loadCapability(addedFile);
>+			_userDefinedCategory.addCapabilityInfo(capability);
>+		}
>+	}
>+
>+	public void fileChanged(IFile changedFile) 
>+	{
>+		if(changedFile.getFileExtension().equals("mcap"))
>+		{
>+			URI capabilityURI = URI.createPlatformResourceURI(changedFile.getFullPath().toString());
>+			_userDefinedCategory.removeCapabilityInfo(capabilityURI);
>+			CapabilityInfo capability = loadCapability(changedFile);
>+			_userDefinedCategory.addCapabilityInfo(capability);
>+		}
>+	}
>+
>+	public void fileRemoved(IFile removedFile)
>+	{
>+		if(removedFile.getFileExtension().equals("mcap"))
>+		{
>+			URI capabilityURI = URI.createPlatformResourceURI(removedFile.getFullPath().toString());
>+			_userDefinedCategory.removeCapabilityInfo(capabilityURI);			
>+		}
>+	}
>+
>+	public void fileReplaced(IFile replacedFile) 
>+	{
>+		// TODO Find out the proper use case for this
>+		fileChanged(replacedFile);		
>+	}
> 
> }
> 
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/internal/CategoryCollection.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/internal/CategoryCollection.java,v
>retrieving revision 1.3
>diff -u -r1.3 CategoryCollection.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/internal/CategoryCollection.java	4 Mar 2007 17:18:58 -0000	1.3
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/internal/CategoryCollection.java	18 Apr 2007 15:13:19 -0000
>@@ -18,18 +18,8 @@
> import java.util.List;
> import java.util.Map;
> 
>-import javax.wsdl.Definition;
>-
>-import org.eclipse.core.resources.IFile;
>-import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.IWorkspaceRoot;
>-import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.tptp.wsdm.tooling.model.capabilities.Capability;
>-import org.eclipse.tptp.wsdm.tooling.util.internal.Definition2Capability;
>-import org.eclipse.tptp.wsdm.tooling.util.internal.EclipseUtils;
>-import org.eclipse.tptp.wsdm.tooling.util.internal.WsdlUtils;
>-import org.eclipse.tptp.wsdm.tooling.util.internal.WsdmToolingLog;
> 
> /**
>  * This class is the collection for all the capability categories. 
>@@ -61,7 +51,8 @@
> 				.getResourceLifetimeCategory().clone();
> 		Category resourceTypeCategory = (Category) StartupCapabilitiesCollector
> 				.getResourceTypeCategory().clone();
>-		Category userDefinedCategory = getUserDefinedCategory(true);
>+		Category userDefinedCategory = (Category) StartupCapabilitiesCollector
>+		.getUserDefinedCategory().clone();
> 
> 		populateMap(managementCategory);
> 		populateMap(managementRelatedCategory);
>@@ -111,44 +102,10 @@
> 				.getResourceLifetimeCategory().clone());
> 		categories.add(StartupCapabilitiesCollector.getResourceTypeCategory()
> 				.clone());
>-		categories.add(getUserDefinedCategory(loadMetadata));
>+		categories.add(StartupCapabilitiesCollector.getUserDefinedCategory().clone());
> 		return (Category[]) categories.toArray(new Category[categories.size()]);
> 	}
> 
>-	private Category getUserDefinedCategory(boolean loadMetadata)
>-	{
>-		Category category = new Category("UserDefined");
>-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
>-		IResource[] resources = EclipseUtils.getResourcesOfExtension(root,
>-				"mcap");
>-		for (int i = 0; i < resources.length; i++)
>-		{
>-			IFile mcapFile = (IFile) resources[i];
>-			CapabilityDefinition capabilityDefinition = null;
>-			try
>-			{
>-				capabilityDefinition = WsdlUtils
>-						.getCapabilityDefinition(mcapFile);
>-			}
>-			catch (Exception e)
>-			{
>-				WsdmToolingLog.logError(e.getMessage(), e);
>-			}
>-			Definition definition = capabilityDefinition.getDefinition();
>-			URI uri = capabilityDefinition.getWSDLResourceProtocolURI();
>-			Definition2Capability def2cap = null;
>-			if (loadMetadata)
>-				def2cap = new Definition2Capability(definition);
>-			else
>-				def2cap = new Definition2Capability(definition, false, false,
>-						false, false);
>-			Capability capability = def2cap.getCapability(uri);
>-			CapabilityInfo capabilityInfo = new CapabilityInfo(capability);
>-			category.addCapabilityInfo(capabilityInfo);
>-		}
>-		return category;
>-	}
>-
> 	/**
> 	 * Returns the capability.
> 	 * @param capabilityURI
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/internal/Category.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/internal/Category.java,v
>retrieving revision 1.2
>diff -u -r1.2 Category.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/internal/Category.java	21 Feb 2007 07:26:50 -0000	1.2
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/internal/Category.java	18 Apr 2007 15:13:19 -0000
>@@ -100,6 +100,14 @@
> 		if (indexToRemove != -1)
> 			_capabilitiesInfo.remove(indexToRemove);
> 	}
>+	
>+	/**
>+	 * Clears all the capabilities from this category.
>+	 */
>+	public void clearAllCapabilities()
>+	{
>+		_capabilitiesInfo.clear();
>+	}
> 
> 	public Object clone()
> 	{
>Index: src/org/eclipse/tptp/wsdm/tooling/editor/capability/command/operation/internal/ImportWSDLOperationCommand.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/editor/capability/command/operation/internal/ImportWSDLOperationCommand.java,v
>retrieving revision 1.1
>diff -u -r1.1 ImportWSDLOperationCommand.java
>--- src/org/eclipse/tptp/wsdm/tooling/editor/capability/command/operation/internal/ImportWSDLOperationCommand.java	22 Mar 2007 13:49:49 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/editor/capability/command/operation/internal/ImportWSDLOperationCommand.java	18 Apr 2007 15:13:19 -0000
>@@ -38,8 +38,10 @@
> import org.eclipse.tptp.wsdm.tooling.util.internal.WsdlUtils;
> import org.eclipse.tptp.wsdm.tooling.util.internal.WsdmConstants;
> import org.eclipse.tptp.wsdm.tooling.util.internal.XsdUtils;
>+import org.eclipse.xsd.XSDComplexTypeDefinition;
> import org.eclipse.xsd.XSDElementDeclaration;
> import org.eclipse.xsd.XSDSchema;
>+import org.eclipse.xsd.XSDTypeDefinition;
> import org.w3c.dom.Document;
> import org.w3c.dom.Element;
> 
>@@ -59,7 +61,7 @@
> 	private IProgressMonitor _monitor;
> 	private QName WSA_ACTION_QNAME = new QName(WsdmConstants.WSA_URI,
> 			WsdmConstants.WSA_ACTION_NAME);
>-
>+	
> 	/**
> 	 * Creates a new object of this class.
> 	 */
>@@ -139,7 +141,7 @@
> 		newInput.setName(importedOperation.getInput().getName());
> 
> 		Message importedMessage = importedOperation.getInput().getMessage();
>-		Message newMessage = createNewMessage(importedMessage);
>+		Message newMessage = createNewMessage(importedOperation, importedMessage, true);
> 		newInput.setMessage(newMessage);
> 		_capabilityDefinition.addMessage(newMessage);
> 
>@@ -166,7 +168,7 @@
> 		newOutput.setName(importedOperation.getOutput().getName());
> 
> 		Message importedMessage = importedOperation.getOutput().getMessage();
>-		Message newMessage = createNewMessage(importedMessage);
>+		Message newMessage = createNewMessage(importedOperation, importedMessage, false);
> 		newOutput.setMessage(newMessage);
> 		_capabilityDefinition.addMessage(newMessage);
> 		
>@@ -192,14 +194,14 @@
> 				newFault.setName(importFault.getName());
> 
> 				Message importedMessage = importFault.getMessage();
>-				Message newMessage = createNewMessage(importedMessage);
>+				Message newMessage = createNewMessage(importedOperation, importedMessage, false);
> 				newFault.setMessage(newMessage);
> 				_capabilityDefinition.addMessage(newMessage);
> 			}
> 		}
> 	}
> 
>-	private Message createNewMessage(Message importedMessage)
>+	private Message createNewMessage(Operation importedOperation, Message importedMessage, boolean isInputMessge)
> 	{
> 		  Definition definition = _capabilityDefinition.getDefinition();
> 		  Message existingMessage = WsdlUtils.getWSDLMessage(definition,importedMessage.getQName().getLocalPart()); 
>@@ -219,9 +221,28 @@
> 			  String xsdNS = importedPart.getElementName().getNamespaceURI();
> 			  String elementName = importedPart.getElementName().getLocalPart();
> 			  XSDSchema elementSchema = _capabilityDefinition.getSchema(xsdNS); 
>-			  XSDElementDeclaration element = XsdUtils.getXSDElementDeclarationOfName(elementSchema, elementName);
>+			  XSDElementDeclaration element = XsdUtils.getXSDElementDeclarationOfName(elementSchema, elementName);			  
> 			  _capabilityDefinition.createOrFindPrefix(element.getTargetNamespace(), null);			  
>-			  part.setElementName(new QName(xsdNS, elementName));  
>+			  
>+			  XSDTypeDefinition typeDef = element.getType();
>+			  XSDSchema typeDefSchema = _capabilityDefinition.getSchema(typeDef.getTargetNamespace());
>+			  typeDef = getXSDTypeDefinition(typeDefSchema, typeDef.getName());
>+			  if(typeDef instanceof XSDComplexTypeDefinition)
>+			  {
>+				  XSDTypeDefinition anonymousTypeDef = (XSDTypeDefinition)typeDef.cloneConcreteComponent(true, false);
>+				  anonymousTypeDef.setName(null);
>+				  element.setAnonymousTypeDefinition(anonymousTypeDef);
>+			  }
>+			  
>+			  if(isInputMessge)
>+			  {
>+				  // Muse 2.2 requires the XSD element name should be same as the operation name
>+				  // So we change the XSD element name to the operation name
>+				  // Remove this if Muse fixes it in its next release
>+				  element.setName(importedOperation.getName());				  
>+			  }
>+			  QName elementQName = new QName(xsdNS, element.getName());
>+			  part.setElementName(elementQName);
> 		  }
> 		  else if(importedPart.getTypeName()!=null)
> 		  {
>@@ -251,7 +272,21 @@
>         Map namespacesMap = _importDefinition.getNamespaces();
>         for(int i=0;i<schemas.length;i++)
>         {
>-        	_capabilityDefinition.addSchema(schemas[i], namespacesMap);
>+        	String tns = schemas[i].getAttribute("targetNamespace");
>+        	if(_capabilityDefinition.getSchema(tns) == null)
>+        		_capabilityDefinition.addSchema(schemas[i], namespacesMap);
>         }        
> 	}
>+	
>+	private XSDTypeDefinition getXSDTypeDefinition(XSDSchema schema, String typeName)
>+	{
>+		List types = schema.getTypeDefinitions();
>+		for(int i=0;i<types.size();i++)
>+		{
>+			XSDTypeDefinition typeDef = (XSDTypeDefinition) types.get(i);
>+			if(typeDef.getName().equals(typeName))
>+				return typeDef;
>+		}
>+		return null;
>+	}
> }
>Index: src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/imports/internal/Messages.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/imports/internal/Messages.java,v
>retrieving revision 1.1
>diff -u -r1.1 Messages.java
>--- src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/imports/internal/Messages.java	8 Feb 2007 19:40:13 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/imports/internal/Messages.java	18 Apr 2007 15:13:19 -0000
>@@ -30,6 +30,7 @@
> 	public static String CONFLICTED_MESSAGE;
> 	public static String INPUT_MESSAGE_NOT_DEFINED;
> 	public static String OUTPUT_MESSAGE_NOT_DEFINED;
>+	public static String SAME_ELEMENT_REFERRED_MESSAGE;
> 	public static String IMPROPER_WSDL_FILE;
> 	public static String DEFINE_CAPABILITY_FROM_WSDL;
> 	public static String SPECIFY_EXISTING_WSDL;
>Index: src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/imports/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/imports/internal/messages.properties,v
>retrieving revision 1.2
>diff -u -r1.2 messages.properties
>--- src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/imports/internal/messages.properties	15 Mar 2007 14:18:43 -0000	1.2
>+++ src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/imports/internal/messages.properties	18 Apr 2007 15:13:19 -0000
>@@ -21,6 +21,7 @@
> CONFLICTED_MESSAGE = IWAT0834E Conflicted message :
> INPUT_MESSAGE_NOT_DEFINED = IWAT0835E Input message must be defined
> OUTPUT_MESSAGE_NOT_DEFINED = IWAT0836E Output message must be defined
>+SAME_ELEMENT_REFERRED_MESSAGE = IWAT0875E Following input messages refer to same xsd elements:
> IMPROPER_WSDL_FILE = IWAT0837E Improper wsdl file
> DEFINE_CAPABILITY_FROM_WSDL = Define capability from existing WSDL file:
> SPECIFY_EXISTING_WSDL = Please specify existing WSDL file
>Index: src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionWizardPage.java
>===================================================================
>RCS file: /cvsroot/ganges/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionWizardPage.java,v
>retrieving revision 1.8
>diff -u -r1.8 CapabilitySelectionWizardPage.java
>--- src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionWizardPage.java	11 Apr 2007 10:47:11 -0000	1.8
>+++ src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/CapabilitySelectionWizardPage.java	18 Apr 2007 15:13:19 -0000
>@@ -99,9 +99,6 @@
> 		_capsViewer.setLabelProvider(_contentProvider.getLabelProvider());
> 		_capsViewer.setSorter(_contentProvider.getSorter());
> 
>-		CategoryCollection collection = new CategoryCollection();
>-		Category[] categories = collection.getAllCategories();
>-		_capsViewer.setInput(Arrays.asList(categories));
> 		initialize();
> 		hookAllListeners();
> 		setControl(container);

Actions: View | Diff

Attachments on bug 165544: 58038 | 58095 | 58849 | 59774 | 64199