Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2016-09-25 10:21:03 +0000
committerEd Willink2016-10-30 11:36:36 +0000
commit1fbeef8d5e5f3ed0beb23c1023f1aeb3b36052db (patch)
tree280dbee546ad99233e9a816ea662a7b35746f5a0 /plugins
parent32772d3bba0483a6119f7135a22e59a4389ef055 (diff)
downloadorg.eclipse.qvtd-1fbeef8d5e5f3ed0beb23c1023f1aeb3b36052db.tar.gz
org.eclipse.qvtd-1fbeef8d5e5f3ed0beb23c1023f1aeb3b36052db.tar.xz
org.eclipse.qvtd-1fbeef8d5e5f3ed0beb23c1023f1aeb3b36052db.zip
[unrelated] Eliminate spurious @since's
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractComputation.java3
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractExecutionVisitor.java7
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractInvocation.java1
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractObjectManager.java1
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractSlotState.java8
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java3
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationInstance.java6
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformer.java2
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTypedModelInstance.java6
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Computation.java17
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitable.java9
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitor.java7
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Invocation.java16
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationFailedException.java6
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationManager.java11
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ObjectManager.java1
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/SlotState.java7
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationExecutor.java5
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationInstance.java3
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Transformer.java19
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractInvocationInternal.java5
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java2
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalInvocationManager.java1
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalObjectManager.java133
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyInvocationManager.java1
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyObjectManager.java3
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/AbstractTransformationTechnology.java6
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/TransformationTechnology.java11
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TransformationInstanceLabelGenerator.java7
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TypedModelInstanceLabelGenerator.java7
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/AllObjectsOperation.java1
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfKindOperation.java1
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfTypeOperation.java1
-rw-r--r--plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/RootObjectsOperation.java1
34 files changed, 132 insertions, 186 deletions
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractComputation.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractComputation.java
index 3fb73568e..4c1bb64ff 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractComputation.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractComputation.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -14,7 +14,6 @@ import org.eclipse.jdt.annotation.NonNull;
/**
* AbstractInvocation provides the mandatory shared functionality of the intrusive blocked/waiting linked list functionality.
- * @since 1.1
*/
public abstract class AbstractComputation implements Computation
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractExecutionVisitor.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractExecutionVisitor.java
index 72c5ce29c..d45203e64 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractExecutionVisitor.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractExecutionVisitor.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*
@@ -17,9 +17,6 @@ package org.eclipse.qvtd.runtime.evaluation;
import org.eclipse.jdt.annotation.NonNull;
-/**
- * @since 1.1
- */
public /*abstract*/ class AbstractExecutionVisitor<R> implements ExecutionVisitor<R>
{
/**
@@ -39,7 +36,7 @@ public /*abstract*/ class AbstractExecutionVisitor<R> implements ExecutionVisito
public R visitInvocation(@NonNull Invocation object) {
return visiting(object);
}
-
+
@Override
public R visitInvocationManager(@NonNull InvocationManager object) {
return visiting(object);
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractInvocation.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractInvocation.java
index 6aaa90014..f462368ab 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractInvocation.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractInvocation.java
@@ -20,7 +20,6 @@ import org.eclipse.qvtd.runtime.internal.evaluation.AbstractInvocationInternal;
/**
* AbstractInvocation provides the mandatory shared functionality of the intrusive blocked/waiting linked list functionality.
- * @since 1.1
*/
public abstract class AbstractInvocation extends AbstractInvocationInternal
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractObjectManager.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractObjectManager.java
index 806921554..6a777bb11 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractObjectManager.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractObjectManager.java
@@ -17,7 +17,6 @@ import org.eclipse.jdt.annotation.NonNull;
/**
* AbstractObjectManager provides the mandatory shared functionality for an object state manager.
- * @since 1.1
*/
public abstract class AbstractObjectManager implements ObjectManager
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractSlotState.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractSlotState.java
index b17aac613..d9ba21b31 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractSlotState.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractSlotState.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -20,8 +20,6 @@ import org.eclipse.jdt.annotation.NonNull;
/**
* The abstract implementation of a SlotState provides the mandatory shared functionality for maintaining
* the state of an object slot.
- *
- * @since 1.1
*/
public abstract class AbstractSlotState implements SlotState
{
@@ -48,13 +46,13 @@ public abstract class AbstractSlotState implements SlotState
}
targets.add(invocation);
}
-
+
@Override
public @NonNull Iterable<Invocation.@NonNull Incremental> getSources() {
return sources != null ? sources : EMPTY_INVOCATIONS_LIST;
}
-
+
@Override
public @NonNull Iterable<Invocation.@NonNull Incremental> getTargets() {
return targets != null ? targets : EMPTY_INVOCATIONS_LIST;
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java
index 1110bc9a1..f0dce3e82 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java
@@ -19,9 +19,6 @@ import org.eclipse.ocl.pivot.internal.library.executor.ExecutorManager;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.utilities.EnvironmentFactory;
-/**
- * @since 1.1
- */
public abstract class AbstractTransformationExecutor extends ExecutorManager implements TransformationExecutor
{
protected final @NonNull EnvironmentFactory environmentFactory;
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationInstance.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationInstance.java
index 32ddb915d..3dd72f3d0 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationInstance.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationInstance.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -13,9 +13,7 @@ package org.eclipse.qvtd.runtime.evaluation;
/**
* The abstract implementation of a transformation instance provides the mandatory shared functionality for maintaining
* a run-time representation of a transformation.
- *
- * @since 1.1
*/
public abstract class AbstractTransformationInstance implements TransformationInstance
-{
+{
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformer.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformer.java
index 1359361b9..76b09d7b8 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformer.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformer.java
@@ -22,8 +22,6 @@ import org.eclipse.qvtd.runtime.internal.evaluation.AbstractTransformerInternal;
/**
* The abstract implementation of an auto-generated transformation provides the mandatory shared functionality for maintaining
* models and deferring invocation of not-ready mapping invocations.
- *
- * @since 1.1
*/
public abstract class AbstractTransformer extends AbstractTransformerInternal
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTypedModelInstance.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTypedModelInstance.java
index 07e5dcf4d..0ec68dcee 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTypedModelInstance.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTypedModelInstance.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -13,9 +13,7 @@ package org.eclipse.qvtd.runtime.evaluation;
/**
* The abstract implementation of a typed model instance provides the mandatory shared functionality for maintaining
* a run-time representation of a typed model.
- *
- * @since 1.1
*/
public abstract class AbstractTypedModelInstance implements TypedModelInstance
-{
+{
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Computation.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Computation.java
index d068ee75d..0ee303cbe 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Computation.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Computation.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -14,33 +14,32 @@ import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.ocl.pivot.ids.IdResolver;
-/**
+/**
* A Computation identifies a unique computation of its input values. This is used to support
* - a function cache which associates a result with its arguments.
* - an OCL shadow which identifies objects from all its properties.
* - a QVTr key which identifies objects from a subset of their properties.
- *
+ *
* @noimplement clients should derive from AbstractIdentification
- * @since 1.1
*/
public interface Computation extends ExecutionVisitable
-{
+{
@Nullable Object getResult();
-
+
/**
* Return true if this is a computation from thoseValues.
*/
boolean isEqual(@NonNull IdResolver idResolver, @Nullable Object @NonNull [] thoseValues);
-
+
public interface Constructor
- {
+ {
/**
* Return the cached computation from argValues, using newInstance(argValues) to
* create a new computation instance if necessary.
*/
public @NonNull Computation getUniqueComputation(@Nullable Object @NonNull ... argValues);
}
-
+
public interface Incremental extends Computation
{
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitable.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitable.java
index 37b9ade45..80bb34627 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitable.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitable.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -12,14 +12,13 @@ package org.eclipse.qvtd.runtime.evaluation;
import org.eclipse.jdt.annotation.NonNull;
-/**
+/**
* ExecutionVisitable defines the common visitable capability of all run-time execution objects.
- *
+ *
* @noimplement clients should derive from some AbstractXXX class
- * @since 1.1
*/
public interface ExecutionVisitable
-{
+{
/**
* Returns the result of accepting a visit from a visitor.
* Implementations typically invoke a derived-class-specific
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitor.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitor.java
index aeac23218..4737bf3fd 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitor.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ExecutionVisitor.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*
@@ -17,16 +17,13 @@ package org.eclipse.qvtd.runtime.evaluation;
import org.eclipse.jdt.annotation.NonNull;
-/**
- * @since 1.1
- */
public interface ExecutionVisitor<R>
{
/**
* Return the result of visiting a visitable for which no more specific pivot type method
* is available.
*/
-// R visiting(@NonNull ExecutionVisitable visitable);
+ // R visiting(@NonNull ExecutionVisitable visitable);
R visitComputation(@NonNull Computation object);
R visitInvocation(@NonNull Invocation object);
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Invocation.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Invocation.java
index dea1ba5e4..abfff4a2a 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Invocation.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Invocation.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -14,11 +14,10 @@ import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.ocl.pivot.ids.IdResolver;
-/**
+/**
* An Invocation identifies a unique invocation of a Mapping and the objects/values bound to its guard variables.
- *
+ *
* @noimplement clients should derive from AbstractInvocation
- * @since 1.1
*/
public interface Invocation extends ExecutionVisitable
{
@@ -37,15 +36,15 @@ public interface Invocation extends ExecutionVisitable
* Return true if an occurrence with thoseValues would be a re-occurrence.
*/
boolean isEqual(@NonNull IdResolver idResolver, @NonNull Object @NonNull [] thoseValues);
-
+
/**
* Remove this Invocation from the blocked or waiting invocations linked list.
*/
void remove();
-
+
public interface Constructor
- {
+ {
/**
* Return the first invocation of this constructor with argValues, using newInstance(argValues) to
* create a new invocation instance if necessary. Returns null if an instance already created.
@@ -57,7 +56,7 @@ public interface Invocation extends ExecutionVisitable
*/
@NonNull Invocation newInstance(@NonNull Object @NonNull [] values);
}
-
+
public interface Incremental extends Invocation
{
void addCreatedObject(@NonNull Object createdObject);
@@ -66,5 +65,6 @@ public interface Invocation extends ExecutionVisitable
@NonNull Iterable<@NonNull Object> getCreatedObjects();
@NonNull Iterable<SlotState.@NonNull Incremental> getReadSlots();
@NonNull Iterable<SlotState.@NonNull Incremental> getWriteSlots();
+ // void invalidate();
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationFailedException.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationFailedException.java
index 8e372b4f6..157a6d6a1 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationFailedException.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationFailedException.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -17,14 +17,12 @@ import org.eclipse.ocl.pivot.values.InvalidValueException;
* An InvocationFailedException is thrown when a Mapping invocation fails as a result of an attempt to
* access a Property before its value has been assigned. The InvocationManager should catch the exception
* and mark the invocation for a retry once the Property has been assigned.
- *
- * @since 1.1
*/
@SuppressWarnings("serial")
public class InvocationFailedException extends InvalidValueException
{
public final @NonNull SlotState slotState;
-
+
public InvocationFailedException(@NonNull SlotState slotState) {
super("not-ready");
this.slotState = slotState;
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationManager.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationManager.java
index fadb16a64..8b962ea31 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationManager.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/InvocationManager.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -16,13 +16,12 @@ import org.eclipse.jdt.annotation.NonNull;
* An InvocationManager supervises the invocations of mappings, inhibiting re-executions and
* maintaining a blocked list of invocations that have failed and a waiting list of invocations
* ready to be reattempted.
- *
- * @since 1.1
+ *
* @noimplement clients should derive from AbstractInvocationManager
*/
public interface InvocationManager extends ExecutionVisitable
-{
+{
boolean flush();
- void invoke(@NonNull Invocation invocation, boolean doFlush);
- void unblock(@NonNull Invocation invocation);
+ void invoke(@NonNull Invocation invocation, boolean doFlush);
+ void unblock(@NonNull Invocation invocation);
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ObjectManager.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ObjectManager.java
index 718b82ca4..f3ce16c12 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ObjectManager.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/ObjectManager.java
@@ -21,7 +21,6 @@ import org.eclipse.jdt.annotation.Nullable;
*
* assigned should be invoked to invocation that a property whose access is guarded is now assigned.
*
- * @since 1.1
* @noimplement clients should derive from AbstractObjectManager
*/
public interface ObjectManager extends ExecutionVisitable
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/SlotState.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/SlotState.java
index 71832d8e5..89bd6cb6e 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/SlotState.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/SlotState.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -17,14 +17,13 @@ import org.eclipse.jdt.annotation.Nullable;
/**
* A SlotState identifies the assigned/not assigned state of an Object slot. Except for debug purposes, it does not
* maintain the assigned values, just whether an assignment has occurred.
- *
+ *
* Derived classes handle different usages:
* A SimpleSlotState supports a unidirectional state such as an EAttribute.
* A OneToOneSlotState supports both ends of a 1:1 EReference.
* A OnetoManyElementSlotState and OneToManyAggregatorSlotState support the 1:N and N:1 ends of a 1:N EReference.
* A ManyToManySlotState supports one end of an M:N EReference.
- *
- * @since 1.1
+ *
* @noimplement clients should derive from AbstractSlotState
*/
public interface SlotState extends ExecutionVisitable
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationExecutor.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationExecutor.java
index a9a6b2c94..0331ba5f7 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationExecutor.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationExecutor.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -15,8 +15,7 @@ import org.eclipse.ocl.pivot.evaluation.Executor;
/**
* A TransformationExecutor supervises the execution of an auto-generated transformation.
- *
- * @since 1.1
+ *
* @noimplement
*/
public interface TransformationExecutor extends Executor
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationInstance.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationInstance.java
index 5dabd5350..a437b7164 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationInstance.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/TransformationInstance.java
@@ -15,8 +15,7 @@ import org.eclipse.jdt.annotation.Nullable;
/**
* A TransformationInstance reifies an executing transformation as a useable
* transformation model instance during the execution of a transformation.
- *
- * @since 1.1
+ *
* @noimplement clients should derive from AbstractTransformationInstance
*/
public interface TransformationInstance
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Transformer.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Transformer.java
index 59e9e67ef..ea0a69e9e 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Transformer.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/Transformer.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -19,31 +19,30 @@ import org.eclipse.ocl.pivot.evaluation.ModelManager;
/**
* A Transformer provides the core support to execute an auto-generated transformation
* between models.
- *
- * @since 1.1
+ *
* @noimplement clients should derive from AbstractTransformer
*/
public interface Transformer extends ModelManager, ExecutionVisitable
{
/**
* Clients may reference this explicitly to force a compile-time failure for a mismatch.
- *
+ *
* @noreference this is solely for development usage.
- *
+ *
* 1.1.0-1 API version introduced, ObjectManager etc interfaces separated out, AbstractObjectManager etc enforced.
* 1.1.0-2 Preliminary incremental support.
*/
public static int RUN_TIME_EVALUATOR_API_VERSION_1_1_0_2 = 1*1000 + 1 * 100 + 0*10 + 2;
-
+
/**
* The run-time API version.
- *
+ *
* @noreference this is solely for development usage.
*/
public static int RUN_TIME_EVALUATOR_API_VERSION = RUN_TIME_EVALUATOR_API_VERSION_1_1_0_2;
-
+
void addRootObjects(@NonNull String modelName, @NonNull Iterable<@NonNull ? extends Object> rootObjects);
@NonNull Collection<@NonNull ? extends EObject> getRootEObjects(@NonNull String modelName);
- @NonNull Collection<@NonNull Object> getRootObjects(@NonNull String modelName);
- boolean run() throws Exception;
+ @NonNull Collection<@NonNull Object> getRootObjects(@NonNull String modelName);
+ boolean run() throws Exception;
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractInvocationInternal.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractInvocationInternal.java
index 260b98f56..8a673f3c3 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractInvocationInternal.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractInvocationInternal.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -17,14 +17,13 @@ import org.eclipse.qvtd.runtime.evaluation.SlotState;
/**
* AbstractInvocation provides the shared implementation of the intrusive blocked/waiting linked list functionality.
- * @since 1.1
*/
public abstract class AbstractInvocationInternal implements Invocation
{
@NonNull AbstractInvocationInternal prev = this;
@NonNull AbstractInvocationInternal next = this;
public @Nullable SlotState debug_blockedBy = null;
-
+
@Override
public void insertAfter(@NonNull Invocation predecessor) {
@NonNull AbstractInvocationInternal castPredecessor = (AbstractInvocationInternal)predecessor;
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java
index 1d98ddbd8..e9c600717 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java
@@ -57,8 +57,6 @@ import org.eclipse.qvtd.runtime.evaluation.Transformer;
/**
* The abstract implementation of an auto-generated transformation provides the shared infrastructure for maintaining
* models and deferring invocation of not-ready mapping invocations.
- *
- * @since 1.1
*/
public abstract class AbstractTransformerInternal extends AbstractModelManager implements Transformer, ExecutionVisitable
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalInvocationManager.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalInvocationManager.java
index 52bf2900e..4825e198d 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalInvocationManager.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalInvocationManager.java
@@ -20,7 +20,6 @@ import org.eclipse.qvtd.runtime.evaluation.SlotState;
/**
* InvocationManager supervises and provides thread safety for the lists of blocked and waiting invocations.
- * @since 1.1
*/
public class IncrementalInvocationManager extends AbstractInvocationManager
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalObjectManager.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalObjectManager.java
index d10c0e3c2..70a22ee15 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalObjectManager.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/IncrementalObjectManager.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -30,9 +30,6 @@ import org.eclipse.qvtd.runtime.evaluation.InvocationFailedException;
import org.eclipse.qvtd.runtime.evaluation.ObjectManager;
import org.eclipse.qvtd.runtime.evaluation.SlotState;
-/**
- * @since 1.1
- */
public class IncrementalObjectManager extends AbstractObjectManager
{
/**
@@ -44,22 +41,22 @@ public class IncrementalObjectManager extends AbstractObjectManager
ASSIGNABLE, // No assignment has been performed, object reads are blocked (collections reads may be unblocked)
ASSIGNED // Last assignment has been performed, reads are unblocked
}
-
- protected final @NonNull Object eObject;
- protected final @NonNull EStructuralFeature eFeature;
- private @Nullable Object value = null;
+
+ protected final @NonNull Object eObject;
+ protected final @NonNull EStructuralFeature eFeature;
+ private @Nullable Object value = null;
protected @NonNull SlotMode mode;
private @Nullable Object blockedInvocations = null;
-
+
public BasicSlotState(@NonNull Object eObject, @NonNull EStructuralFeature eFeature) {
- mode = SlotMode.ASSIGNABLE;
+ mode = SlotMode.ASSIGNABLE;
this.eObject = eObject;
this.eFeature = eFeature;
}
public BasicSlotState(@NonNull Object eObject, @NonNull EStructuralFeature eFeature, @Nullable Object ecoreValue) {
- mode = SlotMode.ASSIGNED;
+ mode = SlotMode.ASSIGNED;
this.eObject = eObject;
this.eFeature = eFeature;
this.value = ecoreValue;
@@ -77,7 +74,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
}
this.value = ecoreValue;
}
-
+
@Override
public synchronized void block(@NonNull Invocation invocation) {
final Object blockedInvocations2 = blockedInvocations;
@@ -146,7 +143,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
blockedInvocations = null;
}
}
-
+
/**
* SlotState describing the contained element side of a 1:N Object navigation.
* A single OneToManyContainedSlotState is shared by each of the possible containing features and also the
@@ -159,14 +156,14 @@ public class IncrementalObjectManager extends AbstractObjectManager
* - get of an aggregator => ASSIGNABLE, blocked
* Unblock
* - assign of possibly null aggregator for the element, ASSIGNABLE, blocked => ASSIGNED, not blocked
- * - non-null aggregator is notified to unblock
+ * - non-null aggregator is notified to unblock
* Thereafter
* - get of aggregator ASSIGNED => ASSIGNED
* <br>
* Lifecycle (write first):
* Create due to
* - assign of a possibly null aggregator => ASSIGNED, unblocked
- * - non-null aggregator is notified to unblock
+ * - non-null aggregator is notified to unblock
* Thereafter
* - get of aggregator ASSIGNED => ASSIGNED
*
@@ -184,7 +181,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
}
return new ContainedSlotState(eObject, eFeature, eContainer);
}
-
+
public ContainedSlotState(@NonNull EObject eObject, @NonNull EReference eFeature) {
super(eObject, eFeature);
assert !eFeature.isMany();
@@ -194,7 +191,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
}
// assert eFeature.getEOpposite().isMany();
}
-
+
private ContainedSlotState(@NonNull EObject eObject, @NonNull EReference eFeature, @Nullable EObject eContainer) {
super(eObject, eFeature, eContainer);
assert !eFeature.isMany();
@@ -216,7 +213,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
}
super.assigned(objectManager, eObject, eFeature, ecoreValue);
}
-
+
@Override
@SuppressWarnings("unchecked")
public synchronized @Nullable <G> G get(@NonNull ObjectManager objectManager, @NonNull EObject eObject, @NonNull EStructuralFeature eFeature) {
@@ -235,7 +232,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
return (G) eObject.eContainer();
}
} */
-
+
/**
* SlotState describing the container side of a 1:N Object navigation.
* <br>
@@ -274,7 +271,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
}
return new ContainerSlotState(eObject, eFeature, eContent);
}
-
+
public ContainerSlotState(@NonNull EObject eContainer, @NonNull EReference eFeature) {
super(eContainer, eFeature);
assert eFeature.isContainer();
@@ -307,12 +304,12 @@ public class IncrementalObjectManager extends AbstractObjectManager
super.assigned(objectManager, eObject, eFeature, ecoreValue);
}
-
+
public void assignedElement(@NonNull ObjectManager objectManager,
@NonNull EObject eContainer, @NonNull EReference eReference, EObject eObject) {
super.assigned(objectManager, eContainer, eReference, eObject);
}
-
+
@Override
@SuppressWarnings("unchecked")
public synchronized @Nullable <G> G get(@NonNull ObjectManager objectManager, @NonNull EObject eObject, @NonNull EStructuralFeature eFeature) {
@@ -327,12 +324,12 @@ public class IncrementalObjectManager extends AbstractObjectManager
return (G) eObject.eGet(eFeature);
}
} */
-
+
/**
* SlotState describing an M:N Object navigation.
*/
class ManyToManySlotState extends BasicSlotState
- {
+ {
public ManyToManySlotState(@NonNull Object eObject, @NonNull EStructuralFeature eFeature) {
super(eObject, eFeature);
throw new UnsupportedOperationException();
@@ -343,7 +340,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
throw new UnsupportedOperationException();
}
}
-
+
/**
* SlotState describing the aggregator side of a 1:N Object navigation.
* <br>
@@ -375,24 +372,24 @@ public class IncrementalObjectManager extends AbstractObjectManager
class OneToManyAggregatorSlotState extends BasicSlotState
{
-// public static @NonNull SlotState create(@NonNull ObjectManager objectManager,
-// EObject eObject, @NonNull EReference eFeature, EReference eOppositeReference, Object ecoreValue) {
-// // TODO Auto-generated method stub
-// return null;
-// }
-
+ // public static @NonNull SlotState create(@NonNull ObjectManager objectManager,
+ // EObject eObject, @NonNull EReference eFeature, EReference eOppositeReference, Object ecoreValue) {
+ // // TODO Auto-generated method stub
+ // return null;
+ // }
+
public OneToManyAggregatorSlotState(@NonNull Object eContainer, @NonNull EStructuralFeature eFeature) {
super(eContainer, eFeature);
assert eFeature.isMany();
-// assert eFeature.getEOpposite() != null;
-// assert eFeature.getEOpposite().isMany();
+ // assert eFeature.getEOpposite() != null;
+ // assert eFeature.getEOpposite().isMany();
}
private OneToManyAggregatorSlotState(@NonNull Object eContainer, @NonNull EStructuralFeature eFeature, @Nullable Object eContents) {
super(eContainer, eFeature, eContents);
assert eFeature.isMany();
-// assert eFeature.getEOpposite() != null;
-// assert eFeature.getEOpposite().isMany();
+ // assert eFeature.getEOpposite() != null;
+ // assert eFeature.getEOpposite().isMany();
assert ((EObject)eContainer).eGet(eFeature).equals(eContents);
}
@@ -408,12 +405,12 @@ public class IncrementalObjectManager extends AbstractObjectManager
elementObjectState.put(eOppositeReference, this);
}
}
-// super.assigned(objectManager, eObject, eFeature, ecoreValue);
+ // super.assigned(objectManager, eObject, eFeature, ecoreValue);
assignedElement(eObject, (EReference)eFeature, (EObject)ecoreValue);
}
-
+
public void assignedElement(@NonNull Object eContainer, @NonNull EReference eReference, Object eObject) {
-// super.assigned(objectManager, eContainer, eReference, eObject);
+ // super.assigned(objectManager, eContainer, eReference, eObject);
switch (mode) {
case ASSIGNABLE:
mode = SlotMode.ASSIGNED;
@@ -423,7 +420,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
break;
}
}
-
+
@Override
public synchronized void getting(@NonNull Object eObject, @NonNull EStructuralFeature eFeature) {
switch (mode) {
@@ -436,7 +433,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
}
}
}
-
+
/**
* SlotState describing the element side of a 1:N Object navigation.
* <br>
@@ -445,14 +442,14 @@ public class IncrementalObjectManager extends AbstractObjectManager
* - get of an aggregator => ASSIGNABLE, blocked
* Unblock
* - assign of possibly null aggregator for the element, ASSIGNABLE, blocked => ASSIGNED, not blocked
- * - non-null aggregator is notified to unblock
+ * - non-null aggregator is notified to unblock
* Thereafter
* - get of aggregator ASSIGNED => ASSIGNED
* <br>
* Lifecycle (write first):
* Create due to
* - assign of a possibly null aggregator => ASSIGNED, unblocked
- * - non-null aggregator is notified to unblock
+ * - non-null aggregator is notified to unblock
* Thereafter
* - get of aggregator ASSIGNED => ASSIGNED
*/
@@ -469,7 +466,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
assert eFeature.getEOpposite().isMany();
}
}
-
+
public OneToManyElementSlotState(@NonNull Object eObject, @NonNull EReference eFeature, @NonNull Object eAggregator) {
super(eObject, eFeature, eAggregator);
assert !eFeature.isMany();
@@ -519,7 +516,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
}
}
}
-
+
/**
* SlotState describing a 1:1 Object navigation. Both ends are assigned exactly once. The remote assignment
* may be null.
@@ -542,7 +539,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
*/
class OneToOneSlotState extends BasicSlotState
{
-/* public static @NonNull <G,S> SlotState createContainer(@NonNull ObjectManager objectManager,
+ /* public static @NonNull <G,S> SlotState createContainer(@NonNull ObjectManager objectManager,
@NonNull EObject eObject, @NonNull EReference eFeature, @Nullable EReference eOppositeFeature, @Nullable EObject eOpposite) {
Map<EStructuralFeature, SlotState> oppositeObjectState = null;
if (eOpposite != null) {
@@ -550,7 +547,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
SlotState slotState = oppositeObjectState.get(eOppositeFeature);
if (slotState != null) {
return slotState;
- }
+ }
}
SlotState slotState = new OneToOneSlotState(eObject, eFeature, eOpposite);
if (oppositeObjectState != null) {
@@ -558,19 +555,19 @@ public class IncrementalObjectManager extends AbstractObjectManager
}
return slotState;
} */
-
+
public OneToOneSlotState(@NonNull Object eObject, @NonNull EReference eFeature) {
super(eObject, eFeature);
assert !eFeature.isMany();
if (eFeature.isContainer()) {
-// assert eObject.eContainer() == eOpposite;
+ // assert eObject.eContainer() == eOpposite;
}
else if (eFeature.isContainment()) {
-// assert eOpposite != null;
-// assert eObject == eOpposite.eContainer();
+ // assert eOpposite != null;
+ // assert eObject == eOpposite.eContainer();
}
else if (eFeature == OCLstdlibPackage.Literals.OCL_ELEMENT__OCL_CONTAINER) {
-// slotState = new OneToOneSlotState(eObject, eReference);
+ // slotState = new OneToOneSlotState(eObject, eReference);
}
else {
assert eFeature.getEOpposite() != null;
@@ -600,7 +597,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
assigned(IncrementalObjectManager.this, eObject, eFeature, ecoreValue);
}
}
-
+
/**
* Simple SlotState describing a DataType element or 1:1 Object navigation.
*/
@@ -622,10 +619,10 @@ public class IncrementalObjectManager extends AbstractObjectManager
/**
* This unpleasant Map of Maps is a pathfinder before embarking on slotted objects that merge user and overhead
- * in a single object. The first map is then a null lookup and the nested map is an index within the object.
+ * in a single object. The first map is then a null lookup and the nested map is an index within the object.
*/
private Map<@NonNull Object, @NonNull Map<@NonNull EStructuralFeature, @NonNull BasicSlotState>> object2feature2slotState = new HashMap<@NonNull Object, @NonNull Map<@NonNull EStructuralFeature, @NonNull BasicSlotState>>();
-
+
public IncrementalObjectManager(@NonNull IncrementalInvocationManager invocationManager) {
super(invocationManager);
}
@@ -639,7 +636,7 @@ public class IncrementalObjectManager extends AbstractObjectManager
Map<EStructuralFeature, BasicSlotState> objectState = getObjectState(eObject);
BasicSlotState slotState = objectState.get(eFeature);
if (slotState != null) {
- slotState.assigned(eObject, eFeature, ecoreValue);
+ slotState.assigned(eObject, eFeature, ecoreValue);
}
else {
if (eFeature instanceof EAttribute) {
@@ -649,10 +646,10 @@ public class IncrementalObjectManager extends AbstractObjectManager
EReference eReference = (EReference)eFeature;
EReference eOppositeReference = eReference.getEOpposite();
if (eOppositeReference != null) {
-// if (ecoreValue != null) {
-// Map<EStructuralFeature, SlotState> oppositeObjectState = getObjectState((EObject) ecoreValue);
-// SlotState oppositeSlotState = oppositeObjectState.get(eOppositeReference);
-// }
+ // if (ecoreValue != null) {
+ // Map<EStructuralFeature, SlotState> oppositeObjectState = getObjectState((EObject) ecoreValue);
+ // SlotState oppositeSlotState = oppositeObjectState.get(eOppositeReference);
+ // }
if (eReference.isMany()) {
assert ecoreValue != null;
if (eOppositeReference.isMany()) {
@@ -666,9 +663,9 @@ public class IncrementalObjectManager extends AbstractObjectManager
if (eOppositeReference.isMany()) {
slotState = createOneToManyElementSlotState(eObject, eReference, eOppositeReference, ecoreValue);
}
-// else if (isIncremental) {
-// slotState = AbstractTransformerInternal.OneToOneSlotState.create(this, eObject, eReference, eOppositeReference, ecoreValue);
-// }
+ // else if (isIncremental) {
+ // slotState = AbstractTransformerInternal.OneToOneSlotState.create(this, eObject, eReference, eOppositeReference, ecoreValue);
+ // }
}
}
else if (eReference.isContainment()) {
@@ -682,16 +679,16 @@ public class IncrementalObjectManager extends AbstractObjectManager
Map<EStructuralFeature, BasicSlotState> oppositeObjectState = getObjectState(ecoreValue);
slotState = oppositeObjectState.get(eOppositeReference);
if (slotState != null) {
- slotState.assigned(ecoreValue, eOppositeReference, eObject);
+ slotState.assigned(ecoreValue, eOppositeReference, eObject);
}
else {
slotState = createOneToOneSlotState(eObject, eReference, eOppositeReference, ecoreValue);
}
}
}
-// else if (eReference == OCLstdlibPackage.Literals.OCL_ELEMENT__OCL_CONTAINER) {
-// slotState = OneToOneSlotState.create(this, eObject, eReference, eOppositeReference, ecoreValue);
-// }
+ // else if (eReference == OCLstdlibPackage.Literals.OCL_ELEMENT__OCL_CONTAINER) {
+ // slotState = OneToOneSlotState.create(this, eObject, eReference, eOppositeReference, ecoreValue);
+ // }
else { // Unidirectional non-containment EReference
slotState = new SimpleSlotState(eObject, eFeature, ecoreValue);
}
@@ -716,8 +713,8 @@ public class IncrementalObjectManager extends AbstractObjectManager
@NonNull BasicSlotState createOneToManyAggregatorSlotState(
@NonNull Object eObject, @NonNull EReference eFeature, @NonNull EReference eOppositeFeature, @Nullable Object eContents) {
if (eContents != null) {
-// SlotState containedSlotState = objectManager.getSlotState(eContent, eOppositeFeature);
-// containedSlotState.assigned(objectManager, eContent, eOppositeFeature, eObject);
+ // SlotState containedSlotState = objectManager.getSlotState(eContent, eOppositeFeature);
+ // containedSlotState.assigned(objectManager, eContent, eOppositeFeature, eObject);
}
return new OneToManyAggregatorSlotState(eObject, eFeature, eContents);
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyInvocationManager.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyInvocationManager.java
index 5cc0b829c..41436b0cd 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyInvocationManager.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyInvocationManager.java
@@ -20,7 +20,6 @@ import org.eclipse.qvtd.runtime.evaluation.SlotState;
/**
* InvocationManager supervises and provides thread safety for the lists of blocked and waiting invocations.
- * @since 1.1
*/
public class LazyInvocationManager extends AbstractInvocationManager
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyObjectManager.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyObjectManager.java
index 2d2244355..6aa2638ff 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyObjectManager.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/LazyObjectManager.java
@@ -43,9 +43,6 @@ import org.eclipse.qvtd.runtime.evaluation.InvocationFailedException;
import org.eclipse.qvtd.runtime.evaluation.ObjectManager;
import org.eclipse.qvtd.runtime.evaluation.SlotState;
-/**
- * @since 1.1
- */
public class LazyObjectManager extends AbstractObjectManager
{
/**
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/AbstractTransformationTechnology.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/AbstractTransformationTechnology.java
index 291c0fea2..b585c8a6e 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/AbstractTransformationTechnology.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/AbstractTransformationTechnology.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -15,13 +15,11 @@ import org.eclipse.jdt.annotation.NonNull;
/**
* AbstractTransformationTechnology provides the mandatory shared functionality of TransformationTechnology
* that is to be extended by all TransformationTechnology implementations.
- *
- * @since 1.1
*/
public abstract class AbstractTransformationTechnology implements TransformationTechnology
{
protected final @NonNull String name;
-
+
protected AbstractTransformationTechnology(@NonNull String name) {
this.name = name;
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/TransformationTechnology.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/TransformationTechnology.java
index ddff21eb8..0d6f65b86 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/TransformationTechnology.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/invocation/TransformationTechnology.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* E.D.Willink - Initial API and implementation
*******************************************************************************/
@@ -20,8 +20,7 @@ import org.eclipse.osgi.util.NLS;
/**
* TransformationTechnology defines a polymorphic interface by which a variety of alternative transformation
* technologies my be invoked.
- *
- * @since 1.1
+ *
* @noimplement clients should derive from AbstractTransformationTechnology
*/
public interface TransformationTechnology
@@ -29,13 +28,13 @@ public interface TransformationTechnology
@SuppressWarnings("serial")
public class TransformationException extends Exception {
protected final @NonNull Map<@NonNull String, Object> parametersMap;
-
+
public TransformationException(@NonNull Map<@NonNull String, Object> parametersMap, @Nullable Throwable cause, @NonNull String message, Object... objects) {
super(NLS.bind(message, objects), cause);
this.parametersMap = parametersMap;
}
}
-
+
/**
* Perform a transformation.
* Optionally use resources within resourceSet.
@@ -46,7 +45,7 @@ public interface TransformationTechnology
*/
@NonNull Map<@NonNull String, Object> execute(@NonNull ResourceSet resourceSet, @NonNull Map<@NonNull String, Object> modelMap,
@NonNull Map<@NonNull String, Object> parametersMap) throws TransformationException;
-
+
/**
* Return the TransformationTechnology name used as the TransformationTechnologyContribution.REGISTRY key.
*/
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TransformationInstanceLabelGenerator.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TransformationInstanceLabelGenerator.java
index 80c2e91e6..4bfce8bcd 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TransformationInstanceLabelGenerator.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TransformationInstanceLabelGenerator.java
@@ -14,15 +14,12 @@ import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.pivot.labels.AbstractLabelGenerator;
import org.eclipse.qvtd.runtime.evaluation.TransformationInstance;
-/**
- * @since 1.1
- */
public final class TransformationInstanceLabelGenerator extends AbstractLabelGenerator<TransformationInstance>
{
public static void initialize(Registry registry) {
- registry.install(TransformationInstance.class, new TransformationInstanceLabelGenerator());
+ registry.install(TransformationInstance.class, new TransformationInstanceLabelGenerator());
}
-
+
public TransformationInstanceLabelGenerator() {
super(TransformationInstance.class);
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TypedModelInstanceLabelGenerator.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TypedModelInstanceLabelGenerator.java
index ec6fafb05..eb7b09389 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TypedModelInstanceLabelGenerator.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/labels/TypedModelInstanceLabelGenerator.java
@@ -14,15 +14,12 @@ import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.pivot.labels.AbstractLabelGenerator;
import org.eclipse.qvtd.runtime.evaluation.TypedModelInstance;
-/**
- * @since 1.1
- */
public final class TypedModelInstanceLabelGenerator extends AbstractLabelGenerator<TypedModelInstance>
{
public static void initialize(Registry registry) {
- registry.install(TypedModelInstance.class, new TypedModelInstanceLabelGenerator());
+ registry.install(TypedModelInstance.class, new TypedModelInstanceLabelGenerator());
}
-
+
public TypedModelInstanceLabelGenerator() {
super(TypedModelInstance.class);
}
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/AllObjectsOperation.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/AllObjectsOperation.java
index 3af134460..134745110 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/AllObjectsOperation.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/AllObjectsOperation.java
@@ -25,7 +25,6 @@ import org.eclipse.qvtd.runtime.evaluation.TypedModelInstance;
/**
* AllObjectsOperation realises the Model::allObjects() library operation.
- * @since 1.1
*/
public class AllObjectsOperation extends AbstractUnaryOperation
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfKindOperation.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfKindOperation.java
index f58bd007f..64c7ab508 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfKindOperation.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfKindOperation.java
@@ -25,7 +25,6 @@ import org.eclipse.qvtd.runtime.evaluation.TypedModelInstance;
/**
* ModelObjectsOfKindOperation realises the Model::objectsOfKind() library operation.
- * @since 1.1
*/
public class ModelObjectsOfKindOperation extends AbstractBinaryOperation
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfTypeOperation.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfTypeOperation.java
index 5e00bef60..1630300ad 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfTypeOperation.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/ModelObjectsOfTypeOperation.java
@@ -25,7 +25,6 @@ import org.eclipse.qvtd.runtime.evaluation.TypedModelInstance;
/**
* ModelObjectsOfTypeOperation realises the Model::objectsOfType() library operation.
- * @since 1.1
*/
public class ModelObjectsOfTypeOperation extends AbstractBinaryOperation
{
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/RootObjectsOperation.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/RootObjectsOperation.java
index 9c5834360..832e841bd 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/RootObjectsOperation.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/library/model/RootObjectsOperation.java
@@ -25,7 +25,6 @@ import org.eclipse.qvtd.runtime.evaluation.TypedModelInstance;
/**
* RootObjectsOperation realises the Model::rootObjects() library operation.
- * @since 1.1
*/
public class RootObjectsOperation extends AbstractUnaryOperation
{

Back to the top