Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel')
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java63
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java344
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java149
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java70
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java100
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java57
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java265
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java62
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java56
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java135
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java70
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java66
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java81
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java64
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java86
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java110
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java122
17 files changed, 0 insertions, 1900 deletions
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java
deleted file mode 100644
index 538caa25e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-public class BasicConnection implements Connection
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private Rel fRel;
- private Element fElement;
- private Connection fOpposingConnection;
-
- public static final int OUTBOUND = 0;
- public static final int INBOUND = 1;
-
- public static Connection[] createPair ( Rel outboundRel, Element targetElement, Rel inboundRel, Element sourceElement )
- {
- BasicConnection outboundConnection = new BasicConnection(outboundRel,targetElement);
- BasicConnection inboundConnection = new BasicConnection(inboundRel,sourceElement);
- outboundConnection.fOpposingConnection = inboundConnection;
- inboundConnection.fOpposingConnection = outboundConnection;
- return new Connection[] {outboundConnection,inboundConnection};
- }
-
- public BasicConnection ( Rel rel, Element element )
- {
- fRel = rel;
- fElement = element;
- fOpposingConnection = null;
- }
-
- public Rel getRel ()
- {
- return fRel;
- }
-
- public Element getElement ()
- {
- return fElement;
- }
-
- public Connection getOpposingConnection ()
- {
- return fOpposingConnection;
- }
-
- public String toString ()
- {
- return fElement.getName();
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java
deleted file mode 100644
index 72d08f09d..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class BasicElement implements Element
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private String fName;
- private String fMUID;
- private Model fModel;
- private Hashtable fRels;
- private Hashtable fProperties;
- private Vector fListeners;
-
- public BasicElement ( String name, Model model )
- {
- fName = name;
- setMUID(model.makeMUID(name));
- model.addElement(this);
- fModel = model;
- fRels = new Hashtable();
- fListeners = new Vector();
- fProperties = new Hashtable();
- fProperties.put(Property.NAME,new BasicProperty(Property.NAME,fName));
- }
-
- public BasicElement ( String name, Element element, String outboundRelName, String inboundRelName )
- {
- this(name,element.getModel());
- connect(element,outboundRelName,inboundRelName);
- }
-
- /**
- * Returns a clone of this <code>Element</code>
- * of the same class and with the same name and model,
- * but with no Properties, Rels or Listeners except for
- * the {@link Property#NAME NAME} property.
- * @return Object A new Element.
- */
- public Element shallowClone ()
- {
- return new BasicElement(fName,fModel);
- }
-
- /**
- * Returns a clone of this <code>Element</code>
- * of the same class and with the same name and model
- * and with a copy of the original Element's Properties.
- * The Rels and Listeners are not cloned.
- * @return Element A new Element.
- */
- public final Element deepClone ()
- {
- Element newElement = shallowClone();
- Enumeration e = getProperties();
- while (e.hasMoreElements())
- {
- Property property = (Property)e.nextElement();
- Property newProperty = (Property)property.shallowClone();
- newElement.setProperty(newProperty);
- }
- return newElement;
- }
-
- /**
- * Model-View-Controller: All property changes to the model
- * (such as those made by a wizard in the role of a Controller)
- * should yield events to which an interested party can listen
- * (such as a wizard in the role of a Viewer).
- * @param tml The listener to add.
- */
- public void addListener ( ElementListener listener )
- {
- fListeners.add(listener);
- }
-
- public Model getModel ()
- {
- return fModel;
- }
-
- public boolean isValid ()
- {
- return (fModel != null && fModel.containsElement(this));
- }
-
- public boolean remove ()
- {
- return fModel.removeElement(this);
- }
-
- public void setName ( String name )
- {
- fName = name;
- fProperties.put(Property.NAME,new BasicProperty(Property.NAME,fName));
- }
-
- public String getName ()
- {
- return fName;
- }
-
- /*
- * The getter for the MUID
- * The MUID is the Model Unique Identifier, made from the name and an
- * appended unique number
- * @return String a unique id for this element within the context of the model
- */
- public String getMUID()
- {
- return fMUID;
- }
-
- /*
- *
- *
- */
- public int getNumberID()
- {
- String number = getMUID().substring(getName().length());
- return Integer.parseInt(number);
- }
-
- /*
- * Set the MUID which was made by the model
- * Should only be settable within this element
- * Set once upon creation, you can change the name
- * but the id will remain constant.
- */
- private void setMUID(String MUID)
- {
- fMUID = MUID;
- }
-
- public void setProperty ( Property property )
- {
- String propertyName = property.getName();
- Property oldProperty = getProperty(propertyName);
- fProperties.put(propertyName,property);
- if (oldProperty == null)
- {
- PropertyAddEvent event = new PropertyAddEvent(this,property);
- Enumeration e = fListeners.elements();
- while (e.hasMoreElements())
- {
- ((ElementListener)e.nextElement()).propertyAdded(event);
- }
- }
- else
- {
- Object oldValue = oldProperty.getValue();
- Object newValue = property.getValue();
- if (oldValue != newValue)
- {
- if (oldValue == null || newValue == null || (!oldValue.equals(newValue)))
- {
- PropertyChangeEvent event = new PropertyChangeEvent(this,property,oldProperty);
- Enumeration e = fListeners.elements();
- while (e.hasMoreElements())
- {
- ((ElementListener)e.nextElement()).propertyChanged(event);
- }
- }
- }
- }
- if (propertyName.equals(Property.NAME)) fName = property.getValue().toString();
- }
-
- public void setPropertyAsObject ( String name, Object value )
- {
- setProperty(new BasicProperty(name,value));
- }
-
- public void setPropertyAsString ( String name, String value )
- {
- setProperty(new BasicProperty(name,value));
- }
-
- public Property getProperty ( String name )
- {
- return (Property)fProperties.get(name);
- }
-
- public Object getPropertyAsObject ( String name )
- {
- Property property = getProperty(name);
- return (property == null ? null : property.getValue());
- }
-
- public String getPropertyAsString ( String name )
- {
- Property property = getProperty(name);
- return (property == null ? null : property.getValueAsString());
- }
-
- public Enumeration getProperties ()
- {
- return fProperties.elements();
- }
-
- public boolean connect ( Element targetElement, String outboundRelName, String inboundRelName )
- {
- if (fModel == null || fModel != targetElement.getModel()) return false;
-
- Element sourceElement = this;
- Rel outboundRel = sourceElement.getRel(outboundRelName);
- Rel inboundRel = targetElement.getRel(inboundRelName);
- Connection[] pair = BasicConnection.createPair(outboundRel,targetElement,inboundRel,sourceElement);
- outboundRel.addConnection(pair[BasicConnection.OUTBOUND]);
- inboundRel.addConnection(pair[BasicConnection.INBOUND]);
- RelAddEvent event = new RelAddEvent(pair);
- Enumeration eSource = getListeners();
- Enumeration eTarget = targetElement.getListeners();
- while (eSource.hasMoreElements())
- {
- ((ElementListener)eSource.nextElement()).relAdded(event);
- }
-
- while (eTarget.hasMoreElements())
- {
- ((ElementListener)eTarget.nextElement()).relAdded(event);
- }
-
-
- return true;
- }
-
- public boolean disconnect ( Element targetElement, String outboundRelName )
- {
- return disconnect(targetElement,getRel(outboundRelName));
- }
-
- public boolean disconnectRel ( String outboundRelName )
- {
- return disconnectRel(getRel(outboundRelName));
- }
-
- public boolean disconnectAll ()
- {
- if (fModel == null) return false;
- Enumeration e = fRels.elements();
- while (e.hasMoreElements())
- {
- Rel rel = (Rel)e.nextElement();
- disconnectRel(rel);
- }
- return true;
- }
-
- public Enumeration getElements ( String relName )
- {
- return getRel(relName).getTargetElements();
- }
-
- public int getNumberOfElements ( String relName )
- {
- return getRel(relName).getNumberOfTargetElements();
- }
-
- public Rel getRel ( String relName )
- {
- Rel rel = (Rel)fRels.get(relName);
- if (rel == null)
- {
- rel = new BasicRel(relName,this);
- fRels.put(relName,rel);
- }
- return rel;
- }
-
- public Enumeration getRels ()
- {
- return fRels.elements();
- }
-
- public Enumeration getListeners()
- {
- return fListeners.elements();
- }
-
- protected boolean disconnect ( Element targetElement, Rel outboundRel )
- {
- if (fModel == null || fModel != targetElement.getModel() || outboundRel == null) return false;
- Connection outboundConnection = outboundRel.getConnectionTo(targetElement);
- if (outboundConnection == null) return false;
- Connection inboundConnection = outboundConnection.getOpposingConnection();
- RelRemoveEvent event = new RelRemoveEvent(new Connection [] {outboundConnection,inboundConnection});
- Enumeration e = fListeners.elements();
- while (e.hasMoreElements())
- {
- ((ElementListener)e.nextElement()).relRemoved(event);
- }
-
- Enumeration eTarget = targetElement.getListeners();
- while (eTarget.hasMoreElements())
- {
- ((ElementListener)eTarget.nextElement()).relRemoved(event);
- }
-
- Rel inboundRel = inboundConnection.getRel();
- boolean done = outboundRel.removeConnection(outboundConnection);
- inboundRel.removeConnection(inboundConnection);
- return done;
- }
-
- protected boolean disconnectRel ( Rel outboundRel )
- {
- if (fModel == null || outboundRel == null) return false;
- Element[] elements = new Element[outboundRel.getNumberOfTargetElements()];
- int i = 0;
- Enumeration e = outboundRel.getTargetElements();
- while (e.hasMoreElements())
- {
- elements[i++] = (Element)e.nextElement();
- }
- while (i-- > 0)
- {
- disconnect(elements[i],outboundRel);
- }
- return true;
- }
-
- public String toString ()
- {
- return getName();
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java
deleted file mode 100644
index 3b3b43589..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class BasicModel implements Model
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private String fName;
- private Hashtable fElements;
- private Element fRoot;
- //This is used by the MUID
- private int fUniqueNumberCounter;
-
- public BasicModel ( String name )
- {
- fName = name;
- fElements = new Hashtable();
- fRoot = null;
- fUniqueNumberCounter = 0;
- }
-
- public void setName ( String name )
- {
- fName = name;
- }
-
- public String getName ()
- {
- return fName;
- }
-
-
- /*
- * simple counter that increments each call
- */
- public int getUniqueNumber()
- {
- fUniqueNumberCounter++;
- return fUniqueNumberCounter;
- }
-
- /*
- * This will use a unique number and append it to the end of the name
- * @param String name of the element
- * @return String MUID
- */
- public String makeMUID(String name)
- {
- String num = String.valueOf(getUniqueNumber());
- String muid = name + num;
- return muid;
- }
-
-
- public boolean setRootElement ( Element root )
- {
- if (root.getModel() == null)
- addElement(root);
- else if (root.getModel() != this)
- return false;
- fRoot = root;
- return true;
- }
-
- public Element getRootElement ()
- {
- if (fRoot == null) fRoot = getFirstElement();
- return fRoot;
- }
-
-
- /**
- * Get the elements that have this name
- * @param String name the name of the element
- * @return Vector a vector of elements that have this name
- * These elements may be of different types
- **/
-
- public Vector getElementsByName(String name)
- {
- Vector vector = new Vector();
- Enumeration e = fElements.keys();
- while (e.hasMoreElements()){
- Element element = (Element)e.nextElement();
- if (element.getName().equals(name)) vector.addElement(element);
- }
- return vector;
- }
-
-
-
- public boolean addElement ( Element element )
- {
- if (element.getModel() != null) return false;
- fElements.put(element,element);
- return true;
- }
-
- public boolean removeElement ( Element element )
- {
- if (element.getModel() != this) return false;
- element.disconnectAll();
- if (fRoot == element) fRoot = null;
- return (fElements.remove(element) == element);
- }
-
- public Enumeration getElements ()
- {
- return fElements.elements();
- }
-
- public int getNumberOfElements ()
- {
- return fElements.size();
- }
-
- public boolean containsElement ( Element element )
- {
- return fElements.contains(element);
- }
-
- private Element getFirstElement ()
- {
- Enumeration e = getElements();
- return (e.hasMoreElements() ? (Element)e.nextElement() : null);
- }
-
- public String toString ()
- {
- return getName();
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java
deleted file mode 100644
index 6661a82e0..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-public class BasicProperty implements Property
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private String fName;
- private Object fValue;
-
- public BasicProperty ( String name )
- {
- fName = name;
- }
-
- public BasicProperty ( String name, Object value )
- {
- fName = name;
- fValue = value;
- }
-
- /**
- * Returns a shallow clone of this <code>Property</code>.
- * Property key and value references are cloned,
- * but the value objects themselves are not cloned.
- * @return Property A new Property.
- */
- public Property shallowClone ()
- {
- return new BasicProperty(fName,fValue);
- }
-
- public String getName ()
- {
- return fName;
- }
-
- public void setValue ( Object value )
- {
- fValue = value;
- }
-
- public Object getValue ()
- {
- return fValue;
- }
-
- public void setValueAsString ( String value )
- {
- fValue = value;
- }
-
- public String getValueAsString ()
- {
- return (fValue != null ? fValue.toString() : null);
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java
deleted file mode 100644
index 41336fbd9..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-public class BasicRel implements Rel
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private String fName;
- private Element fSourceElement;
- private Vector fConnections;
-
- public BasicRel ( String name, Element sourceElement )
- {
- fName = name;
- fSourceElement = sourceElement;
- fConnections = new Vector();
- }
-
- public String getName ()
- {
- return fName;
- }
-
- public Element getSourceElement ()
- {
- return fSourceElement;
- }
-
- public Enumeration getTargetElements ()
- {
- return new ElementEnumeration(fConnections.elements());
- }
-
- public int getNumberOfTargetElements ()
- {
- return fConnections.size();
- }
-
- public void addConnection ( Connection connection )
- {
- fConnections.addElement(connection);
- }
-
- public boolean removeConnection ( Connection connection )
- {
- return fConnections.removeElement(connection);
- }
-
- public Connection getConnectionTo ( Element targetElement )
- {
- Enumeration e = fConnections.elements();
- while (e.hasMoreElements())
- {
- Connection c = (Connection)e.nextElement();
- if (c.getElement() == targetElement) return c;
- }
- return null;
- }
-
- public String toString ()
- {
- return getName();
- }
-
- private class ElementEnumeration implements Enumeration
- {
- private Enumeration fConnectionEnumeration;
-
- public ElementEnumeration ( Enumeration connectionEnumeration )
- {
- fConnectionEnumeration = connectionEnumeration;
- }
-
- public boolean hasMoreElements ()
- {
- return fConnectionEnumeration.hasMoreElements();
- }
-
- public Object nextElement ()
- {
- return ((Connection)fConnectionEnumeration.nextElement()).getElement();
- }
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java
deleted file mode 100644
index 8d6270c6a..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* This is the abstract class for a connection that ties a Rel to a Node.
-* Normally Connection objects are manufactured and managed within the
-* derived classes of the Model framework, and are not manipulated by
-* the caller directly.
-*/
-public interface Connection
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Returns the Rel that owns this connection.
- * @return Rel The Rel that owns this connection.
- * This method never returns null, that is, a Connection
- * cannot exist without a Rel to own it.
- */
- public Rel getRel ();
-
- /**
- * Returns the Node that this connection points to.
- * @return Node The Node this connection points to.
- * This method never returns null, that is, a Connection
- * cannot exist without a Node to point to.
- */
- public Element getElement ();
-
- /**
- * Returns the opposing connection to this connection.
- * Connection objects always exist in pairs, that is,
- * if node "Parent" has a relationship named "Children"
- * containing a connection to node "Child", then there
- * must exist an opposing connection from "Child" to
- * "Parent" in some relationship of "Child" (for example,
- * in a relationship called "Parents").
- * @return Connection The opposing connection.
- * As a general rule, this method should never return null.
- * It may only return null during construction of the pair
- * of connections.
- */
- public Connection getOpposingConnection ();
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java
deleted file mode 100644
index c23721b8e..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-
-/**
-* This is the abstract class for elements that can be managed by a Model.
-* Every element has a name, a set of properties, and a set of relationships
-* to other elements.
-*/
-public interface Element
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Returns a clone of this <code>Element</code>
- * of the same class and with the same name and model,
- * but with no Properties, Rels or Listeners except for
- * the {@link Property#NAME NAME} property.
- * @return Object A new Element.
- */
- public Element shallowClone ();
-
- /**
- * Returns a clone of this <code>Element</code>
- * of the same class and with the same name and model
- * and with a copy of the original Element's Properties.
- * The Rels and Listeners are not cloned.
- * @return Element A new Element.
- */
- public Element deepClone ();
-
- /**
- * Returns the model this element belongs to, or null if the element
- * has not been added to a model. See also {@link #isValid isValid()}.
- * @return Model The model this element belongs to, or null if none.
- */
- public Model getModel ();
-
- /**
- * Returns true if and only if this element belongs to a model.
- * See also {@link #getModel getModel()}.
- * @return boolean True if and only if this element belongs to a model.
- */
- public boolean isValid ();
-
- /**
- * Removes this element from the model to which it currently belongs.
- * After calling this method, {@link #getModel getModel()} will return
- * null and {@link #isValid isValid()} will return false.
- * @return boolean True if the element was successfully removed from
- * its model. This method returns false if the element does not belong
- * to any model.
- */
- public boolean remove ();
-
- /**
- * Sets the name of this element and updates the "name" property.
- * Every element includes a property called "name" (see Property.NAME)
- * whose value is the same string as passed into setName().
- * @param name The name of this element.
- */
- public void setName ( String name );
-
- /**
- *
- */
- public void addListener ( ElementListener listener );
-
- /**
- * Returns the name of this element.
- * @return String The name of this element.
- */
- public String getName ();
-
- /**
- * Adds or sets a property of this element.
- * Properties set using this method can be retrieved using either
- * {@link #getProperty getProperty()} or
- * {@link #getPropertyAsObject getPropertyAsObject()}.
- * Every element includes a property called "name" (see Property.NAME)
- * whose value is the same string as passed into {@link #setName setName()}.
- * Any previous property with the same name is replaced.
- * @param property The property to set.
- */
- public void setProperty ( Property property );
-
- /**
- * Adds or sets a property of this element.
- * Properties set using this method can be retrieved using either
- * {@link #getProperty getProperty()} or
- * {@link #getPropertyAsObject getPropertyAsObject()}.
- * Every element includes a property called "name" (see Property.NAME)
- * whose value is the same string as passed into {@link #setName setName()}.
- * Any previous property with the same name is replaced.
- * @param name The name of the property to set.
- * @param value The Object value of the property to set.
- */
- public void setPropertyAsObject ( String name, Object value );
-
- /**
- * Adds or sets a String property of this element.
- * Properties set using this method can be retrieved using either
- * {@link #getProperty getProperty()},
- * {@link #getPropertyAsObject getPropertyAsObject()} or
- * {@link #getPropertyAsString getPropertyAsString()}.
- * Every element includes a property called "name" (see Property.NAME)
- * whose value is the same string as passed into {@link #setName setName()}.
- * Any previous property with the same name is replaced.
- * @param name The name of the property to set.
- * @param value The String value of the property to set.
- */
- public void setPropertyAsString ( String name, String value );
-
- /**
- * Returns a property of the given name or null if there is none.
- * Every element includes a property called "name" (see Property.NAME)
- * whose value is the same string as passed into {@link #setName setName()}.
- * @param name The name of the property to return.
- * @return Property The property, or null if none.
- */
- public Property getProperty ( String name );
-
- /**
- * Returns the Object value of a property of the given name or null
- * if there is none.
- * Every element includes a property called "name" (see Property.NAME)
- * whose value is the same string as passed into {@link #setName setName()}.
- * @param name The name of the property to return.
- * @return Object The property value as an Object, or null if none.
- */
- public Object getPropertyAsObject ( String name );
-
- /**
- * Returns the String value of a property of the given name or null
- * if there is none.
- * Every element includes a property called "name" (see Property.NAME)
- * whose value is the same string as passed into {@link #setName setName()}.
- * @param name The name of the property to return.
- * @return String The property value as a String, or null if none.
- */
- public String getPropertyAsString ( String name );
-
- /**
- * Returns an enumeration of all properties of this element.
- * There is always at least one property that carries the
- * name of this element (see {@link #setName setName()}).
- * @return Enumeration An enumeration of all properties of this element.
- */
- public Enumeration getProperties ();
-
- /**
- * Creates a bidirectional relationship between this element and another.
- * Both relationships are identified by names. The names of all the
- * outbound relationships of a element must be mutually unique.
- * @param element The element to connect to.
- * @param outboundRelName The name of the relationship to contain the
- * connection to the element.
- * @param inboundRelName The name of the relationship to contain the
- * inverse connection back to this element.
- * @return boolean True if the connection is created successfully.
- * Both elements must belong to the same model, other false is returned.
- */
- public boolean connect ( Element element, String outboundRelName, String inboundRelName );
-
- /**
- * Dismantles the connection to another element in a given relationship.
- * The inverse connection is also automatically dismantled.
- * @param element The element to disconnect from.
- * @param outboundRelName The name of the relationship containing
- * the connection to the element.
- * @return boolean True if the connection is removed successfully.
- * Both elements must belong to the same model, other false is returned.
- * If the elements are not connected through the given relationship, then
- * false is returned.
- */
- public boolean disconnect ( Element element, String outboundRelName );
-
- /**
- * Dismantles the connection to all elements in the given relationship.
- * The inverse connections are also automatically dismantled.
- * @param outboundRelName The name of the relationship.
- * @return boolean True if all connections are removed successfully.
- * This method returns false if the element does not belong to a model.
- */
- public boolean disconnectRel ( String outboundRelName );
-
- /**
- * Dismantles all connections from this element.
- * @return boolean True if all connections are removed successfully.
- * This method returns false if the element does not belong to a model.
- */
- public boolean disconnectAll ();
-
- /**
- * Returns an enumeration of all elements
- * connected thru the given relationship.
- * @param relName The name of the relationship.
- * @return Enumeration The elements in the relationship.
- * This method never returns null.
- */
- public Enumeration getElements ( String relName );
-
- /**
- * Returns the number of elements in the given relationship.
- * @param relName The name of the relationship.
- * @return int The number of elements in the relationship.
- * This method never returns a negative value.
- */
-
- public Enumeration getListeners();
-
- public int getNumberOfElements ( String relName );
-
- /**
- * Returns the relationship object of the given name.
- * @param relName The name of the relationship.
- * @return int The relationship. This method never returns null.
- * In other words, any reference to a relationship name automatically
- * brings a corresponding Rel object into existence. Careless naming
- * may result in the {@link #getRels getRels()} method returning an enumeration of
- * more relationships than would be meaningful, efficient or useful.
- */
- public Rel getRel ( String relName );
-
- /**
- * Returns an enumeration of all known relationships.
- * @return Enumeration The outbound relationships of the element.
- * This method never returns null.
- */
- public Enumeration getRels ();
-
-
- /*
- * There is a need sometimes for each element in a model to have a unique identifier.
- * Normally this would be left to a name, but since the element maker gives it its name
- * there is a chance that a model could have two elements with the same name. If they
- * are the same element type then there would be no way to differenciate between the two.
- * The following getter and setter will provide a unique identifier. This identifier will be known
- * as the muid or Model Unique Identifier. Unlike a uuid it will only be assured uniqueness
- * within its own model. The intention is to use a unique number appended to the end
- * of the name.
- * The following is the getter
- * @return String the unique identifier
- */
-
- public String getMUID();
-
-
-
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java
deleted file mode 100644
index ec0cfd8bb..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* This is where we store all the state data that various UIs
-* (such as the NewWSDLCreationWizard) capture from the user
-* and then need to process.
-*/
-public class ElementAdapter implements ElementListener
-{
- /**
- * Called when a property is added to the model.
- * @param event The event containing the model, property and value.
- */
- public void propertyAdded ( PropertyAddEvent event )
- {
- }
-
- /**
- * Called when a property in the model changes.
- * @param event The event containing the model, property, old value
- * and new value.
- */
- public void propertyChanged ( PropertyChangeEvent event )
- {
- }
-
- /**
- * Called when a property in the model is removed.
- * @param event The event containing the model, property and old value.
- */
- public void propertyRemoved ( PropertyRemoveEvent event )
- {
- }
-
- /**
- * Called when a property is added to the model.
- * @param event The event containing the model, property and value.
- */
- public void relAdded ( RelAddEvent event )
- {
- }
-
- /**
- * Called when a property is added to the model.
- * @param event The event containing the model, property and value.
- */
- public void relRemoved ( RelRemoveEvent event )
- {
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java
deleted file mode 100644
index 44819e36b..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* This is where we store all the state data that various UIs
-* (such as the NewWSDLCreationWizard) capture from the user
-* and then need to process.
-*/
-public interface ElementListener
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Called when a property is added to the model.
- * @param event The event containing the model, property and value.
- */
- public void propertyAdded ( PropertyAddEvent event );
-
- /**
- * Called when a property in the model changes.
- * @param event The event containing the model, property, old value
- * and new value.
- */
- public void propertyChanged ( PropertyChangeEvent event );
-
- /**
- * Called when a property in the model is removed.
- * @param event The event containing the model, property and old value.
- */
- public void propertyRemoved ( PropertyRemoveEvent event );
-
- /**
- * Called when a property is added to the model.
- * @param event The event containing the model, property and value.
- */
- public void relAdded ( RelAddEvent event );
-
- /**
- * Called when a property is added to the model.
- * @param event The event containing the model, property and value.
- */
- public void relRemoved ( RelRemoveEvent event );
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java
deleted file mode 100644
index 72f297a11..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
-* This is the abstract class for a simple data model consisting of
-* a network of named nodes (class Node). Every node carries a set
-* of named properties (class Property). Nodes are interrelated by
-* relationships (class Rel) and connections (class Connection).
-* Each Model keeps a registry of all of its nodes, and keeps a
-* reference to one "root" node that can be used as a starting
-* point for navigation.
-*/
-public interface Model
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Sets the name of the model.
- * @param name The name of the model.
- */
- public void setName ( String name );
-
- /**
- * Gets the name of the model.
- * @return String The name of the model. This must not be null.
- */
- public String getName ();
-
- /**
- * Sets a node as the root of the model. If the node does not
- * belong to a model, then it is added automatically. If the
- * node already belongs to another model, then the root node
- * is not set and method returns false.
- * @param root The node to set as the root. The node must
- * belong either to this model or to no model. This must
- * not be null.
- * @return boolean True if the node was set as the root.
- * This method returns false if the given node already belongs
- * to another model.
- */
- public boolean setRootElement ( Element root );
-
- /**
- * Returns the root node. This method always returns a node
- * except on an empty Model. If setRootNode() has not been
- * called, or if the last root node was removed from the model,
- * then the method will select and return an arbitrary node as
- * the root. This method will consistently return the same node
- * until either
- * (a) setRootNode() is called with a different node or
- * (b) removeNode() is called to remove the node from the model.
- * @return Node The current root node, or null if the model is empty.
- */
-
- public Element getRootElement ();
-
- /**
- * Get the elements that have this name
- * @param String name the name of the element
- * @return Vector a vector of elements that have this name
- * These elements may be of different types
- **/
-
- public Vector getElementsByName(String name);
-
- /**
- * Adds a node to the model. If the node already belongs to another
- * model then it will not be added.
- * @param node The node to add. This must not be null.
- * @return boolean True if the node was added successfully.
- * This method returns false if the given node already belongs to
- * the current model or to another model.
- */
- public boolean addElement ( Element element );
-
- /**
- * Removes a node from the model.
- * @param node The node to remove. This must not be null.
- * @return boolean True if the node was removed successfully.
- * This method returns false if the given node does not belong
- * to this model.
- */
- public boolean removeElement ( Element element );
-
- /**
- * Returns an enumeration of all nodes in the model and in no
- * particular order,
- * @return Enumeration An enumeration of all nodes in the model.
- * This method never returns null.
- */
- public Enumeration getElements ();
-
- /**
- * Returns the number of nodes in the model.
- * @return int The number of nodes in the model.
- * This method never returns a negative value.
- */
- public int getNumberOfElements ();
-
- /**
- * Determines if this model contains the given node.
- * @param node The node to check for. This must not be null.
- * @return boolean True if and only if the model contains the node.
- */
- public boolean containsElement ( Element element );
-
- /*
- * This function will provide the next number in the queue for the MUID
- *
- */
- public int getUniqueNumber();
-
- /*
- * heres what we call from the element
- */
- public String makeMUID(String name);
-
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java
deleted file mode 100644
index 8e793ba7c..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* This is the abstract class for properties of a Node.
-* Every property has an immutable name and a value of type Object.
-*/
-public interface Property
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Every Node has a property called "name" that is equivalent
- * to and kept synchronized with Node.getName() and Node.setName().
- */
- public static final String NAME = "name";
-
- /**
- * Returns a shallow clone of this <code>Property</code>.
- * Property key and value references are cloned,
- * but the value objects themselves are not cloned.
- * @return Property A new Property.
- */
- public Property shallowClone ();
-
- /**
- * Returns the name of this node.
- * @return String The name of this node.
- */
- public String getName ();
-
- /**
- * Sets the value of this property.
- * @param value The value to set. Any previous value is replaced.
- */
- public void setValue ( Object value );
-
- /**
- * Returns the value of this property.
- * @return Object The value of this property, possibly null.
- */
- public Object getValue ();
-
- /**
- * Sets the value of this property as a string.
- * @param value The string to set. Any previous value is replaced.
- * The type of the previous value, if any, is of no consequence.
- */
- public void setValueAsString ( String value );
-
- /**
- * Returns the value of this property as a string.
- * @return String the value of this property as a string, possibly null.
- * If the set value is an arbitrary Object, then Object.toString() is
- * returned.
- */
- public String getValueAsString ();
-}
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java
deleted file mode 100644
index 62fc05805..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is added to the model.
-*/
-public class PropertyAddEvent
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The model the changed.
- */
- protected BasicElement fElement;
-
- /**
- * The property that was added.
- */
- protected Property fProperty;
-
-
- /**
- * Constructor.
- * @param model The model that changed.
- * @param property The property that was added.
- * @param value The property's value.
- */
- public PropertyAddEvent ( BasicElement element, Property property)
- {
- fElement = element;
- fProperty = property;
- }
-
- /**
- * Returns the model that changed (that produced this event).
- * @return TinyModel The model that changed.
- */
- public BasicElement getElement ()
- {
- return fElement;
- }
-
- /**
- * Returns the model property that was added.
- * @return TinyModel The property that was added.
- */
- public Property getProperty ()
- {
- return fProperty;
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java
deleted file mode 100644
index 0ade7cb29..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is changed in the model.
-*/
-public class PropertyChangeEvent
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The model the changed.
- */
- protected BasicElement fElement;
-
- /**
- * The property that changed.
- */
- protected Property fProperty;
-
- /**
- * The property's old value.
- */
- protected Property fOldProperty;
-
- /**
- * Constructor.
- * @param model The model that changed.
- * @param property The property that changed.
- * @param oldValue The property's old value.
- * @param newValue The property's new value.
- */
- public PropertyChangeEvent ( BasicElement element , Property property, Property oldProperty )
- {
- fElement = element;
- fProperty = property;
- fOldProperty = oldProperty;
- }
-
- /**
- * Returns the model that changed (that produced this event).
- * @return TinyModel The model that changed.
- */
- public BasicElement getElement ()
- {
- return fElement;
- }
-
- /**
- * Returns the model property that changed.
- * @return TinyModel The property that changed.
- */
- public Property getProperty ()
- {
- return fProperty;
- }
-
- /**
- * Returns the model property's old value.
- * @return TinyModel The property's old value.
- */
- public Property getOldProperty ()
- {
- return fOldProperty;
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java
deleted file mode 100644
index be468da8c..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is removed from the model.
-*/
-public class PropertyRemoveEvent
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The model the changed.
- */
- protected BasicElement fElement;
-
- /**
- * The property that was removed.
- */
- protected Property fProperty;
-
- /**
- * Constructor.
- * @param model The model that changed.
- * @param property The property that was removed.
- * @param value The property's value.
- */
- public PropertyRemoveEvent ( BasicElement element, Property property)
- {
- fElement = element;
- fProperty = property;
- }
-
- /**
- * Returns the model that changed (that produced this event).
- * @return TinyModel The model that changed.
- */
- public BasicElement getElement ()
- {
- return fElement;
- }
-
- /**
- * Returns the model property that was removed.
- * @return TinyModel The property that was removed.
- */
- public Property getProperty ()
- {
- return fProperty;
- }
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java
deleted file mode 100644
index 661a6dfc3..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-import java.util.Enumeration;
-
-/**
-* This is the abstract class for relationships in a Model.
-*/
-public interface Rel
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Returns the name of this relationship. Relationship names
- * cannot be changed.
- * @return String The name of the relationship.
- */
- public String getName ();
-
- /**
- * Returns the node that owns this relationship.
- * @return Node The node that owns this relationship.
- * This method never returns null, that is, relationships
- * cannot exist in the absence of a node.
- */
- public Element getSourceElement();
-
- /**
- * Returns an enumeration of all nodes in this relationship.
- * @return Enumeration The nodes in this relationship.
- * This method never returns null.
- */
- public Enumeration getTargetElements ();
-
- /**
- * Returns the number of nodes in this relationship.
- * @return int The number of nodes in this relationship.
- * This method never returns a negative value.
- */
- public int getNumberOfTargetElements ();
-
- /**
- * Adds a connection to this relationship. This method is
- * intended for use by derivations of the Model framework,
- * not by users of the framework. Connection objects should
- * only be constructed, added, removed and retrieved by
- * implementations of the Node and Rel interfaces.
- * @param connection The connection to add.
- */
- public void addConnection ( Connection connection );
-
- /**
- * Removes a connection from this relationship. This method is
- * intended for use by derivations of the Model framework,
- * not by users of the framework. Connection objects should
- * only be constructed, added, removed and retrieved by
- * implementations of the Node and Rel interfaces.
- * @param connection The connection to remove.
- * @return boolean True if the connection was found and removed.
- */
- public boolean removeConnection ( Connection connection );
-
- /**
- * Returns the Connection object for the given target node.
- * This method is intended for use by derivations of the Model
- * framework, not by users of the framework. Connection objects
- * should only be constructed, added, removed and retrieved by
- * implementations of the Node and Rel interfaces.
- * @param targetNode The node to find the Connection to.
- * @return Connection The connection, or null if none.
- */
- public Connection getConnectionTo ( Element targetElement );
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java
deleted file mode 100644
index 41a10f739..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is added to the model.
-*/
-public class RelAddEvent
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The model the changed.
- */
- protected Connection fOutBound;
-
- /**
- * The model the changed.
- */
- protected Connection fInBound;
-
- /**
- * The property that was added.
- */
- protected Property fProperty;
-
-
- /**
- * Constructor.
- * @param model The model that changed.
- * @param property The property that was added.
- * @param value The property's value.
- */
- public RelAddEvent (Connection[] pair)
- {
- fOutBound = pair[BasicConnection.OUTBOUND];
- fInBound = pair[BasicConnection.INBOUND];
- }
-
- /**
- * Returns the outbound connection that changed
- **/
- public Connection getOutBoundConnection ()
- {
- return fOutBound;
- }
-
- /**
- * Returns the changed rel name
- **/
- public String getOutBoundRelName()
- {
- return fOutBound.getRel().getName();
- }
-
- /**
- * Returns the changed rel
- **/
- public Rel getOutBoundRel()
- {
- return fOutBound.getRel();
- }
-
- /**
- * Returns the changed rel name
- **/
- public String getInBoundRelName()
- {
- return fInBound.getRel().getName();
- }
-
- /**
- * Returns the changed rel
- **/
- public Rel getInBoundRel()
- {
- return fInBound.getRel();
- }
-
- /**
- * Returns the outbound element that changed
- **/
- public Element getParentElement ()
- {
- return fOutBound.getElement();
- }
-
-
- /**
- * Returns the inbound connection that changed
- **/
- public Element getChildElement ()
- {
- return fInBound.getElement();
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java
deleted file mode 100644
index d8fa4f764..000000000
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.datamodel;
-
-/**
-* Carries data relevant to when a property is added to the model.
-*/
-public class RelRemoveEvent
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The model the changed.
- */
- protected Connection fOutBound;
-
- /**
- * The model the changed.
- */
- protected Connection fInBound;
-
- /**
- * The property that was added.
- */
- protected Property fProperty;
-
-
- /**
- * Constructor.
- * @param model The model that changed.
- * @param property The property that was added.
- * @param value The property's value.
- */
- public RelRemoveEvent (Connection[] pair)
- {
- fOutBound = pair[BasicConnection.OUTBOUND];
- fInBound = pair[BasicConnection.INBOUND];
- }
-
- /**
- * Returns the model that changed (that produced this event).
- * @return TinyModel The model that changed.
- */
- public Connection getOutBound ()
- {
- return fOutBound;
- }
-
- /**
- * Returns the model property that was added.
- * @return TinyModel The property that was added.
- */
- public Connection getInBound ()
- {
- return fInBound;
- }
-
- /**
- * Returns the changed rel name
- **/
- public String getOutBoundRelName()
- {
- return fOutBound.getRel().getName();
- }
-
- /**
- * Returns the changed rel
- **/
- public Rel getOutBoundRel()
- {
- return fOutBound.getRel();
- }
-
- /**
- * Returns the changed rel name
- **/
- public String getInBoundRelName()
- {
- return fInBound.getRel().getName();
- }
-
- /**
- * Returns the changed rel
- **/
- public Rel getInBoundRel()
- {
- return fInBound.getRel();
- }
-
-
- /**
- * Returns the outbound element that changed
- **/
- public Element getOutBoundElement ()
- {
- return fOutBound.getElement();
- }
-
-
- /**
- * Returns the inbound connection that changed
- **/
- public Element getInboundElement ()
- {
- return fInBound.getElement();
- }
-
-
-
-}
-
-

Back to the top