Author: objectiser Date: 2010-07-07 17:27:59 -0400 (Wed, 07 Jul 2010) New Revision: 315 Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java Log: Change contract model to remove scribble specific aspects. The only scribble aspect left is the use of the type references. Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java 2010-07-07 21:26:33 UTC (rev 314) +++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java 2010-07-07 21:27:59 UTC (rev 315) @@ -17,17 +17,11 @@ */ package org.jboss.savara.contract.model; -import org.scribble.model.ContainmentList; -import org.scribble.model.ModelObject; -import org.scribble.model.Reference; - /** * This class represents the contract. */ -public class Contract extends ModelObject { +public class Contract { - private static final long serialVersionUID = 1826808390992159186L; - /** * The default constructor. */ @@ -77,12 +71,33 @@ * * @return The list of interfaces */ - @Reference(containment=true) - public java.util.List<Interface> getInterfaces() { + public java.util.Set<Interface> getInterfaces() { return(m_interfaces); } /** + * This method returns the interface associated + * with the supplied name. + * + * @param name The interface name + * @return The interface, or null if not found. + */ + public Interface getInterface(String name) { + Interface ret=null; + + java.util.Iterator<Interface> iter=getInterfaces().iterator(); + while (ret == null && iter.hasNext()) { + ret = iter.next(); + + if (ret.getName().equals(name) == false) { + ret = null; + } + } + + return(ret); + } + + /** * This method returns the list of namespaces. * If a namespace is used in the contract that does * not exist in this list, then a dynamic prefix should @@ -90,15 +105,14 @@ * * @return The list of namespaces */ - @Reference(containment=true) - public java.util.List<Namespace> getNamespaces() { + public java.util.Set<Namespace> getNamespaces() { return(m_namespaces); } private String m_name=null; private String m_namespace=null; - private java.util.List<Interface> m_interfaces= - new ContainmentList<Interface>(this, Interface.class); - private java.util.List<Namespace> m_namespaces= - new java.util.Vector<Namespace>(); + private java.util.Set<Interface> m_interfaces= + new java.util.HashSet<Interface>(); + private java.util.Set<Namespace> m_namespaces= + new java.util.HashSet<Namespace>(); } Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java 2010-07-07 21:26:33 UTC (rev 314) +++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java 2010-07-07 21:27:59 UTC (rev 315) @@ -17,18 +17,13 @@ */ package org.jboss.savara.contract.model; -import org.scribble.model.ContainmentList; -import org.scribble.model.ModelObject; -import org.scribble.model.Reference; import org.scribble.model.TypeReference; /** * This class represents the fault details. */ -public class FaultDetails extends ModelObject { +public class FaultDetails { - private static final long serialVersionUID = 3197411493758826511L; - /** * The default constructor. */ @@ -78,7 +73,6 @@ * * @return The list of type references */ - @Reference(containment=true) public java.util.List<TypeReference> getTypes() { return(m_types); } @@ -86,5 +80,5 @@ private String m_name=null; private String m_namespace=null; private java.util.List<TypeReference> m_types= - new ContainmentList<TypeReference>(this, TypeReference.class); + new java.util.Vector<TypeReference>(); } Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-07 21:26:33 UTC (rev 314) +++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-07 21:27:59 UTC (rev 315) @@ -17,18 +17,12 @@ */ package org.jboss.savara.contract.model; -import org.scribble.model.ContainmentList; -import org.scribble.model.ModelObject; -import org.scribble.model.Reference; - /** * This class represents an interface, as part of a contract. * */ -public class Interface extends ModelObject { +public class Interface { - private static final long serialVersionUID = -5867002445215817481L; - /** * The default constructor. */ @@ -78,7 +72,6 @@ * * @return The list of message exchange patterns */ - @Reference(containment=true) public java.util.List<MessageExchangePattern> getMessageExchangePatterns() { return(m_messageExchangePatterns); } @@ -86,5 +79,5 @@ private String m_name=null; private String m_namespace=null; private java.util.List<MessageExchangePattern> m_messageExchangePatterns= - new ContainmentList<MessageExchangePattern>(this, MessageExchangePattern.class); + new java.util.Vector<MessageExchangePattern>(); } Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java 2010-07-07 21:26:33 UTC (rev 314) +++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java 2010-07-07 21:27:59 UTC (rev 315) @@ -17,18 +17,13 @@ */ package org.jboss.savara.contract.model; -import org.scribble.model.ContainmentList; -import org.scribble.model.ModelObject; -import org.scribble.model.Reference; import org.scribble.model.TypeReference; /** * This class represents the message exchange pattern. */ -public abstract class MessageExchangePattern extends ModelObject { +public abstract class MessageExchangePattern { - private static final long serialVersionUID = 6024134205644784735L; - /** * The default constructor. */ @@ -60,12 +55,11 @@ * * @return The list of type references */ - @Reference(containment=true) public java.util.List<TypeReference> getTypes() { return(m_types); } private String m_operation=null; private java.util.List<TypeReference> m_types= - new ContainmentList<TypeReference>(this, TypeReference.class); + new java.util.Vector<TypeReference>(); } Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java 2010-07-07 21:26:33 UTC (rev 314) +++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java 2010-07-07 21:27:59 UTC (rev 315) @@ -17,15 +17,11 @@ */ package org.jboss.savara.contract.model; -import org.scribble.model.ModelObject; - /** * This class represents the namespace. */ -public class Namespace extends ModelObject { +public class Namespace { - private static final long serialVersionUID = -2756456243428682166L; - /** * The default constructor. */ Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java 2010-07-07 21:26:33 UTC (rev 314) +++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java 2010-07-07 21:27:59 UTC (rev 315) @@ -22,8 +22,6 @@ */ public class OneWayRequestMEP extends MessageExchangePattern { - private static final long serialVersionUID = 1798545946621135972L; - /** * The default constructor. */ Modified: trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java 2010-07-07 21:26:33 UTC (rev 314) +++ trunk/tools/plugins/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java 2010-07-07 21:27:59 UTC (rev 315) @@ -17,8 +17,6 @@ */ package org.jboss.savara.contract.model; -import org.scribble.model.ContainmentList; -import org.scribble.model.Reference; import org.scribble.model.TypeReference; /** @@ -26,8 +24,6 @@ */ public class RequestResponseMEP extends MessageExchangePattern { - private static final long serialVersionUID = -2468151434616043577L; - /** * The default constructor. */ @@ -39,7 +35,6 @@ * * @return The list of response type references */ - @Reference(containment=true) public java.util.List<TypeReference> getResponseTypes() { return(m_responseTypes); } @@ -49,13 +44,12 @@ * * @return The list of fault details */ - @Reference(containment=true) public java.util.List<FaultDetails> getFaultDetails() { return(m_faultDetails); } private java.util.List<TypeReference> m_responseTypes= - new ContainmentList<TypeReference>(this, TypeReference.class); + new java.util.Vector<TypeReference>(); private java.util.List<FaultDetails> m_faultDetails= - new ContainmentList<FaultDetails>(this, FaultDetails.class); + new java.util.Vector<FaultDetails>(); }