[releng] Missing @since / API restoration
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2AS.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2AS.java
index 6373e52..102acac 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2AS.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2AS.java
@@ -238,6 +238,8 @@
/**
* Initialize global registries with required UML registrations unless already initialized.
+ *
+ * @since 1.9
*/
public static void initializeUMLglobals() {
if (!Resource.Factory.Registry.INSTANCE.getContentTypeToFactoryMap().containsKey(UMLResource.UML_CONTENT_TYPE_IDENTIFIER)) { // Avoid repeated global initialization
@@ -247,6 +249,8 @@
/**
* Initialize resourceSet with required UML registrations unless already initialized.
+ *
+ * @since 1.9
*/
public static void initializeUMLlocals(@NonNull ResourceSet resourceSet) {
if (!resourceSet.getResourceFactoryRegistry().getContentTypeToFactoryMap().containsKey(UML22UMLResource.UML2_CONTENT_TYPE_IDENTIFIER)) { // Avoid repeated local initialization
@@ -257,6 +261,8 @@
/**
* Initialize resourceSet with required UML registrations and if necessary initialize
* global registries as well.
+ *
+ * @since 1.9
*/
public static void initializeUML(@NonNull ResourceSet resourceSet) {
initializeUMLglobals();
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AS2ID.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AS2ID.java
index ba1871a..1d2f8a1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AS2ID.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AS2ID.java
@@ -22,6 +22,8 @@
import org.eclipse.ocl.pivot.Element;
import org.eclipse.ocl.pivot.resource.ASResource;
+import com.google.common.collect.Lists;
+
/**
* AS2ID computes the predictable xmi:ids for ASResources using LUSSIDs.
*
@@ -53,6 +55,21 @@
as2id.assignErrors();
}
+ @Deprecated /* @deprecated pass List to avoid CME hazard */
+ public static void assignIds(@NonNull Iterable</*@NonNull*/ Resource> resources, @Nullable Map<@NonNull Object, @Nullable Object> options) {
+ AS2ID as2id = new AS2ID(options);
+ for (Resource resource : Lists.newArrayList(resources)) { // Proxy resolution may add new resources
+ if (resource instanceof ASResource) {
+ as2id.assignLUSSIDs((ASResource) resource);
+ }
+ }
+ as2id.assignXMIIDs();
+ as2id.assignErrors();
+ }
+
+ /**
+ * @since 1.9
+ */
public static void assignIds(@NonNull List</*@NonNull*/ Resource> resources, @Nullable Map<@NonNull Object, @Nullable Object> options) {
AS2ID as2id = new AS2ID(options);
for (int i = 0; i < resources.size(); i++) { // Proxy resolution may add new resources