Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue19/set default meta properties #27

Merged
merged 13 commits into from
Mar 13, 2020
Merged

Issue19/set default meta properties #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ce0ffc9
set meta-properties whole model
victorviola Mar 11, 2020
731ac81
bug fixed when applying stereotypes for associations.
victorviola Mar 11, 2020
c28c361
set cardinalities if null or unspecified.
victorviola Mar 11, 2020
0e8a089
update smartproperties.java to avoid duplicated code.
Mar 12, 2020
b60bd44
set readonly only where it is true.
Mar 12, 2020
4a5d1bc
fixed bug in cardinality setting.
Mar 12, 2020
7eb2bc1
Fixed cardinality value on <<termination>>
tgoprince Mar 12, 2020
1981d16
renamed smartProperties to SmartModelling. Moved functions from Apply…
victorviola Mar 12, 2020
f26372e
Bugfix: HistoricalDependence
tgoprince Mar 12, 2020
fbd392c
Group all "smart modeling" features together
tgoprince Mar 12, 2020
98bf566
Removed unused imports
tgoprince Mar 13, 2020
acf33ed
Created function to set default meta properties also for classes
tgoprince Mar 13, 2020
8daef8e
Cleaned up SmartModeling.java
tgoprince Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
277 changes: 117 additions & 160 deletions src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyStereotype.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.vp.plugin.action.VPContext;
import com.vp.plugin.action.VPContextActionController;
import com.vp.plugin.model.IAssociation;
import com.vp.plugin.model.IAssociationEnd;
import com.vp.plugin.model.IClass;
import com.vp.plugin.model.IModelElement;
import com.vp.plugin.model.IStereotype;
Expand All @@ -18,6 +17,7 @@
import it.unibz.inf.ontouml.vp.features.constraints.ActionIds;
import it.unibz.inf.ontouml.vp.features.constraints.AssociationConstraints;
import it.unibz.inf.ontouml.vp.utils.SmartColoring;
import it.unibz.inf.ontouml.vp.utils.SmartModelling;
import it.unibz.inf.ontouml.vp.utils.StereotypeUtils;

/**
Expand All @@ -39,139 +39,124 @@ public void performAction(VPAction action, VPContext context, ActionEvent event)
}

switch (action.getActionId()) {
/*
* case ActionIds.POWERTYPE: element.addStereotype(StereotypeUtils.STR_POWERTYPE); paint(context, COLOR_POWERTYPE); break;
*/
case ActionIds.TYPE:
element.addStereotype(StereotypeUtils.STR_TYPE);
break;
case ActionIds.HISTORICAL_ROLE:
element.addStereotype(StereotypeUtils.STR_HISTORICAL_ROLE);
break;
case ActionIds.EVENT:
element.addStereotype(StereotypeUtils.STR_EVENT);
break;
case ActionIds.ENUMERATION:
element.addStereotype(StereotypeUtils.STR_ENUMERATION);
break;
case ActionIds.DATATYPE:
element.addStereotype(StereotypeUtils.STR_DATATYPE);
break;
case ActionIds.SUBKIND:
element.addStereotype(StereotypeUtils.STR_SUBKIND);
break;
case ActionIds.ROLE_MIXIN:
element.addStereotype(StereotypeUtils.STR_ROLE_MIXIN);
setAbstract(element);
break;
case ActionIds.ROLE:
element.addStereotype(StereotypeUtils.STR_ROLE);
break;
case ActionIds.RELATOR:
element.addStereotype(StereotypeUtils.STR_RELATOR);
break;
case ActionIds.QUANTITY:
element.addStereotype(StereotypeUtils.STR_QUANTITY);
break;
case ActionIds.QUALITY:
element.addStereotype(StereotypeUtils.STR_QUALITY);
break;
case ActionIds.PHASE_MIXIN:
element.addStereotype(StereotypeUtils.STR_PHASE_MIXIN);
setAbstract(element);
break;
case ActionIds.PHASE:
element.addStereotype(StereotypeUtils.STR_PHASE);
break;
case ActionIds.MODE:
element.addStereotype(StereotypeUtils.STR_MODE);
break;
case ActionIds.MIXIN:
element.addStereotype(StereotypeUtils.STR_MIXIN);
setAbstract(element);
break;
case ActionIds.KIND:
element.addStereotype(StereotypeUtils.STR_KIND);
break;
case ActionIds.COLLECTIVE:
element.addStereotype(StereotypeUtils.STR_COLLECTIVE);
break;
case ActionIds.CATEGORY:
element.addStereotype(StereotypeUtils.STR_CATEGORY);
break;
case ActionIds.INSTANTIATION:
element.addStereotype(StereotypeUtils.STR_INSTANTIATION);
removeAggregationKind(element);
break;
case ActionIds.TERMINATION:
element.addStereotype(StereotypeUtils.STR_TERMINATION);
removeAggregationKind(element);
break;
case ActionIds.PARTICIPATIONAL:
element.addStereotype(StereotypeUtils.STR_PARTICIPATIONAL);
setAggregationKind(element);
break;
case ActionIds.PARTICIPATION:
element.addStereotype(StereotypeUtils.STR_PARTICIPATION);
removeAggregationKind(element);
break;
case ActionIds.HISTORICAL_DEPENDENCE:
element.addStereotype(StereotypeUtils.STR_HISTORICAL_DEPENDENCE);
removeAggregationKind(element);
break;
case ActionIds.CREATION:
element.addStereotype(StereotypeUtils.STR_CREATION);
removeAggregationKind(element);
break;
case ActionIds.MANIFESTATION:
element.addStereotype(StereotypeUtils.STR_MANIFESTATION);
removeAggregationKind(element);
break;
case ActionIds.MATERIAL:
element.addStereotype(StereotypeUtils.STR_MATERIAL);
removeAggregationKind(element);
break;
case ActionIds.COMPARATIVE:
element.addStereotype(StereotypeUtils.STR_COMPARATIVE);
removeAggregationKind(element);
break;
case ActionIds.MEDIATION:
element.addStereotype(StereotypeUtils.STR_MEDIATION);
removeAggregationKind(element);
break;
case ActionIds.CHARACTERIZATION:
element.addStereotype(StereotypeUtils.STR_CHARACTERIZATION);
removeAggregationKind(element);
break;
case ActionIds.EXTERNAL_DEPENDENCE:
element.addStereotype(StereotypeUtils.STR_EXTERNAL_DEPENDENCE);
removeAggregationKind(element);
break;
case ActionIds.COMPONENT_OF:
element.addStereotype(StereotypeUtils.STR_COMPONENT_OF);
setAggregationKind(element);
break;
case ActionIds.MEMBER_OF:
element.addStereotype(StereotypeUtils.STR_MEMBER_OF);
setAggregationKind(element);
break;
case ActionIds.SUB_COLLECTION_OF:
element.addStereotype(StereotypeUtils.STR_SUB_COLLECTION_OF);
setAggregationKind(element);
break;
case ActionIds.SUB_QUANTITY_OF:
element.addStereotype(StereotypeUtils.STR_SUB_QUANTITY_OF);
setAggregationKind(element);
break;
case ActionIds.BEGIN:
element.addStereotype(StereotypeUtils.STR_BEGIN);
break;
case ActionIds.END:
element.addStereotype(StereotypeUtils.STR_END);
break;
case ActionIds.TYPE:
element.addStereotype(StereotypeUtils.STR_TYPE);
break;
case ActionIds.HISTORICAL_ROLE:
element.addStereotype(StereotypeUtils.STR_HISTORICAL_ROLE);
break;
case ActionIds.EVENT:
element.addStereotype(StereotypeUtils.STR_EVENT);
break;
case ActionIds.ENUMERATION:
element.addStereotype(StereotypeUtils.STR_ENUMERATION);
break;
case ActionIds.DATATYPE:
element.addStereotype(StereotypeUtils.STR_DATATYPE);
break;
case ActionIds.SUBKIND:
element.addStereotype(StereotypeUtils.STR_SUBKIND);
break;
case ActionIds.ROLE_MIXIN:
element.addStereotype(StereotypeUtils.STR_ROLE_MIXIN);
break;
case ActionIds.ROLE:
element.addStereotype(StereotypeUtils.STR_ROLE);
break;
case ActionIds.RELATOR:
element.addStereotype(StereotypeUtils.STR_RELATOR);
break;
case ActionIds.QUANTITY:
element.addStereotype(StereotypeUtils.STR_QUANTITY);
break;
case ActionIds.QUALITY:
element.addStereotype(StereotypeUtils.STR_QUALITY);
break;
case ActionIds.PHASE_MIXIN:
element.addStereotype(StereotypeUtils.STR_PHASE_MIXIN);
break;
case ActionIds.PHASE:
element.addStereotype(StereotypeUtils.STR_PHASE);
break;
case ActionIds.MODE:
element.addStereotype(StereotypeUtils.STR_MODE);
break;
case ActionIds.MIXIN:
element.addStereotype(StereotypeUtils.STR_MIXIN);
break;
case ActionIds.KIND:
element.addStereotype(StereotypeUtils.STR_KIND);
break;
case ActionIds.COLLECTIVE:
element.addStereotype(StereotypeUtils.STR_COLLECTIVE);
break;
case ActionIds.CATEGORY:
element.addStereotype(StereotypeUtils.STR_CATEGORY);
break;
case ActionIds.INSTANTIATION:
element.addStereotype(StereotypeUtils.STR_INSTANTIATION);
break;
case ActionIds.TERMINATION:
element.addStereotype(StereotypeUtils.STR_TERMINATION);
break;
case ActionIds.PARTICIPATIONAL:
element.addStereotype(StereotypeUtils.STR_PARTICIPATIONAL);
break;
case ActionIds.PARTICIPATION:
element.addStereotype(StereotypeUtils.STR_PARTICIPATION);
break;
case ActionIds.HISTORICAL_DEPENDENCE:
element.addStereotype(StereotypeUtils.STR_HISTORICAL_DEPENDENCE);
break;
case ActionIds.CREATION:
element.addStereotype(StereotypeUtils.STR_CREATION);
break;
case ActionIds.MANIFESTATION:
element.addStereotype(StereotypeUtils.STR_MANIFESTATION);
break;
case ActionIds.MATERIAL:
element.addStereotype(StereotypeUtils.STR_MATERIAL);
break;
case ActionIds.COMPARATIVE:
element.addStereotype(StereotypeUtils.STR_COMPARATIVE);
break;
case ActionIds.MEDIATION:
element.addStereotype(StereotypeUtils.STR_MEDIATION);
break;
case ActionIds.CHARACTERIZATION:
element.addStereotype(StereotypeUtils.STR_CHARACTERIZATION);
break;
case ActionIds.EXTERNAL_DEPENDENCE:
element.addStereotype(StereotypeUtils.STR_EXTERNAL_DEPENDENCE);
break;
case ActionIds.COMPONENT_OF:
element.addStereotype(StereotypeUtils.STR_COMPONENT_OF);
break;
case ActionIds.MEMBER_OF:
element.addStereotype(StereotypeUtils.STR_MEMBER_OF);
break;
case ActionIds.SUB_COLLECTION_OF:
element.addStereotype(StereotypeUtils.STR_SUB_COLLECTION_OF);
break;
case ActionIds.SUB_QUANTITY_OF:
element.addStereotype(StereotypeUtils.STR_SUB_QUANTITY_OF);
break;
case ActionIds.BEGIN:
element.addStereotype(StereotypeUtils.STR_BEGIN);
break;
case ActionIds.END:
element.addStereotype(StereotypeUtils.STR_END);
break;
}

SmartColoring.paint((IClass) element);
if(element.getModelType().equals(IModelElementFactory.MODEL_TYPE_CLASS)){
SmartModelling.setClassMetaProperties((IClass) element);
SmartColoring.paint((IClass) element);
}

if(element.getModelType().equals(IModelElementFactory.MODEL_TYPE_ASSOCIATION))
SmartModelling.setAssociationMetaProperties((IAssociation) element);

SmartColoring.smartPaint();
}

Expand Down Expand Up @@ -221,32 +206,4 @@ public void update(VPAction action, VPContext context) {
}
}

private void setAggregationKind(IModelElement element) {
IAssociation association = (IAssociation) element;
IAssociationEnd compositionFromEnd = (IAssociationEnd) association.getFromEnd();
IAssociationEnd compositionToEnd = (IAssociationEnd) association.getToEnd();

if (compositionToEnd.getAggregationKind().equals(IAssociationEnd.AGGREGATION_KIND_NONE)) {
compositionToEnd.setAggregationKind(IAssociationEnd.AGGREGATION_KIND_COMPOSITED);
compositionFromEnd.setAggregationKind(IAssociationEnd.AGGREGATION_KIND_NONE);
}

return;
}

private void removeAggregationKind(IModelElement element) {
IAssociationEnd compositionFromEnd = (IAssociationEnd) ((IAssociation) element).getFromEnd();
IAssociationEnd compositionToEnd = (IAssociationEnd) ((IAssociation) element).getToEnd();

compositionFromEnd.setAggregationKind(IAssociationEnd.AGGREGATION_KIND_NONE);
compositionToEnd.setAggregationKind(IAssociationEnd.AGGREGATION_KIND_NONE);

return;
}

private void setAbstract(IModelElement element) {
((IClass) element).setAbstract(true);

return;
}
}
1 change: 0 additions & 1 deletion src/main/java/it/unibz/inf/ontouml/vp/features/constraints/ActionIds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public final class ActionIds {
public static final String MEMBER_OF = "it.unibz.inf.ontouml.vp.addMemberOfStereotype";
public static final String MEDIATION = "it.unibz.inf.ontouml.vp.addMediationStereotype";
public static final String MATERIAL = "it.unibz.inf.ontouml.vp.addMaterialStereotype";
public static final String HISTORICAL = "it.unibz.inf.ontouml.vp.addHistoricalStereotype";
public static final String EXTERNAL_DEPENDENCE = "it.unibz.inf.ontouml.vp.addExternalDependenceStereotype";
public static final String COMPONENT_OF = "it.unibz.inf.ontouml.vp.addComponentOfStereotype";
public static final String COMPARATIVE = "it.unibz.inf.ontouml.vp.addComparativeStereotype";
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/it/unibz/inf/ontouml/vp/features/constraints/AssociationConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ public class AssociationConstraints {
put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_MIXIN), new ArrayList<>(Arrays.asList(ActionIds.PARTICIPATION, ActionIds.CREATION, ActionIds.TERMINATION, ActionIds.MANIFESTATION)));
put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_ROLE_MIXIN), new ArrayList<>(Arrays.asList(ActionIds.PARTICIPATION, ActionIds.CREATION, ActionIds.TERMINATION, ActionIds.MANIFESTATION)));
put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_PHASE_MIXIN), new ArrayList<>(Arrays.asList(ActionIds.PARTICIPATION, ActionIds.CREATION, ActionIds.TERMINATION, ActionIds.MANIFESTATION)));
put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_HISTORICAL_ROLE), new ArrayList<>(Arrays.asList(ActionIds.PARTICIPATION)));
put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_EVENT), new ArrayList<>(Arrays.asList(ActionIds.HISTORICAL, ActionIds.PARTICIPATIONAL)));
put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_HISTORICAL_ROLE), new ArrayList<>(Arrays.asList(ActionIds.PARTICIPATION, ActionIds.CREATION, ActionIds.TERMINATION, ActionIds.MANIFESTATION)));
put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_EVENT), new ArrayList<>(Arrays.asList(ActionIds.HISTORICAL_DEPENDENCE, ActionIds.PARTICIPATIONAL)));
put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_TYPE), new ArrayList<>(Arrays.asList(ActionIds.INSTANTIATION)));
// put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_DATATYPE), new ArrayList<>());
// put(new SimpleEntry<String, String>(StereotypeUtils.STR_EVENT, StereotypeUtils.STR_ENUMERATION), new ArrayList<>());
Expand Down
Loading