[jbpm-commits] JBoss JBPM SVN: r1577 - in api/trunk/modules/api: scripts and 2 other directories.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-07-10 13:18:06 -0400 (Thu, 10 Jul 2008)
New Revision: 1577

Modified:
   api/trunk/modules/api/pom.xml
   api/trunk/modules/api/scripts/antrun-schemagen.xml
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java
   api/trunk/modules/api/src/main/resources/org/jboss/bpm/model/jaxb.index
Log:
interface NamedFlowObject

Modified: api/trunk/modules/api/pom.xml
===================================================================
--- api/trunk/modules/api/pom.xml	2008-07-10 17:10:40 UTC (rev 1576)
+++ api/trunk/modules/api/pom.xml	2008-07-10 17:18:06 UTC (rev 1577)
@@ -86,7 +86,6 @@
             <include>InclusiveGateway.java</include>
             <include>ItermediateEvent.java</include>
             <include>MessageFlow.java</include>
-            <include>NamedFlowObject.java</include>
             <include>ParallelGateway.java</include>
             <include>Process.java</include>
             <include>SequenceFlow.java</include>

Modified: api/trunk/modules/api/scripts/antrun-schemagen.xml
===================================================================
--- api/trunk/modules/api/scripts/antrun-schemagen.xml	2008-07-10 17:10:40 UTC (rev 1576)
+++ api/trunk/modules/api/scripts/antrun-schemagen.xml	2008-07-10 17:18:06 UTC (rev 1577)
@@ -36,7 +36,6 @@
       <include name="InclusiveGateway.java"/>
       <include name="ItermediateEvent.java"/>
       <include name="MessageFlow.java"/>
-      <include name="NamedFlowObject.java"/>
       <include name="ParallelGateway.java"/>
       <include name="Process.java"/>
       <include name="SequenceFlow.java"/>

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java	2008-07-10 17:10:40 UTC (rev 1576)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java	2008-07-10 17:18:06 UTC (rev 1577)
@@ -21,6 +21,7 @@
  */
 package org.jboss.bpm.model;
 
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
 // $Id$
@@ -34,8 +35,10 @@
  * @since 08-Jul-2008
  */
 @XmlType(name="Activity")
-public abstract class Activity extends NamedFlowObject
+public abstract class Activity extends FlowObject implements NamedFlowObject
 {
+  private String name;
+  
   /**
    * Construct an anonymous Activity
    */
@@ -48,6 +51,28 @@
    */
   public Activity(String name)
   {
-    super(name);
+    this.name = name;
   }
+  
+  /**
+   * Get the name
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Set the name.
+   * Note, this MUST NOT leak into the public API.
+   */
+  // TODO
+  @XmlAttribute(required = true)
+  public void setName(String name)
+  {
+    if (this.name != null)
+      throw new IllegalStateException("Cannot rename: " + name);
+
+    this.name = name;
+  }
 }
\ No newline at end of file

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java	2008-07-10 17:10:40 UTC (rev 1576)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java	2008-07-10 17:18:06 UTC (rev 1577)
@@ -42,7 +42,7 @@
  * @since 08-Jul-2008
  */
 @XmlType(name="EndEvent")
-public class EndEvent extends Event
+public class EndEvent extends Event implements NamedFlowObject
 {
   private String name;
   private Result result;

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java	2008-07-10 17:10:40 UTC (rev 1576)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java	2008-07-10 17:18:06 UTC (rev 1577)
@@ -21,9 +21,6 @@
  */
 package org.jboss.bpm.model;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
 //$Id$
 
 /**
@@ -32,45 +29,10 @@
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
- at XmlType(name = "NamedFlowObject")
-public abstract class NamedFlowObject extends FlowObject
+public interface NamedFlowObject
 {
-  private String name;
-
   /**
-   * Construct an anonymous NamedFlowObject
-   */
-  public NamedFlowObject()
-  {
-  }
-
-  /**
-   * Construct a NamedFlowObject with a given name
-   */
-  public NamedFlowObject(String name)
-  {
-    this.name = name;
-  }
-  
-  /**
    * Get the name
    */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Set the name.
-   * Note, this MUST NOT leak into the public API.
-   */
-  // TODO
-  @XmlAttribute(required = true)
-  public void setName(String name)
-  {
-    if (this.name != null)
-      throw new IllegalStateException("Cannot rename: " + name);
-
-    this.name = name;
-  }
+  String getName();
 }
\ No newline at end of file

Modified: api/trunk/modules/api/src/main/resources/org/jboss/bpm/model/jaxb.index
===================================================================
--- api/trunk/modules/api/src/main/resources/org/jboss/bpm/model/jaxb.index	2008-07-10 17:10:40 UTC (rev 1576)
+++ api/trunk/modules/api/src/main/resources/org/jboss/bpm/model/jaxb.index	2008-07-10 17:18:06 UTC (rev 1577)
@@ -9,7 +9,6 @@
 InclusiveGateway
 ItermediateEvent
 MessageFlow
-NamedFlowObject
 ParallelGateway
 Process
 SequenceFlow