[135688] XML Schema editor does not display 'any elements' in design view
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDAdapterFactory.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDAdapterFactory.java
index 7273e03..c41cb31 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDAdapterFactory.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDAdapterFactory.java
@@ -120,7 +120,7 @@
public Object caseXSDSchema(XSDSchema object)
{
return new XSDSchemaAdapter();
- }
+ }
};
Object o = xsdSwitch.doSwitch((EObject) target);
Adapter result = null;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDVisitorForFields.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDVisitorForFields.java
index 59b236d..7a27b73 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDVisitorForFields.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDVisitorForFields.java
@@ -27,6 +27,7 @@
import org.eclipse.xsd.XSDModelGroupDefinition;
import org.eclipse.xsd.XSDParticle;
import org.eclipse.xsd.XSDSimpleTypeDefinition;
+import org.eclipse.xsd.XSDWildcard;
public class XSDVisitorForFields extends XSDVisitor
{
@@ -131,6 +132,11 @@
thingsWeNeedToListenTo.add(particle);
super.visitParticle(particle);
}
+
+ public void visitWildcard(XSDWildcard wildcard)
+ {
+ concreteComponentList.add(wildcard);
+ }
public void visitElementDeclaration(XSDElementDeclaration element)
{
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDWildcardAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDWildcardAdapter.java
index 1ab8da8..33a014a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDWildcardAdapter.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/editor/internal/adapters/XSDWildcardAdapter.java
@@ -10,16 +10,19 @@
*******************************************************************************/
package org.eclipse.wst.xsd.editor.internal.adapters;
+import org.eclipse.gef.commands.Command;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.wst.xsd.adt.facade.IField;
+import org.eclipse.wst.xsd.adt.facade.IModel;
+import org.eclipse.wst.xsd.adt.facade.IType;
import org.eclipse.wst.xsd.editor.XSDEditorPlugin;
import org.eclipse.xsd.XSDParticle;
import org.eclipse.xsd.XSDWildcard;
import org.eclipse.xsd.util.XSDConstants;
import org.w3c.dom.Element;
-public class XSDWildcardAdapter extends XSDBaseAdapter
+public class XSDWildcardAdapter extends XSDParticleAdapter implements IField
{
-
public XSDWildcardAdapter()
{
@@ -103,4 +106,70 @@
XSDWildcard xsdWildcard = (XSDWildcard) target;
return xsdWildcard.getContainer();
}
+
+ public Command getDeleteCommand()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getKind()
+ {
+ return "element";
+ }
+
+ public IModel getModel()
+ {
+ return null;
+ }
+
+ public String getName()
+ {
+ return "anyElement";
+ }
+
+ public IType getType()
+ {
+ return null;
+ }
+
+ public String getTypeName()
+ {
+ return "anyType";
+ }
+
+ public String getTypeNameQualifier()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Command getUpdateMaxOccursCommand(int maxOccurs)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Command getUpdateMinOccursCommand(int minOccurs)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Command getUpdateNameCommand(String name)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Command getUpdateTypeNameCommand(String typeName, String quailifier)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isGlobal()
+ {
+ return false;
+ }
}
