[579109] Fix generated model setSaveable
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodelXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodelXtend.xtend
index c6ec8b4..42bda99 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodelXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodelXtend.xtend
@@ -165,6 +165,7 @@
metamodel = INSTANCE = new ReadOnly(PIVOT_AS_URI);
Contents contents = new Contents(OCLstdlib.getDefaultPackage(), "«pkg.name»", "«pkg.nsPrefix»", PIVOT_URI);
metamodel.getContents().add(contents.getModel());
+ metamodel.setSaveable(false);
}
return metamodel;
}
@@ -261,7 +262,6 @@
{
protected ReadOnly(@NonNull URI uri) {
super(uri);
- setSaveable(false);
}
/**
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlibXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlibXtend.xtend
index efede1d..0e1b09b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlibXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlibXtend.xtend
@@ -231,6 +231,7 @@
Contents contents = new Contents("«lib.getURI»");
String asURI = STDLIB_URI + PivotConstants.DOT_OCL_AS_FILE_EXTENSION;
oclstdlib = INSTANCE = new ReadOnly(asURI, contents.getModel());
+ oclstdlib.setSaveable(false);
}
return oclstdlib;
}
@@ -321,7 +322,6 @@
{
protected ReadOnly(@NonNull String asURI, @NonNull Model libraryModel) {
super(asURI, libraryModel);
- setSaveable(false);
}
/**
diff --git a/plugins/org.eclipse.ocl.pivot/annotations/java/util/WeakHashMap.eea b/plugins/org.eclipse.ocl.pivot/annotations/java/util/WeakHashMap.eea
index a4ae4c5..9734ad0 100644
--- a/plugins/org.eclipse.ocl.pivot/annotations/java/util/WeakHashMap.eea
+++ b/plugins/org.eclipse.ocl.pivot/annotations/java/util/WeakHashMap.eea
@@ -1,4 +1,7 @@
class java/util/WeakHashMap
+entrySet
+ ()Ljava/util/Set<Ljava/util/Map$Entry<TK;TV;>;>;
+ ()L1java/util/Set<L1java/util/Map$Entry<TK;TV;>;>;
get
(Ljava/lang/Object;)TV;
(Ljava/lang/Object;)T0V;
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLmetamodel.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLmetamodel.java
index 6555a0d..beae432 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLmetamodel.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLmetamodel.java
@@ -18,7 +18,6 @@
package org.eclipse.ocl.pivot.model;
import java.io.IOException;
-import java.math.BigInteger;
import java.util.List;
import java.util.Map;
@@ -27,27 +26,33 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.pivot.*;
+import org.eclipse.ocl.pivot.AnyType;
+import org.eclipse.ocl.pivot.BagType;
import org.eclipse.ocl.pivot.Class;
+import org.eclipse.ocl.pivot.CollectionType;
+import org.eclipse.ocl.pivot.DataType;
+import org.eclipse.ocl.pivot.Enumeration;
+import org.eclipse.ocl.pivot.EnumerationLiteral;
+import org.eclipse.ocl.pivot.Model;
+import org.eclipse.ocl.pivot.Operation;
+import org.eclipse.ocl.pivot.OrderedSetType;
import org.eclipse.ocl.pivot.Package;
+import org.eclipse.ocl.pivot.Parameter;
+import org.eclipse.ocl.pivot.PivotPackage;
+import org.eclipse.ocl.pivot.PrimitiveType;
+import org.eclipse.ocl.pivot.Property;
+import org.eclipse.ocl.pivot.SequenceType;
+import org.eclipse.ocl.pivot.SetType;
+import org.eclipse.ocl.pivot.TemplateParameter;
import org.eclipse.ocl.pivot.ids.IdManager;
import org.eclipse.ocl.pivot.internal.complete.StandardLibraryInternal;
import org.eclipse.ocl.pivot.internal.library.StandardLibraryContribution;
import org.eclipse.ocl.pivot.internal.resource.ASResourceImpl;
import org.eclipse.ocl.pivot.internal.resource.OCLASResourceFactory;
import org.eclipse.ocl.pivot.internal.utilities.AbstractContents;
-import org.eclipse.ocl.pivot.library.LibraryFeature;
-import org.eclipse.ocl.pivot.model.OCLstdlib;
-import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.utilities.PivotConstants;
-import org.eclipse.ocl.pivot.internal.utilities.PivotObjectImpl;
-import org.eclipse.ocl.pivot.utilities.PivotUtil;
-
-import org.eclipse.ocl.pivot.oclstdlib.OCLstdlibPackage;
-import org.eclipse.ocl.pivot.PivotPackage;
/**
* This is the pivot representation of the http://www.eclipse.org/ocl/2015/Pivot metamodel
@@ -94,6 +99,7 @@
metamodel = INSTANCE = new ReadOnly(PIVOT_AS_URI);
Contents contents = new Contents(OCLstdlib.getDefaultPackage(), "pivot", "pivot", PIVOT_URI);
metamodel.getContents().add(contents.getModel());
+ metamodel.setSaveable(false);
}
return metamodel;
}
@@ -177,7 +183,6 @@
{
protected ReadOnly(@NonNull URI uri) {
super(uri);
- setSaveable(false);
}
/**
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java
index 82d746b..eecdabb 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java
@@ -116,6 +116,7 @@
Contents contents = new Contents("http://www.eclipse.org/ocl/2015/Library");
String asURI = STDLIB_URI + PivotConstants.DOT_OCL_AS_FILE_EXTENSION;
oclstdlib = INSTANCE = new ReadOnly(asURI, contents.getModel());
+ oclstdlib.setSaveable(false);
}
return oclstdlib;
}
@@ -204,7 +205,6 @@
{
protected ReadOnly(@NonNull String asURI, @NonNull Model libraryModel) {
super(asURI, libraryModel);
- setSaveable(false);
}
/**
