refactoring interfaces

danimaniarqsoft · May 12, 2017 · 6538b2d · 6538b2d
1 parent 10b3748
commit 6538b2d
Show file tree

Hide file tree

Showing 24 changed files with 193 additions and 187 deletions.
diff --git a/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEAbstractActivity.java b/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEAbstractActivity.java
@@ -64,27 +64,27 @@
 public abstract class SEAbstractActivity extends SEBasicElement implements AbstractActivity {
 
     /** The activity association. */
-    private Collection<SEActivityAssociation> activityAssociation;
+    protected Collection<? extends ActivityAssociation> activityAssociation;
 
     /**
      * The criterion. A collection of criteria that have to be fulfilled for
      * entering the activity or considering the activity completed
      */
-    private Collection<Criterion> criterion;
+    protected Collection<? extends Criterion> criterion;
 
-    public Collection<SEActivityAssociation> getActivityAssociation() {
+    public Collection<? extends ActivityAssociation> getActivityAssociation() {
         return activityAssociation;
     }
 
-    public void setActivityAssociation(Collection<SEActivityAssociation> activityAssociation) {
+    public void setActivityAssociation(Collection<? extends ActivityAssociation> activityAssociation) {
         this.activityAssociation = activityAssociation;
     }
 
-    public Collection<Criterion> getCriterion() {
+    public Collection<? extends Criterion> getCriterion() {
         return criterion;
     }
 
-    public void setCriterion(Collection<Criterion> criterion) {
+    public void setCriterion(Collection<? extends Criterion> criterion) {
         this.criterion = criterion;
     }
 

diff --git a/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEAction.java b/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEAction.java
@@ -88,16 +88,16 @@
 public class SEAction extends SELanguageElement implements Action {
 
     /** The activity. */
-    private Activity activity;
+    protected Activity activity;
 
     /** The alpha. */
-    private Collection<Alpha> alpha;
+    protected Collection<? extends Alpha> alpha;
 
     /** The work product. */
-    private Collection<WorkProduct> workProduct;
+    protected Collection<? extends WorkProduct> workProduct;
 
     /** The kind. */
-    private ActionKind kind;
+    protected ActionKind kind;
 
     public Activity getActivity() {
         return activity;
@@ -107,19 +107,19 @@ public void setActivity(Activity activity) {
         this.activity = activity;
     }
 
-    public Collection<Alpha> getAlpha() {
+    public Collection<? extends Alpha> getAlpha() {
         return alpha;
     }
 
-    public void setAlpha(Collection<Alpha> alpha) {
+    public void setAlpha(Collection<? extends Alpha> alpha) {
         this.alpha = alpha;
     }
 
-    public Collection<WorkProduct> getWorkProduct() {
+    public Collection<? extends WorkProduct> getWorkProduct() {
         return workProduct;
     }
 
-    public void setWorkProduct(Collection<WorkProduct> workProduct) {
+    public void setWorkProduct(Collection<? extends WorkProduct> workProduct) {
         this.workProduct = workProduct;
     }
 

diff --git a/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEActivity.java b/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEActivity.java
@@ -86,35 +86,35 @@
 public class SEActivity extends SEAbstractActivity implements Activity{
 
     /** The approach. */
-    private Collection<Approach> approach;
+    private Collection<? extends Approach> approach;
 
     /** The action. */
-    private Collection<Action> action;
+    private Collection<? extends Action> action;
 
     /** The required competency level. */
-    private Collection<CompetencyLevel> requiredCompetencyLevel;
+    private Collection<? extends CompetencyLevel> requiredCompetencyLevel;
 
-    public Collection<Approach> getApproach() {
+    public Collection<? extends Approach> getApproach() {
         return approach;
     }
 
-    public void setApproach(Collection<Approach> approach) {
+    public void setApproach(Collection<? extends Approach> approach) {
         this.approach = approach;
     }
 
-    public Collection<Action> getAction() {
+    public Collection<? extends Action> getAction() {
         return action;
     }
 
-    public void setAction(Collection<Action> action) {
+    public void setAction(Collection<? extends Action> action) {
         this.action = action;
     }
 
-    public Collection<CompetencyLevel> getRequiredCompetencyLevel() {
+    public Collection<? extends CompetencyLevel> getRequiredCompetencyLevel() {
         return requiredCompetencyLevel;
     }
 
-    public void setRequiredCompetencyLevel(Collection<CompetencyLevel> requiredCompetencyLevel) {
+    public void setRequiredCompetencyLevel(Collection<? extends CompetencyLevel> requiredCompetencyLevel) {
         this.requiredCompetencyLevel = requiredCompetencyLevel;
     }
 

diff --git a/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEActivitySpace.java b/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SEActivitySpace.java
@@ -71,13 +71,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<Alpha> input;
+    private Collection<? extends Alpha> input;
 
-    public Collection<Alpha> getInput() {
+    public Collection<? extends Alpha> getInput() {
         return input;
     }
 
-    public void setInput(Collection<Alpha> input) {
+    public void setInput(Collection<? extends Alpha> input) {
         this.input = input;
     }
 

diff --git a/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SECriterion.java b/src/main/java/mx/infotec/dads/essence/model/activityspaceandactivity/SECriterion.java
@@ -70,16 +70,16 @@
 public abstract class SECriterion extends SELanguageElement implements Criterion {
 
     /** The activity. */
-    private AbstractActivity activity;
+    protected AbstractActivity activity;
 
     /** A state to be reached. */
-    private State state;
+    protected State state;
 
     /** A level of detail to be reached. */
-    private LevelOfDetail levelOfDetail;
+    protected LevelOfDetail levelOfDetail;
 
     /** The description of the Criterion */
-    private String description;
+    protected String description;
 
     public AbstractActivity getActivity() {
         return activity;

diff --git a/src/main/java/mx/infotec/dads/essence/model/alphaandworkproduct/SEAlpha.java b/src/main/java/mx/infotec/dads/essence/model/alphaandworkproduct/SEAlpha.java
@@ -104,36 +104,36 @@
 public class SEAlpha extends SEBasicElement implements Alpha {
 
     /** The states of the alpha. */
-    private Collection<State> states;
+    private Collection<? extends State> states;
 
     /** The action. */
-    private Collection<Action> action;
+    private Collection<? extends Action> action;
 
     /** The activity space. */
     private ActivitySpace activitySpace;
 
     /** The alpha containment. */
-    private Collection<AlphaContainment> alphaContainment;
+    private Collection<? extends AlphaContainment> alphaContainment;
 
     /** The alpha association. */
-    private Collection<AlphaAssociation> alphaAssociation;
+    private Collection<? extends AlphaAssociation> alphaAssociation;
 
     /** The work product manifest. */
-    private Collection<WorkProductManifest> workProductManifest;
+    private Collection<? extends WorkProductManifest> workProductManifest;
 
-    public Collection<State> getStates() {
+    public Collection<? extends State> getStates() {
         return states;
     }
 
-    public void setStates(Collection<State> states) {
+    public void setStates(Collection<? extends State> states) {
         this.states = states;
     }
 
-    public Collection<Action> getAction() {
+    public Collection<? extends Action> getAction() {
         return action;
     }
 
-    public void setAction(Collection<Action> action) {
+    public void setAction(Collection<? extends Action> action) {
         this.action = action;
     }
 
@@ -145,27 +145,27 @@ public void setActivitySpace(ActivitySpace activitySpace) {
         this.activitySpace = activitySpace;
     }
 
-    public Collection<AlphaContainment> getAlphaContainment() {
+    public Collection<? extends AlphaContainment> getAlphaContainment() {
         return alphaContainment;
     }
 
-    public void setAlphaContainment(Collection<AlphaContainment> alphaContainment) {
+    public void setAlphaContainment(Collection<? extends AlphaContainment> alphaContainment) {
         this.alphaContainment = alphaContainment;
     }
 
-    public Collection<AlphaAssociation> getAlphaAssociation() {
+    public Collection<? extends AlphaAssociation> getAlphaAssociation() {
         return alphaAssociation;
     }
 
-    public void setAlphaAssociation(Collection<AlphaAssociation> alphaAssociation) {
+    public void setAlphaAssociation(Collection<? extends AlphaAssociation> alphaAssociation) {
         this.alphaAssociation = alphaAssociation;
     }
 
-    public Collection<WorkProductManifest> getWorkProductManifest() {
+    public Collection<? extends WorkProductManifest> getWorkProductManifest() {
         return workProductManifest;
     }
 
-    public void setWorkProductManifest(Collection<WorkProductManifest> workProductManifest) {
+    public void setWorkProductManifest(Collection<? extends WorkProductManifest> workProductManifest) {
         this.workProductManifest = workProductManifest;
     }
 

diff --git a/src/main/java/mx/infotec/dads/essence/model/alphaandworkproduct/SELevelOfDetail.java b/src/main/java/mx/infotec/dads/essence/model/alphaandworkproduct/SELevelOfDetail.java
@@ -99,13 +99,13 @@ public class SELevelOfDetail extends SELanguageElement implements LevelOfDetail
     private String name;
 
     /** Checklist items to determine if the level of detail has been reached. */
-    private Collection<Checkpoint> checkListItem;
+    private Collection<? extends Checkpoint> checkListItem;
 
     /** Next level of detail. */
     private SELevelOfDetail successor;
 
     /** The criterion. */
-    private Collection<Criterion> criterion;
+    private Collection<? extends Criterion> criterion;
 
     /** The predecessor. */
     private SELevelOfDetail predecessor;
@@ -137,11 +137,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public Collection<Checkpoint> getCheckListItem() {
+    public Collection<? extends Checkpoint> getCheckListItem() {
         return checkListItem;
     }
 
-    public void setCheckListItem(Collection<Checkpoint> checkListItem) {
+    public void setCheckListItem(Collection<? extends Checkpoint> checkListItem) {
         this.checkListItem = checkListItem;
     }
 
@@ -153,11 +153,11 @@ public void setSuccessor(SELevelOfDetail successor) {
         this.successor = successor;
     }
 
-    public Collection<Criterion> getCriterion() {
+    public Collection<? extends Criterion> getCriterion() {
         return criterion;
     }
 
-    public void setCriterion(Collection<Criterion> criterion) {
+    public void setCriterion(Collection<? extends Criterion> criterion) {
         this.criterion = criterion;
     }
 

diff --git a/src/main/java/mx/infotec/dads/essence/model/alphaandworkproduct/SEState.java b/src/main/java/mx/infotec/dads/essence/model/alphaandworkproduct/SEState.java
@@ -85,13 +85,13 @@ public class SEState extends SELanguageElement implements State {
     private String description;
 
     /** A collection of checkpoints associated with the state. */
-    private Collection<Checkpoint> checkListItem;
+    private Collection<? extends Checkpoint> checkListItem;
 
     /** The successor state. */
     private SEState successor;
 
     /** The criterion. */
-    private Collection<Criterion> criterion;
+    private Collection<? extends Criterion> criterion;
 
     /** The alpha. */
     private Alpha alpha;
@@ -115,11 +115,11 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public Collection<Checkpoint> getCheckListItem() {
+    public Collection<? extends Checkpoint> getCheckListItem() {
         return checkListItem;
     }
 
-    public void setCheckListItem(Collection<Checkpoint> checkListItem) {
+    public void setCheckListItem(Collection<? extends Checkpoint> checkListItem) {
         this.checkListItem = checkListItem;
     }
 
@@ -131,11 +131,11 @@ public void setSuccessor(SEState successor) {
         this.successor = successor;
     }
 
-    public Collection<Criterion> getCriterion() {
+    public Collection<? extends Criterion> getCriterion() {
         return criterion;
     }
 
-    public void setCriterion(Collection<Criterion> criterion) {
+    public void setCriterion(Collection<? extends Criterion> criterion) {
         this.criterion = criterion;
     }
 

diff --git a/src/main/java/mx/infotec/dads/essence/model/alphaandworkproduct/SEWorkProduct.java b/src/main/java/mx/infotec/dads/essence/model/alphaandworkproduct/SEWorkProduct.java
@@ -79,35 +79,35 @@
 public class SEWorkProduct extends SEBasicElement implements WorkProduct {
 
     /** The level of details defined for the work product. */
-    private Collection<LevelOfDetail> levelOfDetail;
+    private Collection<? extends LevelOfDetail> levelOfDetail;
 
     /** The action. */
-    private Collection<Action> action;
+    private Collection<? extends Action> action;
 
     /** The work product manifest. */
-    private Collection<WorkProductManifest> workProductManifest;
+    private Collection<? extends WorkProductManifest> workProductManifest;
 
-    public Collection<LevelOfDetail> getLevelOfDetail() {
+    public Collection<? extends LevelOfDetail> getLevelOfDetail() {
         return levelOfDetail;
     }
 
-    public void setLevelOfDetail(Collection<LevelOfDetail> levelOfDetail) {
+    public void setLevelOfDetail(Collection<? extends LevelOfDetail> levelOfDetail) {
         this.levelOfDetail = levelOfDetail;
     }
 
-    public Collection<Action> getAction() {
+    public Collection<? extends Action> getAction() {
         return action;
     }
 
-    public void setAction(Collection<Action> action) {
+    public void setAction(Collection<? extends Action> action) {
         this.action = action;
     }
 
-    public Collection<WorkProductManifest> getWorkProductManifest() {
+    public Collection<? extends WorkProductManifest> getWorkProductManifest() {
         return workProductManifest;
     }
 
-    public void setWorkProductManifest(Collection<WorkProductManifest> workProductManifest) {
+    public void setWorkProductManifest(Collection<? extends WorkProductManifest> workProductManifest) {
         this.workProductManifest = workProductManifest;
     }
 

diff --git a/src/main/java/mx/infotec/dads/essence/model/competency/SECompetency.java b/src/main/java/mx/infotec/dads/essence/model/competency/SECompetency.java
@@ -69,13 +69,13 @@
 public class SECompetency extends SEBasicElement implements Competency {
 
     /** A collection of levels defined for this competency. */
-    private Collection<CompetencyLevel> possibleLevel;
+    private Collection<? extends CompetencyLevel> possibleLevel;
 
-    public Collection<CompetencyLevel> getPossibleLevel() {
+    public Collection<? extends CompetencyLevel> getPossibleLevel() {
         return possibleLevel;
     }
 
-    public void setPossibleLevel(Collection<CompetencyLevel> possibleLevel) {
+    public void setPossibleLevel(Collection<? extends CompetencyLevel> possibleLevel) {
         this.possibleLevel = possibleLevel;
     }