[579051] Fix orphanage Package leakage
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/xtend/GenerateAutoLookupInfrastructureXtend.xtend b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/xtend/GenerateAutoLookupInfrastructureXtend.xtend
index 9acf12f..9a4cb32 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/xtend/GenerateAutoLookupInfrastructureXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/xtend/GenerateAutoLookupInfrastructureXtend.xtend
@@ -35,6 +35,8 @@
import org.eclipse.ocl.examples.autogen.lookup.LookupCGUtil
import org.eclipse.ocl.examples.build.xtend.GenerateVisitorsXtend
import org.eclipse.ocl.examples.build.xtend.MergeWriter
+import org.eclipse.emf.mwe.core.WorkflowContext
+import org.eclipse.emf.mwe.core.monitor.ProgressMonitor
class GenerateAutoLookupInfrastructureXtend extends GenerateVisitorsXtend
{
@@ -55,6 +57,11 @@
issues.addError(this, "lookupFilePath must be specified");
}
}
+
+ override invokeInternal(WorkflowContext ctx, ProgressMonitor monitor, Issues issues) {
+ super.invokeInternal(ctx, monitor, issues);
+ genModelHelper = null;
+ }
/**
* The path inside the projectName to the Complete OCL file which contains the
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DebugStep.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DebugStep.java
new file mode 100644
index 0000000..fab29cc
--- /dev/null
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DebugStep.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2018 Willink Transformations and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ * E.D.Willink - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.ocl.examples.build.utilities;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.mwe.core.WorkflowContext;
+import org.eclipse.emf.mwe.core.issues.Issues;
+import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent;
+import org.eclipse.emf.mwe.core.monitor.ProgressMonitor;
+
+/**
+ * Does nothing other than provide a debg opportunity at which issues such as GC can be addressed.
+ */
+public class DebugStep extends AbstractWorkflowComponent
+{
+ private Logger log = Logger.getLogger(getClass());
+
+ @Override
+ public void checkConfiguration(Issues arg0) {}
+
+ @Override
+ public void invokeInternal(WorkflowContext ctx, ProgressMonitor arg1, Issues arg2) {
+ log.info("Debug step");
+ getClass();
+ }
+}
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeExpImpl.java
index 9cec9f1..62c0f37 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeExpImpl.java
@@ -26,7 +26,6 @@
import org.eclipse.ocl.pivot.ElementExtension;
import org.eclipse.ocl.pivot.PivotPackage;
import org.eclipse.ocl.pivot.ReferringElement;
-import org.eclipse.ocl.pivot.TemplateParameter;
import org.eclipse.ocl.pivot.Type;
import org.eclipse.ocl.pivot.TypeExp;
import org.eclipse.ocl.pivot.ValueSpecification;
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/Orphanage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/Orphanage.java
index f80e1cb..bf34fad 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/Orphanage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/Orphanage.java
@@ -216,7 +216,8 @@
@Override
public void addUnique(T object) {
- throw new UnsupportedOperationException();
+ // throw new UnsupportedOperationException();
+ basicAdd(object, null);
}
@Override
@@ -490,11 +491,24 @@
@Override
public @NonNull EList<org.eclipse.ocl.pivot.Class> getOwnedClasses() {
- EList<org.eclipse.ocl.pivot.Class> ownedType2 = ownedClasses;
- if (ownedType2 == null)
+ EList<org.eclipse.ocl.pivot.Class> ownedClasses2 = ownedClasses;
+ if (ownedClasses2 == null)
{
- ownedType2 = ownedClasses = new WeakEList<org.eclipse.ocl.pivot.Class>(/*WeakReference.class, this, PivotPackage.PACKAGE__OWNED_TYPE, PivotPackage.TYPE__PACKAGE*/);
+ ownedClasses2 = ownedClasses = new WeakEList<org.eclipse.ocl.pivot.Class>(/*WeakReference.class, this, PivotPackage.PACKAGE__OWNED_TYPE, PivotPackage.TYPE__PACKAGE*/);
}
- return ownedType2;
+ return ownedClasses2;
+ }
+
+ /**
+ * @since 1.18
+ */
+ @Override
+ public @NonNull EList<org.eclipse.ocl.pivot.Package> getOwnedPackages() {
+ EList<org.eclipse.ocl.pivot.Package> ownedPackages2 = ownedPackages;
+ if (ownedPackages2 == null)
+ {
+ ownedPackages2 = ownedPackages = new WeakEList<org.eclipse.ocl.pivot.Package>(/*WeakReference.class, this, PivotPackage.PACKAGE__OWNED_PACKAGE, PivotPackage.PACKAGE__OWNING_PACKAGE*/);
+ }
+ return ownedPackages2;
}
}
\ No newline at end of file
