refactoring adding SE

refactoring adding SE

src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEAbstractActivity.java

@@ -26,8 +26,6 @@
 import java.util.Collection;
 
 import org.omg.essence.model.activityspaceandactivity.AbstractActivity;
-import org.omg.essence.model.activityspaceandactivity.ActivityAssociation;
-import org.omg.essence.model.activityspaceandactivity.Criterion;
 
 import mx.infotec.dads.essence.model.foundation.SEBasicElement;
 
@@ -64,27 +62,27 @@
 public abstract class SEAbstractActivity extends SEBasicElement implements AbstractActivity {
 
     /** The activity association. */
-    protected Collection<? extends ActivityAssociation> activityAssociation;
+    protected Collection<? extends SEActivityAssociation> activityAssociation;
 
     /**
      * The criterion. A collection of criteria that have to be fulfilled for
      * entering the activity or considering the activity completed
      */
-    protected Collection<? extends Criterion> criterion;
+    protected Collection<? extends SECriterion> criterion;
 
-    public Collection<? extends ActivityAssociation> getActivityAssociation() {
+    public Collection<? extends SEActivityAssociation> getActivityAssociation() {
         return activityAssociation;
     }
 
-    public void setActivityAssociation(Collection<? extends ActivityAssociation> activityAssociation) {
+    public void setActivityAssociation(Collection<? extends SEActivityAssociation> activityAssociation) {
         this.activityAssociation = activityAssociation;
     }
 
-    public Collection<? extends Criterion> getCriterion() {
+    public Collection<? extends SECriterion> getCriterion() {
         return criterion;
     }
 
-    public void setCriterion(Collection<? extends Criterion> criterion) {
+    public void setCriterion(Collection<? extends SECriterion> criterion) {
         this.criterion = criterion;
     }
 

src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEAction.java

@@ -27,10 +27,9 @@
 
 import org.omg.essence.model.activityspaceandactivity.Action;
 import org.omg.essence.model.activityspaceandactivity.ActionKind;
-import org.omg.essence.model.activityspaceandactivity.Activity;
-import org.omg.essence.model.alphaandworkproduct.Alpha;
-import org.omg.essence.model.alphaandworkproduct.WorkProduct;
 
+import mx.infotec.dads.essence.model.alphaandworkproduct.SEAlpha;
+import mx.infotec.dads.essence.model.alphaandworkproduct.SEWorkProduct;
 import mx.infotec.dads.essence.model.foundation.SELanguageElement;
 
 /**
@@ -88,38 +87,38 @@
 public class SEAction extends SELanguageElement implements Action {
 
     /** The activity. */
-    protected Activity activity;
+    protected SEActivity activity;
 
     /** The alpha. */
-    protected Collection<? extends Alpha> alpha;
+    protected Collection<? extends SEAlpha> alpha;
 
     /** The work product. */
-    protected Collection<? extends WorkProduct> workProduct;
+    protected Collection<? extends SEWorkProduct> workProduct;
 
     /** The kind. */
     protected ActionKind kind;
 
-    public Activity getActivity() {
+    public SEActivity getActivity() {
         return activity;
     }
 
-    public void setActivity(Activity activity) {
+    public void setActivity(SEActivity activity) {
         this.activity = activity;
     }
 
-    public Collection<? extends Alpha> getAlpha() {
+    public Collection<? extends SEAlpha> getAlpha() {
         return alpha;
     }
 
-    public void setAlpha(Collection<? extends Alpha> alpha) {
+    public void setAlpha(Collection<? extends SEAlpha> alpha) {
         this.alpha = alpha;
     }
 
-    public Collection<? extends WorkProduct> getWorkProduct() {
+    public Collection<? extends SEWorkProduct> getWorkProduct() {
         return workProduct;
     }
 
-    public void setWorkProduct(Collection<? extends WorkProduct> workProduct) {
+    public void setWorkProduct(Collection<? extends SEWorkProduct> workProduct) {
         this.workProduct = workProduct;
     }
 

src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEActivity.java

@@ -25,10 +25,9 @@
 
 import java.util.Collection;
 
-import org.omg.essence.model.activityspaceandactivity.Action;
 import org.omg.essence.model.activityspaceandactivity.Activity;
-import org.omg.essence.model.activityspaceandactivity.Approach;
-import org.omg.essence.model.competency.CompetencyLevel;
+
+import mx.infotec.dads.essence.model.competency.SECompetencyLevel;
 
 /**
  * <pre>
@@ -86,35 +85,35 @@
 public class SEActivity extends SEAbstractActivity implements Activity{
 
     /** The approach. */
-    private Collection<? extends Approach> approach;
+    private Collection<? extends SEApproach> approach;
 
     /** The action. */
-    private Collection<? extends Action> action;
+    private Collection<? extends SEAction> action;
 
     /** The required competency level. */
-    private Collection<? extends CompetencyLevel> requiredCompetencyLevel;
+    private Collection<? extends SECompetencyLevel> requiredCompetencyLevel;
 
-    public Collection<? extends Approach> getApproach() {
+    public Collection<? extends SEApproach> getApproach() {
         return approach;
     }
 
-    public void setApproach(Collection<? extends Approach> approach) {
+    public void setApproach(Collection<? extends SEApproach> approach) {
         this.approach = approach;
     }
 
-    public Collection<? extends Action> getAction() {
+    public Collection<? extends SEAction> getAction() {
         return action;
     }
 
-    public void setAction(Collection<? extends Action> action) {
+    public void setAction(Collection<? extends SEAction> action) {
         this.action = action;
     }
 
-    public Collection<? extends CompetencyLevel> getRequiredCompetencyLevel() {
+    public Collection<? extends SECompetencyLevel> getRequiredCompetencyLevel() {
         return requiredCompetencyLevel;
     }
 
-    public void setRequiredCompetencyLevel(Collection<? extends CompetencyLevel> requiredCompetencyLevel) {
+    public void setRequiredCompetencyLevel(Collection<? extends SECompetencyLevel> requiredCompetencyLevel) {
         this.requiredCompetencyLevel = requiredCompetencyLevel;
     }
 

src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEActivityAssociation.java

@@ -23,7 +23,6 @@
  */
 package mx.infotec.dads.essence.model.activityspaceandactivity;
 
-import org.omg.essence.model.activityspaceandactivity.AbstractActivity;
 import org.omg.essence.model.activityspaceandactivity.ActivityAssociation;
 
 import mx.infotec.dads.essence.model.foundation.SELanguageElement;
@@ -83,27 +82,27 @@
 public class SEActivityAssociation extends SELanguageElement implements ActivityAssociation{
 
     /** The first member of the association. */
-    private AbstractActivity end2;
+    private SEAbstractActivity end2;
 
     /** The second member of the association. */
-    private AbstractActivity end1;
+    private SEAbstractActivity end1;
 
     /** The kind of the association. */
     private String kind;
 
-    public AbstractActivity getEnd2() {
+    public SEAbstractActivity getEnd2() {
         return end2;
     }
 
-    public void setEnd2(AbstractActivity end2) {
+    public void setEnd2(SEAbstractActivity end2) {
         this.end2 = end2;
     }
 
-    public AbstractActivity getEnd1() {
+    public SEAbstractActivity getEnd1() {
         return end1;
     }
 
-    public void setEnd1(AbstractActivity end1) {
+    public void setEnd1(SEAbstractActivity end1) {
         this.end1 = end1;
     }
 

src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEActivitySpace.java

@@ -26,7 +26,8 @@
 import java.util.Collection;
 
 import org.omg.essence.model.activityspaceandactivity.ActivitySpace;
-import org.omg.essence.model.alphaandworkproduct.Alpha;
+
+import mx.infotec.dads.essence.model.alphaandworkproduct.SEAlpha;
 
 /**
  * <pre>
@@ -71,13 +72,13 @@ public class SEActivitySpace extends SEAbstractActivity implements ActivitySpace
      * A collection of alphas that have to be present to be successful in
      * fulfilling the objectives of this activity space.
      */
-    private Collection<? extends Alpha> input;
+    private Collection<? extends SEAlpha> input;
 
-    public Collection<? extends Alpha> getInput() {
+    public Collection<? extends SEAlpha> getInput() {
         return input;
     }
 
-    public void setInput(Collection<? extends Alpha> input) {
+    public void setInput(Collection<? extends SEAlpha> input) {
         this.input = input;
     }
 

src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEApproach.java

@@ -23,7 +23,6 @@
  */
 package mx.infotec.dads.essence.model.activityspaceandactivity;
 
-import org.omg.essence.model.activityspaceandactivity.Activity;
 import org.omg.essence.model.activityspaceandactivity.Approach;
 
 import mx.infotec.dads.essence.model.foundation.SELanguageElement;
@@ -61,7 +60,7 @@
 public class SEApproach extends SELanguageElement implements Approach {
 
     /** The activity */
-    private Activity activity;
+    private SEActivity activity;
 
     /** The name of the Approach */
     private String name;
@@ -71,11 +70,11 @@ public class SEApproach extends SELanguageElement implements Approach {
      */
     private String description;
 
-    public Activity getActivity() {
+    public SEActivity getActivity() {
         return activity;
     }
 
-    public void setActivity(Activity activity) {
+    public void setActivity(SEActivity activity) {
         this.activity = activity;
     }
 

src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SECriterion.java

@@ -23,11 +23,10 @@
  */
 package mx.infotec.dads.essence.model.activityspaceandactivity;
 
-import org.omg.essence.model.activityspaceandactivity.AbstractActivity;
 import org.omg.essence.model.activityspaceandactivity.Criterion;
-import org.omg.essence.model.alphaandworkproduct.LevelOfDetail;
-import org.omg.essence.model.alphaandworkproduct.State;
 
+import mx.infotec.dads.essence.model.alphaandworkproduct.SELevelOfDetail;
+import mx.infotec.dads.essence.model.alphaandworkproduct.SEState;
 import mx.infotec.dads.essence.model.foundation.SELanguageElement;
 
 /**
@@ -70,38 +69,38 @@
 public abstract class SECriterion extends SELanguageElement implements Criterion {
 
     /** The activity. */
-    protected AbstractActivity activity;
+    protected SEAbstractActivity activity;
 
     /** A state to be reached. */
-    protected State state;
+    protected SEState state;
 
     /** A level of detail to be reached. */
-    protected LevelOfDetail levelOfDetail;
+    protected SELevelOfDetail levelOfDetail;
 
     /** The description of the Criterion */
     protected String description;
 
-    public AbstractActivity getActivity() {
+    public SEAbstractActivity getActivity() {
         return activity;
     }
 
-    public void setActivity(AbstractActivity activity) {
+    public void setActivity(SEAbstractActivity activity) {
         this.activity = activity;
     }
 
-    public State getState() {
+    public SEState getState() {
         return state;
     }
 
-    public void setState(State state) {
+    public void setState(SEState state) {
         this.state = state;
     }
 
-    public LevelOfDetail getLevelOfDetail() {
+    public SELevelOfDetail getLevelOfDetail() {
         return levelOfDetail;
     }
 
-    public void setLevelOfDetail(LevelOfDetail levelOfDetail) {
+    public void setLevelOfDetail(SELevelOfDetail levelOfDetail) {
         this.levelOfDetail = levelOfDetail;
     }