[unrelated] Promote some helpers/utilities
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotUtilInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotUtilInternal.java
index 5f36596..f045662 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotUtilInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotUtilInternal.java
@@ -441,6 +441,13 @@
/**
* @since 1.3
*/
+ public static @NonNull List<org.eclipse.ocl.pivot.@NonNull Class> getOwnedClassesList(org.eclipse.ocl.pivot.@NonNull Package asPackage) {
+ return ClassUtil.nullFree(asPackage.getOwnedClasses());
+ }
+
+ /**
+ * @since 1.3
+ */
public static @NonNull List<@NonNull Variable> getOwnedIteratorsList(@NonNull LoopExp loopExp) {
return ClassUtil.nullFree(loopExp.getOwnedIterators());
}
@@ -448,13 +455,27 @@
/**
* @since 1.3
*/
- public static @NonNull List<@NonNull ? extends Operation> getOwnedOperationsList(org.eclipse.ocl.pivot.@NonNull Class asClass) {
+ public static @NonNull List<@NonNull Operation> getOwnedOperationsList(org.eclipse.ocl.pivot.@NonNull Class asClass) {
return ClassUtil.nullFree(asClass.getOwnedOperations());
}
/**
* @since 1.3
*/
+ public static @NonNull List<org.eclipse.ocl.pivot.@NonNull Package> getOwnedPackagesList(@NonNull Model asModel) {
+ return ClassUtil.nullFree(asModel.getOwnedPackages());
+ }
+
+ /**
+ * @since 1.3
+ */
+ public static @NonNull List<org.eclipse.ocl.pivot.@NonNull Package> getOwnedPackagesList(org.eclipse.ocl.pivot.@NonNull Package asPackage) {
+ return ClassUtil.nullFree(asPackage.getOwnedPackages());
+ }
+
+ /**
+ * @since 1.3
+ */
public static @NonNull List<@NonNull CollectionLiteralPart> getOwnedPartsList(@NonNull CollectionLiteralExp collectionLiteralExp) {
return ClassUtil.nullFree(collectionLiteralExp.getOwnedParts());
}
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java
index a51312f..ae3f423 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java
@@ -39,6 +39,7 @@
import org.eclipse.ocl.pivot.CollectionLiteralPart;
import org.eclipse.ocl.pivot.CollectionRange;
import org.eclipse.ocl.pivot.CollectionType;
+import org.eclipse.ocl.pivot.Comment;
import org.eclipse.ocl.pivot.CompleteClass;
import org.eclipse.ocl.pivot.CompletePackage;
import org.eclipse.ocl.pivot.Constraint;
@@ -49,6 +50,7 @@
import org.eclipse.ocl.pivot.ExpressionInOCL;
import org.eclipse.ocl.pivot.Feature;
import org.eclipse.ocl.pivot.IfExp;
+import org.eclipse.ocl.pivot.Import;
import org.eclipse.ocl.pivot.InvalidType;
import org.eclipse.ocl.pivot.IterateExp;
import org.eclipse.ocl.pivot.Iteration;
@@ -1070,6 +1072,13 @@
/**
* @since 1.3
*/
+ public static @NonNull Iterable<@NonNull Comment> getOwnedComments(@NonNull Element asElement) {
+ return ClassUtil.nullFree(asElement.getOwnedComments());
+ }
+
+ /**
+ * @since 1.3
+ */
public static @NonNull OCLExpression getOwnedCondition(@NonNull IfExp ifExp) {
return ClassUtil.nonNullState(ifExp.getOwnedCondition());
}
@@ -1091,6 +1100,13 @@
/**
* @since 1.3
*/
+ public static @NonNull Iterable<@NonNull Import> getOwnedImports(@NonNull Model asModel) {
+ return ClassUtil.nullFree(asModel.getOwnedImports());
+ }
+
+ /**
+ * @since 1.3
+ */
public static @NonNull OCLExpression getOwnedIn(@NonNull LetExp letExp) {
return ClassUtil.nonNullState(letExp.getOwnedIn());
}
@@ -1242,6 +1258,13 @@
return ClassUtil.nonNullState(property.getOwningClass());
}
+ /**
+ * @since 1.3
+ */
+ public static org.eclipse.ocl.pivot.@NonNull Package getOwningPackage(org.eclipse.ocl.pivot.@NonNull Class asClass) {
+ return ClassUtil.nonNullState(asClass.getOwningPackage());
+ }
+
public static org.eclipse.ocl.pivot.@Nullable Package getPackage(@NonNull EObject object) {
for (EObject eObject = object; eObject != null; eObject = eObject.eContainer()) {
if (eObject instanceof org.eclipse.ocl.pivot.Package) {
