[150734] [Model] Adding new WSDL element throws IllegalArgumentException - Approved. Bump up version number from 1.0.101 to 1.0.102 for WTP 1.5.2
diff --git a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
index 2702e58..1ff6d8b 100644
--- a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.wsdl; singleton:=true
-Bundle-Version: 1.0.101.qualifier
+Bundle-Version: 1.0.102.qualifier
Bundle-Activator: org.eclipse.wst.wsdl.WSDLPluginImplementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
index 4fca0c0..a1efb06 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
@@ -642,8 +642,8 @@
public void reconcileAttributes(Element changedElement)
{
Definition definition = getEnclosingDefinition();
-
- QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
+ String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
+ QName qname = new QName(definition.getTargetNamespace(), name == null ? "" : name); //$NON-NLS-1$
setQName(qname);
reconcileReferences(false);
}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
index 66ef43c..a0acc63 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
@@ -155,8 +155,6 @@
*/
protected EList eParts = null;
- private Map parts;
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -534,16 +532,9 @@
public void reconcileAttributes(Element changedElement)
{
Definition definition = getEnclosingDefinition();
- String newName = null;
- if (changedElement.hasAttribute("name"))
- {
- newName = changedElement.getAttribute("name");
- }
- if (newName != null)
- {
- QName qname = new QName(definition.getTargetNamespace(), newName);
- setQName(qname);
- }
+ String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
+ QName qname = new QName(definition.getTargetNamespace(), name == null ? "" : name); //$NON-NLS-1$
+ setQName(qname);
}
public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
index e37cfd8..b70890b 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
@@ -544,7 +544,8 @@
public void reconcileAttributes(Element changedElement)
{
Definition definition = getEnclosingDefinition();
- QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
+ String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
+ QName qname = new QName(definition.getTargetNamespace(), name == null ? "" : name); //$NON-NLS-1$
setQName(qname);
}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
index bf38f3c..75f9aa2 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
@@ -145,8 +145,6 @@
*/
protected String resourceURI = RESOURCE_URI_EDEFAULT;
- private Map ports;
-
/**
* The cached value of the '{@link #getEPorts() <em>EPorts</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -522,8 +520,8 @@
public void reconcileAttributes(Element changedElement)
{
Definition definition = getEnclosingDefinition();
-
- QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
+ String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
+ QName qname = new QName(definition.getTargetNamespace(), name == null ? "" : name); //$NON-NLS-1$
setQName(qname);
}
