Refactoring Collections

Refactoring <? extends ... class> for <class> because of we did not add elements into a collection.
danimaniarqsoft · May 13, 2017 · 1274579 · 1274579
1 parent beac30e
commit 1274579
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 139 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,28 +64,28 @@ public abstract class SEAbstractActivity extends SEBasicElement implements Abstr
 
     /** The activity association. */
     @DBRef
-    protected Collection<? extends SEActivityAssociation> activityAssociation;
+    protected Collection<SEActivityAssociation> activityAssociation;
 
     /**
      * The criterion. A collection of criteria that have to be fulfilled for
      * entering the activity or considering the activity completed
      */
     @DBRef
-    protected Collection<? extends SECriterion> criterion;
+    protected Collection<SECriterion> criterion;
 
-    public Collection<? extends SEActivityAssociation> getActivityAssociation() {
+    public Collection<SEActivityAssociation> getActivityAssociation() {
         return activityAssociation;
     }
 
-    public void setActivityAssociation(Collection<? extends SEActivityAssociation> activityAssociation) {
+    public void setActivityAssociation(Collection<SEActivityAssociation> activityAssociation) {
         this.activityAssociation = activityAssociation;
     }
 
-    public Collection<? extends SECriterion> getCriterion() {
+    public Collection<SECriterion> getCriterion() {
         return criterion;
     }
 
-    public void setCriterion(Collection<? extends SECriterion> criterion) {
+    public void setCriterion(Collection<SECriterion> 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
@@ -95,11 +95,11 @@ public class SEAction extends SELanguageElement implements Action {
 
     /** The alpha. */
     @DBRef
-    private Collection<? extends SEAlpha> alpha;
+    private Collection<SEAlpha> alpha;
 
     /** The work product. */
     @DBRef
-    private Collection<? extends SEWorkProduct> workProduct;
+    private Collection<SEWorkProduct> workProduct;
 
     /** The kind. */
     @DBRef
@@ -115,20 +115,20 @@ public void setActivity(SEActivity activity) {
     }
 
     @Override
-    public Collection<? extends SEAlpha> getAlpha() {
+    public Collection<SEAlpha> getAlpha() {
         return alpha;
     }
 
-    public void setAlpha(Collection<? extends SEAlpha> alpha) {
+    public void setAlpha(Collection<SEAlpha> alpha) {
         this.alpha = alpha;
     }
 
     @Override
-    public Collection<? extends SEWorkProduct> getWorkProduct() {
+    public Collection<SEWorkProduct> getWorkProduct() {
         return workProduct;
     }
 
-    public void setWorkProduct(Collection<? extends SEWorkProduct> workProduct) {
+    public void setWorkProduct(Collection<SEWorkProduct> 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
@@ -89,37 +89,37 @@ public class SEActivity extends SEAbstractActivity implements Activity {
 
     /** The approach. */
     @DBRef
-    private Collection<? extends SEApproach> approach;
+    private Collection<SEApproach> approach;
 
     /** The action. */
     @DBRef
-    private Collection<? extends SEAction> action;
+    private Collection<SEAction> action;
 
     /** The required competency level. */
     @DBRef
-    private Collection<? extends SECompetencyLevel> requiredCompetencyLevel;
+    private Collection<SECompetencyLevel> requiredCompetencyLevel;
 
-    public Collection<? extends SEApproach> getApproach() {
+    public Collection<SEApproach> getApproach() {
         return approach;
     }
 
-    public void setApproach(Collection<? extends SEApproach> approach) {
+    public void setApproach(Collection<SEApproach> approach) {
         this.approach = approach;
     }
 
-    public Collection<? extends SEAction> getAction() {
+    public Collection<SEAction> getAction() {
         return action;
     }
 
-    public void setAction(Collection<? extends SEAction> action) {
+    public void setAction(Collection<SEAction> action) {
         this.action = action;
     }
 
-    public Collection<? extends SECompetencyLevel> getRequiredCompetencyLevel() {
+    public Collection<SECompetencyLevel> getRequiredCompetencyLevel() {
         return requiredCompetencyLevel;
     }
 
-    public void setRequiredCompetencyLevel(Collection<? extends SECompetencyLevel> requiredCompetencyLevel) {
+    public void setRequiredCompetencyLevel(Collection<SECompetencyLevel> 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
@@ -76,13 +76,13 @@ public class SEActivitySpace extends SEAbstractActivity implements ActivitySpace
      * fulfilling the objectives of this activity space.
      */
     @DBRef
-    private Collection<? extends SEAlpha> input;
+    private Collection<SEAlpha> input;
 
-    public Collection<? extends SEAlpha> getInput() {
+    public Collection<SEAlpha> getInput() {
         return input;
     }
 
-    public void setInput(Collection<? extends SEAlpha> input) {
+    public void setInput(Collection<SEAlpha> input) {
         this.input = input;
     }
 

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,41 +104,41 @@ public class SEAlpha extends SEBasicElement implements Alpha {
 
     /** The states of the alpha. */
     @DBRef
-    private Collection<? extends SEState> states;
+    private Collection<SEState> states;
 
     /** The action. */
     @DBRef
-    private Collection<? extends SEAction> action;
+    private Collection<SEAction> action;
 
     /** The activity space. */
     @DBRef
     private SEActivitySpace activitySpace;
 
     /** The alpha containment. */
     @DBRef
-    private Collection<? extends SEAlphaContainment> alphaContainment;
+    private Collection<SEAlphaContainment> alphaContainment;
 
     /** The alpha association. */
     @DBRef
-    private Collection<? extends SEAlphaAssociation> alphaAssociation;
+    private Collection<SEAlphaAssociation> alphaAssociation;
 
     /** The work product manifest. */
     @DBRef
-    private Collection<? extends SEWorkProductManifest> workProductManifest;
+    private Collection<SEWorkProductManifest> workProductManifest;
 
-    public Collection<? extends SEState> getStates() {
+    public Collection<SEState> getStates() {
         return states;
     }
 
-    public void setStates(Collection<? extends SEState> states) {
+    public void setStates(Collection<SEState> states) {
         this.states = states;
     }
 
-    public Collection<? extends SEAction> getAction() {
+    public Collection<SEAction> getAction() {
         return action;
     }
 
-    public void setAction(Collection<? extends SEAction> action) {
+    public void setAction(Collection<SEAction> action) {
         this.action = action;
     }
 
@@ -150,27 +150,27 @@ public void setActivitySpace(SEActivitySpace activitySpace) {
         this.activitySpace = activitySpace;
     }
 
-    public Collection<? extends SEAlphaContainment> getAlphaContainment() {
+    public Collection<SEAlphaContainment> getAlphaContainment() {
         return alphaContainment;
     }
 
-    public void setAlphaContainment(Collection<? extends SEAlphaContainment> alphaContainment) {
+    public void setAlphaContainment(Collection<SEAlphaContainment> alphaContainment) {
         this.alphaContainment = alphaContainment;
     }
 
-    public Collection<? extends SEAlphaAssociation> getAlphaAssociation() {
+    public Collection<SEAlphaAssociation> getAlphaAssociation() {
         return alphaAssociation;
     }
 
-    public void setAlphaAssociation(Collection<? extends SEAlphaAssociation> alphaAssociation) {
+    public void setAlphaAssociation(Collection<SEAlphaAssociation> alphaAssociation) {
         this.alphaAssociation = alphaAssociation;
     }
 
-    public Collection<? extends SEWorkProductManifest> getWorkProductManifest() {
+    public Collection<SEWorkProductManifest> getWorkProductManifest() {
         return workProductManifest;
     }
 
-    public void setWorkProductManifest(Collection<? extends SEWorkProductManifest> workProductManifest) {
+    public void setWorkProductManifest(Collection<SEWorkProductManifest> 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
@@ -102,15 +102,15 @@ public class SELevelOfDetail extends SELanguageElement implements LevelOfDetail
 
     /** Checklist items to determine if the level of detail has been reached. */
     @DBRef
-    private Collection<? extends SECheckpoint> checkListItem;
+    private Collection<SECheckpoint> checkListItem;
 
     /** Next level of detail. */
     @DBRef
     private SELevelOfDetail successor;
 
     /** The criterion. */
     @DBRef
-    private Collection<? extends SECriterion> criterion;
+    private Collection<SECriterion> criterion;
 
     /** The predecessor. */
     @DBRef
@@ -144,11 +144,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public Collection<? extends SECheckpoint> getCheckListItem() {
+    public Collection<SECheckpoint> getCheckListItem() {
         return checkListItem;
     }
 
-    public void setCheckListItem(Collection<? extends SECheckpoint> checkListItem) {
+    public void setCheckListItem(Collection<SECheckpoint> checkListItem) {
         this.checkListItem = checkListItem;
     }
 
@@ -160,11 +160,11 @@ public void setSuccessor(SELevelOfDetail successor) {
         this.successor = successor;
     }
 
-    public Collection<? extends SECriterion> getCriterion() {
+    public Collection<SECriterion> getCriterion() {
         return criterion;
     }
 
-    public void setCriterion(Collection<? extends SECriterion> criterion) {
+    public void setCriterion(Collection<SECriterion> 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
@@ -88,15 +88,15 @@ public class SEState extends SELanguageElement implements State {
 
     /** A collection of checkpoints associated with the state. */
     @DBRef
-    private Collection<? extends SECheckpoint> checkListItem;
+    private Collection<SECheckpoint> checkListItem;
 
     /** The successor state. */
     @DBRef
     private SEState successor;
 
     /** The criterion. */
     @DBRef
-    private Collection<? extends SECriterion> criterion;
+    private Collection<SECriterion> criterion;
 
     /** The alpha. */
     @DBRef
@@ -122,11 +122,11 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public Collection<? extends SECheckpoint> getCheckListItem() {
+    public Collection<SECheckpoint> getCheckListItem() {
         return checkListItem;
     }
 
-    public void setCheckListItem(Collection<? extends SECheckpoint> checkListItem) {
+    public void setCheckListItem(Collection<SECheckpoint> checkListItem) {
         this.checkListItem = checkListItem;
     }
 
@@ -138,11 +138,11 @@ public void setSuccessor(SEState successor) {
         this.successor = successor;
     }
 
-    public Collection<? extends SECriterion> getCriterion() {
+    public Collection<SECriterion> getCriterion() {
         return criterion;
     }
 
-    public void setCriterion(Collection<? extends SECriterion> criterion) {
+    public void setCriterion(Collection<SECriterion> 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
@@ -81,37 +81,37 @@ public class SEWorkProduct extends SEBasicElement implements WorkProduct {
 
     /** The level of details defined for the work product. */
     @DBRef
-    private Collection<? extends SELevelOfDetail> levelOfDetail;
+    private Collection<SELevelOfDetail> levelOfDetail;
 
     /** The action. */
     @DBRef
-    private Collection<? extends SEAction> action;
+    private Collection<SEAction> action;
 
     /** The work product manifest. */
     @DBRef
-    private Collection<? extends SEWorkProductManifest> workProductManifest;
+    private Collection<SEWorkProductManifest> workProductManifest;
 
-    public Collection<? extends SELevelOfDetail> getLevelOfDetail() {
+    public Collection<SELevelOfDetail> getLevelOfDetail() {
         return levelOfDetail;
     }
 
-    public void setLevelOfDetail(Collection<? extends SELevelOfDetail> levelOfDetail) {
+    public void setLevelOfDetail(Collection<SELevelOfDetail> levelOfDetail) {
         this.levelOfDetail = levelOfDetail;
     }
 
-    public Collection<? extends SEAction> getAction() {
+    public Collection<SEAction> getAction() {
         return action;
     }
 
-    public void setAction(Collection<? extends SEAction> action) {
+    public void setAction(Collection<SEAction> action) {
         this.action = action;
     }
 
-    public Collection<? extends SEWorkProductManifest> getWorkProductManifest() {
+    public Collection<SEWorkProductManifest> getWorkProductManifest() {
         return workProductManifest;
     }
 
-    public void setWorkProductManifest(Collection<? extends SEWorkProductManifest> workProductManifest) {
+    public void setWorkProductManifest(Collection<SEWorkProductManifest> 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
@@ -73,13 +73,13 @@ public class SECompetency extends SEBasicElement implements Competency {
 
     /** A collection of levels defined for this competency. */
     @DBRef
-    private Collection<? extends CompetencyLevel> possibleLevel;
+    private Collection<CompetencyLevel> possibleLevel;
 
-    public Collection<? extends CompetencyLevel> getPossibleLevel() {
+    public Collection<CompetencyLevel> getPossibleLevel() {
         return possibleLevel;
     }
 
-    public void setPossibleLevel(Collection<? extends CompetencyLevel> possibleLevel) {
+    public void setPossibleLevel(Collection<CompetencyLevel> possibleLevel) {
         this.possibleLevel = possibleLevel;
     }