From eb2c6cfcfaed7efa638184badff890a8978efcb3 Mon Sep 17 00:00:00 2001
From: Vincent Aravantinos <aravantinos@fortiss.org>
Date: Wed, 4 Feb 2015 17:00:20 +0000
Subject: [PATCH] RED refs 2255
---
.../fortiss/tooling/base/migration/IDMigrationProvider.java | 1 +
.../base/model/base/impl/DerivedAnnotationBaseStaticImpl.java | 2 ++
.../src/org/fortiss/tooling/base/utils/AnnotationUtils.java | 4 +++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/IDMigrationProvider.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/IDMigrationProvider.java
index e6da22c6f..5ddd8b38d 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/IDMigrationProvider.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/IDMigrationProvider.java
@@ -42,6 +42,7 @@ public class IDMigrationProvider implements IMigrationProvider {
public boolean needMigration(ITopLevelElement modelElement,
Map<EObject, AnyType> unknownFeatures) {
// if the id of model element is 0
+ // TODO(VA,B11 & C1)
if(modelElement != null && modelElement.getRootModelElement() != null &&
hasMissingIDs(modelElement.getRootModelElement())) {
return true;
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/DerivedAnnotationBaseStaticImpl.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/DerivedAnnotationBaseStaticImpl.java
index 3d8d27243..be4cebeef 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/DerivedAnnotationBaseStaticImpl.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/DerivedAnnotationBaseStaticImpl.java
@@ -42,6 +42,8 @@ public class DerivedAnnotationBaseStaticImpl {
* @return See above.
*/
public static <T> T getValue(IDerivedAnnotation<T> annotation) {
+ // TODO(VA) Am I right that annotation.getDerivedValue entails a calculation?
+ // If so it would benefit being stored into a local variable instead of being called twice.
if(annotation.getUserAnnotatedValue() != null &&
(annotation.isUserAnnotatedValuePreferred() || annotation.getDerivedValue() == null)) {
return annotation.getUserAnnotatedValue();
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AnnotationUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AnnotationUtils.java
index 4c9face00..6475e2671 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AnnotationUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AnnotationUtils.java
@@ -51,6 +51,7 @@ public class AnnotationUtils {
private static <T extends IAnnotatedSpecification> T getAnnotation(
final IModelElement modelElement, EClass eClass) {
+ // TODO(VA, B11)
final T annotation =
(T)pickFirstInstanceOf((Class<IAnnotatedSpecification>)eClass.getInstanceClass(),
modelElement.getSpecifications());
@@ -115,7 +116,7 @@ public class AnnotationUtils {
}
// Retrieve annotation / create if the creation does not need to be wrapped into a
- // command
+ // command.
return getAnnotation(modelElement, eClass);
}
@@ -137,6 +138,7 @@ public class AnnotationUtils {
EList<T> parentSpecificationList = new BasicEList<T>();
List<IModelElement> parentsElements = getParentsWithType(startElement, IModelElement.class);
for(IModelElement currentParentElement : parentsElements) {
+ // TODO(VA, B11)
parentSpecificationList.add(pickFirstInstanceOf(clazz,
currentParentElement.getSpecifications()));
}
--
GitLab