Fix failing test.
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/.classpath b/plugins/org.eclipse.wst.sse.sieditor.test/.classpath
index 634bdc6..c60d707 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/.classpath
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="api"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/commands/wsdl/ReconcilerCalledAfterInliningTest.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/commands/wsdl/ReconcilerCalledAfterInliningTest.java
index f6ba106..55697a2 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/commands/wsdl/ReconcilerCalledAfterInliningTest.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/commands/wsdl/ReconcilerCalledAfterInliningTest.java
@@ -14,20 +14,12 @@
*******************************************************************************/
package org.eclipse.wst.sse.sieditor.test.model.commands.wsdl;
-import java.io.IOException;
import java.util.Collection;
import org.eclipse.core.commands.operations.IUndoableOperation;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.sse.sieditor.test.model.commands.AbstractCommandChainTest;
-import org.eclipse.wst.sse.sieditor.test.util.ResourceUtils;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.junit.Before;
-
import org.eclipse.wst.sse.sieditor.command.common.AbstractNotificationOperation;
import org.eclipse.wst.sse.sieditor.command.emf.wsdl.InlineNamespaceCompositeCommand;
import org.eclipse.wst.sse.sieditor.command.emf.xsd.SetElementTypeCommand;
@@ -36,9 +28,11 @@
import org.eclipse.wst.sse.sieditor.model.xsd.api.ISchema;
import org.eclipse.wst.sse.sieditor.model.xsd.api.IStructureType;
import org.eclipse.wst.sse.sieditor.model.xsd.api.IType;
-import org.eclipse.wst.sse.sieditor.model.xsd.impl.Element;
import org.eclipse.wst.sse.sieditor.model.xsd.impl.StructureType;
-import com.sun.xml.internal.bind.v2.schemagen.xmlschema.ComplexType;
+import org.eclipse.wst.sse.sieditor.test.model.commands.AbstractCommandChainTest;
+import org.eclipse.wst.sse.sieditor.test.util.ResourceUtils;
+import org.eclipse.xsd.XSDElementDeclaration;
+import org.junit.Before;
public class ReconcilerCalledAfterInliningTest extends AbstractCommandChainTest {
private static final String XSD1_NS = "http://www.example.org/NamespaceImportsXSD";
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/commands/xsd/SetElementTypeCommandXSDTest.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/commands/xsd/SetElementTypeCommandXSDTest.java
index c3d7573..ef66d06 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/commands/xsd/SetElementTypeCommandXSDTest.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/commands/xsd/SetElementTypeCommandXSDTest.java
@@ -25,6 +25,7 @@
import org.eclipse.wst.sse.sieditor.command.common.AbstractNotificationOperation;
import org.eclipse.wst.sse.sieditor.command.emf.xsd.SetElementTypeCommand;
import org.eclipse.wst.sse.sieditor.model.api.IXSDModelRoot;
+import org.eclipse.wst.sse.sieditor.model.utils.ElementAttributeUtils;
import org.eclipse.wst.sse.sieditor.model.xsd.api.IElement;
import org.eclipse.wst.sse.sieditor.model.xsd.api.ISchema;
import org.eclipse.wst.sse.sieditor.model.xsd.api.IType;
@@ -89,7 +90,7 @@
final Element xsdElement = element2.getElements("string").iterator().next().getComponent().getElement();
- assertEquals("Element2 must not has 'ref' to Sch2Element1", UIConstants.EMPTY_STRING, xsdElement.getAttribute("ref"));
+ assertFalse("Element2 must not has 'ref' to Sch2Element1", ElementAttributeUtils.hasAttributeValue(xsdElement, "ref"));
assertTrue("Element2 must has 'type' xml attribute.", xsdElement.getAttribute("type").length() > 0);
assertTrue("Element2 must has 'name' xml attribute.", xsdElement.getAttribute("name").length() > 0);
diff --git a/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java b/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java
index eca4077..7916541 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java
@@ -31,6 +31,7 @@
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.wst.sse.sieditor.model.api.IModelObject;
+import org.eclipse.wst.sse.sieditor.model.api.IModelRoot;
import org.eclipse.wst.sse.sieditor.model.utils.EmfXsdUtils;
import org.eclipse.wst.sse.sieditor.model.wsdl.api.IDescription;
import org.eclipse.wst.sse.sieditor.model.wsdl.api.IFault;
@@ -114,7 +115,9 @@
protected boolean hasToOpenTheSelectedTypeInNewEditor(final ITreeNode input, final IType selectedType) {
// reach the parent model root in case that the input object is
// imported tree node
- final IModelObject originalModelObject = input.getModelObject().getModelRoot().getModelObject();
+ IModelObject modelObject = input.getModelObject();
+ IModelRoot modelRoot = modelObject.getModelRoot();
+ final IModelObject originalModelObject = modelRoot.getModelObject();
final Collection<ISchema> allVisibleSchemas = new HashSet<ISchema>();
if (originalModelObject instanceof IDescription) {
allVisibleSchemas.addAll(((IDescription) originalModelObject).getAllVisibleSchemas());
