[436546] remove many Javadoc warnings, add interactive launch
diff --git a/examples/org.eclipse.ocl.examples.autogen/emf-gen/org/eclipse/ocl/examples/autogen/autocgmodel/util/AutoCGModelSwitch.java b/examples/org.eclipse.ocl.examples.autogen/emf-gen/org/eclipse/ocl/examples/autogen/autocgmodel/util/AutoCGModelSwitch.java
index 8ff95a6..499ba79 100644
--- a/examples/org.eclipse.ocl.examples.autogen/emf-gen/org/eclipse/ocl/examples/autogen/autocgmodel/util/AutoCGModelSwitch.java
+++ b/examples/org.eclipse.ocl.examples.autogen/emf-gen/org/eclipse/ocl/examples/autogen/autocgmodel/util/AutoCGModelSwitch.java
@@ -65,7 +65,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/MethodSpec.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/MethodSpec.java
index 2b04688..b2447f5 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/MethodSpec.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/MethodSpec.java
@@ -53,7 +53,9 @@
protected void appendHeader(@NonNull StringBuilder s, @Nullable String comment) {
s.append("\n");
s.append("\t/**\n");
- if (comment != null) {
+ if ("".equals(comment)) {
+ }
+ else if (comment != null) {
for (String commentLine : comment.split("\n")) {
s.append("\t * " + commentLine + "\n");
}
@@ -81,7 +83,7 @@
}
else {
if (isRootSpec && (variableDecl != null)) {
- appendHeader(s, null);
+ appendHeader(s, "");
s.append("\tprotected " + variableDecl + ";\n");
}
String body = getBody(modelSpec, genModel);
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAccumulatorImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAccumulatorImpl.java
index 7371f1b..474991f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAccumulatorImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAccumulatorImpl.java
@@ -81,7 +81,6 @@
}
/**
- * {@inheritDoc}
* @generated
*/
protected boolean nonInvalid = false;
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBuiltInIterationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBuiltInIterationCallExpImpl.java
index 5d8fdab..1752111 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBuiltInIterationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBuiltInIterationCallExpImpl.java
@@ -246,7 +246,6 @@
}
/**
- * {@inheritDoc}
* @generated
*/
protected boolean nonNull = false;
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGValuedElementImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGValuedElementImpl.java
index a602ef5..6d7cebd 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGValuedElementImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGValuedElementImpl.java
@@ -480,7 +480,6 @@
}
/**
- * {@inheritDoc}
* @generated
*/
protected boolean caught = false;
@@ -495,7 +494,6 @@
}
/**
- * {@inheritDoc}
* @generated
*/
protected String valueName = null;
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableImpl.java
index 9a1b558..b6aff7d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableImpl.java
@@ -300,7 +300,6 @@
}
/**
- * {@inheritDoc}
* @generated
*/
protected boolean nonInvalid = false;
@@ -315,7 +314,6 @@
}
/**
- * {@inheritDoc}
* @generated
*/
protected boolean nonNull = false;
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractCGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractCGModelVisitor.java
index fd99bbf..23637da 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractCGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractCGModelVisitor.java
@@ -13,8 +13,8 @@
* This code is auto-generated
* from: org.eclipse.ocl.examples.codegen/model/cgmodel.genmodel
*
- * Do not edit it.
- */
+ * Only the copyright statement is editable.
+ *******************************************************************************/
package org.eclipse.ocl.examples.codegen.cgmodel.util;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractExtendingCGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractExtendingCGModelVisitor.java
index e3f1e40..a123583 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractExtendingCGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractExtendingCGModelVisitor.java
@@ -13,8 +13,8 @@
* This code is auto-generated
* from: org.eclipse.ocl.examples.codegen/model/cgmodel.genmodel
*
- * Do not edit it.
- */
+ * Only the copyright statement is editable.
+ *******************************************************************************/
package org.eclipse.ocl.examples.codegen.cgmodel.util;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNonNullExtendingCGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNonNullExtendingCGModelVisitor.java
index 1453bf8..9995a86 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNonNullExtendingCGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNonNullExtendingCGModelVisitor.java
@@ -13,8 +13,8 @@
* This code is auto-generated
* from: org.eclipse.ocl.examples.codegen/model/cgmodel.genmodel
*
- * Do not edit it.
- */
+ * Only the copyright statement is editable.
+ *******************************************************************************/
package org.eclipse.ocl.examples.codegen.cgmodel.util;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNullCGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNullCGModelVisitor.java
index a2db36c..7e3ce4c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNullCGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNullCGModelVisitor.java
@@ -13,8 +13,8 @@
* This code is auto-generated
* from: org.eclipse.ocl.examples.codegen/model/cgmodel.genmodel
*
- * Do not edit it.
- */
+ * Only the copyright statement is editable.
+ *******************************************************************************/
package org.eclipse.ocl.examples.codegen.cgmodel.util;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelSwitch.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelSwitch.java
index 6955b18..69e2589 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelSwitch.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelSwitch.java
@@ -56,7 +56,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelVisitor.java
index 47d3e71..c510ff2 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelVisitor.java
@@ -13,8 +13,8 @@
* This code is auto-generated
* from: org.eclipse.ocl.examples.codegen/model/cgmodel.genmodel
*
- * Do not edit it.
- */
+ * Only the copyright statement is editable.
+ *******************************************************************************/
package org.eclipse.ocl.examples.codegen.cgmodel.util;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/GlobalPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/GlobalPlace.java
index 2f6825d..3470dc2 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/GlobalPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/GlobalPlace.java
@@ -224,7 +224,6 @@
/**
* Optimize the cgRoot tree by eliminating common subexpressions.
- * @param globals
*/
public void optimize(@NonNull CGElement cgRoot) {
element2place.put(null, this);
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/TypeDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/TypeDescriptor.java
index e74679b..58e777e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/TypeDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/TypeDescriptor.java
@@ -63,8 +63,7 @@
@NonNull CGUnboxExp cgUnboxExp, @NonNull CGValuedElement boxedValue);
/**
- * Return a non-null Collection type descriptor if this type descriptor dedescribes a Collection.
- * @return
+ * Return a non-null Collection type descriptor if this type descriptor describes a Collection.
*/
@Nullable CollectionDescriptor asCollectionDescriptor();
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java
index 1b84e21..908380f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java
@@ -84,10 +84,10 @@
public static final @NonNull String USE_NULL_ANNOTATIONS_KEY = "Use Null Annotations";
/**
- * Return true if the genModel has a {@link OCL_GENMODEL_URI} GenAnnotation with a
- * {@link USE_DELEGATES_KEY} detail set to true, or if there is no such GenAnnotation and the
- * global preference {@link CommonOptions.CODE_GENERATION_MODE}
- * has been set to {@link CodeGenerationMode.DELEGATED}
+ * Return true if the genModel has a {@link #OCL_GENMODEL_URI} GenAnnotation with a
+ * {@link #USE_DELEGATES_KEY} detail set to true, or if there is no such GenAnnotation and the
+ * global preference {@link CommonOptions#CODE_GENERATION_MODE}
+ * has been set to {@link CodeGenerationMode#DELEGATED}
*/
public static boolean useDelegates(@NonNull GenModel genModel) {
GenAnnotation genAnnotation = genModel.getGenAnnotation(OCL_GENMODEL_URI);
@@ -105,8 +105,8 @@
}
/**
- * Return true if the genModel has a {@link OCL_GENMODEL_URI} GenAnnotation with a
- * {@link USE_NULL_ANNOTATIONS_KEY} detail set to true.
+ * Return true if the genModel has a {@link #OCL_GENMODEL_URI} GenAnnotation with a
+ * {@link #USE_NULL_ANNOTATIONS_KEY} detail set to true.
*/
public static boolean useNullAnnotations(@NonNull GenModel genModel) {
GenAnnotation genAnnotation = genModel.getGenAnnotation(OCL_GENMODEL_URI);
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGeneratorAdapterFactory.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGeneratorAdapterFactory.java
index 6ba4398..dc32660 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGeneratorAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGeneratorAdapterFactory.java
@@ -20,7 +20,7 @@
* <p>
* For Eclipse usage it is activated by the <tt>org.eclipse.emf.codegen.ecore.generatorAdapters</tt> extension point regisdtration.
* <p>
- * For standalone usage, {@link install()} should be invoked.
+ * For standalone usage, {@link #install()} should be invoked.
*/
public class OCLinEcoreGeneratorAdapterFactory extends GenModelGeneratorAdapterFactory
{
diff --git a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/plugin/LabelGeneratorRegistryReader.java b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/plugin/LabelGeneratorRegistryReader.java
index 313ac70..cc0f7ab 100644
--- a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/plugin/LabelGeneratorRegistryReader.java
+++ b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/plugin/LabelGeneratorRegistryReader.java
@@ -20,8 +20,7 @@
/**
* A plugin extension reader that populates the
- * {@link ILabelGenerator.Registry#INSTANCE
- * global} label generator registry. Clients are not expected to use
+ * {@link org.eclipse.ocl.examples.common.label.ILabelGenerator.Registry#INSTANCE ILabelGenerator.Registry.INSTANCE} label generator registry. Clients are not expected to use
* this class directly.
*/
public class LabelGeneratorRegistryReader extends RegistryReader
diff --git a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/EcoreUtils.java b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/EcoreUtils.java
index 50fc1ca..0fd39a3 100644
--- a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/EcoreUtils.java
+++ b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/EcoreUtils.java
@@ -177,7 +177,6 @@
*
* @param sourceObject
* @param feature
- * @return
*/
public static EClassifier getEType(EObject sourceObject, @NonNull EStructuralFeature feature) {
EGenericType targetGenericType = feature.getEGenericType();
diff --git a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/XMIUtils.java b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/XMIUtils.java
index 66e4349..03e189f 100644
--- a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/XMIUtils.java
+++ b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/XMIUtils.java
@@ -36,7 +36,6 @@
*
* @param eObject
* @param knownIds
- * @return
*/
public String createId(EObject eObject, Set<String> knownIds);
}
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/SWTFactory.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/SWTFactory.java
index 579adf0..a8e6366 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/SWTFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/SWTFactory.java
@@ -208,7 +208,7 @@
* NOP if the button's layout data is not an instance of
* <code>GridData</code>.
*
- * @param the
+ * @param button
* button for which to set the dimension hint
*/
public static void setButtonDimensionHint(Button button) {
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMSuspension.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMSuspension.java
index 511a858..9a8b7b8 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMSuspension.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMSuspension.java
@@ -39,7 +39,6 @@
/**
* Return the underlying framework DebugEvent detail for the suspension.
- * @return
*/
public int getDebugEventDetail() {
return detail;
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/InternalDebuggableExecutor.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/InternalDebuggableExecutor.java
index 71a149c..afbf9f4 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/InternalDebuggableExecutor.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/InternalDebuggableExecutor.java
@@ -66,9 +66,6 @@
* Constructs the executor for the given transformation URI.
* <p>
* No attempt to resolve and load the transformation is done at this step
- *
- * @param uri
- * the URI of an existing transformation
*/
public InternalDebuggableExecutor(@NonNull IVMEnvironmentFactory envFactory, @NonNull URI debuggableURI) {
this.envFactory = envFactory;
@@ -252,11 +249,6 @@
* Executes the transformation referred by this executor using the given
* model parameters and execution context.
*
- * @param executionContext
- * the context object keeping the execution environment details
- * @param modelParameters
- * the actual model arguments to the transformation
- *
* @return the diagnostic object indicating the execution result status,
* also keeping the details of possible problems
* @throws IllegalArgumentException
@@ -335,7 +327,7 @@
* <p>
* <b>Remark</b>: This method invocation causes the referenced transformation to
* load if not already done before by direct call to
- * {@linkplain #loadTransformation()} or
+ * {@linkplain #loadDebuggable()} or
*
* @return compiled unit or <code>null</code> if it failed to be obtained
*/
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceBuilder.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceBuilder.java
index f6cce2d..5112126 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceBuilder.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceBuilder.java
@@ -40,9 +40,6 @@
*
* @param evalEnv
* the evaluation environment representing the top stack trace
- *
- * @param astNodeIPOffset explicit the AST node offset representing the current instruction
- * pointer of execution in a OCL module
*/
public VMStackTraceBuilder(@NonNull IVMEvaluationEnvironment<?> evalEnv) {
fEvalEnv = evalEnv;
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluator.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluator.java
index d3f8e29..9cb7922 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluator.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluator.java
@@ -29,8 +29,6 @@
/**
* A OCLVMEvaluator supports loading a transformation as source then loading models, performing a transformation
* and then saving the models.
- *
- * @see OCLPivotEvaluator
*/
public class OCLVMEvaluator implements IVMEvaluator
{
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMModelManager.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMModelManager.java
index 807c43d..592a834 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMModelManager.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMModelManager.java
@@ -63,8 +63,8 @@
* is an instance of the specified class, according to the metamodel
* semantics implemented by the environment that created this extent map.
*
- * @param type the type
- * @param element a potential run-time (M0) instance of that class
+ * @param requiredType the type
+ * @param eObject a potential run-time (M0) instance of that class
* @return <code>true</code> if this element is an instance of the given
* class; <code>false</code> otherwise
*/
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainStandardLibrary.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainStandardLibrary.java
index c9d73ee..ca9e667 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainStandardLibrary.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainStandardLibrary.java
@@ -10,10 +10,7 @@
*******************************************************************************/
package org.eclipse.ocl.examples.domain.elements;
-import java.util.Enumeration;
-
import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.xml.type.AnyType;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.ocl.examples.domain.ids.PrimitiveTypeId;
@@ -35,10 +32,10 @@
@NonNull Iterable<? extends DomainPackage> getAllPackages();
/**
- * Obtains the generic instance of the {@link BagType} metatype, named
+ * Obtains the generic instance of the BagType metatype, named
* <tt>Bag(T)</tt>.
*
- * @return the <tt>Bag(T)</tt> type (an instance of {@link BagType})
+ * @return the <tt>Bag(T)</tt> type (an instance of BagType)
*/
@NonNull DomainType getBagType();
@@ -48,18 +45,18 @@
@NonNull DomainCollectionType getBagType(@NonNull DomainType elementType, @Nullable IntegerValue lower, @Nullable IntegerValue upper);
/**
- * Obtains the instance of the {@link PrimitiveType} metatype, named
+ * Obtains the instance of the PrimitiveType metatype, named
* <tt>Boolean</tt>.
*
- * @return the <tt>Boolean</tt> type (an instance of {@link PrimitiveType})
+ * @return the <tt>Boolean</tt> type (an instance of PrimitiveType)
*/
@NonNull DomainType getBooleanType();
/**
- * Obtains the generic instance of the {@link CollectionType} metatype, named
+ * Obtains the generic instance of the CollectionType metatype, named
* <tt>Collection(T)</tt>.
*
- * @return the <tt>Collection(T)</tt> type (an instance of {@link CollectionType})
+ * @return the <tt>Collection(T)</tt> type (an instance of CollectionType)
*/
@NonNull DomainType getCollectionType();
@@ -74,10 +71,10 @@
DomainEnumeration getEnumeration(@NonNull Enumerator enumerator);
/**
- * Obtains the single instance of the {@link EnumerationType} metatype, named
+ * Obtains the single instance of the EnumerationType metatype, named
* <tt>Enumeration</tt>.
*
- * @return the <tt>Enumeration</tt> type (an instance of {@link Enumeration})
+ * @return the <tt>Enumeration</tt> type (an instance of Enumeration)
*/
@NonNull DomainType getEnumerationType();
@@ -87,10 +84,10 @@
@NonNull DomainInheritance getInheritance(@NonNull DomainType type);
/**
- * Obtains the instance of the {@link PrimitiveType} metatype, named
+ * Obtains the instance of the PrimitiveType metatype, named
* <tt>Integer</tt>.
*
- * @return the <tt>Integer</tt> type (an instance of {@link PrimitiveType})
+ * @return the <tt>Integer</tt> type (an instance of PrimitiveType)
*/
@NonNull DomainType getIntegerType();
@@ -100,10 +97,10 @@
@NonNull DomainMetaclass getMetaclass(@NonNull DomainType classType);
/**
- * Obtains the single instance of the {@link DomainMetaclass} metatype, named
+ * Obtains the single instance of the DomainMetaclass metatype, named
* <tt>Metaclass</tt>.
*
- * @return the <tt>Metaclass</tt> type (an instance of {@link Metaclass})
+ * @return the <tt>Metaclass</tt> type (an instance of Metaclass)
*/
@NonNull DomainType getMetaclassType();
@@ -119,94 +116,94 @@
DomainPackage getNsURIPackage(@NonNull String nsURI);
/**
- * Obtains the single instance of the {@link AnyType} metatype, named
+ * Obtains the single instance of the AnyType metatype, named
* <tt>OclAny</tt>.
*
- * @return the <tt>OclAny</tt> type (an instance of {@link AnyType})
+ * @return the <tt>OclAny</tt> type (an instance of AnyType)
*/
@NonNull DomainType getOclAnyType();
/**
- * Obtains the single instance of the {@link OclComparable} metatype, named
+ * Obtains the single instance of the OclComparable metatype, named
* <tt>OclAny</tt>.
*
- * @return the <tt>OclAny</tt> type (an instance of {@link Class})
+ * @return the <tt>OclAny</tt> type (an instance of Class)
*/
@NonNull DomainType getOclComparableType();
/**
- * Obtains the single instance of the {@link Class} metatype, named
+ * Obtains the single instance of the Class metatype, named
* <tt>OclElement</tt>.
*
- * @return the <tt>OclElement</tt> type (an instance of {@link Class})
+ * @return the <tt>OclElement</tt> type (an instance of Class)
*/
@NonNull DomainType getOclElementType();
/**
- * Obtains the single instance of the {@link InvalidType} metatype, named
+ * Obtains the single instance of the InvalidType metatype, named
* <tt>OclInvalid</tt>.
*
- * @return the <tt>OclInvalid</tt> type (an instance of {@link InvalidType})
+ * @return the <tt>OclInvalid</tt> type (an instance of InvalidType)
*/
@NonNull DomainType getOclInvalidType();
/**
- * Obtains the generic instance of the {@link MessageType} metatype, named
+ * Obtains the generic instance of the MessageType metatype, named
* <tt>OclMessage</tt>.
*
- * @return the <tt>OclMessage</tt> type (an instance of {@link MessageType})
+ * @return the <tt>OclMessage</tt> type (an instance of MessageType)
*/
DomainType getOclMessageType();
/**
- * Obtains the single instance of the {@link OclSelf} pseudo-metatype, named
+ * Obtains the single instance of the OclSelf pseudo-metatype, named
* <tt>OclSelf</tt>.
*
- * @return the <tt>OclSelf</tt> type (an instance of {@link SelfType})
+ * @return the <tt>OclSelf</tt> type (an instance of SelfType)
*/
@NonNull DomainType getOclSelfType();
/**
- * Obtains the single instance of the {@link OclSummable} metatype, named
+ * Obtains the single instance of the OclSummable metatype, named
* <tt>OclAny</tt>.
*
- * @return the <tt>OclAny</tt> type (an instance of {@link Class})
+ * @return the <tt>OclAny</tt> type (an instance of Class)
*/
@NonNull DomainType getOclSummableType();
/**
- * Obtains the single instance of the {@link OclTupleType} metatype, named
+ * Obtains the single instance of the OclTupleType metatype, named
* <tt>OclVoid</tt>.
*
- * @return the <tt>OclTuple</tt> type (an instance of {@link Class})
+ * @return the <tt>OclTuple</tt> type (an instance of Class)
*/
@NonNull DomainType getOclTupleType();
DomainType getOclType(@NonNull String typeName);
/**
- * Obtains the single instance of the {@link VoidType} metatype, named
+ * Obtains the single instance of the VoidType metatype, named
* <tt>OclVoid</tt>.
*
- * @return the <tt>OclVoid</tt> type (an instance of {@link VoidType})
+ * @return the <tt>OclVoid</tt> type (an instance of VoidType)
*/
@NonNull DomainType getOclVoidType();
DomainElement getOperationTemplateParameter(@NonNull DomainOperation anOperation, int index);
/**
- * Obtains the generic instance of the {@link OrderedCollection} metatype, named
+ * Obtains the generic instance of the OrderedCollection metatype, named
* <tt>OrderedCollection(T)</tt>.
*
- * @return the <tt>OrderedCollection(T)</tt> type (an instance of {@link CollectionType})
+ * @return the <tt>OrderedCollection(T)</tt> type (an instance of CollectionType)
*/
@NonNull DomainType getOrderedCollectionType();
/**
- * Obtains the generic instance of the {@link OrderedSetType} metatype, named
+ * Obtains the generic instance of the OrderedSetType metatype, named
* <tt>OrderedSet(T)</tt>.
*
- * @return the <tt>OrderedSet(T)</tt> type (an instance of {@link OrderedSetType})
+ * @return the <tt>OrderedSet(T)</tt> type (an instance of OrderedSetType)
*/
@NonNull DomainType getOrderedSetType();
@@ -218,20 +215,20 @@
DomainType getPrimitiveType(@NonNull PrimitiveTypeId id);
/**
- * Obtains the instance of the {@link PrimitiveType} metatype, named
+ * Obtains the instance of the PrimitiveType metatype, named
* <tt>Real</tt>.
*
- * @return the <tt>Real</tt> type (an instance of {@link PrimitiveType})
+ * @return the <tt>Real</tt> type (an instance of PrimitiveType)
*/
@NonNull DomainType getRealType();
DomainPackage getRootPackage(@NonNull String name);
/**
- * Obtains the generic instance of the {@link SequenceType} metatype, named
+ * Obtains the generic instance of the SequenceType metatype, named
* <tt>Sequence(T)</tt>.
*
- * @return the <tt>Sequence(T)</tt> type (an instance of {@link SequenceType})
+ * @return the <tt>Sequence(T)</tt> type (an instance of SequenceType)
*/
@NonNull DomainType getSequenceType();
@@ -241,10 +238,10 @@
@NonNull DomainCollectionType getSequenceType(@NonNull DomainType elementType, @Nullable IntegerValue lower, @Nullable IntegerValue upper);
/**
- * Obtains the generic instance of the {@link SetType} metatype, named
+ * Obtains the generic instance of the SetType metatype, named
* <tt>Set(T)</tt>.
*
- * @return the <tt>Set(T)</tt> type (an instance of {@link SetType})
+ * @return the <tt>Set(T)</tt> type (an instance of SetType)
*/
@NonNull DomainType getSetType();
@@ -254,27 +251,27 @@
@NonNull DomainCollectionType getSetType(@NonNull DomainType elementType, @Nullable IntegerValue lower, @Nullable IntegerValue upper);
/**
- * Obtains the instance of the {@link PrimitiveType} metatype, named
+ * Obtains the instance of the PrimitiveType metatype, named
* <tt>String</tt>.
*
- * @return the <tt>String</tt> type (an instance of {@link PrimitiveType})
+ * @return the <tt>String</tt> type (an instance of PrimitiveType)
*/
@NonNull DomainType getStringType();
/**
- * Obtains the generic instance of the {@link UniqueCollection} metatype, named
+ * Obtains the generic instance of the UniqueCollection metatype, named
* <tt>Set(T)</tt>.
*
- * @return the <tt>Set(T)</tt> type (an instance of {@link CollectionType})
+ * @return the <tt>Set(T)</tt> type (an instance of CollectionType)
*/
@NonNull DomainType getUniqueCollectionType();
/**
- * Obtains the instance of the {@link PrimitiveType} metatype,
+ * Obtains the instance of the PrimitiveType metatype,
* named <tt>UnlimitedNatural</tt>.
*
* @return the <tt>UnlimitedNatural</tt> type (an instance of
- * {@link PrimitiveType})
+ * PrimitiveType)
*/
@NonNull DomainType getUnlimitedNaturalType();
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainTupleType.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainTupleType.java
index 699991a..f46ca03 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainTupleType.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainTupleType.java
@@ -18,7 +18,6 @@
{
/**
* Return a unique StandardLibrary-independent identifier for this type.
- * @return
*/
@NonNull TupleTypeId getTupleTypeId();
@NonNull TupleTypeId getTypeId();
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainType.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainType.java
index eaa1a05..65e2570 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainType.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/elements/DomainType.java
@@ -18,8 +18,6 @@
import org.eclipse.ocl.examples.domain.library.LibraryFeature;
import org.eclipse.ocl.examples.domain.types.IdResolver;
import org.eclipse.ocl.examples.domain.values.OCLValue;
-import org.eclipse.ocl.examples.domain.values.ObjectValue;
-import org.eclipse.ocl.examples.domain.values.Value;
public interface DomainType extends DomainNamespace, OCLValue
{
@@ -30,9 +28,8 @@
/**
* Return a new instance of this type from valueFactory. Properties may be initialised using
- * {@link DomainProperty#initValue(DomainStandardLibrary, ObjectValue, Value) } provided no side-effect free
+ * {@link DomainProperty#initValue(Object, Object) } provided no side-effect free
* OCL functionality is permitted to use the ObjectValue until initialisation has completed.
- * @param value
*/
@NonNull Object createInstance();
@@ -86,7 +83,6 @@
/**
* Return a unique StandardLibrary-independent identifier for this type.
- * @return
*/
@NonNull TypeId getTypeId();
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/evaluation/DomainEvaluator.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/evaluation/DomainEvaluator.java
index b1218dc..72f7375 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/evaluation/DomainEvaluator.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/evaluation/DomainEvaluator.java
@@ -55,8 +55,8 @@
/**
* Request cancelation of the current the evaluation, or reset the request for a new evaluation.
- * Cancelation occurs by throwing an {@link EvaluationHaltedException} when {@link #getValuefactory()}
- * is next invoked.
+ * Cancelation occurs by throwing an {@link EvaluationHaltedException} when an expression,
+ * operation or iteration is next invoked.
*/
void setCanceled(boolean isCanceled);
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/IdManager.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/IdManager.java
index 0ff3467..905b5db 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/IdManager.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/IdManager.java
@@ -52,7 +52,7 @@
/**
* IdManager supervises the thread-safe allocation of unique hierarchical identifier to each metamodel element.
*
- * @see ElementId.
+ * @see ElementId
*/
public final class IdManager
{
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/impl/UnscopedId.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/impl/UnscopedId.java
index 1a18bc3..d88807d 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/impl/UnscopedId.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/impl/UnscopedId.java
@@ -16,29 +16,6 @@
{
protected final @NonNull String name;
protected final int hashCode;
-
- /**
- * Map from the operation hashCode to the lambda typeIds with the same hash.
- *
- private @NonNull WeakHashMapOfListOfWeakReference<Integer, DomainParameterTypes, OperationIdImpl> memberOperations =
- new WeakHashMapOfListOfWeakReference<Integer, DomainParameterTypes, OperationIdImpl>()
- {
- @Override
- protected @NonNull OperationIdImpl newTypeId(@NonNull Integer hashCode, @NonNull DomainParameterTypes parameterTypes, @NonNull String name) {
- return new OperationIdImpl(UnscopedId.this, name, parameterTypes, hashCode);
- }
- }; */
-
- /**
- * Map from a type parameter name to the corresponding TypeParameterId.
- *
- private @NonNull WeakHashMapOfWeakReference<String, TypeTemplateParameterId> typeParameters = new WeakHashMapOfWeakReference<String, TypeTemplateParameterId>()
- {
- @Override
- protected @NonNull TypeTemplateParameterId newTypeId(@NonNull String name) {
- return new TypeParameterIdImpl(UnscopedId.this, name);
- }
- }; */
protected UnscopedId(@NonNull String name) {
this.name = name;
@@ -53,20 +30,6 @@
return name;
}
-/* @Override
- public @NonNull OperationId getOperationId(@NonNull DomainOperation anOperation) {
- String name = anOperation.getName();
- assert name != null;
- DomainTypeParameters typeParameters = anOperation.getTypeParameters();
- int hashCode = 47 * hashCode() + 37 * name.hashCode() + typeParameters.hashCode();
- return memberOperations.getTypeId(hashCode, anOperation.getParameterTypes(), name);
- } */
-
-// @Override
-// public @NonNull TypeTemplateParameterId getTypeParameterId(final @NonNull String name) {
-// return typeParameters.getElementId(name);
-// }
-
@Override
public final int hashCode() {
return hashCode;
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/AbstractIteration.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/AbstractIteration.java
index 4d58c7c..45015fa 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/AbstractIteration.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/AbstractIteration.java
@@ -21,7 +21,7 @@
public abstract class AbstractIteration extends AbstractFeature implements LibraryIteration
{
/**
- * An out-of-band value that can be returned by {@link updateAccumulator} to signal
+ * An out-of-band value that can be returned by {@link #updateAccumulator} to signal
* that the iteration should carry on rather than terminate using the returned value.
*/
protected static final @NonNull Object CARRY_ON = new Object() {
@@ -53,10 +53,10 @@
/**
* The default iteration algorithm steps through the iteration domain by invoking
- * {@link DomainIterationManager.hasCurrent()} and {@link DomainIterationManager.advanceIterators()}.
- * At each step {@link updateAccumulator(DomainIterationManager)} is invoked to update the
+ * {@link DomainIterationManager#hasCurrent()} and {@link DomainIterationManager#advanceIterators()}.
+ * At each step {@link #updateAccumulator(DomainIterationManager)} is invoked to update the
* accumulator for that step. A non-null return causes a premature exit and forms the
- * return from the overall evaluation. If all steps complete {@link resolveTerminalValue(DomainIterationManager)}
+ * return from the overall evaluation. If all steps complete {@link #resolveTerminalValue(DomainIterationManager)}
* is invoked to provide the return value.
* <p>
* Derived classes may override this method to change the iteration algorithm or override
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryBinaryOperation.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryBinaryOperation.java
index 28e4fe3..002445f 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryBinaryOperation.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryBinaryOperation.java
@@ -14,7 +14,6 @@
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.ocl.examples.domain.evaluation.DomainEvaluator;
import org.eclipse.ocl.examples.domain.ids.TypeId;
-import org.eclipse.ocl.examples.domain.values.impl.InvalidValueException;
/**
* LibraryBinaryOperation defines the invocation API of a binary operation using
@@ -28,12 +27,6 @@
/**
* Return the result of evaluating the operation on left and right arguments.
* An invalid return may be indicated by throwing an exception returning Java null or OCL invalid.
- *
- * @param left left argument
- * @param right argument
- * @return the evaluated value
- * @throws Exception
- * @throws InvalidValueException
*/
@Nullable Object evaluate(@NonNull DomainEvaluator evaluator, @NonNull TypeId returnTypeId, @Nullable Object sourceValue, @Nullable Object argumentValue);
}
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryIteration.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryIteration.java
index d1af639..1c46fe2 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryIteration.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryIteration.java
@@ -23,11 +23,6 @@
{
/**
* Create the value that will accumulate the iteration results.
- *
- * @param evaluator that supervises evaluation
- * @param type of the accumulator
- * @return the accumulator
- * @throws InvalidValueException
*/
@NonNull Object createAccumulatorValue(@NonNull DomainEvaluator evaluator, @NonNull TypeId accumulatorTypeId, @NonNull TypeId bodyTypeId);
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryTernaryOperation.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryTernaryOperation.java
index 736b2b5..7c41303 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryTernaryOperation.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryTernaryOperation.java
@@ -26,12 +26,6 @@
/**
* Return the result of evaluating the operation on source with arg1 and arg2.
* An invalid return may be indicated by throwing an exception returning Java null or OCL invalid.
- *
- * @param source source argument
- * @param arg1 first argument
- * @param arg2 second argument
- * @return the evaluated value
- * @throws Exception
*/
@Nullable Object evaluate(@NonNull DomainEvaluator evaluator, @NonNull TypeId returnTypeId, @Nullable Object sourceValue, @Nullable Object firstArgumentValue, @Nullable Object secondArgumentValue);
}
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryUnaryOperation.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryUnaryOperation.java
index d73c545..5977184 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryUnaryOperation.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/library/LibraryUnaryOperation.java
@@ -14,7 +14,6 @@
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.ocl.examples.domain.evaluation.DomainEvaluator;
import org.eclipse.ocl.examples.domain.ids.TypeId;
-import org.eclipse.ocl.examples.domain.values.impl.InvalidValueException;
/**
* LibraryUnaryOperation defines the invocation API of a unary operation using
@@ -27,11 +26,6 @@
/**
* Return the result of evaluating the operation on an argument.
* An invalid return may be indicated by throwing an exception returning Java null or OCL invalid.
- *
- * @param argument the argument
- * @return the evaluated value
- * @throws Exception
- * @throws InvalidValueException
*/
@Nullable Object evaluate(@NonNull DomainEvaluator evaluator, @NonNull TypeId returnTypeId, @Nullable Object sourceValue);
}
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/utilities/ProjectMap.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/utilities/ProjectMap.java
index 8a5d4fc..4f997bb 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/utilities/ProjectMap.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/utilities/ProjectMap.java
@@ -40,7 +40,7 @@
* A resolvable location is perhaps <tt>platform:/plugin/org.antlr.runtime/</tt> for a bundle or
* <tt>platform:/resource/org.eclipse.ocl.examples.common/</tt> for an open project.
* <p>
- * {@link #getProjectMap()} returns a map of project names, but not bundle names, to resolvable location.
+ * {@link #getProjectDescriptors()} returns a map of project names, but not bundle names, to resolvable location.
* <p>
* {@link #initializePackageRegistry(ResourceSet)} augments the default EMF startup in a plugin environment
* whereby the global package registry acquires a registration for each namespace URI
@@ -53,13 +53,13 @@
* <tt>org.eclipse.emf.ecore.generated_package</tt> declarations ensure that all three URIs resolve to
* the same Resource eliminating most opportunities for meta-model schizophrenia.
* <p>
- * {@link #initializePlatformResourceMap()} does nothing since the standard EMF Platform URI Handler
+ * {@link #initializePlatformResourceMap(boolean)} does nothing since the standard EMF Platform URI Handler
* can open platform resources directly.
* <p>
- * {@link #initializeGenModelLocationMap(ResourceSet)} does nothing, since the standard EMF startup in a
+ * {@link #initializeGenModelLocationMap(boolean)} does nothing, since the standard EMF startup in a
* plugin environment populates the {@link EcorePlugin#getEPackageNsURIToGenModelLocationMap()}.
* <p>
- * {@link #initializeURIMap(URIConverter)} installs explicit URI mappings into the {@link URIConverter}
+ * {@link #initializeURIMap(ResourceSet)} installs explicit URI mappings into the {@link URIConverter}
* so that for each project so that both <tt>platform:/resource/project</tt> and
* <tt>platform:/plugin/<i>project</i></tt> reference <tt>platform:/resource/<i>project</i></tt>. An additional
* backstop URI mapping redirects <tt>platform:/resource</tt> to <tt>platform:/plugin</tt>.
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/utilities/StandaloneProjectMap.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/utilities/StandaloneProjectMap.java
index bcb7be3..3b3781c 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/utilities/StandaloneProjectMap.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/utilities/StandaloneProjectMap.java
@@ -48,7 +48,6 @@
import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -68,7 +67,7 @@
/**
* StandaloneProjectMap and {@link ProjectMap} provide facilities to assist in
- * preparing the {@link URIConverter}, the {@link EPackage.Registry, andd the
+ * preparing the {@link URIConverter}, the {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry}, and the
* and URIResourceMap of a {@link ResourceSet} and the global and
* {@link EcorePlugin#getPlatformResourceMap()} and
* {@link EcorePlugin#getEPackageNsURIToGenModelLocationMap} to support
@@ -91,7 +90,7 @@
* <li>../../org.eclipse.emf.ecore/model/Ecore.ecore</li>
* </ul>
* results in the same Resource being returned by {@link
- * ResourceSet.getResource()}.
+ * ResourceSet#getResource(URI, boolean)}.
* <p>
* If the classpath contains distinct imported project and JAR versions of
* Ecore, referencing
@@ -129,7 +128,7 @@
* </li>
* </ul>
* <p>
- * {@link #getProjectMap()} returns a map of project names and bundle names to a
+ * {@link #getProjectDescriptors()} returns a map of project names and bundle names to a
* physical location which is established by searching the classpath for folders
* and JARs containing .project files. If a manifest is also found, the search
* has found a bundle and the Bundle-SymbolicName is read from the manifest.
@@ -147,19 +146,19 @@
* the same Resource eliminating most opportunities for meta-model
* schizophrenia.
* <p>
- * {@link #initializePlatformResourceMap()} populates
+ * {@link #initializePlatformResourceMap(boolean)} populates
* {@link EcorePlugin#getPlatformResourceMap()} with a <i>project</i> to
* <tt>platform:/resource/<i>project</i></tt> entry for each project and a
* <i>bundle</i> to <tt>platform:/plugin/<i>bundle</i></tt> entry for each
* bundle.
* <p>
- * {@link #initializeGenModelLocationMap(ResourceSet)} exploits the classpath
+ * {@link #initializeGenModelLocationMap(boolean)} exploits the classpath
* scan for plugins and projects to identify all plugin.xml files and populate
* the {@link EcorePlugin#getEPackageNsURIToGenModelLocationMap()} from the
* <tt>org.eclipse.emf.ecore.generated_package</tt> extension points in the same
* way as occurs automatically in a plugin environment.
* <p>
- * {@link #initializeURIMap(URIConverter)} installs a
+ * {@link #initializeURIMap(ResourceSet)} installs a
* <tt>platform:/plugin/<i>project</i></tt> to
* <tt>platform:/resource/<i>project</i></tt> URI mapping for each project and a
* <tt>platform:/resource/<i>bundle</i></tt> to
@@ -199,7 +198,7 @@
* The classpath is analyzed to identify an IProjectDescriptor per project/bundle within which
* a plugin.xml is analyzed to identify generated_package extension points leading to a
* an IResourceDescriptor per genmodel and an IPackageDescriptor per nsURI/className within
- * the IResorceDescriptor. There is usually only one nsURi per genmodel but the greater
+ * the IResorceDescriptor. There is usually only one nsURI per genmodel but the greater
* generality has to be accommodated. The foregoing constitute a shared model that can be re-used
* by multiple applications, so long as the classpath content is unchanged.
*
@@ -207,7 +206,7 @@
*
* The actual state is maintained on a per-ResourceSet basis with an IResourceLoadStatus and
* one or more IPackageDescriptors for in use IResourceDescriptors and IPackageDescriptors. The
- * IResourceLOadStatus is confugured with an IResourceLoadStrategy and an IConflictHandler.
+ * IResourceLoadStatus is confugured with an IResourceLoadStrategy and an IConflictHandler.
*/
public class StandaloneProjectMap extends SingletonAdapterImpl
{
@@ -281,7 +280,7 @@
return getURI() + " with " + resourceLoadStrategy;
}
- public void uninstall(@NonNull Registry packageRegistry) {
+ public void uninstall(@NonNull EPackage.Registry packageRegistry) {
if (PROJECT_MAP_INSTALL.isActive()) {
PROJECT_MAP_INSTALL.println("" + toString());
}
@@ -324,7 +323,6 @@
/**
* Return the first loaded EPackage which may be part of a model or a Java generated EPackageinstance..
- * @return
*/
@Nullable EPackage getFirstEPackage();
@@ -838,7 +836,7 @@
/**
* Return the external filespace form of the model URI containing the package.
- * @Throws IllegalStateException if there is no Ecore model.
+ * @throws IllegalStateException if there is no Ecore model.
*/
@NonNull URI getLocationURI();
@@ -849,13 +847,13 @@
/**
* Return the platform:/resource form of the model URI containing the package
- * @Throws IllegalStateException if there is no Ecore model.
+ * @throws IllegalStateException if there is no Ecore model.
*/
@NonNull URI getPlatformResourceURI();
/**
* Return the platform:/plugin form of the model URI containing the package
- * @Throws IllegalStateException if there is no Ecore model.
+ * @throws IllegalStateException if there is no Ecore model.
*/
@NonNull URI getPlatformPluginURI();
@@ -903,7 +901,6 @@
/**
* Return the classname defined in the generated_packaged extension point, or null if undefined.
- * @return
*/
@Nullable String getClassName();
@@ -2012,8 +2009,7 @@
* PluginReader provides the SAX callbacks to support reading the
* org.eclipse.emf.ecore.generated_package extension point in a plugin.xml
* file and activating the GenModelReader to process the
- * ecorePackage locations and invoking {@link addGenModel()} for each
- * encounter.
+ * ecorePackage locations.
*/
protected static class PluginReader extends DefaultHandler
{
@@ -2145,8 +2141,7 @@
/**
* GenModelReader provides the SAX callbacks to support reading
- * the genPackages element in a genmodel file and invoking {@link
- * addEcorePackage()} for each encounter.
+ * the genPackages element in a genmodel file.
*/
protected static class GenModelReader extends DefaultHandler
{
@@ -2391,7 +2386,7 @@
resourceDescriptor.unload(resourceSet);
}
Map<URI, IPackageDescriptor> nsURI2packageDescriptor2 = nsURI2packageDescriptor;
- Registry packageRegistry = resourceSet.getPackageRegistry();
+ EPackage.Registry packageRegistry = resourceSet.getPackageRegistry();
if ((nsURI2packageDescriptor2 != null) && (packageRegistry != null)) {
for (URI nsURI : nsURI2packageDescriptor2.keySet()) {
packageRegistry.remove(nsURI.toString());
@@ -2501,25 +2496,25 @@
/**
* Return the EPackage.Registry for a resourceSet or the Global
- * {@link EPackage.Registry.INSTANCE} if resourceSet is null.
+ * {@link org.eclipse.emf.ecore.EPackage.Registry#INSTANCE} if resourceSet is null.
*/
public static @NonNull EPackage.Registry getPackageRegistry(@Nullable ResourceSet resourceSet) {
if (resourceSet == null) {
@SuppressWarnings("null")
@NonNull
- Registry globalRegistry = EPackage.Registry.INSTANCE;
+ EPackage.Registry globalRegistry = EPackage.Registry.INSTANCE;
return globalRegistry;
} else {
@SuppressWarnings("null")
@NonNull
- Registry packageRegistry = resourceSet.getPackageRegistry();
+ EPackage.Registry packageRegistry = resourceSet.getPackageRegistry();
return packageRegistry;
}
}
/**
* Return the Resource.Factory.Registry for a resourceSet or the Global
- * {@link Resource.Factory.Registry.INSTANCE} if resourceSet is null.
+ * {@link org.eclipse.emf.ecore.resource.Resource.Factory.Registry#INSTANCE} if resourceSet is null.
*/
public static Resource.Factory.Registry getResourceFactoryRegistry(@Nullable ResourceSet resourceSet) {
return resourceSet != null
@@ -2529,7 +2524,7 @@
/**
* Return the URIConverter for a resourceSet or the Global
- * {@link URIConverter.INSTANCE} if resourceSet is null.
+ * {@link URIConverter#INSTANCE} if resourceSet is null.
*/
@SuppressWarnings("null")
public static @NonNull URIConverter getURIConverter(@Nullable ResourceSet resourceSet) {
@@ -2538,7 +2533,7 @@
/**
* Return the URI Map for a resourceSet or the Global
- * {@link URIConverter.URI_MAP} if resourceSet is null.
+ * {@link URIConverter#URI_MAP} if resourceSet is null.
*/
@SuppressWarnings("null")
public static @NonNull Map<URI, URI> getURIMap(@Nullable ResourceSet resourceSet) {
@@ -2782,9 +2777,8 @@
}
/**
- * Initialize the {@link EcorePlugin#getPlatformResourceMap()} so that in a
- * standalone environment and in conjunction with {@link
- * initializeURIMap(URIConverter)} URIs such as
+ * Initialize the {@link EcorePlugin#getPlatformResourceMap()} so that in a standalone
+ * environment and in conjunction with {@link #initializeURIMap(ResourceSet)} URIs such as
* <tt>platform:/resource/<i>project</i></tt> and
* <tt>platform:/plugin/<i>project</i></tt> are useable.
* <p>
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/TupleValue.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/TupleValue.java
index e3516fd..be79add 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/TupleValue.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/TupleValue.java
@@ -46,7 +46,7 @@
/**
* Queries the value of the specified tuple part.
*
- * @param part the tuple part (as an attribute)
+ * @param partId the tuple part (as an attribute)
* @return the corresponding value
* @throws InvalidValueException
* @generated NOT
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/ValuesPackage.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/ValuesPackage.java
index ca43b5d..a9bcd92 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/ValuesPackage.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/ValuesPackage.java
@@ -150,10 +150,10 @@
int NULL_VALUE = 4;
/**
- * The meta object id for the '{@link org.eclipse.ocl.examples.domain.values.impl.InvalidValueImpl <em>Invalid Value</em>}' class.
+ * The meta object id for the '{@link org.eclipse.ocl.examples.domain.values.impl.InvalidValueException <em>Invalid Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.ocl.examples.domain.values.impl.InvalidValueImpl
+ * @see org.eclipse.ocl.examples.domain.values.impl.InvalidValueException
* @see org.eclipse.ocl.examples.domain.values.impl.ValuesPackageImpl#getInvalidValue()
* @generated
*/
@@ -551,10 +551,10 @@
EClass INTEGER_VALUE = eINSTANCE.getIntegerValue();
/**
- * The meta object literal for the '{@link org.eclipse.ocl.examples.domain.values.impl.InvalidValueImpl <em>Invalid Value</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.ocl.examples.domain.values.impl.InvalidValueException <em>Invalid Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.ocl.examples.domain.values.impl.InvalidValueImpl
+ * @see org.eclipse.ocl.examples.domain.values.impl.InvalidValueException
* @see org.eclipse.ocl.examples.domain.values.impl.ValuesPackageImpl#getInvalidValue()
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/CollectionValueImpl.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/CollectionValueImpl.java
index 652f5a0..70b172b 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/CollectionValueImpl.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/CollectionValueImpl.java
@@ -297,8 +297,7 @@
* <tt>Collection::count(object : T) : Integer</tt>
* operation.
*
- * @param self the source collection
- * @param object an object
+ * @param value an object
* @return the number of occurrences of the object in the collection
* @throws InvalidValueException
*/
@@ -326,8 +325,7 @@
* <tt>Collection::excludes(object : T) : Boolean</tt>
* operation.
*
- * @param self the source collection
- * @param object an object
+ * @param value an object
* @return whether the collection does not include the object
*/
public @NonNull Boolean excludes(@Nullable Object value) {
@@ -353,7 +351,6 @@
* <tt>Collection::excludesAll(c : Collection(T)) : Boolean</tt>
* operation.
*
- * @param self the source collection
* @param c another collection
* @return whether the source collection does not contain any of the
* elements of the other
@@ -530,7 +527,6 @@
* <tt>Collection::includesAll(c : Collection(T)) : Boolean</tt>
* operation.
*
- * @param self the source collection
* @param c another collection
* @return whether the source collection includes all of the elements
* of the other
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/SequenceValueImpl.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/SequenceValueImpl.java
index 506b42d..ed89a48 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/SequenceValueImpl.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/SequenceValueImpl.java
@@ -278,7 +278,6 @@
* <tt>Sequence::subSequence(lower : Integer, upper : Integer) : Sequence(T)</tt></li>
* operation.
*
- * @param self the source sequence
* @param lower the 1-based (in OCL fashion) inclusive lower bound
* @param upper the 1-based (in OCL fashion) inclusive upper bound
* @return the source collection with the object inserted at the index
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/TupleValueImpl.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/TupleValueImpl.java
index e138822..cbbf212 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/TupleValueImpl.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/impl/TupleValueImpl.java
@@ -47,7 +47,7 @@
/**
* Initializes me with a map of part values.
*
- * @param type my type
+ * @param tupleTypeId my type
* @param values my parts
*/
public TupleValueImpl(@NonNull TupleTypeId tupleTypeId, @NonNull Map<? extends TuplePartId, Object> values) {
@@ -63,7 +63,7 @@
* required by the Collection::product() operation.
*
* @param tupleTypeId my type
- * @param value my values which are aligned to the tupleTypeId.getParts()
+ * @param values my values which are aligned to the tupleTypeId.getParts()
*/
public TupleValueImpl(@NonNull TupleTypeId tupleTypeId, @NonNull Object... values) {
this.tupleTypeId = tupleTypeId;
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/util/ValuesSwitch.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/util/ValuesSwitch.java
index 9394f83..daea11a 100644
--- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/util/ValuesSwitch.java
+++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/values/util/ValuesSwitch.java
@@ -70,7 +70,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizardPage.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizardPage.java
index e18321f..7d59a74 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizardPage.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizardPage.java
@@ -55,7 +55,7 @@
* Creates a new exported file creation wizard page. The initial
* resource will be used as the default container resource.
*
- * @param expectedExtension
+ * @param preferredExtension
* @param initialResource
* the current resource selection
*/
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/AbstractNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/AbstractNode.java
index 6d98dbd..4b898fe 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/AbstractNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/AbstractNode.java
@@ -179,7 +179,6 @@
/**
* Return the fraction of getChildren() that are visible in an array to suit access by a ContentProvider.
- * @return
*/
@NonNull AbstractNode[] getVisibleChildren();
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValiditySwitch.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValiditySwitch.java
index 45ff9fd..9f2dea8 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValiditySwitch.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValiditySwitch.java
@@ -53,7 +53,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/AbstractExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/AbstractExporter.java
index 4e193a2..50676cd 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/AbstractExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/AbstractExporter.java
@@ -58,8 +58,6 @@
* @param exportedFileName
* The target file name or null if not known and not to be reported
*
- * @return exported String contents to be given to new exported file resource
- * instances
* @throws IOException
*/
protected abstract void createContents(@NonNull Appendable s, @NonNull Resource validatedResource, @NonNull RootNode rootNode, @Nullable String exportedFileName) throws IOException;
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/HTMLExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/HTMLExporter.java
index 98fd2ef..1fd4ccb 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/HTMLExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/HTMLExporter.java
@@ -70,8 +70,6 @@
* Returns a stream containing the initial contents to be given to new
* exported validation results file resource instances.
*
- * @return exported File contents to be given to new exported file resource
- * instances
* @throws IOException
*/
@Override
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporter.java
index f2ab615..005a1d2 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporter.java
@@ -32,7 +32,7 @@
* The resource to validate
* @param rootNode
* The Root Node to export
- * @param exportedFileName
+ * @param fileName
* The target file name or null if not known and not to be reported
* @throws IOException
*/
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ModelExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ModelExporter.java
index b4fd3a6..fc3902a 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ModelExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ModelExporter.java
@@ -34,8 +34,6 @@
* Returns a stream containing the initial contents to be given to new
* exported validation results file resource instances.
*
- * @return exported File contents to be given to new exported file resource
- * instances
* @throws IOException
*/
@Override
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/TextExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/TextExporter.java
index 627bb2e..f25665b 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/TextExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/TextExporter.java
@@ -58,8 +58,6 @@
* Returns a stream containing the initial contents to be given to new
* exported validation results file resource instances.
*
- * @return exported File contents to be given to new exported file resource
- * instances
* @throws IOException
*/
@Override
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterDescriptor.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterDescriptor.java
index c779948..89e4983 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterDescriptor.java
@@ -52,7 +52,7 @@
* Configuration element from which to create this descriptor.
* @param exporterName
* @param exporterType
- * @param validityExporterClassAttribute
+ * @param exporterClassAttribute
*/
public ValidityExporterDescriptor(IConfigurationElement configuration, @NonNull String exporterClassAttribute,
@NonNull String exporterType, @NonNull String exporterName) {
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterRegistry.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterRegistry.java
index c823910..a14dcb3 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterRegistry.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterRegistry.java
@@ -44,8 +44,7 @@
/**
* Adds an extension to the registry.
*
- * @param extension
- * The extension that is to be added to the registry.
+ * @param exporter
*/
public void addExporter(@NonNull IValidityExporterDescriptor exporter) {
EXTENSIONS.put(exporter.getExporterType(), exporter);
@@ -76,9 +75,7 @@
/**
* Removes a phantom from the registry.
*
- * @param extensionClassName
- * Qualified class name of the extension point which corresponding
- * phantom is to be removed from the registry.
+ * @param exporterType
*/
public void removeExtension(@NonNull String exporterType) {
EXTENSIONS.remove(exporterType);
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityManager.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityManager.java
index 7a351ae..0e3e121 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityManager.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityManager.java
@@ -267,9 +267,6 @@
*
* In such a case, the URI of the first will be <code>http://www.eclipse.org/emf/2002/Ecore#//EClass</code> while the URI of the second will be <code>http://www.eclipse.org/emf/2002/Ecore#//EClass.1</code>. We wish to "regroup" both invariants
* under the same context in the validity results.
- *
- * @param uri
- * @return
*/
private @NonNull URI trimDuplicateContextSuffix(URI uri) {
String fragment = uri.fragment();
@@ -353,9 +350,6 @@
/**
* Returns the eObject uri
- *
- * @param eObject
- * @return the eObject uri
*/
public @NonNull TypeURI getTypeURI(@NonNull EObject constrainingObject) {
for (EObject eContainer = constrainingObject; eContainer != null; eContainer = eContainer.eContainer()) {
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityModel.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityModel.java
index f6c172c..d38079d 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityModel.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityModel.java
@@ -249,10 +249,6 @@
/**
* Return all types that may provide constraints to an instance of aType.
- *
- * @param aType
- * a modelElement
- * @return all types that may provide constraints to an instance if aType.
*/
protected @NonNull Set<TypeURI> buildTypeClosure(@NonNull EObject constrainingObject) {
TypeURI typeURI = validityManager.getTypeURI(constrainingObject);
@@ -410,7 +406,7 @@
*
* @param constrainedObject
* the constraining object
- * @param constrainingType
+ * @param constrainingURI
* the uri of the constrainingNode
*/
protected void createResultNodes(@NonNull EObject constrainedObject, @NonNull ConstrainingURI constrainingURI) {
@@ -562,9 +558,6 @@
* Return the ConstrainingNode node for EObject creating any parent
* ConstrainingNodes that are required to ensure that the returned
* ConstrainingNode is installed in the root.
- *
- * @param eObject
- * @return the ConstrainingNode node for EObject
*/
public @NonNull ConstrainingNode getConstrainingNode(@NonNull EObject constrainingObject) {
buildTypeClosure(constrainingObject);
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManagerFactory.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManagerFactory.java
index ba81abf..ade32bc 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManagerFactory.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManagerFactory.java
@@ -22,6 +22,7 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.ocl.examples.eventmanager.filters.AndFilter;
+import org.eclipse.ocl.examples.eventmanager.filters.EventTypeFilter;
import org.eclipse.ocl.examples.eventmanager.filters.NewValueClassFilter;
import org.eclipse.ocl.examples.eventmanager.filters.NewValueClassFilterIncludingSubclasses;
import org.eclipse.ocl.examples.eventmanager.filters.OldValueClassFilter;
@@ -87,7 +88,7 @@
* event type}, such as {@link Notification#ADD} or
* {@link Notification#REMOVE}.
*
- * {@see EventTypeFilter#EventTypeFilter()}
+ * @see EventTypeFilter#EventTypeFilter(int, boolean)
*/
EventFilter createEventTypeFilter(int eventType);
@@ -143,7 +144,7 @@
* not require the individual {@link OldValueClassFilter}s to match based on
* the same element in case the old value happens to be a collection. For
* example, assume there are two classes <code>X</code> and <code>Y</code>.
- * Assume there is an {@link AndFiter} with two {@link OldValueClassFilter}s
+ * Assume there is an {@link AndFilter} with two {@link OldValueClassFilter}s
* inside, one matching <code>X</code>, the other matching <code>Y</code>.
* If there are two elements in the old value collection of the
* {@link Notification}, one of type <code>X</code> and the other of type
@@ -170,7 +171,7 @@
* a collection. For example, assume there are two classes <code>X</code>
* and <code>Y</code> with a class <code>Z</code> that has both,
* <code>X</code> and <code>Y</code> as its superclasses (multiple
- * inheritance). Assume there is an {@link AndFiter} with two
+ * inheritance). Assume there is an {@link AndFilter} with two
* {@link OldValueClassFilterIncludingSubclasses}s inside, one matching
* <code>X</code>, the other matching <code>Y</code>. If only a single
* element is the old value of a {@link Notification}, the {@link AndFilter}
@@ -201,7 +202,7 @@
* not require the individual {@link NewValueClassFilter}s to match based on
* the same element in case the new value happens to be a collection. For
* example, assume there are two classes <code>X</code> and <code>Y</code>.
- * Assume there is an {@link AndFiter} with two {@link NewValueClassFilter}s
+ * Assume there is an {@link AndFilter} with two {@link NewValueClassFilter}s
* inside, one matching <code>X</code>, the other matching <code>Y</code>.
* If there are two elements in the new value collection of the
* {@link Notification}, one of type <code>X</code> and the other of type
@@ -228,7 +229,7 @@
* a collection. For example, assume there are two classes <code>X</code>
* and <code>Y</code> with a class <code>Z</code> that has both,
* <code>X</code> and <code>Y</code> as its superclasses (multiple
- * inheritance). Assume there is an {@link AndFiter} with two
+ * inheritance). Assume there is an {@link AndFilter} with two
* {@link NewValueClassFilterIncludingSubclasses}s inside, one matching
* <code>X</code>, the other matching <code>Y</code>. If only a single
* element is the new value of a {@link Notification}, the {@link AndFilter}
@@ -249,7 +250,7 @@
* Constructs an {@link #createAndFilterFor(EventFilter...) AndFilter}
* combining a {@link #createClassFilter(EClass) ClassFilter} for
* <code>eClass</code> and a
- * {@link #createStructuralFeatureFilter(EStructuralFeature) PropertyFilter}
+ * {@link #createStructuralFeatureFilter(EStructuralFeature) StructuralFeatureFilter}
* for <code>referredProperty</code>.
*/
EventFilter createFilterForEReference(EClass eClass,
@@ -259,7 +260,7 @@
* Constructs an {@link #createAndFilterFor(EventFilter...) AndFilter}
* combining a {@link #createClassFilter(EClass) ClassFilter} for
* <code>eClass</code> and an
- * {@link #createStructuralFeatureFilter(EStructuralFeature) PropertyFilter}
+ * {@link #createStructuralFeatureFilter(EStructuralFeature) StructuralFeatureFilter}
* for <code>referredProperty</code>.
*/
EventFilter createFilterForEAttribute(EClass eClass,
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AbstractEventFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AbstractEventFilter.java
index 0a1f750..dc3d91d 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AbstractEventFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AbstractEventFilter.java
@@ -44,7 +44,6 @@
/**
* Returns the unique property for an {@link AbstractEventFilter} object
- * @return
*/
public abstract Object getFilterCriterion();
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/EventTypeFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/EventTypeFilter.java
index 7c4acf4..b2650f4 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/EventTypeFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/EventTypeFilter.java
@@ -25,7 +25,7 @@
/**
* Creates a new {@link EventTypeFilter} with the given filter type.
- * For the different types {@see Notifier}
+ * For the different types @see Notifier
* @param eventType
* @param negated defines whether the filter is negated
*/
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilter.java
index 3cafa01..935a44a 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilter.java
@@ -29,7 +29,7 @@
* require the individual {@link NewValueClassFilter}s to match based on the
* same element in case the new value happens to be a collection. For example,
* assume there are two classes <code>X</code> and <code>Y</code>. Assume there
- * is an {@link AndFiter} with two {@link NewValueClassFilter}s inside, one
+ * is an {@link AndFilter} with two {@link NewValueClassFilter}s inside, one
* matching <code>X</code>, the other matching <code>Y</code>. If there are two
* elements in the new value collection of the {@link Notification}, one of type
* <code>X</code> and the other of type <code>Y</code>, the first
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilterIncludingSubclasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilterIncludingSubclasses.java
index 24054f9..6c430fa 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilterIncludingSubclasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilterIncludingSubclasses.java
@@ -29,7 +29,7 @@
* collection. For example, assume there are two classes <code>X</code> and
* <code>Y</code> with a class <code>Z</code> that has both, <code>X</code> and
* <code>Y</code> as its superclasses (multiple inheritance). Assume there is an
- * {@link AndFiter} with two {@link NewValueClassFilterIncludingSubclasses}s
+ * {@link AndFilter} with two {@link NewValueClassFilterIncludingSubclasses}s
* inside, one matching <code>X</code>, the other matching <code>Y</code>. If
* only a single element is the new value of a {@link Notification}, the
* {@link AndFilter} matches the notification if and only if the new value
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilter.java
index c7fbfac..695c632 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilter.java
@@ -29,7 +29,7 @@
* require the individual {@link OldValueClassFilter}s to match based on the
* same element in case the old value happens to be a collection. For example,
* assume there are two classes <code>X</code> and <code>Y</code>. Assume there
- * is an {@link AndFiter} with two {@link OldValueClassFilter}s inside, one
+ * is an {@link AndFilter} with two {@link OldValueClassFilter}s inside, one
* matching <code>X</code>, the other matching <code>Y</code>. If there are two
* elements in the old value collection of the {@link Notification}, one of type
* <code>X</code> and the other of type <code>Y</code>, the first
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilterIncludingSubclasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilterIncludingSubclasses.java
index 765b9a2..0c6d820 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilterIncludingSubclasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilterIncludingSubclasses.java
@@ -28,7 +28,7 @@
* collection. For example, assume there are two classes <code>X</code> and
* <code>Y</code> with a class <code>Z</code> that has both, <code>X</code> and
* <code>Y</code> as its superclasses (multiple inheritance). Assume there is an
- * {@link AndFiter} with two {@link OldValueClassFilterIncludingSubclasses}s
+ * {@link AndFilter} with two {@link OldValueClassFilterIncludingSubclasses}s
* inside, one matching <code>X</code>, the other matching <code>Y</code>. If
* only a single element is the old value of a {@link Notification}, the
* {@link AndFilter} matches the notification if and only if the old value
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/StructuralFeatureFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/StructuralFeatureFilter.java
index 9c27a53..75f4caf 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/StructuralFeatureFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/StructuralFeatureFilter.java
@@ -25,7 +25,7 @@
/**
* The standard constructor
* @param negated set {@link #isNegated()}
- * @param passes the {@link EStructuralFeature feature} to match
+ * @param feature the {@link EStructuralFeature feature} to match
*/
public StructuralFeatureFilter(EStructuralFeature feature, boolean negated) {
super(negated);
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/AdapterCapsule.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/AdapterCapsule.java
index f47b312..da97977 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/AdapterCapsule.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/AdapterCapsule.java
@@ -72,8 +72,6 @@
}
/**
* This method is defined here because of convenience reasons. The implementation can be found in subclasses.
- *
- * @param connection
*/
public void deferNotification(){
/*
@@ -83,7 +81,6 @@
/**
* This method is defined here because of convenience reasons. The implementation can be found in subclasses.
- * @param connection
*/
public void deliverDeferredEvents(){
/*
@@ -93,7 +90,6 @@
/**
* This method is defined here because of convenience reasons. The implementation can be found in subclasses.
- * @param connection
*/
public void cancelDeferment(){
/*
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/DeferringNotifier.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/DeferringNotifier.java
index b655c3e..b4b8f2a 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/DeferringNotifier.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/DeferringNotifier.java
@@ -29,7 +29,7 @@
/**
* contains the queued events by each connection that has an open command. The queued events are stored in an {@link EventChain}
- * in order to simplyfy the notification of multiple events and to improve performance.
+ * in order to simplify the notification of multiple events and to improve performance.
*/
protected HashSet<Notification> deferredEvents = new HashSet<Notification>();
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/LogicalOperationFilterImpl.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/LogicalOperationFilterImpl.java
index 74f0b3b..9fe192f 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/LogicalOperationFilterImpl.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/LogicalOperationFilterImpl.java
@@ -55,7 +55,7 @@
}
/**
- * {@link Set#addAll(Collection)Adds} a {@link Collection collection} of {@link EventFilter filters} to
+ * {@link Set#addAll(Collection)} a {@link Collection collection} of {@link EventFilter filters} to
* the {@link #getOperands() operands}
* @param filters to add
*/
@@ -117,7 +117,7 @@
/**
* {@link LogicalOperationFilterImpl filter} cannot be negated
* @throws IllegalArgumentException
- * @see org.eclipse.ocl.examples.eventmanager.filters.EventFilter#setNegated(boolean)
+ * @see org.eclipse.ocl.examples.eventmanager.filters.AbstractEventFilter#setNegated(boolean)
*/
@Override
public void setNegated(boolean b) {
@@ -128,7 +128,7 @@
* {@link LogicalOperationFilter logical filters} are never negated,
* negation is done by combining with a {@link NotFilter}
* @return <code>false</code>
- * @see org.eclipse.ocl.examples.eventmanager.filters.EventFilter#isNegated()
+ * @see org.eclipse.ocl.examples.eventmanager.EventFilter#isNegated()
*/
@Override
public boolean isNegated() {
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationManagerTableBased.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationManagerTableBased.java
index 0294923..b68e4d8 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationManagerTableBased.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationManagerTableBased.java
@@ -50,12 +50,12 @@
* </ul>
* <br>
* The first two points are defined in the {@link #init()} method which is implemented in the subclass
- * {@link com.RegistrationManagerTableBased.tc.moin.repository.events.framework.SessionRegistrationManager} because originally there also were other
+ * {@link RegistrationManagerTableBased} because originally there also were other
* subtypes of <code>RegistrationManager</code> (e.g. the GlobalRegistrationManager). <br>
* This knowledge enables the <code>RegistrationManager</code> to fill the <code>EventFilterTables</code> with new registrations
* and to compute all listeners that are registered to a certain event. The knowledge of the registrations that belong to a
* listener is primary for performance improvement at deregistration time. The
- * {@link org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter.tc.moin.repository.events.framework.EventFilterTable EventFilterTables} provide registrations for an event in
+ * {@link org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter} provide registrations for an event in
* one context. When an event is being fired, the <code>RegistrationManager</code> will know which <code>EventFilterTables</code>
* to ask and can collect all registrations from all affected <code>EventFilterTables</code>. The <code>RegistrationManager</code>
* has the overview and can merge these candidates into a consolidated set of registrations. Afterwards these Registrations are
@@ -204,11 +204,10 @@
* registers a listener with the passed filter expression. The returned object of type <code>RegistrationHandle</code> is
* intended to be used as handle for deregistration puposes.
*
- * @param filter
+ * @param filterTree
* the filter expression (may also be a tree)
* @param listener
* the listener to register
- * @return an object of type RegistrationHandle (needed for deregistering purposes only)
*/
public synchronized void register(EventFilter filterTree, WeakReference<? extends Adapter> listener,
ListenerTypeEnum listenerType) {
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationSet.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationSet.java
index a77b14b..7bb0b1d 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationSet.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationSet.java
@@ -68,7 +68,6 @@
* The return value defines the type of the Listener
*
* @see ListenerTypeEnum
- * @return
*/
public ListenerTypeEnum getListenerType() {
return listenerType;
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForContainmentFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForContainmentFilter.java
index 2917804..be26bf4 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForContainmentFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForContainmentFilter.java
@@ -14,13 +14,12 @@
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.ocl.examples.eventmanager.filters.ContainmentFilter;
-
-
+import org.eclipse.ocl.examples.eventmanager.filters.StructuralFeatureFilter;
/**
- * The AttributeFilterTable manages all Registrations containing {@link PropertyFilter.hpi.sam.bp2009.solution.eventManager.filters.sap.tc.moin.repository.events.filter.AttributeFilter}.
+ * The AttributeFilterTable manages all Registrations containing {@link StructuralFeatureFilter}.
*
- * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter.tc.moin.repository.events.framework.EventFilterTable
+ * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter
* @author Daniel Vocke (D044825)
*/
public class TableForContainmentFilter extends TableForEventFilter {
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventTypeFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventTypeFilter.java
index a66a85d..aeb87b8 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventTypeFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventTypeFilter.java
@@ -21,7 +21,7 @@
/**
* The EventTypeFilterTable manages all Registrations containing {@link EventTypeFilter}.
*
- * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter.tc.moin.repository.events.framework.EventFilterTable
+ * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter
* @author Daniel Vocke (D044825)
*/
public class TableForEventTypeFilter extends TableForEventFilter {
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilter.java
index 5762848..f57d2fc 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilter.java
@@ -24,7 +24,7 @@
* The AssociationFilterTable manages all Registrations containing
* {@link StructuralFeatureFilter}.
*
- * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter.tc.moin.repository.events.framework.EventFilterTable
+ * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter
* @author Daniel Vocke (D044825)
*/
public class TableForNewValueClassFilter extends TableForEventFilter {
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilterIncludingSubclasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilterIncludingSubclasses.java
index 29141f1..64551da 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilterIncludingSubclasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilterIncludingSubclasses.java
@@ -25,7 +25,7 @@
* The AssociationFilterTable manages all Registrations containing
* {@link StructuralFeatureFilter}.
*
- * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter.tc.moin.repository.events.framework.EventFilterTable
+ * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter
* @author Daniel Vocke (D044825)
*/
public class TableForNewValueClassFilterIncludingSubclasses extends TableForEventFilter {
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilter.java
index 1e5baeb..847479e 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilter.java
@@ -24,7 +24,7 @@
* The AssociationFilterTable manages all Registrations containing
* {@link StructuralFeatureFilter}.
*
- * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter.tc.moin.repository.events.framework.EventFilterTable
+ * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter
* @author Daniel Vocke (D044825)
*/
public class TableForOldValueClassFilter extends TableForEventFilter {
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForStructuralFeatureFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForStructuralFeatureFilter.java
index af00a10..8ba1a2d 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForStructuralFeatureFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForStructuralFeatureFilter.java
@@ -17,9 +17,9 @@
/**
- * This filter table manages all Registrations containing {@link PropertyFilter}.
+ * This filter table manages all Registrations containing {@link StructuralFeatureFilter}.
*
- * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter.tc.moin.repository.events.framework.EventFilterTable
+ * @see org.eclipse.ocl.examples.eventmanager.framework.TableForEventFilter
* @author Daniel Vocke (D044825), Axel Uhl
*/
public class TableForStructuralFeatureFilter extends TableForEventFilter {
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/Revalidator.java b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/Revalidator.java
index 3dcb29a..30c8c18 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/Revalidator.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/Revalidator.java
@@ -74,7 +74,7 @@
}
/**
- * @param oclFactory used to create {@link OCL} instances
+ * @param resourceSet used to create {@link OCL} instances
* @param oppositeEndFinder used to instantiate an {@link OCL} object using
* {@link OCLFactory#createOCL(OppositeEndFinder)}, and used for the {@link ImpactAnalyzer} when
* retrieving and navigating hidden opposite references as well as for evaluating
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEnvironmentFactoryWithScopedExtentMap.java b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEnvironmentFactoryWithScopedExtentMap.java
index 4c2592e..3c3a301 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEnvironmentFactoryWithScopedExtentMap.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEnvironmentFactoryWithScopedExtentMap.java
@@ -15,7 +15,6 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.ocl.EvaluationEnvironment;
import org.eclipse.ocl.ecore.opposites.DefaultOppositeEndFinder;
@@ -26,7 +25,7 @@
/**
* An OCL environment factory that is parameterizable during construction with an
* {@link OppositeEndFinder} in addition to the default parameterization of the
- * package {@link EPackage.Registry}. If no {@link OppositeEndFinder} is provided to
+ * package {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry}. If no {@link OppositeEndFinder} is provided to
* the constructor, a {@link DefaultOppositeEndFinder} instance is used.
*
* @author Axel Uhl (D043530)
@@ -57,8 +56,8 @@
/**
* Initializes me with the default <code>EPackage.Registry</code> that the environments I create will use to look up
* packages. The {@link OppositeEndFinder} object specified is used. Callers should ensure that the
- * <code>oppositeEndFinder</code> is consistent with the default {@link EPackage.Registry}. Otherwise,
- * use {@link #EcoreEnvironmentFactoryWithScopedExtentMap(Registry, OppositeEndFinder)} and specify the
+ * <code>oppositeEndFinder</code> is consistent with the default {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry}. Otherwise,
+ * use {@link #EcoreEnvironmentFactoryWithScopedExtentMap(org.eclipse.emf.ecore.EPackage.Registry, OppositeEndFinder)} and specify the
* particular package registry used by your opposite end finder.
*/
public EcoreEnvironmentFactoryWithScopedExtentMap(OppositeEndFinder oppositeEndFinder) {
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCLFactory.java b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCLFactory.java
index bbc13b5..70d3222 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCLFactory.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCLFactory.java
@@ -50,7 +50,7 @@
/**
* Creates an OCL instance that uses the environment factory provided. See also
- * {@link OCL#newInstance(org.eclipse.ocl.EnvironmentFactory)}.
+ * {@link org.eclipse.ocl.ecore.OCL#newInstance(org.eclipse.ocl.EnvironmentFactory)}.
*/
public OCL createOCL(EcoreEnvironmentFactory environmentFactory) {
if (!(environmentFactory instanceof EcoreEnvironmentFactoryWithScopedExtentMap)) {
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzer.java
index a80ee4c..defab24 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzer.java
@@ -72,7 +72,7 @@
/**
* Determines a superset of the set of context objects for which the overall
- * {@link #expression} managed by this instance scope analysis results in
+ * expression managed by this instance scope analysis results in
* <code>evaluationResult</code> or a collection containing
* <code>evaluationResult</code>. The result is always a valid collection,
* never <code>null</code>, but possibly empty.
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzerFactory.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzerFactory.java
index 5f7a1b2..86ff16a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzerFactory.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzerFactory.java
@@ -38,7 +38,7 @@
* Constructs an impact analyzer for the expression specified. The expression's context type is inferred from any occurrence
* of <code>self</code> in the expression. If no <code>self</code> occurrence can be found, an exception will be thrown. The
* configuration is taken from the default {@link OptimizationActivation#getOption()}.
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type and its subtypes or not. (Creation here means that the object is added to a resource in the
* {@link ResourceSet} observed by the {@link EventManager} used for handling change events.) Registering for
@@ -55,7 +55,7 @@
* Constructs an impact analyzer for the expression specified with an explicit context type specification. Use this factory
* method if <code>expression</code> does not contain any reference to <code>self</code>. The configuration is taken from the
* default {@link OptimizationActivation#getOption()}.
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type and its subtypes or not. (Creation here means that the object is added to a resource in the
* {@link ResourceSet} observed by the {@link EventManager} used for handling change events.) Registering for
@@ -75,7 +75,7 @@
* @param oppositeEndFinder
* used to perform {@link OppositePropertyCallExp} when evaluating (parts of) <code>expression</code> and for
* evaluating <code>allInstances()</code> calls
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
@@ -94,7 +94,7 @@
* @param oppositeEndFinder
* used to perform {@link OppositePropertyCallExp} when evaluating (parts of) <code>expression</code> and for
* evaluating <code>allInstances()</code> calls
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
@@ -109,7 +109,7 @@
/**
* Constructs an impact analyzer for the expression specified. The expression's context type is inferred from any occurrence
* of <code>self</code> in the expression. If no <code>self</code> occurrence can be found, an exception will be thrown.
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
@@ -124,7 +124,7 @@
/**
* Constructs an impact analyzer for the expression specified with an explicit context type specification. Use this factory
* method if <code>expression</code> does not contain any reference to <code>self</code>.
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
@@ -139,7 +139,7 @@
/**
* Constructs an impact analyzer for the expression specified with an explicit context type specification. Use this factory
* method if <code>expression</code> does not contain any reference to <code>self</code>.
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
@@ -147,9 +147,6 @@
* only wants to receive <em>update</em> events after the element has been fully initialized from those OCL
* expressions. In those cases, some framework may be responsible for the initial evaluation of those OCL
* expressions on new element, and therefore, context element creation events are not of interest.
- * @param oppositeEndFinder
- * used to perform {@link OppositePropertyCallExp} when evaluating (parts of) <code>expression</code> and for
- * evaluating <code>allInstances()</code> calls
*/
ImpactAnalyzer createImpactAnalyzer(OCLExpression expression, EClass context, boolean notifyOnNewContextElements,
ActivationOption configuration, OCLFactory oclFactory);
@@ -157,7 +154,7 @@
/**
* Constructs an impact analyzer for the expression specified. The expression's context type is inferred from any occurrence
* of <code>self</code> in the expression. If no <code>self</code> occurrence can be found, an exception will be thrown.
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
@@ -249,9 +246,6 @@
* finder} for resolving and navigating {@link OppositePropertyCallExp}
* expressions. The configuration is taken from the default
* {@link OptimizationActivation#getOption()}.
- *
- * @param property
- * the {@link EStructuralFeature#isDerived() derived} property
*/
DerivedPropertyNotifier createDerivedPropertyNotifier(
EPackage pkg, OCLFactory oclFactory);
@@ -266,9 +260,6 @@
* This variant uses a {@link DefaultOppositeEndFinder default opposite end
* finder} for resolving and navigating {@link OppositePropertyCallExp}
* expressions.
- *
- * @param property
- * the {@link EStructuralFeature#isDerived() derived} property
*/
DerivedPropertyNotifier createDerivedPropertyNotifier(
EPackage pkg, ActivationOption configuration, OCLFactory oclFactory);
@@ -283,8 +274,6 @@
* The configuration is taken from the default
* {@link OptimizationActivation#getOption()}.
*
- * @param property
- * the {@link EStructuralFeature#isDerived() derived} property
* @param oppositeEndFinder
* used to perform {@link OppositePropertyCallExp} when
* evaluating (parts of) <code>expression</code> and for
@@ -300,8 +289,6 @@
* {@link EStructuralFeature properties}.
* <p>
*
- * @param property
- * the {@link EStructuralFeature#isDerived() derived} property
* @param oppositeEndFinder
* used to perform {@link OppositePropertyCallExp} when
* evaluating (parts of) <code>expression</code> and for
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/ActivationOption.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/ActivationOption.java
index b5ddeaf..b5e9309 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/ActivationOption.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/ActivationOption.java
@@ -10,6 +10,8 @@
******************************************************************************/
package org.eclipse.ocl.examples.impactanalyzer.configuration;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.ocl.ecore.OperationCallExp;
import org.eclipse.ocl.examples.impactanalyzer.ImpactAnalyzer;
import org.eclipse.ocl.examples.impactanalyzer.instanceScope.InstanceScopeAnalysis;
import org.eclipse.ocl.examples.impactanalyzer.instanceScope.NavigationStep;
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluationVisitorImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluationVisitorImpl.java
index 0c4d4db..846995c 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluationVisitorImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluationVisitorImpl.java
@@ -328,7 +328,6 @@
* @param <T>
* @param into
* @param kind
- * @return
*/
@SuppressWarnings("unchecked")
private <T> Collection<T> insertManyAt(Collection<T> into, CollectionKind kind) {
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorImpl.java
index 9613e44..877e49b 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorImpl.java
@@ -164,7 +164,7 @@
*
* The method first applies partial evaluation along chains of {@link CallExp} and operation calls. If the computation of the
* full value based on old and new source value reaches the end of such a chain of {@link CallExp} and operation
- * body/operation call constructs, {@link #transitivelyPropagateDelta(OCLExpression, Collection)} tries to
+ * body/operation call constructs, {@link #transitivelyPropagateDelta(OCLExpression, Collection, OperationBodyToCallMapper)} tries to
* propagate the delta between old and new value further. If the result of this delta propagation is empty for all
* expressions to which it propagates then this proves that the original change indicated by <tt>oldSourceValue</tt>
* and <tt>newSourceValue</tt> has no effect on the overall expression.
@@ -385,7 +385,7 @@
* <p>
*
* <b>Postcondition</b>:
- * <tt>this.{@link #getDeltaPropagationStrategy(OCLExpression) getDeltaPropagationStrategy}(result.getA()) == null</tt>
+ * <tt>this.{@link #getDeltaPropagationStrategy(OCLExpression, OperationBodyToCallMapper) getDeltaPropagationStrategy}(result.getA()) == null</tt>
*
* @param deltaForEValue
* may be null, empty or a valid non-empty collection specifying a delta in <tt>e</tt>'s evaluation result
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/filterSynthesis/FilterSynthesisImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/filterSynthesis/FilterSynthesisImpl.java
index 2a97e24..6d6aaaa 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/filterSynthesis/FilterSynthesisImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/filterSynthesis/FilterSynthesisImpl.java
@@ -262,7 +262,7 @@
/**
* Returns all the calls to the operation whose body is <tt>operationBodyExpression</tt> that are reachable from the root
- * expression analyzed by this {@link FilterSynthesis}. If no such calls exist, an empty set is returned.
+ * expression analyzed by this {@link FilterSynthesisImpl}. If no such calls exist, an empty set is returned.
*/
public Set<OperationCallExp> getCallsOf(OCLExpression operationBodyExpression) {
Set<OperationCallExp> result = visitedOperationBodies.get(operationBodyExpression);
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerImpl.java
index 118f53f..f2e52e5 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerImpl.java
@@ -51,7 +51,7 @@
*
* Should you conveniently have the context type available, consider using
* {@link #ImpactAnalyzerImpl(OCLExpression, EClass, boolean, ActivationOption, OCLFactory)} instead.
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
@@ -71,7 +71,7 @@
/**
* @param oppositeEndFinder
* used during partial navigation and for metamodel queries
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
@@ -97,7 +97,7 @@
/**
* @param oppositeEndFinder
* used during partial navigation and for metamodel queries
- * @param notifyNewContextElements
+ * @param notifyOnNewContextElements
* The analyzer can be parameterized during construction such that it either registers for creation events on the
* context type or not. Registering for element creation on the context type is useful for invariants / constraints
* because when a new element is created, validating the constraint may be useful. For other use cases, registering
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractPathCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractPathCache.java
index 029e7fa..44ae420 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractPathCache.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractPathCache.java
@@ -43,7 +43,7 @@
* {@link AbstractPathCache} for <tt>self</tt> and parameter expressions of the operation called invalid. Additionally, all
* dependent paths would become invalid too. Identifying and removing those entries from a {@link AbstractPathCache} seems to
* cause more effort than using a new {@link AbstractPathCache} object for each expression analyzed, particularly given the fact
- * that the step assembly only has to happen once per life-time of an {@link OCLExpression<EClassifier>} during
+ * that the step assembly only has to happen once per life-time of an {@link OCLExpression} during
* a session.
*
*/
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractTracer.java
index 6b664e7..1826960 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractTracer.java
@@ -138,8 +138,8 @@
/**
* There are a few known idiosyncrasies in the OCL "composition" hierarchy. A {@link TupleLiteralExp} does not contain its
- * {@link TupleLiteralExp#getTuplePart() tuple parts} which are variable declarations, a {@link CollectionLiteralExp} does not
- * contain its {@link CollectionLiteralExp#getParts() parts}, and of those parts, none of {@link CollectionRange} nor
+ * {@link TupleLiteralExp#getPart() tuple parts} which are variable declarations, a {@link CollectionLiteralExp} does not
+ * contain its {@link CollectionLiteralExp#getPart() parts}, and of those parts, none of {@link CollectionRange} nor
* {@link CollectionItem} contains the expressions that it uses to describe itself.
* <p>
*
@@ -155,7 +155,7 @@
}
/**
- * Checks if <tt>s</tt> conforms to the {@link OclExpressionInternal#getType type} of the {@link #getExpression()
+ * Checks if <tt>s</tt> conforms to the type of the {@link #getExpression()
* expression} managed by this tracer. A mismatch may occur because of "reverse polymorphic traversal." In other
* words, if an expression with a {@link ModelPropertyCallExpInternal#getSource(CoreConnection) source} traces back
* to its source in order to find out the possible values for <tt>self</tt> that may have produced a specific value,
@@ -323,7 +323,6 @@
* This method is a shortcut for {@link AbstractTracer#commonCompositionParent(OCLExpression, OCLExpression)} that uses {@link AbstractTracer#getExpression()} as the origin.
* See {@link AbstractTracer#commonCompositionParent(OCLExpression, OCLExpression)} for description.
* @param second
- * @return
*/
protected OCLExpression commonCompositionParent(OCLExpression second){
return commonCompositionParent((OCLExpression) getExpression(), second);
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BranchingNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BranchingNavigationStep.java
index 5d9480e..de72693 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BranchingNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BranchingNavigationStep.java
@@ -184,7 +184,6 @@
* of this idea has not been finished.
*
* @param branchingNavigationStep
- * @return
*/
@SuppressWarnings("unused")
private List<NavigationStep> getFlattenedSubsteps(BranchingNavigationStep branchingNavigationStep){
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InstanceScopeAnalysis.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InstanceScopeAnalysis.java
index b877f87..5f15aed 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InstanceScopeAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InstanceScopeAnalysis.java
@@ -70,7 +70,7 @@
/**
* Supports a lookup from a source model element of either an attribute value change event or a link add/remove event together
- * with an {@link OCLExpression<EClassifier>} to a set of context objects for which the expression may return a value different
+ * with an {@link OCLExpression} to a set of context objects for which the expression may return a value different
* from the one it returned before the change event occurred. An instance of this class manages the analysis for all expression
* occuring within one root OCL expression, including the expressions reachable in operation body expressions where the operation
* may be called directly of indirectly by the root expression.
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStep.java
index 0787399..5f8c89c 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStep.java
@@ -14,8 +14,6 @@
import java.util.HashSet;
import java.util.Set;
-import javax.swing.event.ChangeListener;
-
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -43,7 +41,7 @@
* associations or ascend the composition hierarchy, using {@link RefObject#refImmediateComposite()}.
* <p>
*
- * A navigation step object may change its {@link #hashCode()} over its life time. This particularly has to do with
+ * A navigation step object may change its {@link Object#hashCode()} over its life time. This particularly has to do with
* the propagation of information taking place after an {@link IndirectingStep} has its actual step set. This can lead
* to a ripple effect regarding source and target type settings as well as {@link #isAlwaysEmpty()} changes, all
* affecting a step's hash code and equality definition. Whenever you insert a navigation step into a hashing
@@ -84,14 +82,12 @@
/**
* Optionally, a navigation step may tell for which OCL expression it was mainly created. This can aid the impact analysis
* debugging process. May return <tt>null</tt>.
- *
- * @return
*/
Set<OCLExpression> getDebugInfo();
/**
* Whenever the result of {@link #isAlwaysEmpty()} changes, registered listeners will be informed by calling their
- * {@link ChangeListener#alwaysEmptyChanged(NavigationStep)} method with this step as parameter.
+ * {@link AlwaysEmptyChangeListener#alwaysEmptyChanged(NavigationStep)} method with this step as parameter.
*/
void addAlwaysEmptyChangeListener(AlwaysEmptyChangeListener listener);
@@ -152,7 +148,7 @@
/**
* Sets the set of variables that come into scope when this navigation step is navigated. It is given as an
- * <code>Set>{@link |Variable}></code>.
+ * <code>Set>{@link Variable}></code>.
*
* @param enteringScope
* the set of {@link Variable}s representing the variables getting into scope by navigating this step.
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PathCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PathCache.java
index d8fc3ef..85e9faa 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PathCache.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PathCache.java
@@ -19,6 +19,7 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.ocl.ecore.OCLExpression;
+import org.eclipse.ocl.ecore.PropertyCallExp;
import org.eclipse.ocl.ecore.opposites.OppositeEndFinder;
import org.eclipse.ocl.examples.impactanalyzer.impl.OperationBodyToCallMapper;
import org.eclipse.ocl.examples.impactanalyzer.util.OCLFactory;
@@ -27,8 +28,8 @@
/**
- * The instance scope analysis's goal is to compute {@link NavigationStep} objects for each {@link AttributeCallExp} and
- * {@link AssociationEndCallExp} subexpression in an OCL expression's expression tree. These {@link NavigationStep}s can each be a
+ * The instance scope analysis's goal is to compute {@link NavigationStep} objects for each {@link PropertyCallExp}
+ * subexpression in an OCL expression's expression tree. These {@link NavigationStep}s can each be a
* graph, referring to other potentially composite navigation steps. The graph can even be cyclic, as in the case for recursive
* operation calls.
* <p>
@@ -42,7 +43,7 @@
* <tt>self</tt> and parameter expressions of the operation called invalid. Additionally, all dependent paths would become invalid
* too. Identifying and removing those entries from a {@link PathCache} seems to cause more effort than using a new
* {@link PathCache} object for each expression analyzed, particularly given the fact that the {@link NavigationPath} assembly
- * only has to happen once per life-time of an {@link OCLExpression<EClassifier>} during a session.
+ * only has to happen once per life-time of an {@link OCLExpression} during a session.
*
*/
public class PathCache extends AbstractPathCache<NavigationStep> implements HashCodeChangeListener {
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PredicateCheckNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PredicateCheckNavigationStep.java
index b5b8030..88b7db9 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PredicateCheckNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PredicateCheckNavigationStep.java
@@ -35,7 +35,7 @@
/**
* Evaluates an OCL expression that is expected to be the {@link IteratorExp#getBody() body} expression of an iterator expression.
- * Before the evaluation is triggered, the single iterator variable obtained from {@link LoopExp#getIterators()} is set to the
+ * Before the evaluation is triggered, the single iterator variable obtained from {@link LoopExp#getIterator()} is set to the
* {@link RefObject} passed to {@link #navigate(CoreConnection, AnnotatedRefObjectImpl, Map, Set)} in the <tt>fromObject</tt>
* parameter. Depending on the particular type of iterator (<tt>select</tt>, <tt>reject</tt> or <tt>any</tt>), the object is
* passed on if and only if the OCL expression evaluates to <tt>true</tt>/<tt>false</tt>/<tt>true</tt>, respectively. For any
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/Tracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/Tracer.java
index 3115a5a..d97c593 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/Tracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/Tracer.java
@@ -14,15 +14,16 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.ocl.ecore.OCLExpression;
import org.eclipse.ocl.examples.impactanalyzer.impl.OperationBodyToCallMapper;
/**
- * All implementations must offer a constructor that takes a {@link CoreConnection} and a {@link OclExpression} impl
+ * All implementations must offer a constructor that takes a {@link OCLFactory} and a {@link OCLExpression} impl
* subclass of the type handled by them as argument. Furthermore, the implementing classes underly a naming convention.
- * If they handle an {@link OclExpression} type by the MOF name of <tt>X</tt> then the tracer implementation class name
+ * If they handle an {@link OCLExpression} type by the MOF name of <tt>X</tt> then the tracer implementation class name
* must be <tt>XTracer</tt>.
*
*/
@@ -41,11 +42,6 @@
* @param filterSynthesizer
* the filter synthesizer that analyzed an overall expression that contains the expression to be handled by this
* tracer
- * @param classScopeAnalyzer
- * retains the results of traversing the outermost expression's tree, a sub-expression of which this tracer will
- * analyze in this method. The class scope analyzer in particular remembers the operation calls it found and
- * thereby makes it possible to limit the analysis of operation bodies by the scope of those calls actually
- * invoking the operation in the context of the outermost expression.
*/
NavigationStep traceback(EClass context, PathCache pathCache, OperationBodyToCallMapper filterSynthesizer);
}
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/AbstractTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/AbstractTracebackStep.java
index ef53962..9090349 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/AbstractTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/AbstractTracebackStep.java
@@ -56,8 +56,8 @@
public abstract class AbstractTracebackStep<E extends OCLExpression> implements TracebackStep {
/**
* If set to a non-<code>null</code> class, this step asserts that if the source objects passed to its
- * {@link #traceback(AnnotatedEObject, UnusedEvaluationRequestSet, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)} or
- * {@link #traceback(Set, UnusedEvaluationRequestSet, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)} operation are not compatible to that
+ * {@link #traceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)}
+ * operation are not compatible to that
* type, then the result set will be empty.
*/
protected EClass requiredType;
@@ -157,7 +157,7 @@
/**
* Remembers <code>call</code> as the only operation call through which
- * @param orCreateNavigationPath
+ * @param step
* @param variablesChangingScope
* @param callToWhichResultsAreSpecific
*/
@@ -519,7 +519,7 @@
}
/**
- * This method is used to invoke the {@link TracebackStep#traceback(AnnotatedEObject, Set, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)} method on all necessary subsequent {@link TracebackStep}s and return their results.
+ * This method is used to invoke the {@link TracebackStep#traceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)} method on all necessary subsequent {@link TracebackStep}s and return their results.
* Which subsequent steps are necessary depends on the respective <code>source</code> {@link OCLExpression} the {@link TracebackStep} was created for.
*/
protected abstract OperationCallExpKeyedSet performSubsequentTraceback(AnnotatedEObject source,
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/CollectionLiteralTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/CollectionLiteralTracebackStep.java
index 0acdb0e..be84aaa 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/CollectionLiteralTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/CollectionLiteralTracebackStep.java
@@ -10,7 +10,6 @@
******************************************************************************/
package org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback;
-import java.util.Set;
import java.util.Stack;
import org.eclipse.emf.common.notify.Notification;
@@ -20,6 +19,7 @@
import org.eclipse.ocl.ecore.CollectionLiteralExp;
import org.eclipse.ocl.ecore.OCLExpression;
import org.eclipse.ocl.examples.impactanalyzer.impl.OperationBodyToCallMapper;
+import org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache;
import org.eclipse.ocl.examples.impactanalyzer.instanceScope.unusedEvaluation.UnusedEvaluationRequestFactory;
import org.eclipse.ocl.examples.impactanalyzer.util.AnnotatedEObject;
import org.eclipse.ocl.examples.impactanalyzer.util.OCLFactory;
@@ -28,11 +28,11 @@
/**
* When a {@link CollectionLiteralExp} is traced back, it calls the
- * {@link TracebackStep#traceback(AnnotatedEObject, Set, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)} function for the item of those parts, which are
+ * {@link TracebackStep#traceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)} function for the item of those parts, which are
* instance of {@link CollectionItem}, forwarding the <code>source</code> object, the (possibly modified)
* <code>pendingUnusedEvalRequests</code> and the <code>tracebackCache</code>.
*
- * @see AbstractTracebackStep#performSubsequentTraceback(AnnotatedEObject, Set, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)
+ * @see AbstractTracebackStep#performSubsequentTraceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)
*/
public class CollectionLiteralTracebackStep extends BranchingTracebackStep<CollectionLiteralExp> {
public CollectionLiteralTracebackStep(CollectionLiteralExp sourceExpression, EClass context,
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/EmptyTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/EmptyTracebackStep.java
index 5e5498f..685a62f 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/EmptyTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/EmptyTracebackStep.java
@@ -10,7 +10,6 @@
******************************************************************************/
package org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback;
-import java.util.Set;
import java.util.Stack;
import org.eclipse.emf.common.notify.Notification;
@@ -44,7 +43,7 @@
* {@link RealLiteralExp} or an {@link EnumLiteralExp} or a {@link BooleanLiteralExp} or a {@link NullLiteralExp} or an
* {@link InvalidLiteralExp} is traced back, an empty set is returned.
*
- * @see AbstractTracebackStep#performSubsequentTraceback(AnnotatedEObject, Set, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)
+ * @see AbstractTracebackStep#performSubsequentTraceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)
*/
@Override
protected OperationCallExpKeyedSet performSubsequentTraceback(AnnotatedEObject source,
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IfTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IfTracebackStep.java
index e74f9d2..7383eb0 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IfTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IfTracebackStep.java
@@ -10,7 +10,6 @@
******************************************************************************/
package org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback;
-import java.util.Set;
import java.util.Stack;
import org.eclipse.emf.common.notify.Notification;
@@ -24,11 +23,11 @@
/**
- * When a {@link IfExp} is traced back, it calls the {@link TracebackStep#traceback(AnnotatedEObject, Set, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)}
+ * When a {@link IfExp} is traced back, it calls the {@link TracebackStep#traceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)}
* function for its then-expression and its else-expression, forwarding the <code>source</code> object, the (possibly
* modified) <code>pendingUnusedEvalRequests</code> and the <code>tracebackCache</code>.
*
- * @see AbstractTracebackStep#performSubsequentTraceback(AnnotatedEObject, Set, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)
+ * @see AbstractTracebackStep#performSubsequentTraceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)
*/
public class IfTracebackStep extends BranchingTracebackStep<IfExp> {
public IfTracebackStep(IfExp sourceExpression, EClass context, OperationBodyToCallMapper operationBodyToCallMapper,
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/LetTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/LetTracebackStep.java
index 75dd70d..44ca409 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/LetTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/LetTracebackStep.java
@@ -10,7 +10,6 @@
******************************************************************************/
package org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback;
-import java.util.Set;
import java.util.Stack;
import org.eclipse.emf.common.notify.Notification;
@@ -24,11 +23,11 @@
/**
- * When a {@link LetExp} is traced back, it calls the {@link TracebackStep#traceback(AnnotatedEObject, Set, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)}
+ * When a {@link LetExp} is traced back, it calls the {@link TracebackStep#traceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)}
* function for its in-expression, forwarding the <code>source</code> object, the (possibly modified)
* <code>pendingUnusedEvalRequests</code> and the <code>tracebackCache</code>.
*
- * @see AbstractTracebackStep#performSubsequentTraceback(AnnotatedEObject, Set, org.eclipse.ocl.examples.impactanalyzer.instanceScope.traceback.TracebackCache, Notification)
+ * @see AbstractTracebackStep#performSubsequentTraceback(AnnotatedEObject, UnusedEvaluationRequestSet, TracebackCache, Notification)
*/
public class LetTracebackStep extends BranchingTracebackStep<LetExp> {
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackCache.java
index 3411dfc..bd234cf 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackCache.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackCache.java
@@ -134,7 +134,7 @@
/**
* Caches the results of
- * {@link UnusedEvaluationRequest#evaluate(org.eclipse.ocl.ecore.opposites.OppositeEndFinder, org.eclipse.ocl.examples.impactanalyzer.OCLFactory)
+ * {@link UnusedEvaluationRequest#evaluate(org.eclipse.ocl.ecore.opposites.OppositeEndFinder, org.eclipse.ocl.examples.impactanalyzer.util.OCLFactory)
* evaluating} an {@link UnusedEvaluationRequest}. The result may either be a {@link ValueNotFoundException} telling
* for which unknown variable the request failed, or a {@link Boolean} telling if the evaluation caused unusedness
* to be proven.
@@ -145,7 +145,7 @@
/**
* Caches the results of
- * {@link UnusedEvaluationRequest#evaluate(org.eclipse.ocl.ecore.opposites.OppositeEndFinder, org.eclipse.ocl.examples.impactanalyzer.OCLFactory)
+ * {@link UnusedEvaluationRequest#evaluate(org.eclipse.ocl.ecore.opposites.OppositeEndFinder, org.eclipse.ocl.examples.impactanalyzer.util.OCLFactory)
* evaluating} an {@link UnusedEvaluationRequest}. The result may either be a {@link ValueNotFoundException} telling
* for which unknown variable the request failed, or a {@link Boolean} telling if the evaluation caused unusedness
* to be proven.
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStep.java
index b8d5502..7a428cf 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStep.java
@@ -13,6 +13,7 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.ocl.ecore.OCLExpression;
+import org.eclipse.ocl.ecore.OperationCallExp;
import org.eclipse.ocl.ecore.VariableExp;
import org.eclipse.ocl.examples.impactanalyzer.instanceScope.unusedEvaluation.UnusedEvaluationRequestSet;
import org.eclipse.ocl.examples.impactanalyzer.util.AnnotatedEObject;
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/VariableTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/VariableTracebackStep.java
index 29270a2..6b28956 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/VariableTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/VariableTracebackStep.java
@@ -292,8 +292,8 @@
/**
* There are a few known idiosyncrasies in the OCL "composition" hierarchy. A {@link TupleLiteralExp} does not contain its
- * {@link TupleLiteralExp#getTuplePart() tuple parts} which are variable declarations, a {@link CollectionLiteralExp} does not
- * contain its {@link CollectionLiteralExp#getParts() parts}, and of those parts, none of {@link CollectionRange} nor
+ * {@link TupleLiteralExp#getPart() tuple parts} which are variable declarations, a {@link CollectionLiteralExp} does not
+ * contain its {@link CollectionLiteralExp#getPart() parts}, and of those parts, none of {@link CollectionRange} nor
* {@link CollectionItem} contains the expressions that it uses to describe itself.
* <p>
*
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequest.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequest.java
index 481b52e..f86735a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequest.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequest.java
@@ -146,7 +146,7 @@
* the expression to evaluate
* @param resultIndicatingUnused
* if <code>expression</code> evaluates to this result, this request will return <code>true</code> from its
- * {@link #evaluate(OppositeEndFinder, OCL)} method; as a special case, <code>null</code> will be considered "equal"
+ * {@link #evaluate(OppositeEndFinder, OCLFactory)} method; as a special case, <code>null</code> will be considered "equal"
* to an empty collection as the result of evaluating <code>expression</code>
* @param inferredVariableValues
* may be <code>null</code>. In this case, a new {@link Map} is created internally.
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestSet.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestSet.java
index c5b3c1b..2c5bdf9 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestSet.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestSet.java
@@ -17,7 +17,6 @@
import java.util.Set;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.ocl.ecore.OCL;
import org.eclipse.ocl.ecore.Variable;
import org.eclipse.ocl.ecore.opposites.OppositeEndFinder;
import org.eclipse.ocl.examples.impactanalyzer.ValueNotFoundException;
@@ -212,7 +211,7 @@
/**
* Evaluates the <code>requestsToEvaluate</code>. If any of them returns <code>true</code> from its
- * {@link UnusedEvaluationRequest#evaluate(OppositeEndFinder, OCL)} method, a result will be returned that returns
+ * {@link UnusedEvaluationRequest#evaluate(OppositeEndFinder, OCLFactory)} method, a result will be returned that returns
* <code>true</code> from its {@link UnusedEvaluationResult#hasProvenUnused()} method. Otherwise, that result's method will
* return <code>false</code>. If any request's evaluation failed for an unknown variable, the request will be added to a new
* {@link UnusedEvaluationRequestSet} which is part of this method's result (see
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/AnnotatedEObject.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/AnnotatedEObject.java
index 0ec8729..cd06fdf 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/AnnotatedEObject.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/AnnotatedEObject.java
@@ -11,6 +11,7 @@
package org.eclipse.ocl.examples.impactanalyzer.util;
import java.lang.reflect.InvocationTargetException;
+import java.util.Stack;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
@@ -25,8 +26,8 @@
import org.eclipse.ocl.ecore.TupleLiteralExp;
/**
- * The AnnotatedEObject is a delegate of an {@link EObject} that adds support for {@link Sting} annotations.
- * Additionally it holds a {@link Stack<EStructuralFeature>} to enable the backtracking of {@link TupleLiteralExp}
+ * The AnnotatedEObject is a delegate of an {@link EObject} that adds support for {@link String} annotations.
+ * Additionally it holds a {@link Stack}<{@link EStructuralFeature}> to enable the backtracking of {@link TupleLiteralExp}
*
* @author martin.hanysz
*
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleDelegate.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleDelegate.java
index 5a9b1c2..5f9c04b 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleDelegate.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleDelegate.java
@@ -26,7 +26,7 @@
* Action delegate that ensures that the console view is active, with the
* Interactive OCL console active within it.
*
- * @Deprecated Use ShowConsoleHandler
+ * @deprecated Use ShowConsoleHandler
*/
@Deprecated
public class ShowConsoleDelegate
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleDelegate.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleDelegate.java
index 2af2a19..12f47c4 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleDelegate.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleDelegate.java
@@ -19,7 +19,7 @@
* Action delegate that ensures that the OCL Console is active and set to
* target the Ecore metamodel.
*
- * @Deprecated Use ShowEcoreConsoleHandler
+ * @deprecated Use ShowEcoreConsoleHandler
*/
@Deprecated
public class ShowEcoreConsoleDelegate
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleDelegate.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleDelegate.java
index f6ccb01..8913aee 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleDelegate.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleDelegate.java
@@ -19,7 +19,7 @@
* Action delegate that ensures that the OCL Console is active and set to
* target the UML metamodel.
*
- * @Deprecated Use ShowUMLConsoleHandler
+ * @deprecated Use ShowUMLConsoleHandler
*/
@Deprecated
public class ShowUMLConsoleDelegate
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/IOCLFactory.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/IOCLFactory.java
index 56f70e3..9149bfc 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/IOCLFactory.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/IOCLFactory.java
@@ -32,7 +32,7 @@
/**
* Creates a new OCL instance for my target metamodel.
*
- * @param modeling level the active modeling level
+ * @param level the active modeling level
*
* @return an OCL facade
*/
@@ -43,7 +43,7 @@
* Creates a new OCL instance for my target metamodel, persisted in the
* specified resource.
*
- * @param modeling level the active modeling level
+ * @param level the active modeling level
*
* @param res a resource in which to persist the OCL environment
*
diff --git a/examples/org.eclipse.ocl.examples.library/emf-gen/org/eclipse/ocl/examples/library/oclstdlib/util/OCLstdlibSwitch.java b/examples/org.eclipse.ocl.examples.library/emf-gen/org/eclipse/ocl/examples/library/oclstdlib/util/OCLstdlibSwitch.java
index f0a5f7b..a5d21f1 100644
--- a/examples/org.eclipse.ocl.examples.library/emf-gen/org/eclipse/ocl/examples/library/oclstdlib/util/OCLstdlibSwitch.java
+++ b/examples/org.eclipse.ocl.examples.library/emf-gen/org/eclipse/ocl/examples/library/oclstdlib/util/OCLstdlibSwitch.java
@@ -57,7 +57,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/ecore/EcoreExecutorType.java b/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/ecore/EcoreExecutorType.java
index d95df89..609585d 100644
--- a/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/ecore/EcoreExecutorType.java
+++ b/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/ecore/EcoreExecutorType.java
@@ -34,7 +34,7 @@
/**
* Construct an executable type descriptor in the absence of a known EClassifier. A subsequent
- * call of {@link #init(EClassifier)} may define an EClassifier.
+ * call of {@link #initFragments(ExecutorFragment[], int[], EClassifier)} may define an EClassifier.
*/
public EcoreExecutorType(@NonNull String name, @NonNull ExecutorPackage evaluationPackage, int flags, @NonNull ExecutorTypeParameter... typeParameters) {
super(name, evaluationPackage, flags, typeParameters);
@@ -43,7 +43,7 @@
/**
* Construct an executable type descriptor in the absence of a known EClassifier. A subsequent
- * call of {@link #init(EClassifier)} may define an EClassifier.
+ * call of {@link #initFragments(ExecutorFragment[], int[], EClassifier)} may define an EClassifier.
*/
public EcoreExecutorType(@NonNull BuiltInTypeId typeId, @NonNull ExecutorPackage evaluationPackage, int flags, @NonNull ExecutorTypeParameter... typeParameters) {
super(typeId.getName(), evaluationPackage, flags, typeParameters);
diff --git a/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/executor/AbstractIdResolver.java b/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/executor/AbstractIdResolver.java
index 4a2392e..4b5142a 100644
--- a/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/executor/AbstractIdResolver.java
+++ b/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/executor/AbstractIdResolver.java
@@ -391,7 +391,7 @@
*
* @param isOrdered the required collection ordering
* @param isUnique the required collection uniqueness
- * @param values the required collection contents
+ * @param unboxedValues the required collection contents
* @return the new collection
*/
public @NonNull CollectionValue createCollectionOfAll(boolean isOrdered, boolean isUnique, @NonNull TypeId elementTypeId, @NonNull Iterable<? extends Object> unboxedValues) {
diff --git a/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/executor/LazyModelManager.java b/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/executor/LazyModelManager.java
index 24e4de7..fa27318 100644
--- a/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/executor/LazyModelManager.java
+++ b/examples/org.eclipse.ocl.examples.library/src/org/eclipse/ocl/examples/library/executor/LazyModelManager.java
@@ -74,7 +74,7 @@
/**
* Lazily computes the extent of the specified class <code>key</code>.
*
- * @param key a class in the model
+ * @param type a class in the model
*/
public @NonNull Set<EObject> get(@NonNull DomainType type) {
// TODO: Optimize by parsing ahead of time to find all EClasses that we will query
@@ -103,7 +103,7 @@
* is an instance of the specified class, according to the metamodel
* semantics implemented by the environment that created this extent map.
*
- * @param cls a class in the model
+ * @param type a class in the model
* @param element a potential run-time (M0) instance of that class
* @return <code>true</code> if this element is an instance of the given
* class; <code>false</code> otherwise
diff --git a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/AssociationKind.java b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/AssociationKind.java
index 3847a13..631f35d 100644
--- a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/AssociationKind.java
+++ b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/AssociationKind.java
@@ -21,7 +21,6 @@
* A representation of the literals of the enumeration '<em><b>Association Kind</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.eclipse.ocl.examples.pivot.PivotPackage#getAssociationKind()
* @model
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/TuplePartImpl.java b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/TuplePartImpl.java
index cfe4ee3..df76a54 100644
--- a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/TuplePartImpl.java
+++ b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/TuplePartImpl.java
@@ -20,13 +20,7 @@
public class TuplePartImpl
extends PropertyImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param partType
- * @param partId2
- * @generated
- */
+
protected TuplePartImpl() {
super();
}
diff --git a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/util/PivotSwitch.java b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/util/PivotSwitch.java
index 6bd33b1..b872cf8 100644
--- a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/util/PivotSwitch.java
+++ b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/util/PivotSwitch.java
@@ -168,7 +168,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/util/Visitable.java b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/util/Visitable.java
index 9ba63b4..f1fb881 100644
--- a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/util/Visitable.java
+++ b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/util/Visitable.java
@@ -32,7 +32,7 @@
* <p>
* Derived implementations of accept() may use getAdapter() to obtain
* richer visitor interfaces.
- * @param <R, C>
+ * @param <R>
* @param visitor
* @return the result of the visit.
*/
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/AbstractEnvironment.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/AbstractEnvironment.java
index 98e98dd..a061374 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/AbstractEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/AbstractEnvironment.java
@@ -90,22 +90,11 @@
}
/**
- * I dispose my type resolver, if it is an {@link AbstractTypeResolver}
- * and I am the root environment (which owns the resolver).
+ * Dispose of any owned objects.
*/
public void dispose() {
}
- /**
- * Initializes me with the specified parent environment, which should be
- * of the same type as me.
- *
- * @param parent an environment of the same type as me (or <code>null</code>)
- */
-// protected AbstractEnvironment(AbstractEnvironment parent) {
-// this(parent);
-// }
-
// implements the interface method
public @Nullable org.eclipse.ocl.examples.pivot.Package getContextPackage() {
if (contextPackage != null) {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/AbstractEnvironmentFactory.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/AbstractEnvironmentFactory.java
index 6d59fa1..d436e82 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/AbstractEnvironmentFactory.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/AbstractEnvironmentFactory.java
@@ -23,33 +23,7 @@
/**
* Partial implementation of the {@link EnvironmentFactory} interface, useful
- * for subclassing to define the OCL binding for a metamodel. This abstract
- * class takes care of some of the more common (and mundane) chores, such as:
- * <ul>
- * <li>defining the "self" variable in the classifier context</li>
- * <li>creating variables for operation parameters in an operation context</li>
- * </ul>
- * <p>
- * The subclass's responsibility (in addition to implementing any other
- * interface methods not implemented here) is to define how to:
- * </p>
- * <ul>
- * <li>{@linkplain #getClassifier obtain} the classifier in the
- * user model of an input element (which may already be a classifier
- * or an may be an M0 instance)</li>
- * <li>{@linkplain #lookupPackage lookup} a package in the model associated
- * with this environment factory</li>
- * </ul>
- * <p>
- * This class is intended to be extended by clients, for the purpose of
- * implementing metamodel-specific environment factories.
- * </p>
- * <p>
- * See the {@link EnvironmentFactory} class for a description of the
- * generic type parameters of this class.
- * </p>
- *
- * @author Christian W. Damus (cdamus)
+ * for subclassing to define the Pivot binding for a metamodel.
*/
public abstract class AbstractEnvironmentFactory implements EnvironmentFactory, Adaptable {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Customizable.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Customizable.java
index 5b52d84..f3629a5 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Customizable.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Customizable.java
@@ -19,7 +19,7 @@
import org.eclipse.ocl.examples.pivot.options.Option;
//import org.eclipse.ocl.Environment;
-//import org.eclipse.ocl.EvaluationEnvironment;
+import org.eclipse.ocl.examples.pivot.evaluation.EvaluationEnvironment;
//import org.eclipse.ocl.util.Adaptable;
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Environment.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Environment.java
index 00dfb96..978e976 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Environment.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Environment.java
@@ -45,27 +45,6 @@
* adapters for any environment instance.
* </p>
*
- * @param <PK> is substituted by the metaclass representing the metamodel's
- * analogue for the UML 2.x <tt>Package</tt>
- * @param <C> corresponds to the UML <tt>Classifier</tt> metaclass
- * @param <O> corresponds to the UML <tt>Operation</tt> metaclass
- * @param <P> corresponds to the UML <tt>Property</tt> metaclass
- * @param <EL> corresponds to the UML <tt>EnumerationLiteral</tt> metaclass
- * (<tt>Enumeration</tt>s are simply represented as classifiers)
- * @param <PM> corresponds to the UML <tt>Parameter</tt> metaclass
- * @param <S> corresponds to the UML <tt>State</tt> metaclass (for metamodels
- * that describe state machines)
- * @param <COA> corresponds to the UML <tt>CallOperationAction</tt> metaclass
- * (used in message expressions)
- * @param <SSA> corresponds to the UML <tt>SendSignalAction</tt> metaclass
- * (used in message expressions)
- * @param <CT> corresponds to the UML <tt>Constraint</tt> metaclass
- * @param <CLS> corresponds to the UML <tt>Class</tt> metaclass
- * @param <E> corresponds to the UML <tt>Element</tt> metaclass
- *
- * @author Edith Schonberg (edith)
- * @author Christian W. Damus (cdamus)
- *
* @see AbstractEnvironment
* @see EnvironmentFactory
*/
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/EnvironmentFactory.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/EnvironmentFactory.java
index 60a2192..82c5891 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/EnvironmentFactory.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/EnvironmentFactory.java
@@ -15,6 +15,7 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.examples.domain.elements.DomainStandardLibrary;
import org.eclipse.ocl.examples.domain.evaluation.DomainModelManager;
import org.eclipse.ocl.examples.pivot.evaluation.EvaluationEnvironment;
import org.eclipse.ocl.examples.pivot.evaluation.EvaluationVisitor;
@@ -32,31 +33,7 @@
* "directly" by providers of metamodel bindings.
* It is highly recommended to extend the {@link AbstractEnvironmentFactory}
* class, instead.
- * </p><p>
- * Since 1.2, the {@link AbstractEnvironmentFactory} implements the
- * {@link Adaptable} interface and provides an adapter for the
- * {@link EnvironmentFactory.Lookup} interface. Use the
- * {@link OCLUtil#getAdapter(EnvironmentFactory, Class)} method to obtain
- * adapters for any factory instance.
* </p>
- *
- * @param <PK> is substituted by the metaclass representing the metamodel's
- * analogue for the UML 2.x <tt>Package</tt>
- * @param <C> corresponds to the UML <tt>Classifier</tt> metaclass
- * @param <O> corresponds to the UML <tt>Operation</tt> metaclass
- * @param <P> corresponds to the UML <tt>Property</tt> metaclass
- * @param <EL> corresponds to the UML <tt>EnumerationLiteral</tt> metaclass
- * (<tt>Enumeration</tt>s are simply represented as classifiers)
- * @param <PM> corresponds to the UML <tt>Parameter</tt> metaclass
- * @param <S> corresponds to the UML <tt>State</tt> metaclass (for metamodels
- * that describe state machines)
- * @param <COA> corresponds to the UML <tt>CallOperationAction</tt> metaclass
- * (used in message expressions)
- * @param <SSA> corresponds to the UML <tt>SendSignalAction</tt> metaclass
- * (used in message expressions)
- * @param <CT> corresponds to the UML <tt>Constraint</tt> metaclass
- * @param <CLS> corresponds to the UML <tt>Class</tt> metaclass
- * @param <E> corresponds to the UML <tt>Element</tt> metaclass
*
* @author Christian W. Damus (cdamus)
*/
@@ -108,8 +85,8 @@
* @param context the context classifier
* @return the environment
*
- * @see #createOperationContext(Environment, Object)
- * @see #createAttributeContext(Environment, Object)
+ * @see #createOperationContext(Environment, Operation)
+ * @see #createPropertyContext(Environment, Property)
* @see #createInstanceContext(Environment, Object)
*/
@NonNull Environment createClassifierContext(@NonNull Environment parent, @NonNull Type context);
@@ -124,14 +101,14 @@
* context classifier (as an OCL type or classifier) will be
* inferred from the context instance according to the metamodel that the
* environment factory supports, if possible. If not possible, then the
- * {@link DomainStandardLibrary#getOclAny() OclAny} type is assumed.
+ * {@link DomainStandardLibrary#getOclAnyType() OclAny} type is assumed.
* </p>
*
* @param context the context object or value
* @return the environment
*
- * @see #createClassifierContext(Environment, Object)
- * @see DomainStandardLibrary#getOclAny()
+ * @see #createClassifierContext(Environment, Type)
+ * @see DomainStandardLibrary#getOclAnyType()
*/
@NonNull Environment createInstanceContext(@NonNull Environment parent, @NonNull Object context);
@@ -145,7 +122,7 @@
* @param operation an operation in the client's metamodel
* @return the environment
*
- * @see #createClassifierContext(Environment, Object)
+ * @see #createClassifierContext(Environment, Type)
*/
@NonNull Environment createOperationContext(@NonNull Environment parent, @NonNull Operation operation);
@@ -159,7 +136,7 @@
* @param property an attribute in the client's metamodel
* @return the environment
*
- * @see #createClassifierContext(Environment, Object)
+ * @see #createClassifierContext(Environment, Type)
*/
@NonNull Environment createPropertyContext(@NonNull Environment parent, @NonNull Property property);
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/LookupException.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/LookupException.java
index 2e98aba..46ca8d6 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/LookupException.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/LookupException.java
@@ -19,12 +19,9 @@
* Exception indicating a semantic error in looking up a definition, typically
* resulting from an ambiguity.
* <p>
- * Actual instances of this exception are usually more specific, being either
- * {@link AmbiguousLookupException}s or {@link InvalidLookupException}s.
+ * Actual instances of this exception are usually more specific,
+ * {@link AmbiguousLookupException}s.
* </p>
- *
- * @see AmbiguousLookupException
- * @see InvalidLookupException
*/
public class LookupException
extends SemanticException {
@@ -87,7 +84,6 @@
* @return the matches found by the look-up
*
* @see #getAmbiguousMatches()
- * @see InvalidLookupException#getInvalidMatch()
*/
public List<?> getMatches() {
return matches;
@@ -100,7 +96,6 @@
* @return the ambiguous matches, or an empty list if the look-up problem
* was not a matter of ambiguity
*
- * @see InvalidLookupException#getInvalidMatch()
* @see #getMatches()
*/
public List<?> getAmbiguousMatches() {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/OCL.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/OCL.java
index d788920..efd51e2 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/OCL.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/OCL.java
@@ -53,11 +53,11 @@
* Ecore metamodel to the superclass's generic type parameters. This frees
* client code from the long list of parameter substitutions. This subclass
* also provides a shortcut to creating an <code>OCL</code> on the shared
- * {@link EcoreEnvironmentFactory} instance.
+ * {@link EnvironmentFactory} instance.
*
* @author Christian W. Damus (cdamus)
*
- * @see EcoreEnvironmentFactory
+ * @see EnvironmentFactory
*/
public class OCL {
@@ -194,8 +194,8 @@
*
* @return whether the context object satisfies the constraint
*
- * @see #check(Object, OCLExpression)
- * @see #evaluate(Object, OCLExpression)
+ * @see #check(Object, ExpressionInOCL)
+ * @see #evaluate(Object, ExpressionInOCL)
*/
public boolean check(Object context, @NonNull Constraint constraint) {
OpaqueExpression specification = constraint.getSpecification();
@@ -212,14 +212,14 @@
*
* @param context
* the <tt>self</tt> object of the constraint
- * @param constraint
+ * @param specification
* the constraint to check, which must be a boolean-valued
* expression
*
* @return whether the context object satisfies the constraint
*
- * @see #check(Object, Object)
- * @see #evaluate(Object, OCLExpression)
+ * @see #check(Object, ExpressionInOCL)
+ * @see #evaluate(Object, ExpressionInOCL)
*
* @throws IllegalArgumentException
* if the constraint expression is not boolean-valued
@@ -318,13 +318,13 @@
* different bindings for client-supplied "global" variables.
* </p>
*
- * @param query
+ * @param specification
* the OCL query expression, which may be interpreted as a
* constraint if it is boolean-valued
*
* @return the new query object
*
- * @see #createQuery(Object)
+ * @see #createQuery(ExpressionInOCL)
*/
public @NonNull Query createQuery(@NonNull ExpressionInOCL specification) {
return new QueryImpl(this, specification);
@@ -345,7 +345,7 @@
*
* @return the new query object
*
- * @see #createQuery(OCLExpression)
+ * @see #createQuery(ExpressionInOCL)
*/
public Query createQuery(@NonNull Constraint constraint) {
OpaqueExpression specification = constraint.getSpecification();
@@ -369,7 +369,7 @@
/**
* Disposes any objects that I have created while I have been in use. This
* includes disposing of any {@link #getConstraints() constraints} that I
- * have parsed and {@linkplain Environment.Internal#dispose() disposing} of
+ * have parsed and {@linkplain Environment#dispose() disposing} of
* my environment.
*/
public void dispose() {
@@ -403,9 +403,7 @@
/**
* Evaluates a query expression on a context object (which is bound to the
- * <tt>self</tt> variable). Clients should use the
- * {@link #isInvalid(Object)} method to check whether the evaluation result
- * is <tt>OclInvalid</tt>.
+ * <tt>self</tt> variable).
*
* @param context
* the context (self) object
@@ -415,8 +413,7 @@
* @return the value of the expression, or <tt>OclInvalid</tt> if the
* evaluation fails for reasons other than a run-time exception
*
- * @see #isInvalid(Object)
- * @see #check(Object, Object)
+ * @see #check(Object, ExpressionInOCL)
*/
public @Nullable Object evaluate(@Nullable Object context, @NonNull ExpressionInOCL expression) {
evaluationProblems = null;
@@ -436,7 +433,7 @@
*
* @return the constraints that I have parsed
*
- * @see #parse(OCLInput)
+ * @see #parse(URI)
*/
public @NonNull List<Constraint> getConstraints() {
return constraints;
@@ -751,7 +748,7 @@
* @throws SemanticException
* on detection of any well-formedness problem in the expression
*
- * @see #validate(Object)
+ * @see #validate(Constraint)
*/
public void validate(@NonNull OCLExpression expression) throws SemanticException {
throw new UnsupportedOperationException(getClass().getName() + ".validate");
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/OCLUtil.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/OCLUtil.java
index 510b8fc..6a1e8c9 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/OCLUtil.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/OCLUtil.java
@@ -36,20 +36,7 @@
}
/**
- * Obtains an adapter for the specified interface type. Even for
- * environments that do not adapt to the following interfaces, this method
- * will provide a default implementation for convenience:
- * <ul>
- * <li>{@link BasicEnvironment}. In the case that the environment is not
- * intrinsically adaptable to this interface and an extrinsic adapter
- * is provided, multiple adaptations of the same environment will
- * always return the same adapter instance</li>
- * <li>{@link Customizable}. In the case that the environment is not
- * intrinsically adaptable to this interface it is forcibly adapted to
- * the {@link BasicEnvironment} protocol</li>
- * <li>{@link ProblemHandler}</li>
- * <li>{@link Environment.Lookup}</li>
- * </ul>
+ * Obtains an adapter for the specified interface type.
*
* @param <T> the requested adapter interface
*
@@ -100,19 +87,7 @@
} */
/**
- * Obtains an adapter for the specified interface type. Even for
- * environment factories that do not adapt to the following interfaces,
- * this method will provide a default implementation for convenience:
- * <ul>
- * <li>{@link EnvironmentFactory.Lookup}</li>
- * </ul>
- *
- * @param <T> the requested adapter interface
- *
- * @param factory an environment factory to adapt
- * @param adapterType the requested adapter interface
- * @return an instance of the requested interface, or <code>null</code>
- * if this environment factory does not adapt to it
+ * Obtains an adapter for the specified interface type.
*/
@SuppressWarnings("unchecked")
public static @Nullable <T> T getAdapter(@NonNull EnvironmentFactory factory, @NonNull java.lang.Class<T> adapterType) {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Query.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Query.java
index 898acd1..48e2afd 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Query.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/Query.java
@@ -134,7 +134,7 @@
/**
* Obtains the OCL result type of the query. This may be a classifier
* in the user model, or it may represent a pre-defined OCL data type
- * such as {@link DomainStandardLibrary#getBoolean() Boolean}.
+ * such as {@link DomainStandardLibrary#getBooleanType() Boolean}.
*
* @return the query's result type
*/
@@ -151,8 +151,6 @@
* Obtains the mapping of classes to their extents (sets of all instances).
*
* @return the map of classes to their extents
- *
- * @see OCLBase#setModelManager
*/
public DomainModelManager getModelManager();
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/UMLReflection.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/UMLReflection.java
index 0b0b5a1..940675a 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/UMLReflection.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/UMLReflection.java
@@ -28,50 +28,36 @@
/**
* Stereotype applied to classifier invariant constraints.
- *
- * @see #getStereotype
*/
@NonNull String INVARIANT = "invariant"; //$NON-NLS-1$
/**
* Stereotype applied to operation precondition constraints.
- *
- * @see #getStereotype
*/
@NonNull String PRECONDITION = "precondition"; //$NON-NLS-1$
/**
* Stereotype applied to operation postcondition constraints.
- *
- * @see #getStereotype
*/
@NonNull String POSTCONDITION = "postcondition"; //$NON-NLS-1$
/**
* Stereotype applied to operation body conditions.
- *
- * @see #getStereotype
*/
@NonNull String BODY = "body"; //$NON-NLS-1$
/**
* Stereotype applied definition expressions.
- *
- * @see #getStereotype
*/
@NonNull String DEFINITION = "definition"; //$NON-NLS-1$
/**
* Stereotype applied initial value expressions.
- *
- * @see #getStereotype
*/
@NonNull String INITIAL = "initial"; //$NON-NLS-1$
/**
* Stereotype applied derived value expressions.
- *
- * @see #getStereotype
*/
@NonNull String DERIVATION = "derivation"; //$NON-NLS-1$
}
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/context/AbstractBase2PivotConversion.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/context/AbstractBase2PivotConversion.java
index 3807de7..370d4a9 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/context/AbstractBase2PivotConversion.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/context/AbstractBase2PivotConversion.java
@@ -230,9 +230,6 @@
/**
* Set the type and so potentially satisfy some TypeOfDependency. This method ensures that
* type is not set to null.
- *
- * @param pivotExpression
- * @param type
*/
@Deprecated
public void setType(@NonNull TypedElement pivotElement, Type type) {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/context/ParserContext.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/context/ParserContext.java
index b399329..5b60267 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/context/ParserContext.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/context/ParserContext.java
@@ -70,7 +70,7 @@
* Create an Abstract Syntax ExpressionInOCL containing the parsed expression.
*
* @throws ParserException if parsing fails
- * @DEprected specify owner/owningList for use in diagnostics
+ * @deprecated specify owner/owningList for use in diagnostics
*/
@Deprecated
@NonNull ExpressionInOCL parse(@NonNull String expression) throws ParserException;
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/delegate/DelegateInstaller.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/delegate/DelegateInstaller.java
index cc6fbde..32ee756 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/delegate/DelegateInstaller.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/delegate/DelegateInstaller.java
@@ -281,9 +281,6 @@
/**
* Install all Constraints from pivotPackage and its nestedPackages as OCL Delegates.
- *
- * @param metaModelManager
- * @param pivotPackage
*/
public void installDelegates(@NonNull PackageServer packageServer) {
boolean hasDelegates = false;
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/delegate/OCLQueryDelegate.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/delegate/OCLQueryDelegate.java
index 855b9ea..8a61b7f 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/delegate/OCLQueryDelegate.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/delegate/OCLQueryDelegate.java
@@ -60,7 +60,7 @@
* my domain
* @param context
* my context
- * @param variables
+ * @param parameters
* name and types of variables used in my expression
* @param expression
* the expression that I handle
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/AbstractEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/AbstractEvaluationEnvironment.java
index f2c89f9..d214f7c 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/AbstractEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/AbstractEvaluationEnvironment.java
@@ -20,8 +20,6 @@
import org.eclipse.ocl.examples.domain.elements.DomainTypedElement;
import org.eclipse.ocl.examples.domain.values.impl.InvalidValueException;
import org.eclipse.ocl.examples.pivot.AbstractBasicEnvironment;
-import org.eclipse.ocl.examples.pivot.Adaptable;
-import org.eclipse.ocl.examples.pivot.Customizable;
import org.eclipse.ocl.examples.pivot.Environment;
import org.eclipse.ocl.examples.pivot.Operation;
import org.eclipse.ocl.examples.pivot.manager.MetaModelManager;
@@ -36,10 +34,6 @@
* <p>
* See the {@link Environment} class for a description of the
* generic type parameters of this class.
- * </p><p>
- * Since the 1.2 release, this interface is {@link Adaptable} to support the
- * optional adapter protocols such as {@link EvaluationEnvironment.Enumerations}
- * and {@link Customizable}.
* </p>
*
* @author Christian W. Damus (cdamus)
@@ -66,11 +60,11 @@
}
/**
- * Returns the value associated with the supplied name
+ * Returns the value associated with the supplied referredVariable
*
- * @param name
- * the name whose value is to be returned
- * @return the value associated with the name
+ * @param referredVariable
+ * the referredVariable whose value is to be returned
+ * @return the value associated with the referredVariable
*/
public @Nullable Object getValueOf(@NonNull DomainTypedElement referredVariable) {
Object object = variableValues.get(referredVariable);
@@ -94,10 +88,10 @@
}
/**
- * Replaces the current value of the supplied name with the supplied value.
+ * Replaces the current value of the supplied referredVariable with the supplied value.
*
- * @param name
- * the name
+ * @param referredVariable
+ * the referredVariable
* @param value
* the new value
*/
@@ -106,10 +100,10 @@
}
/**
- * Adds the supplied name and value binding to the environment
+ * Adds the supplied referredVariable and value binding to the environment
*
- * @param name
- * the name to add
+ * @param referredVariable
+ * the referredVariable to add
* @param value
* the associated binding
*/
@@ -128,12 +122,12 @@
}
/**
- * Removes the supplied name and binding from the environment (if it exists)
+ * Removes the supplied referredVariable and binding from the environment (if it exists)
* and returns it.
*
- * @param name
- * the name to remove
- * @return the value associated with the removed name
+ * @param referredVariable
+ * the referredVariable to remove
+ * @return the value associated with the removed referredVariable
*/
@Deprecated
public Object remove(@NonNull DomainTypedElement referredVariable) {
@@ -156,10 +150,9 @@
}
/**
- * By default, a subclass will not support overriding the operations defined
- * by the OCL Standard Library. This implementation delegates to the
- * parent environment (if any), otherwise returns <code>false</code>.
+ * @deprecated This Classic OCL API is not used by the Pivot.
*/
+ @Deprecated
public boolean overrides(@NonNull Operation operation, int opcode) {
return (getParent() != null)? getParent().overrides(operation, opcode) : false;
}
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/AbstractEvaluationVisitor.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/AbstractEvaluationVisitor.java
index 8ca0090..50ada81 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/AbstractEvaluationVisitor.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/AbstractEvaluationVisitor.java
@@ -195,7 +195,7 @@
/**
* Obtains the visitor on which I perform nested
- * {@link Visitable#accept(org.eclipse.ocl.utilities.Visitor)} calls. This
+ * {@link Visitable#accept(Visitor)} calls. This
* handles the case in which I am decorated by another visitor that must
* intercept every <tt>visitXxx()</tt> method. If I internally just
* recursively visit myself, then this decorator is cut out of the picture.
@@ -208,7 +208,7 @@
/**
* Obtains the visitor on which I perform nested
- * {@link Visitable#accept(org.eclipse.ocl.utilities.Visitor)} calls. This
+ * {@link Visitable#accept(Visitor)} calls. This
* handles the case in which I am decorated by another visitor that must
* intercept every <tt>visitXxx()</tt> method. If I internally just
* recursively visit myself, then this decorator is cut out of the picture.
@@ -246,9 +246,9 @@
/**
* Sets the visitor on which I perform nested
- * {@link Visitable#accept(org.eclipse.ocl.utilities.Visitor)} calls.
+ * {@link Visitable#accept(Visitor)} calls.
*
- * @param visitor my delegate visitor
+ * @param evaluationVisitor my delegate visitor
*
* @see #getUndecoratedVisitor()
*/
@@ -284,7 +284,7 @@
* This default implementation asserts that the <tt>constraint</tt> is
* boolean-valued if it is an invariant, pre-condition, or post-condition
* constraint and returns the value of its body expression by delegation to
- * {@link #visitExpression(OCLExpression)}.
+ * {@link Visitable#accept(Visitor)}.
*/
@Override
public Object visitConstraint(@NonNull Constraint constraint) {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationEnvironment.java
index 06a6b9c..c75d5cb 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationEnvironment.java
@@ -62,7 +62,6 @@
/**
* Return the set of all locally registered variables.
- * @return
*/
@NonNull Set<DomainTypedElement> getVariables();
@@ -85,7 +84,7 @@
* @param value
* the associated binding
*
- * @see #replace(String, Object)
+ * @see #replace(DomainTypedElement, Object)
*/
void add(@NonNull DomainTypedElement referredVariable, Object value);
@@ -105,21 +104,9 @@
void clear();
/**
- * Queries whether this evaluation environment provides a custom
- * implementation of the specified pre-defined OCL <code>operation</code>.
- * In the case that the receiver does, then it must implement the
- * {@link #callOperation} method to apply the operation.
- *
- * @param operation an OCL operation
- * @param opcode the operation code, if one of the operations pre-defined
- * by OCL. Otherwise, <code>-1</code>
- *
- * @return <code>true</code> if this evaluation environment provides an
- * implementation of this <code>operation</code>; <code>false</code>,
- * otherwise
- *
- * @see #callOperation
+ * @deprecated This Classic OCL API is not used by the Pivot.
*/
+ @Deprecated
boolean overrides(@NonNull Operation operation, int opcode);
/**
@@ -227,24 +214,5 @@
@Deprecated
Type getType(Object object);
- /**
- * Obtains the Java-language value of the specified enumeration literal.
- * Often, this is an instance of an EMF-generated enumeration type.
- *
- * @param enumerationLiteral the enumeration literal model element
- * @return the corresponding run-time instance
- */
-// Value getValue(EnumerationLiteral enumerationLiteral);
-
@NonNull MetaModelManager getMetaModelManager();
-
-// @NonNull NullValue throwInvalidEvaluation(InvalidValueException e);
-
-// @NonNull NullValue throwInvalidEvaluation(String message);
-
-// @NonNull NullValue throwInvalidEvaluation(String message, DomainExpression expression);
-
-// @NonNull NullValue throwInvalidEvaluation(String message, DomainExpression expression, Object context);
-
-// @NonNull NullValue throwInvalidEvaluation(Throwable e, DomainExpression expression, Object context, String message, Object... bindings);
}
\ No newline at end of file
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationVisitor.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationVisitor.java
index 122e667..611151e 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationVisitor.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationVisitor.java
@@ -85,7 +85,7 @@
* so that recursive visitation follows the entire decorator chain at
* every step.
*
- * @param decorator the decorator that is not decorated/
+ * @param evaluationVisitor the evaluationVisitor that is not decorated/
*/
void setUndecoratedVisitor(@NonNull EvaluationVisitor evaluationVisitor);
}
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationVisitorImpl.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationVisitorImpl.java
index b3d3f45..b677ac9 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationVisitorImpl.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/EvaluationVisitorImpl.java
@@ -868,7 +868,7 @@
/**
* Callback for a VariableExp visit.
*
- * @param v
+ * @param variableExp
* the variable expression
* @return the value of the variable
*/
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/PivotEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/PivotEvaluationEnvironment.java
index 8216f22..e4a6d24 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/PivotEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/evaluation/PivotEvaluationEnvironment.java
@@ -320,7 +320,9 @@
return result;
} */
- // implements the inherited specification
+ /**
+ * {@inheritDoc}
+ */
public @NonNull DomainModelManager createModelManager(@Nullable Object object) {
if (object instanceof ObjectValue) {
object = ((ObjectValue) object).getObject();
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/helper/OCLHelper.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/helper/OCLHelper.java
index 526f817..61e79d4 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/helper/OCLHelper.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/helper/OCLHelper.java
@@ -62,8 +62,8 @@
*
* @param context the OCL context classifier
*
- * @see #setOperationContext(Object, Object)
- * @see #setPropertyContext(Object, Object)
+ * @see #setOperationContext(Type, Operation)
+ * @see #setPropertyContext(Type, Property)
*/
void setContext(@NonNull EClassifier context);
@@ -73,8 +73,8 @@
*
* @param context the OCL context classifier
*
- * @see #setOperationContext(Object, Object)
- * @see #setPropertyContext(Object, Object)
+ * @see #setOperationContext(Type, Operation)
+ * @see #setPropertyContext(Type, Property)
*/
void setContext(@NonNull Type context);
@@ -95,7 +95,7 @@
* @param context the OCL context classifier
* @param operation the OCL context operation
*
- * @see #setContext(Object)
+ * @see #setContext(EClassifier)
*/
void setOperationContext(@NonNull EClassifier context, @NonNull EOperation operation);
@@ -109,7 +109,7 @@
* @param context the OCL context classifier
* @param operation the OCL context operation
*
- * @see #setContext(Object)
+ * @see #setContext(Type)
*/
void setOperationContext(@NonNull Type context, @NonNull Operation operation);
@@ -131,7 +131,7 @@
* @param context the OCL context classifier
* @param property the OCL context attribute
*
- * @see #setContext(Object)
+ * @see #setContext(Type)
*/
void setPropertyContext(@NonNull Type context, @NonNull Property property);
@@ -145,7 +145,7 @@
* @param context the OCL context classifier
* @param property the OCL context attribute
*
- * @see #setContext(Object)
+ * @see #setContext(EClassifier)
*/
void setPropertyContext(@NonNull EClassifier context, @NonNull EStructuralFeature property);
@@ -168,7 +168,7 @@
*
* @param instance the OCL context instance
*
- * @see #setContext(Object)
+ * @see #setContext(EClassifier)
*/
void setInstanceContext(@NonNull Object instance);
@@ -184,7 +184,7 @@
* @param instance the OCL context instance
* @param operation the OCL context operation
*
- * @see #setOperationContext(Object, Object)
+ * @see #setOperationContext(Type, Operation)
*/
void setInstanceOperationContext(@NonNull Object instance, @NonNull Operation operation);
@@ -200,7 +200,7 @@
* @param instance the OCL context instance
* @param property the OCL context attribute
*
- * @see #setPropertyContext(Object, Object)
+ * @see #setPropertyContext(Type, Property)
*/
void setInstancePropertyContext(@NonNull Object instance, @NonNull Property property);
@@ -224,9 +224,9 @@
* @return my current context environment, or <code>null</code> if I have
* not yet been assigned a context
*
- * @see #setContext(Object)
- * @see #setOperationContext(Object, Object)
- * @see #setPropertyContext(Object, Object)
+ * @see #setContext(Type)
+ * @see #setOperationContext(Type, Operation)
+ * @see #setPropertyContext(Type, Property)
*/
@NonNull Environment getEnvironment();
@@ -305,7 +305,7 @@
*
* @throws ParserException if the <code>expression</code> fails to parse
*
- * @see #setOperationContext(Object, Object)
+ * @see #setOperationContext(Type, Operation)
*/
@NonNull ExpressionInOCL createPrecondition(@NonNull String expression) throws ParserException;
@@ -320,7 +320,7 @@
*
* @throws ParserException if the <code>expression</code> fails to parse
*
- * @see #setOperationContext(Object, Object)
+ * @see #setOperationContext(Type, Operation)
*/
@NonNull ExpressionInOCL createPostcondition(@NonNull String expression) throws ParserException;
@@ -339,7 +339,7 @@
*
* @throws ParserException if the <code>expression</code> fails to parse
*
- * @see #setOperationContext(Object, Object)
+ * @see #setOperationContext(Type, Operation)
*/
@NonNull ExpressionInOCL createBodyCondition(@NonNull String expression) throws ParserException;
@@ -355,7 +355,7 @@
* @throws ParserException if the <code>expression</code> fails to parse
* or is not valid for my context property
*
- * @see #setPropertyContext(Object, Object)
+ * @see #setPropertyContext(Type, Property)
*/
// Constraint createInitialValueExpression(@NonNull String expression) throws ParserException;
@@ -371,7 +371,7 @@
* @throws ParserException if the <code>expression</code> fails to parse
* or is not valid for my context property
*
- * @see #setPropertyContext(Object, Object)
+ * @see #setPropertyContext(Type, Property)
*/
@NonNull ExpressionInOCL createDerivedValueExpression(@NonNull String expression) throws ParserException;
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/helper/OCLHelperImpl.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/helper/OCLHelperImpl.java
index 09caa31..9dd3bf8 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/helper/OCLHelperImpl.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/helper/OCLHelperImpl.java
@@ -31,10 +31,9 @@
import org.eclipse.ocl.examples.pivot.context.ParserContext;
import org.eclipse.ocl.examples.pivot.context.PropertyContext;
import org.eclipse.ocl.examples.pivot.manager.MetaModelManager;
-import org.eclipse.ocl.examples.pivot.model.OCLMetaModel;
/**
- * Implementation of the {@link OCLMetaModel.Helper} convenience interface.
+ * Implementation of the {@link OCLHelper} convenience interface.
*/
public class OCLHelperImpl implements OCLHelper
{
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/library/RegisteredContribution.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/library/RegisteredContribution.java
index c7d5cd5..6065b3b 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/library/RegisteredContribution.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/library/RegisteredContribution.java
@@ -31,7 +31,7 @@
}
/**
* A <code>Factory</code> wrapper that is used by the
- * {@link Factory.Registry}.
+ * {@link Registry}.
*/
interface Descriptor<C extends RegisteredContribution<C>> extends RegisteredContribution<C> {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/manager/MetaModelManager.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/manager/MetaModelManager.java
index bca56c9..70e6ae6 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/manager/MetaModelManager.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/manager/MetaModelManager.java
@@ -512,7 +512,7 @@
/**
* Construct a MetaModelManager that will use asResourceSet to contain pivot copies
- * of meta-models, and {@link ProjectMap.getAdapter(ResourceSet)} to assist in locating resources.
+ * of meta-models, and {@link ProjectMap#getAdapter(ResourceSet)} to assist in locating resources.
*/
public MetaModelManager(@NonNull ResourceSet asResourceSet) {
if (asResourceSet.getResourceFactoryRegistry().getContentTypeToFactoryMap().get(ASResource.CONTENT_TYPE) == null) {
@@ -2276,7 +2276,7 @@
* with a uniqueContext. If uniqueContext is an Element the moniker is used as
* part of the URI, otherwise a unique value is created and cached for reuse.
*
- * @Deprecated URIs are auto-generated
+ * @deprecated URIs are auto-generated
*/
@Deprecated
public URI getResourceIdentifier(Object uniqueContext, String subContext) {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/options/EvaluationOptions.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/options/EvaluationOptions.java
index 7654757..8167733 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/options/EvaluationOptions.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/options/EvaluationOptions.java
@@ -60,7 +60,7 @@
* @param option the option
* @param value the option's value
*
- * @see Cusotmizable#setOption(Option, Object)
+ * @see Customizable#setOption(Option, Object)
*/
public static <T> void setOption(@NonNull EvaluationEnvironment env, @NonNull Option<T> option, @Nullable T value) {
@@ -74,7 +74,7 @@
* Obtains the value of the specified option's setting in the the given
* environment's options map, adapting the environment as necessary to the
* {@link Customizable} API. If not already set, return the option's
- * {@linkplain #getDefaultValue() default value}.
+ * {@linkplain Option#getDefaultValue() default value}.
*
* @param env an evaluation environment on which to query an option
* @param option an option to query
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/options/ParsingOptions.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/options/ParsingOptions.java
index b90292d..11dc311 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/options/ParsingOptions.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/options/ParsingOptions.java
@@ -30,113 +30,53 @@
public class ParsingOptions {
/**
- * <p>
- * Parsing option indicating whether to reference the defined property or
- * operation in a <tt>def:</tt> expression as a constrained element of the
- * constraint, in addition to the context classifier. The well-formedness
- * rules for definition constraints in the OCL 2.0 Specification require
- * that a definition constraint reference only its context classifier as
- * a constrained element.
- * </p><p>
- * The default value of this option is <tt>false</tt>. For compatibility
- * with the 1.1 release behaviour, set this option <tt>true</tt>. Note
- * that this is not necessary for loading and processing constraints
- * created by the 1.1 release, only for persisting constraints that will be
- * consumed by the 1.1 release.
- * </p>
+ * @deprecated This Classic OCL API is not used by the Pivot.
*/
+ @Deprecated
public static final @NonNull Option<Boolean> DEFINITION_CONSTRAINS_FEATURE =
new BasicOption<Boolean>("definition.constraints.feature", false); //$NON-NLS-1$
/**
- * <p>
- * Parsing option indicating whether to interpolate {@literal <},
- * {@literal <=}, {@literal >}, and {@literal >=} operations when a model
- * type defines a Java-style <tt>compareTo(...)</tt> operation.
- * </p><p>
- * The default value of this option is <tt>false</tt>. For compatibility
- * with the 1.1 release behaviour, set this option <tt>true</tt>.
- * </p>
+ * @deprecated This Classic OCL API is not used by the Pivot.
*/
+ @Deprecated
public static final @NonNull Option<Boolean> USE_COMPARE_TO_OPERATION =
new BasicOption<Boolean>("use.compare.to.operation", false); //$NON-NLS-1$
/**
- * <p>
- * Parsing option indicating whether to generate a warning when the
- * OCL 2.1 parsing of distinct xor, or, and precedences leads to a different
- * parse to the OCL 2.0 specification of all levels equal.
- * The default value of this option is <tt>false</tt>. To diagnose
- * compatibility with the OCL 2.0 behaviour in the MDT-OCL 1.x release,
- * set this option <tt>true</tt>.
- * </p>
+ * @deprecated This Classic OCL API is not used by the Pivot.
*/
+ @Deprecated
public static final @NonNull Option<Boolean> WARN_OF_XOR_OR_AND_PRECEDENCE_CHANGE =
new BasicOption<Boolean>("warn.of.xor.or.and.precedence.change", false); //$NON-NLS-1$
/**
- * <p>
- * Static instance for the implicit-root-class option token. It is returned
- * via an unchecked cast by the {@link #implicitRootClass()} method.
- * </p>
+ * @deprecated This Classic OCL API is not used by the Pivot.
*/
+ @Deprecated
public static final @NonNull Option<?> IMPLICIT_ROOT_CLASS =
new BasicOption<Object>("implict.root.class", null); //$NON-NLS-1$
- /**
- * <p>
- * Parsing option indicating whether to process backslash escape sequences (
- * <tt>\n</tt>, <tt>\r</tt>, etc.) as specified by OMG Issue 14357 for OCL 2.3.
- * </p>
- * <p>
- * The default value of this option is <tt>true</tt>. To disable
- * backslash escaping support, set this option <tt>false</tt>.
- * </p>
- */
+ /**
+ * @deprecated This Classic OCL API is not used by the Pivot.
+ */
+ @Deprecated
public static final @NonNull Option<Boolean> USE_BACKSLASH_ESCAPE_PROCESSING =
new BasicOption<Boolean>("use.backslash.escape.processing", true); //$NON-NLS-1$
/**
- * <p>
- * A parsing option specifying a class that's assumed to be the implicit
- * root of the subject model's class hierarchy. Note that this excludes
- * datatypes defined by OCL such as the collections and tuples, and also those
- * defined by the subject model. This option is only used in accessing operations
- * and attributes; for other characteristics of a classifier, a specialized
- * environment implementation is required.
- * </p><p>
- * This option is commonly used to provide access to operations and attributes
- * defined by an implicit root extends class in Ecore-based models, for example,
- * such as <tt>EObject</tt>, that is not explicitly referenced in the subject model.
- * </p><p>
- * The default value of this option is <tt>null</tt>.
- * </p>
- *
- * @param <C> the type representing classes in the target metamodel, consistent with
- * the current {@link Environment} implementation
- *
- * @param env the environment to which this option is to be applied
- *
- * @return the option token
+ * @deprecated This Classic OCL API is not used by the Pivot.
*/
+ @Deprecated
@SuppressWarnings("unchecked")
public static @NonNull Option<Type> implicitRootClass(@NonNull Environment env) {
return (Option<Type>) IMPLICIT_ROOT_CLASS;
}
/**
- * <p>
- * Parsing option indicating whether to accept <tt>static</tt> as part of a
- * definition constraint. <tt>static</tt> are a proposed cpability of OCL 2.1,
- * however they are only available for meta-models that implement the
- * {@link UMLReflection#setIsStatic(Object, boolean)} method. Therefore use of <tt>static</tt> constraints
- * will generate an error message on the Ecore binding regardless of this setting.
- * </p><p>
- * The default value of this option is <tt>true</tt>. For stricter compatibility
- * with OCL 2.0, set this option <tt>false</tt>.
- * </p>
- * @see UMLReflection#setIsStatic(Object, boolean)
+ * @deprecated This Classic OCL API is not used by the Pivot.
*/
+ @Deprecated
public static final @NonNull Option<Boolean> SUPPORT_STATIC_FEATURES =
new BasicOption<Boolean>("support.static.features", true); //$NON-NLS-1$
@@ -155,7 +95,7 @@
* @param option the option
* @param value the option's value
*
- * @see Cusotmizable#setOption(Option, Object)
+ * @see Customizable#setOption(Option, Object)
*/
public static <T> void setOption(@NonNull Environment env, @NonNull Option<T> option, @Nullable T value) {
@@ -174,7 +114,7 @@
* Obtains the value of the specified option's setting in the the given
* environment's options map, adapting the environment as necessary to the
* {@link Customizable} API. If not already set, return the option's
- * {@linkplain #getDefaultValue() default value}.
+ * {@linkplain Option#getDefaultValue() default value}.
*
* @param env an environment on which to query an option
* @param option an option to query
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/ASResource.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/ASResource.java
index 79619c3..b8833a8 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/ASResource.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/ASResource.java
@@ -12,6 +12,7 @@
import java.util.Map;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.examples.pivot.PivotConstants;
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/ASResourceFactory.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/ASResourceFactory.java
index 9fd500d..af42a70 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/ASResourceFactory.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/ASResourceFactory.java
@@ -95,7 +95,6 @@
/**
* Return the Content Type Identifier supported by this ASResourceFactory.
- * @return
*/
@NonNull String getContentType();
@@ -140,7 +139,6 @@
/**
* Return the root element in the Pivot resource resulting from import of the available
* resource.
- * @param uriFragment
* @throws ParserException
*/
@Nullable Element importFromResource(@NonNull MetaModelManager metaModelManager, @NonNull Resource resource, @Nullable URI uri) throws ParserException;
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/OCLASResourceFactory.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/OCLASResourceFactory.java
index 4fd5ec1..2d5cc5a 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/OCLASResourceFactory.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/resource/OCLASResourceFactory.java
@@ -21,8 +21,7 @@
import org.eclipse.ocl.examples.pivot.library.StandardLibraryContribution;
/**
- * The <b>Resource Factory</b> associated with the package.
- * @see org.eclipse.ocl.examples.pivot.utilities.PivotResourceImpl
+ * The <b>Resource Factory</b> for the pivot abstract syntax.
*/
public class OCLASResourceFactory extends AbstractASResourceFactory
{
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/AbstractAttribution.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/AbstractAttribution.java
index 69acbd2..643cfb5 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/AbstractAttribution.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/AbstractAttribution.java
@@ -17,8 +17,6 @@
* Ann AbstractAttribution provides the basic behaviour for a family of derived
* classes that provide additional scope/environment behaviour for corresponding
* CS elements.
- *
- * @param <T>
*/
public abstract class AbstractAttribution implements Attribution
{
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/Attribution.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/Attribution.java
index 647e800..4a62852 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/Attribution.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/Attribution.java
@@ -25,8 +25,6 @@
*
* The REGISTRY maintains the helpsers for each type. Missing entries may be lazily populated by following the
* primary superclasses until an entry is found.
- *
- * @param <T>
*/
public interface Attribution
{
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/EnvironmentView.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/EnvironmentView.java
index 978a7e0..8c96358 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/EnvironmentView.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/EnvironmentView.java
@@ -499,7 +499,6 @@
* name of element
* @param element
* the element
- * @return the number of elements added; 1 if added, 0 if not
*/
public void addElement(/*@NonNull*/ String elementName, /*@NonNull*/ Object element) {
if ((elementName == null) || (element == null)) {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/ScopeFilter.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/ScopeFilter.java
index a29c627..3376a41 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/ScopeFilter.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/scoping/ScopeFilter.java
@@ -34,8 +34,6 @@
/**
* Return true if the filter accepts eObject as a candidate for
* inclusion in the EnvironmentView.
- *
- * @param eObject
*/
boolean matches(@NonNull EnvironmentView environmentView, @NonNull Object object);
}
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/uml/UML2Ecore2Pivot.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/uml/UML2Ecore2Pivot.java
index fbf71a4..4daf33f 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/uml/UML2Ecore2Pivot.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/uml/UML2Ecore2Pivot.java
@@ -141,7 +141,7 @@
* Convert an (annotated) Ecore resource to a Pivot Model.
* @param alias
*
- * @param ecoreResource the annotated Ecore resource
+ * @param umlResource the annotated Ecore resource
*
* @return the Pivot root package
*/
@@ -159,26 +159,6 @@
}
return false;
}
-
- /**
- * Convert an (annotated) Ecore object to a pivot element.
- *
- * @param eObject the annotated Ecore object
- *
- * @return the pivot element
- *
- public static Element importFromUML(MetaModelManager metaModelManager, String alias, EObject eObject) {
- if (eObject == null) {
- return null;
- }
- Resource ecoreResource = eObject.eResource();
- UML2Ecore2Pivot conversion = getAdapter(ecoreResource, metaModelManager);
- org.eclipse.ocl.examples.pivot.Package pivotRoot = conversion.getPivotRoot();
- if (pivotRoot == null) {
- return null;
- }
- return conversion.createMap.get(eObject);
- } */
protected final @NonNull Resource umlResource; // Set via eAdapters.add()
private UML2EcoreConverterWithReverseMap uml2EcoreConverter = null;
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/PivotEnvironment.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/PivotEnvironment.java
index 5946e58..1d9b50e 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/PivotEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/PivotEnvironment.java
@@ -110,8 +110,8 @@
* resource in which I am persisted (and from which I load myself if it
* already has content).
*
- * @param reg
- * a package registry
+ * @param factory
+ * a factory
* @param resource
* a resource, which may or may not already have content
*/
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/QueryImpl.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/QueryImpl.java
index d54af9b..91e23d6 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/QueryImpl.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/QueryImpl.java
@@ -63,13 +63,6 @@
private Diagnostic evalProblems;
private BasicDiagnostic batchEvalProblems;
- /**
- *
- * @param environment
- * @param expr
- * @param modelManager may be <code>null</code>, in which case I will use my
- * evaluation environment to create a dynamic extent map
- */
public QueryImpl(@NonNull OCL ocl, @NonNull ExpressionInOCL specification) {
this.ocl = ocl;
this.environment = ocl.getEnvironment();
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/ToStringVisitor.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/ToStringVisitor.java
index d3b7e10..314bb14 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/ToStringVisitor.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/ToStringVisitor.java
@@ -486,8 +486,6 @@
/**
* Visits the item's item expression.
- *
- * Returns the result of {@link #handleCollectionItem(CollectionItem, Object)}
*/
@Override
public String visitCollectionItem(@NonNull CollectionItem item) {
@@ -497,8 +495,6 @@
/**
* Visits the collection literal's parts.
- *
- * Returns the result of {@link #handleCollectionLiteralExp(CollectionLiteralExp, List)}.
*/
@Override
public String visitCollectionLiteralExp(@NonNull CollectionLiteralExp cl) {
@@ -535,8 +531,6 @@
/**
* Visits the range's first and last expressions.
- *
- * Returns the result of {@link #handleCollectionRange(CollectionRange, Object, Object)}.
*/
@Override
public String visitCollectionRange(@NonNull CollectionRange range) {
@@ -682,38 +676,6 @@
}
}
- /**
- * Visits the expressions context variable, its parameter variables (if any),
- * its result variable (if any), and finally its body expression.
- *
- * Returns the result of
- * {@link #handleExpressionInOCL(ExpressionInOCL, Object, Object, List, Object)}.
- *
- @Override
- public T visitExpressionInOCL(ExpressionInOCL expression) {
- T contextResult = safeVisit(expression.getContextVariable());
-
- Variable resultVar = expression.getResultVariable();
- T resultResult = safeVisit(resultVar);
-
- List<T> parameterResults;
- List<Variable> parameters = expression.getParameterVariable();
-
- if (parameters.isEmpty()) {
- parameterResults = Collections.emptyList();
- } else {
- parameterResults = new java.util.ArrayList<T>(parameters.size());
- for (Variable iterVar : parameters) {
- parameterResults.add(safeVisit(iterVar));
- }
- }
-
- T bodyResult = safeVisit(expression.getBodyExpression());
-
- return handleExpressionInOCL(expression, contextResult, resultResult,
- parameterResults, bodyResult);
- } */
-
/**
* Callback for an IfExp visit.
*
@@ -903,7 +865,6 @@
/**
* Visits the message expression's target and then its arguments.
- * Returns the result of {@link #handleMessageExp(MessageExp, Object, List)}.
*/
@Override
public String visitMessageExp(@NonNull MessageExp messageExp) {
@@ -1258,7 +1219,6 @@
/**
* Visits the variable's initialization expression (if any).
- * Returns the result of {@link #handleVariable(Variable, Object)}.
*/
@Override
public String visitVariable(@NonNull Variable variable) {
diff --git a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/TypeManagerResourceAdapter.java b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/TypeManagerResourceAdapter.java
index 40d2e53..faf74a9 100644
--- a/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/TypeManagerResourceAdapter.java
+++ b/examples/org.eclipse.ocl.examples.pivot/src/org/eclipse/ocl/examples/pivot/utilities/TypeManagerResourceAdapter.java
@@ -16,7 +16,7 @@
import org.eclipse.ocl.examples.pivot.manager.MetaModelManagerResourceAdapter;
/**
- * @Deprecated Use MetaModelManagerResourceAdapter.
+ * @deprecated Use MetaModelManagerResourceAdapter.
*/
@Deprecated
public class TypeManagerResourceAdapter extends MetaModelManagerResourceAdapter
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/PapyrusTestFile.di b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/PapyrusTestFile.di
index 9f82257..e89c660 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/PapyrusTestFile.di
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/PapyrusTestFile.di
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="UTF-8"?>
<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
<pageList>
<availablePage>
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneApplication.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneApplication.java
index 27d7047..3fca326 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneApplication.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneApplication.java
@@ -50,12 +50,10 @@
ValidityExporterRegistry.initialize(ValidityExporterRegistry.INSTANCE);
}
}
+
/**
* Initializes all the needed resource factories to create ecore and ocl
* resources in the global registry.
- *
- * @param resourceSet
- * the resource set.
*/
public void doCompleteOCLSetup() {
getResourceSet();
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateUIConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateUIConstraintLocator.java
index 161d1f5..ca30127 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateUIConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateUIConstraintLocator.java
@@ -144,7 +144,6 @@
/**
* Create and launch an internal launch configuration to debug expressionInOCL applied to contextObject.
- * @return
*/
protected ILaunch launchDebugger(IProgressMonitor monitor, @Nullable EObject contextObject, @NonNull ExpressionInOCL expressionInOCL) throws CoreException {
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotUIConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotUIConstraintLocator.java
index dcf5748..3faba12 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotUIConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotUIConstraintLocator.java
@@ -69,7 +69,6 @@
/**
* Create and launch an internal launch configuration to debug expressionInOCL applied to contextObject.
- * @return
*/
protected ILaunch launchDebugger(IProgressMonitor monitor, @Nullable EObject contextObject, @NonNull ExpressionInOCL expressionInOCL) throws CoreException {
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLUIConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLUIConstraintLocator.java
index ff42965..c2d2b98 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLUIConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLUIConstraintLocator.java
@@ -148,7 +148,6 @@
/**
* Create and launch an internal launch configuration to debug expressionInOCL applied to contextObject.
- * @return
*/
protected ILaunch launchDebugger(IProgressMonitor monitor, @Nullable EObject contextObject, @NonNull ExpressionInOCL expressionInOCL) throws CoreException {
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
diff --git a/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/Activator.java b/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/Activator.java
index 5d68dc7..687e8fa 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/Activator.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/Activator.java
@@ -164,11 +164,6 @@
/**
* Logs a message with given level into the Eclipse log file
- *
- * @param message
- * the message to log
- * @param severity
- * the message priority
*/
public static void log(Exception e) {
log(e.getMessage(), IStatus.ERROR, e);
diff --git a/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/commands/ValidateHandler.java b/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/commands/ValidateHandler.java
index 3cab265..48f601c 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/commands/ValidateHandler.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/commands/ValidateHandler.java
@@ -67,9 +67,6 @@
/**
* Creates a new instance of this class given an instance of
* <code>IAction</code>.
- *
- * @param action
- * the action. Must not be <code>null</code>.
*/
public ValidateHandler() {
this.action = new ValidateCommand();
diff --git a/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/wizards/AbstractFileDialog.java b/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/wizards/AbstractFileDialog.java
index 28955e7..9b423d9 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/wizards/AbstractFileDialog.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/wizards/AbstractFileDialog.java
@@ -57,14 +57,6 @@
* Creates an extended new complete OCL file creation dialog. If the initial
* resource selection contains exactly one container resource then it will
* be used as the default container resource.
- *
- * @param parent
- * composite widget to parent the group
- * @param domain
- * @param selection
- * the current resource selection
- * @param listener
- * object interested in changes to the group's fields value
*/
public AbstractFileDialog(@NonNull AbstractFileNewWizard wizard, @NonNull AbstractFileNewWizardPage wizardPage, @Nullable IResource initialSelection) {
super(wizardPage.getShell(), null);
@@ -185,7 +177,7 @@
/**
* Returns true if this selected resource would be filtered from view.
*
- * {@link IWorkspace#validateFiltered(Resource)}
+ * {@link IWorkspace#validateFiltered(IResource)}
*/
protected boolean isFilteredByParent() {
ResourceAndContainerGroup group = getGroup();
diff --git a/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/wizards/AbstractFileNewWizardPage.java b/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/wizards/AbstractFileNewWizardPage.java
index 8c576cc..026a479 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/wizards/AbstractFileNewWizardPage.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base.ui/src/org/eclipse/ocl/examples/xtext/base/ui/wizards/AbstractFileNewWizardPage.java
@@ -52,9 +52,6 @@
* Creates a new complete OCL file creation wizard page. If the initial
* resource selection contains exactly one container resource then it will
* be used as the default container resource.
- *
- * @param selection
- * the current resource selection
*/
public AbstractFileNewWizardPage(@NonNull AbstractFileNewWizard wizard, @Nullable IResource initialSelection) {
super(BaseUIMessages.NewWizardPage_pageName);
diff --git a/examples/org.eclipse.ocl.examples.xtext.base/emf-gen/org/eclipse/ocl/examples/xtext/base/basecs/util/BaseCSSwitch.java b/examples/org.eclipse.ocl.examples.xtext.base/emf-gen/org/eclipse/ocl/examples/xtext/base/basecs/util/BaseCSSwitch.java
index 3940327..8a7f211 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base/emf-gen/org/eclipse/ocl/examples/xtext/base/basecs/util/BaseCSSwitch.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base/emf-gen/org/eclipse/ocl/examples/xtext/base/basecs/util/BaseCSSwitch.java
@@ -57,7 +57,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.xtext.base/emf-gen/org/eclipse/ocl/examples/xtext/base/basecs/util/VisitableCS.java b/examples/org.eclipse.ocl.examples.xtext.base/emf-gen/org/eclipse/ocl/examples/xtext/base/basecs/util/VisitableCS.java
index 85d5a7b..d075783 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base/emf-gen/org/eclipse/ocl/examples/xtext/base/basecs/util/VisitableCS.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base/emf-gen/org/eclipse/ocl/examples/xtext/base/basecs/util/VisitableCS.java
@@ -34,7 +34,7 @@
* <p>
* Derived implementations of accept() may use getAdapter() to obtain
* richer visitor interfaces.
- * @param <R, C>
+ * @param <R>
* @param visitor
* @return the result of the visit.
*/
diff --git a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/BaseCSContainmentVisitor.java b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/BaseCSContainmentVisitor.java
index 4b3dd09..a4ac766 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/BaseCSContainmentVisitor.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/BaseCSContainmentVisitor.java
@@ -197,11 +197,6 @@
/**
* Method used to refresh every {@link RootCS} element.
- *
- * @param pivotClass
- * @param pivotEClass
- * @param csElement
- * @return
*/
protected @NonNull <T extends Root> T refreshRoot(@NonNull Class<T> pivotClass, /*@NonNull*/ EClass pivotEClass, @NonNull RootCS csElement) {
assert pivotEClass != null;
@@ -248,11 +243,6 @@
* Method used to refresh every {@link RootPackageCS} element.
*
* There are some Roots which may own packages like those created in OCLinEcore or StdLin documents
- *
- * @param pivotClass
- * @param pivotEClass
- * @param csElement
- * @return
*/
protected @NonNull <T extends Root> T refreshRootPackage(@NonNull Class<T> pivotClass, /*@NonNull*/ EClass pivotEClass, @NonNull RootPackageCS csElement) {
@NonNull T pivotElement = refreshRoot(pivotClass, pivotEClass, csElement);
diff --git a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/CS2Pivot.java b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/CS2Pivot.java
index 256f7c4..8204979 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/CS2Pivot.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/CS2Pivot.java
@@ -130,7 +130,7 @@
}
/**
- * Default message binder that just invokes {@link NLS.bind}.
+ * Default message binder that just invokes {@link NLS#bind(String, Object[])}.
*/
public static class DefaultMessageBinder implements CS2Pivot.MessageBinder
{
@@ -142,7 +142,7 @@
}
/**
- * Message binder that prefixes the uri and line number to the return from {@link NLS.bind}.
+ * Message binder that prefixes the uri and line number to the return from {@link NLS#bind(String, Object[])}.
*/
public static class MessageBinderWithLineContext implements CS2Pivot.MessageBinder
{
@@ -292,7 +292,7 @@
/**
* Define an alternative message binder. THe default null messageBinder uses
- * {@link NLS.bind}
+ * {@link NLS#bind(String, Object[])}
*/
public static MessageBinder setMessageBinder(MessageBinder messageBinder) {
MessageBinder savedMessageBinder = CS2Pivot.messageBinder;
diff --git a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/CS2PivotConversion.java b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/CS2PivotConversion.java
index 65ea6a9..6df1f76 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/CS2PivotConversion.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/cs2as/CS2PivotConversion.java
@@ -750,7 +750,7 @@
}
}
- /** @Deprecated cast first argument to BaseCSResource */
+ /** @deprecated cast first argument to BaseCSResource */
@Deprecated
public void installRootElement(@NonNull Resource csResource, @NonNull Element pivotElement) {
installRootElement((BaseCSResource)csResource, pivotElement);
@@ -980,11 +980,6 @@
* Return a pivotEClass instance cast to pivotClass registered for csElement.getCSI().
* <p>An existing element is re-used else an new instance is created.
* <p>The pivot element is installed as the original object of csElement.
- * @param <T>
- * @param pivotClass
- * @param pivotEClass
- * @param csElement
- * @return
*/
public @NonNull <T extends Element> T refreshModelElement(@NonNull Class<T> pivotClass, /*@NonNull*/ EClass pivotEClass, @Nullable ModelElementCS csElement) {
assert pivotEClass != null;
@@ -1131,10 +1126,6 @@
* Update a list of TemplateParameterSubstitution to match a list of TemplateParameter
* by moving/adding/removing existing entries. Once matched each TemplateParameterSubstitution.formal
* references the corresponding TemplateParameter.
- * @param eList
- *
- * @param templateSignature
- * @param templateBinding
*/
protected void specializeTemplateParameterSubstitutions(@NonNull List<TemplateParameterSubstitution> templateParameterSubstitutions,
@NonNull List<TemplateParameter> templateParameters, @NonNull List<TemplateParameterSubstitutionCS> csTemplateParameterSubstitutions) {
@@ -1246,7 +1237,6 @@
/**
* Sequence the update passes to make the pivot match the CS.
- * @param csResources
*/
public boolean update() {
resetPivotMappings(csResources);
diff --git a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/formatting/AbstractBaseFormatter.java b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/formatting/AbstractBaseFormatter.java
index 85b0eb0..f0be48d 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/formatting/AbstractBaseFormatter.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/formatting/AbstractBaseFormatter.java
@@ -16,11 +16,6 @@
/**
* This class contains custom formatting description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
*/
public abstract class AbstractBaseFormatter extends AbstractDeclarativeFormatter {
diff --git a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/utilities/NoEObjectCompositeEValidator.java b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/utilities/NoEObjectCompositeEValidator.java
index 5c02e83..89e9b2f 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/utilities/NoEObjectCompositeEValidator.java
+++ b/examples/org.eclipse.ocl.examples.xtext.base/src/org/eclipse/ocl/examples/xtext/base/utilities/NoEObjectCompositeEValidator.java
@@ -13,16 +13,17 @@
import org.eclipse.xtext.validation.CompositeEValidator;
/**
+ * @deprecated use
+ * <pre>
+ *@Override
+ *public void configure(Binder binder) {
+ * super.configure(binder);
+ * binder.bindConstant().annotatedWith(Names.named(org.eclipse.xtext.validation.CompositeEValidator.USE_EOBJECT_VALIDATOR)).to(false);
+ *}
+ * </pre>
* NoEObjectCompositeEValidator worksaround Bug 322639 by ensuring the
* that CompositeEValidator does not register an additional
* EObjectValidator.
- *
- * @Deprecated use
- * @Override
- * public void configure(Binder binder) {
- * super.configure(binder);
- * binder.bindConstant().annotatedWith(Names.named(org.eclipse.xtext.validation.CompositeEValidator.USE_EOBJECT_VALIDATOR)).to(false);
- * }
*/
@Deprecated
public class NoEObjectCompositeEValidator extends CompositeEValidator
diff --git a/examples/org.eclipse.ocl.examples.xtext.completeocl.ui/src/org/eclipse/ocl/examples/xtext/completeocl/ui/commands/LoadCompleteOCLResourceHandler.java b/examples/org.eclipse.ocl.examples.xtext.completeocl.ui/src/org/eclipse/ocl/examples/xtext/completeocl/ui/commands/LoadCompleteOCLResourceHandler.java
index 5396268..4c16295 100644
--- a/examples/org.eclipse.ocl.examples.xtext.completeocl.ui/src/org/eclipse/ocl/examples/xtext/completeocl/ui/commands/LoadCompleteOCLResourceHandler.java
+++ b/examples/org.eclipse.ocl.examples.xtext.completeocl.ui/src/org/eclipse/ocl/examples/xtext/completeocl/ui/commands/LoadCompleteOCLResourceHandler.java
@@ -245,9 +245,6 @@
/**
* Generate a popup to display a primaryMessage and optionally a detailMessage too.
- * @param primaryMessage
- * @param detailMessage
- * @return
*/
protected boolean error(@NonNull String primaryMessage, @Nullable String detailMessage) {
Shell shell = parent;
diff --git a/examples/org.eclipse.ocl.examples.xtext.completeocl.ui/src/org/eclipse/ocl/examples/xtext/completeocl/ui/wizards/CompleteOCLFileDialog.java b/examples/org.eclipse.ocl.examples.xtext.completeocl.ui/src/org/eclipse/ocl/examples/xtext/completeocl/ui/wizards/CompleteOCLFileDialog.java
index b47c7b7..4b4ec34 100644
--- a/examples/org.eclipse.ocl.examples.xtext.completeocl.ui/src/org/eclipse/ocl/examples/xtext/completeocl/ui/wizards/CompleteOCLFileDialog.java
+++ b/examples/org.eclipse.ocl.examples.xtext.completeocl.ui/src/org/eclipse/ocl/examples/xtext/completeocl/ui/wizards/CompleteOCLFileDialog.java
@@ -23,14 +23,6 @@
* Creates an extended new complete OCL file creation dialog. If the initial
* resource selection contains exactly one container resource then it will
* be used as the default container resource.
- *
- * @param parent
- * composite widget to parent the group
- * @param domain
- * @param selection
- * the current resource selection
- * @param listener
- * object interested in changes to the group's fields value
*/
public CompleteOCLFileDialog(@NonNull CompleteOCLFileNewWizard wizard, @NonNull AbstractFileNewWizardPage wizardPage, @Nullable IResource initialSelection) {
super(wizard, wizardPage, initialSelection);
diff --git a/examples/org.eclipse.ocl.examples.xtext.completeocl/emf-gen/org/eclipse/ocl/examples/xtext/completeocl/completeoclcs/util/CompleteOCLCSSwitch.java b/examples/org.eclipse.ocl.examples.xtext.completeocl/emf-gen/org/eclipse/ocl/examples/xtext/completeocl/completeoclcs/util/CompleteOCLCSSwitch.java
index b5ef9be..f7d6111 100644
--- a/examples/org.eclipse.ocl.examples.xtext.completeocl/emf-gen/org/eclipse/ocl/examples/xtext/completeocl/completeoclcs/util/CompleteOCLCSSwitch.java
+++ b/examples/org.eclipse.ocl.examples.xtext.completeocl/emf-gen/org/eclipse/ocl/examples/xtext/completeocl/completeoclcs/util/CompleteOCLCSSwitch.java
@@ -68,7 +68,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.xtext.completeocl/src/org/eclipse/ocl/examples/xtext/completeocl/formatting/CompleteOCLFormatter.java b/examples/org.eclipse.ocl.examples.xtext.completeocl/src/org/eclipse/ocl/examples/xtext/completeocl/formatting/CompleteOCLFormatter.java
index a0e9904..de0f697 100644
--- a/examples/org.eclipse.ocl.examples.xtext.completeocl/src/org/eclipse/ocl/examples/xtext/completeocl/formatting/CompleteOCLFormatter.java
+++ b/examples/org.eclipse.ocl.examples.xtext.completeocl/src/org/eclipse/ocl/examples/xtext/completeocl/formatting/CompleteOCLFormatter.java
@@ -25,11 +25,6 @@
/**
* This class contains custom formatting description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
*/
public class CompleteOCLFormatter extends AbstractEssentialOCLFormatter
{
diff --git a/examples/org.eclipse.ocl.examples.xtext.completeocl/src/org/eclipse/ocl/examples/xtext/completeocl/validation/CompleteOCLEObjectValidator.java b/examples/org.eclipse.ocl.examples.xtext.completeocl/src/org/eclipse/ocl/examples/xtext/completeocl/validation/CompleteOCLEObjectValidator.java
index 904c704..4d27033 100644
--- a/examples/org.eclipse.ocl.examples.xtext.completeocl/src/org/eclipse/ocl/examples/xtext/completeocl/validation/CompleteOCLEObjectValidator.java
+++ b/examples/org.eclipse.ocl.examples.xtext.completeocl/src/org/eclipse/ocl/examples/xtext/completeocl/validation/CompleteOCLEObjectValidator.java
@@ -93,7 +93,6 @@
/**
* Perform the loading and installation of the Complete OCL, returning true if successful.
- * @return
*/
public boolean initialize() {
Resource ecoreResource = ePackage.eResource();
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsolePage.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsolePage.java
index 4b0c5d0..51799a3 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsolePage.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsolePage.java
@@ -128,8 +128,8 @@
public class OCLConsolePage extends Page implements MetaModelManagerListener
{
/**
- * CancelableEvaluationVisitor refines the EvaluationVisitor to poll the monitor foer cancelation at a variety of significant
- * evaluation events, such as feature vists and {@link #getValueFactory()}.
+ * CancelableEvaluationVisitor refines the EvaluationVisitor to poll the monitor for cancellation at a variety of significant
+ * evaluation events, such as feature visits and {@link #createNestedEvaluator()}.
*/
protected static class CancelableEvaluationVisitor extends EvaluationVisitorImpl
{
@@ -399,7 +399,7 @@
/**
* Initializes me.
- * @param oclConsole
+ * @param console
*/
protected OCLConsolePage(OCLConsole console) {
super();
@@ -444,7 +444,7 @@
* Appends the specified text to the output viewer.
*
* @param text the text to append
- * @param color the color to print the text with
+ * @param rgb the color to print the text with
* @param bold whether to print the text bold
*/
protected void append(String text, RGB rgb, boolean bold) {
@@ -804,30 +804,7 @@
public BaseDocument getEditorDocument() {
return (BaseDocument) editor.getDocument();
}
-
- /**
- * Gets the editor image for the specified element.
- *
- * @param element a model element
- *
- * @return the corresponding image
- *
- private ImageDescriptor getImage(EObject element) {
- ImageDescriptor result = null;
-
- IItemLabelProvider provider = (IItemLabelProvider) new ComposedAdapterFactory(
- ComposedAdapterFactory.Descriptor.Registry.INSTANCE).adapt(
- element, IItemLabelProvider.class);
- if (provider != null) {
- Object image = provider.getImage(element);
- if (image != null) {
- result = ExtendedImageRegistry.INSTANCE.getImageDescriptor(image);
- }
- }
-
- return result;
- } */
-
+
public String getLastOCLExpression() {
return lastOCLExpression;
}
@@ -844,49 +821,6 @@
}
return nullMetaModelManager2;
}
-
- /**
- * Prints the specified <code>object</code> to the output viewer. The
- * object is converted to a string using the best matching EMF label
- * provider adapter if it is an {@link EObject}; otherwise, just use
- * {@link String#valueOf(java.lang.Object)} on it. If the
- * <code>object</code> is a collection or an array, then we print each
- * element on a separate line.
- *
- * @param object the object or collection to print
- * @param color the color to print the <code>object</code> with
- * @param bold whether to display it in bold text
- *
- private void print(Value value, Color color, boolean bold) {
- CollectionValue collectionValue = value.isCollectionValue();
- if (collectionValue != null) {
- for (Value elementValue : collectionValue) {
- append(String.valueOf(elementValue), color, bold);
- }
- }
- else {
- append(String.valueOf(value), color, bold);
- }
-/* Collection<?> toPrint;
-
- if (object == null) {
- toPrint = Collections.EMPTY_SET;
- } else if (object instanceof Collection) {
- toPrint = (Collection<?>) object;
- } else if (object.getClass().isArray()) {
- toPrint = Arrays.asList((Object[]) object);
- } else {
- toPrint = Collections.singleton(object);
- }
-
- for (Iterator<?> iter = toPrint.iterator(); iter.hasNext();) {
- append(toString(iter.next()), color, bold);
- } * /
-// append(String.valueOf(object), color, bold);
-
- scrollText();
- }
- * @return */
protected ILaunch internalLaunchDebugger() {
return debugAction.launch();
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/DebugAction.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/DebugAction.java
index e37415d..7ef8d99 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/DebugAction.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/DebugAction.java
@@ -152,7 +152,6 @@
/**
* Create and launch an internal launch configuration to debug expressionInOCL applied to contextObject.
- * @return
*/
protected ILaunch launchDebugger(IProgressMonitor monitor, @Nullable EObject contextObject, @NonNull ExpressionInOCL expressionInOCL) throws CoreException {
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextEditor.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextEditor.java
index ecc0849..6a71472 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextEditor.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextEditor.java
@@ -174,11 +174,7 @@
*
* @param control the parent composite that will contain the editor
* @param injector the Guice injector to get Xtext configuration elements
- * @param job the synchronization job that will be scheduled/rescheduled at each
- * modification of the editor text. It may be use to reconcile the content of
- * the editor with something else.
* @param style the SWT style of the {@link SourceViewer} of this editor.
- * @param fileExtension the file extension (without the DOT) of the textual DSL to edit
*/
public EmbeddedXtextEditor(Composite control, Injector injector, int style) {
fControl = control;
@@ -197,11 +193,6 @@
*
* @param control the parent composite that will contain the editor
* @param injector the Guice injector to get Xtext configuration elements
- * @param job the synchronization job that will be scheduled/rescheduled at each
- * modification of the editor text. It may be use to reconcile the content of
- * the editor with something else.
- * @param fileExtension the file extension (without the DOT) of the textual DSL to edit
- * @param fileExtension
*/
public EmbeddedXtextEditor(Composite control, Injector injector) {
this(control, injector, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
@@ -226,12 +217,7 @@
/**
* Should be called only once, during initialization.
*
- * Then, you should call {@link #updateText(String, String, String)};
- *
- * @param document
- * @param prefix
- * @param text
- * @param suffix
+ * Then, you should call {@link #update(String)};
*/
protected void setText(XtextDocument document, String text) {
document.set(text);
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingReconciler.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingReconciler.java
index 6d52482..3624407 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingReconciler.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingReconciler.java
@@ -106,7 +106,6 @@
* Add a position with the given range and highlighting if it does not exist already.
* @param offset The range offset
* @param length The range length
- * @param highlighting The highlighting
*/
public void addPosition(int offset, int length, String... ids) {
TextAttribute highlighting = ids.length == 1 ?
@@ -168,8 +167,6 @@
/**
* Install this reconciler on the given editor and presenter.
*
- * @param editor
- * the editor
* @param sourceViewer
* the source viewer
* @param presenter
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/ToggleSLCommentAction.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/ToggleSLCommentAction.java
index 58ccf8f..39d7f47 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/ToggleSLCommentAction.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/ToggleSLCommentAction.java
@@ -16,8 +16,6 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.ResourceBundle;
-
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.text.BadLocationException;
@@ -36,7 +34,6 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.texteditor.IUpdate;
-import org.eclipse.ui.texteditor.ResourceAction;
/**
* This implementation has been copied from org.eclipse.jdt.internal.ui.javaeditor.ToggleCommentAction.
@@ -56,13 +53,6 @@
/**
* Creates and initializes the action for the given text editor. The action
* configures its visual representation from the given resource bundle.
- *
- * @param bundle the resource bundle
- * @param prefix a prefix to be prepended to the various resource keys
- * (described in <code>ResourceAction</code> constructor), or
- * <code>null</code> if none
- * @param editor the text editor
- * @see ResourceAction#ResourceAction(ResourceBundle, String, int)
*/
public ToggleSLCommentAction(ITextViewer viewer) {
fViewer = viewer;
diff --git a/examples/org.eclipse.ocl.examples.xtext.essentialocl/emf-gen/org/eclipse/ocl/examples/xtext/essentialocl/essentialoclcs/util/EssentialOCLCSSwitch.java b/examples/org.eclipse.ocl.examples.xtext.essentialocl/emf-gen/org/eclipse/ocl/examples/xtext/essentialocl/essentialoclcs/util/EssentialOCLCSSwitch.java
index cf741eb..a8f4135 100644
--- a/examples/org.eclipse.ocl.examples.xtext.essentialocl/emf-gen/org/eclipse/ocl/examples/xtext/essentialocl/essentialoclcs/util/EssentialOCLCSSwitch.java
+++ b/examples/org.eclipse.ocl.examples.xtext.essentialocl/emf-gen/org/eclipse/ocl/examples/xtext/essentialocl/essentialoclcs/util/EssentialOCLCSSwitch.java
@@ -68,7 +68,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.xtext.essentialocl/src/org/eclipse/ocl/examples/xtext/essentialocl/formatting/AbstractEssentialOCLFormatter.java b/examples/org.eclipse.ocl.examples.xtext.essentialocl/src/org/eclipse/ocl/examples/xtext/essentialocl/formatting/AbstractEssentialOCLFormatter.java
index cc91587..3c2102d 100644
--- a/examples/org.eclipse.ocl.examples.xtext.essentialocl/src/org/eclipse/ocl/examples/xtext/essentialocl/formatting/AbstractEssentialOCLFormatter.java
+++ b/examples/org.eclipse.ocl.examples.xtext.essentialocl/src/org/eclipse/ocl/examples/xtext/essentialocl/formatting/AbstractEssentialOCLFormatter.java
@@ -33,11 +33,6 @@
/**
* This class contains custom formatting description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
*/
public abstract class AbstractEssentialOCLFormatter extends AbstractBaseFormatter
{
diff --git a/examples/org.eclipse.ocl.examples.xtext.essentialocl/src/org/eclipse/ocl/examples/xtext/essentialocl/formatting/EssentialOCLFormatter.java b/examples/org.eclipse.ocl.examples.xtext.essentialocl/src/org/eclipse/ocl/examples/xtext/essentialocl/formatting/EssentialOCLFormatter.java
index 84f0352..2060ec9 100644
--- a/examples/org.eclipse.ocl.examples.xtext.essentialocl/src/org/eclipse/ocl/examples/xtext/essentialocl/formatting/EssentialOCLFormatter.java
+++ b/examples/org.eclipse.ocl.examples.xtext.essentialocl/src/org/eclipse/ocl/examples/xtext/essentialocl/formatting/EssentialOCLFormatter.java
@@ -15,11 +15,6 @@
/**
* This class contains custom formatting description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
*/
public class EssentialOCLFormatter extends AbstractEssentialOCLFormatter
{
diff --git a/examples/org.eclipse.ocl.examples.xtext.markup/emf-gen/org/eclipse/ocl/examples/xtext/markup/util/MarkupSwitch.java b/examples/org.eclipse.ocl.examples.xtext.markup/emf-gen/org/eclipse/ocl/examples/xtext/markup/util/MarkupSwitch.java
index 962828d..638885a 100644
--- a/examples/org.eclipse.ocl.examples.xtext.markup/emf-gen/org/eclipse/ocl/examples/xtext/markup/util/MarkupSwitch.java
+++ b/examples/org.eclipse.ocl.examples.xtext.markup/emf-gen/org/eclipse/ocl/examples/xtext/markup/util/MarkupSwitch.java
@@ -62,7 +62,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.xtext.markup/src/org/eclipse/ocl/examples/xtext/markup/formatting/MarkupFormatter.java b/examples/org.eclipse.ocl.examples.xtext.markup/src/org/eclipse/ocl/examples/xtext/markup/formatting/MarkupFormatter.java
index 604b4a7..b1f0c77 100644
--- a/examples/org.eclipse.ocl.examples.xtext.markup/src/org/eclipse/ocl/examples/xtext/markup/formatting/MarkupFormatter.java
+++ b/examples/org.eclipse.ocl.examples.xtext.markup/src/org/eclipse/ocl/examples/xtext/markup/formatting/MarkupFormatter.java
@@ -15,11 +15,6 @@
/**
* This class contains custom formatting description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
*/
public class MarkupFormatter extends AbstractDeclarativeFormatter {
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclinecore.ui/src/org/eclipse/ocl/examples/xtext/oclinecore/ui/wizards/EcoreWithOCLFileDialog.java b/examples/org.eclipse.ocl.examples.xtext.oclinecore.ui/src/org/eclipse/ocl/examples/xtext/oclinecore/ui/wizards/EcoreWithOCLFileDialog.java
index acbb113..2a5cfc9 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclinecore.ui/src/org/eclipse/ocl/examples/xtext/oclinecore/ui/wizards/EcoreWithOCLFileDialog.java
+++ b/examples/org.eclipse.ocl.examples.xtext.oclinecore.ui/src/org/eclipse/ocl/examples/xtext/oclinecore/ui/wizards/EcoreWithOCLFileDialog.java
@@ -23,14 +23,6 @@
* Creates an extended new OCLinEcore file creation dialog. If the initial
* resource selection contains exactly one container resource then it will
* be used as the default container resource.
- *
- * @param parent
- * composite widget to parent the group
- * @param domain
- * @param selection
- * the current resource selection
- * @param listener
- * object interested in changes to the group's fields value
*/
public EcoreWithOCLFileDialog(@NonNull AbstractOCLinEcoreFileNewWizard wizard, @NonNull AbstractFileNewWizardPage wizardPage, @Nullable IResource initialSelection) {
super(wizard, wizardPage, initialSelection);
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclinecore.ui/src/org/eclipse/ocl/examples/xtext/oclinecore/ui/wizards/OCLinEcoreFileDialog.java b/examples/org.eclipse.ocl.examples.xtext.oclinecore.ui/src/org/eclipse/ocl/examples/xtext/oclinecore/ui/wizards/OCLinEcoreFileDialog.java
index 5cbbddf..87d6291 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclinecore.ui/src/org/eclipse/ocl/examples/xtext/oclinecore/ui/wizards/OCLinEcoreFileDialog.java
+++ b/examples/org.eclipse.ocl.examples.xtext.oclinecore.ui/src/org/eclipse/ocl/examples/xtext/oclinecore/ui/wizards/OCLinEcoreFileDialog.java
@@ -22,14 +22,6 @@
* Creates an extended new OCLinEcore file creation dialog. If the initial
* resource selection contains exactly one container resource then it will
* be used as the default container resource.
- *
- * @param parent
- * composite widget to parent the group
- * @param domain
- * @param selection
- * the current resource selection
- * @param listener
- * object interested in changes to the group's fields value
*/
public OCLinEcoreFileDialog(@NonNull AbstractOCLinEcoreFileNewWizard wizard, @NonNull AbstractFileNewWizardPage wizardPage, @Nullable IResource initialSelection) {
super(wizard, wizardPage, initialSelection);
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclinecore/emf-gen/org/eclipse/ocl/examples/xtext/oclinecore/oclinecorecs/util/OCLinEcoreCSSwitch.java b/examples/org.eclipse.ocl.examples.xtext.oclinecore/emf-gen/org/eclipse/ocl/examples/xtext/oclinecore/oclinecorecs/util/OCLinEcoreCSSwitch.java
index 3e54eba..1b26198 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclinecore/emf-gen/org/eclipse/ocl/examples/xtext/oclinecore/oclinecorecs/util/OCLinEcoreCSSwitch.java
+++ b/examples/org.eclipse.ocl.examples.xtext.oclinecore/emf-gen/org/eclipse/ocl/examples/xtext/oclinecore/oclinecorecs/util/OCLinEcoreCSSwitch.java
@@ -68,7 +68,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclinecore/src/org/eclipse/ocl/examples/xtext/oclinecore/formatting/OCLinEcoreFormatter.java b/examples/org.eclipse.ocl.examples.xtext.oclinecore/src/org/eclipse/ocl/examples/xtext/oclinecore/formatting/OCLinEcoreFormatter.java
index a514d43..74e9dce 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclinecore/src/org/eclipse/ocl/examples/xtext/oclinecore/formatting/OCLinEcoreFormatter.java
+++ b/examples/org.eclipse.ocl.examples.xtext.oclinecore/src/org/eclipse/ocl/examples/xtext/oclinecore/formatting/OCLinEcoreFormatter.java
@@ -35,11 +35,6 @@
/**
* This class contains custom formatting description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
*/
public class OCLinEcoreFormatter extends AbstractEssentialOCLFormatter {
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclstdlib.ui/src/org/eclipse/ocl/examples/xtext/oclstdlib/ui/wizards/OCLstdlibFileDialog.java b/examples/org.eclipse.ocl.examples.xtext.oclstdlib.ui/src/org/eclipse/ocl/examples/xtext/oclstdlib/ui/wizards/OCLstdlibFileDialog.java
index a97dc23..16af9ab 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclstdlib.ui/src/org/eclipse/ocl/examples/xtext/oclstdlib/ui/wizards/OCLstdlibFileDialog.java
+++ b/examples/org.eclipse.ocl.examples.xtext.oclstdlib.ui/src/org/eclipse/ocl/examples/xtext/oclstdlib/ui/wizards/OCLstdlibFileDialog.java
@@ -23,14 +23,6 @@
* Creates an extended new OCL Standard Library file creation dialog. If the initial
* resource selection contains exactly one container resource then it will
* be used as the default container resource.
- *
- * @param parent
- * composite widget to parent the group
- * @param domain
- * @param selection
- * the current resource selection
- * @param listener
- * object interested in changes to the group's fields value
*/
public OCLstdlibFileDialog(@NonNull OCLstdlibFileNewWizard wizard, @NonNull AbstractFileNewWizardPage wizardPage, @Nullable IResource initialSelection) {
super(wizard, wizardPage, initialSelection);
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclstdlib/emf-gen/org/eclipse/ocl/examples/xtext/oclstdlib/oclstdlibcs/util/OCLstdlibCSSwitch.java b/examples/org.eclipse.ocl.examples.xtext.oclstdlib/emf-gen/org/eclipse/ocl/examples/xtext/oclstdlib/oclstdlibcs/util/OCLstdlibCSSwitch.java
index 545e7a5..32e97f5 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclstdlib/emf-gen/org/eclipse/ocl/examples/xtext/oclstdlib/oclstdlibcs/util/OCLstdlibCSSwitch.java
+++ b/examples/org.eclipse.ocl.examples.xtext.oclstdlib/emf-gen/org/eclipse/ocl/examples/xtext/oclstdlib/oclstdlibcs/util/OCLstdlibCSSwitch.java
@@ -79,7 +79,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclstdlib/src/org/eclipse/ocl/examples/xtext/oclstdlib/formatting/OCLstdlibFormatter.java b/examples/org.eclipse.ocl.examples.xtext.oclstdlib/src/org/eclipse/ocl/examples/xtext/oclstdlib/formatting/OCLstdlibFormatter.java
index d72e871..57cd9e2 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclstdlib/src/org/eclipse/ocl/examples/xtext/oclstdlib/formatting/OCLstdlibFormatter.java
+++ b/examples/org.eclipse.ocl.examples.xtext.oclstdlib/src/org/eclipse/ocl/examples/xtext/oclstdlib/formatting/OCLstdlibFormatter.java
@@ -37,11 +37,6 @@
/**
* This class contains custom formatting description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
*/
public class OCLstdlibFormatter extends AbstractEssentialOCLFormatter {
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLCommon.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLCommon.java
index df70f73..2b9dd22 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLCommon.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLCommon.java
@@ -149,10 +149,8 @@
/**
* Return the preference value for
- * @param localKey
- * @param defaultValue
+ * @param option
* @param contexts
- * @return
*/
public static <T> T getPreference(PreferenceableOption<T> option, IScopeContext[] contexts) {
if (EMFPlugin.IS_ECLIPSE_RUNNING) {
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLConstants.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLConstants.java
index 7204422..bb36361 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLConstants.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLConstants.java
@@ -40,13 +40,13 @@
* <p>
* For an EPackage, the EAnnotation details may include
* <br>
- * an {@link #KEY_FOR_ENVIRONMENT_FACTORY_CLASS environmentFactoryClass} key whose value is the fully qualified
- * class name for the {@link EnvironmentFactory}. If no key is specified either the {@link EcoreEnvironmentFactory}
- * or {@link EcoreEnvironmentFactoryWithHiddenOpposites} class are used.
+ * an {@link org.eclipse.ocl.ecore.delegate.OCLDelegateDomain#KEY_FOR_ENVIRONMENT_FACTORY_CLASS environmentFactoryClass} key whose value is the fully qualified
+ * class name for the {@link org.eclipse.ocl.EnvironmentFactory}. If no key is specified either the {@link org.eclipse.ocl.ecore.EcoreEnvironmentFactory}
+ * or {@link org.eclipse.ocl.ecore.opposites.EcoreEnvironmentFactoryWithHiddenOpposites} class are used.
* <br>
- * a {@link #OCL_DELEGATES_USE_HIDDEN_OPPOSITES_KEY hiddenOpposites} key that may have a <tt>true</tt> value to
- * use the {@link EcoreEnvironmentFactoryWithHiddenOpposites} class rather than the {@link EcoreEnvironmentFactory}
- * when no {@link #KEY_FOR_ENVIRONMENT_FACTORY_CLASS environmentFactoryClass} key is specified.
+ * a {@link org.eclipse.ocl.ecore.delegate.OCLDelegateDomain#OCL_DELEGATES_USE_HIDDEN_OPPOSITES_KEY hiddenOpposites} key that may have a <tt>true</tt> value to
+ * use the {@link org.eclipse.ocl.ecore.opposites.EcoreEnvironmentFactoryWithHiddenOpposites} class rather than the {@link org.eclipse.ocl.ecore.EcoreEnvironmentFactory}
+ * when no {@link org.eclipse.ocl.ecore.delegate.OCLDelegateDomain#KEY_FOR_ENVIRONMENT_FACTORY_CLASS environmentFactoryClass} key is specified.
* <p>
* Note that the delegate OCL functionality must be enabled by an EPackage Ecore annotation specifying this URI
* as the value of <tt>invocationDelegates</tt>, <tt>settingDelegates</tt> and <tt>validationDelegates</tt> details
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/Preference.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/Preference.java
index 20aafdc..3486833 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/Preference.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/Preference.java
@@ -25,7 +25,6 @@
* @see BooleanPreference
* @see ClassPreference
* @see EnumerationPreference
- * @see IntegerPreference
*
* @param <T> the type of the option's value
*/
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/preferences/PreferenceableOption.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/preferences/PreferenceableOption.java
index e32c647..83a00d2 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/preferences/PreferenceableOption.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/preferences/PreferenceableOption.java
@@ -19,7 +19,7 @@
* <p>
* The behavior is identified by a <i>key</i> and has a value with a type <i>T</i> and a <i>defaultValue</i>.
* <p>
- * The value may be persisted as a string and reconstructed by {@link #getValueOf()}.
+ * The value may be persisted as a string and reconstructed by {@link #getValueOf(String)}.
*
* @param <T> the type of the option's value
*/
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironment.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironment.java
index d15a93c..b43b0ae 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironment.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironment.java
@@ -133,7 +133,7 @@
* Initializes me with a package registry for package look-ups.
*
* @param reg a package registry
- * @deprecated Use {@link #EcoreEnvironment(EcoreEnvironmentFactory, null)} instead
+ * @deprecated Use {@link #EcoreEnvironment(EcoreEnvironmentFactory, Resource)} instead
*/
@Deprecated
protected EcoreEnvironment(EPackage.Registry reg) {
@@ -147,7 +147,7 @@
* resource in which I am persisted (and from which I load myself if it
* already has content).
*
- * @param reg
+ * @param fac
* a package registry
* @param resource
* a resource, which may or may not already have content
@@ -869,7 +869,7 @@
/**
* This default implementation simply delegates to the
- * {@link Environment#lookupOppositeProperty(Object, String)} method.
+ * {@link #lookupOppositeProperty(EClassifier, String)} method.
*
* @since 3.1
*/
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironmentFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironmentFactory.java
index 3b06766..9b4463a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironmentFactory.java
@@ -86,14 +86,14 @@
* descriptors that are not yet resolved will not be resolved for
* OCL package name lookups. To ensure that packages can be
* referenced by their name, clients shall
- * {@link EPackage.Registry#getEPackage(String) resolve} those
+ * {@link org.eclipse.emf.ecore.EPackage.Registry#getEPackage(String) EPackage.Registry.getEPackage(String)} those
* packages explicitly before asking OCL to look them up. See
* also {@link ParsingOptions#PACKAGE_LOOKUP_STRATEGY} for
* different package lookup strategies. Note also, that if a
* {@link EPackageRegistryImpl#EPackageRegistryImpl(org.eclipse.emf.ecore.EPackage.Registry)
* "delegating registry"} is used, packages contained only by the
* delegate will not be found by an OCL lookup because
- * {@link EPackage.Registry#values()} only enumerates the
+ * {@link org.eclipse.emf.ecore.EPackage.Registry#values() EPackage.Registry.values()} only enumerates the
* packages / descriptors contained by the outer registry.
*/
public EcoreEnvironmentFactory(EPackage.Registry reg) {
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnvironmentWithHiddenOpposites.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnvironmentWithHiddenOpposites.java
index 89f3a37..6239ad4 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnvironmentWithHiddenOpposites.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnvironmentWithHiddenOpposites.java
@@ -27,6 +27,7 @@
import org.eclipse.ocl.AbstractEnvironment;
import org.eclipse.ocl.Environment;
import org.eclipse.ocl.LookupException;
+import org.eclipse.ocl.ecore.opposites.OppositeEndFinder;
import org.eclipse.ocl.expressions.Variable;
@@ -79,7 +80,7 @@
* is <code>classifier</code> or any of <code>classifier</code>'s super
* types and that own an {@link EAnnotation annotation} with source
* {@link EMOFExtendedMetaData#EMOF_PACKAGE_NS_URI_2_0} containing a detail
- * entry with key {@link EcoreEnvironment#PROPERTY_OPPOSITE_ROLE_NAME_KEY}.
+ * entry with key {@link OppositeEndFinder#PROPERTY_OPPOSITE_ROLE_NAME_KEY}.
* The value of the annotation detail is entered into the resulting map as a
* key, the {@link EReference} on which the annotation was found is entered
* into the result map as the corresponding value.
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationEnvironmentWithHiddenOpposites.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationEnvironmentWithHiddenOpposites.java
index e4d6d9f..1405bb7 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationEnvironmentWithHiddenOpposites.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationEnvironmentWithHiddenOpposites.java
@@ -16,7 +16,7 @@
/**
- * Introduces the {@link #navigateOppositeProperty(P, Object)} method to
+ * Introduces the {@link #navigateOppositeProperty(EReference, Object)} method to
* {@link AbstractEvaluationEnvironment} which implements this interface.
*
* @author Axel Uhl
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractDelegatedBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractDelegatedBehavior.java
index bc2519a..dedabd3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractDelegatedBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractDelegatedBehavior.java
@@ -17,7 +17,6 @@
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EModelElement;
@@ -79,13 +78,13 @@
protected static class ExpressionCacheAdapter extends AdapterImpl
{
/**
- * Creates an {@link OCLExpressionCacheAdapter} for expression <code>e</code> and adds
- * it to <code>modelElement</code>'s adapter list so that {@link #getCachedOCLExpression(Notifier)}
+ * Creates an {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} for expression <code>e</code> and adds
+ * it to <code>modelElement</code>'s adapter list so that {@link #getCachedOCLExpression(EModelElement)}
* will return <code>e</code> when called for <code>modelElement</code>. To achieve this, any other
- * {@link OCLExpressionCacheAdapter} in <code>modelElement</code>'s adapter list is removed.
+ * {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} in <code>modelElement</code>'s adapter list is removed.
*
* @param e if <code>null</code>, any existing cache entry is removed and no new entry
- * is created. {@link #getCachedOCLExpression(Notifier)} will then return <code>null</code>.
+ * is created. {@link #getCachedOCLExpression(EModelElement)} will then return <code>null</code>.
*/
public static void cacheOCLExpression(EModelElement modelElement, OCLExpression e) {
for (Iterator<Adapter> i = modelElement.eAdapters().iterator(); i.hasNext(); ) {
@@ -100,7 +99,7 @@
}
/**
- * Looks for an {@link OCLExpressionCacheAdapter} attached to <code>modelElement</code>.
+ * Looks for an {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} attached to <code>modelElement</code>.
* If such an adapter is found, its cached expression is returned. The cached expression
* may be a reserved expression indicating that no OCL expression exists and that an
* unsuccessful attempt to obtain one has been made before.
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractOCLDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractOCLDelegateFactory.java
index aa99df4..76a7607 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractOCLDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractOCLDelegateFactory.java
@@ -38,7 +38,7 @@
/**
* Construct a factory for a known delegate domain.
*
- * @param delegateDomain the delegate domain.
+ * @param delegateURI the delegate domain.
* @since 3.2
*/
protected AbstractOCLDelegateFactory(String delegateURI) {
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEPackageAdapter.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEPackageAdapter.java
index 7023209..f2bd69a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEPackageAdapter.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEPackageAdapter.java
@@ -70,7 +70,7 @@
* with the behavior name as a key and the delegateURIs as a comma
* separated list.
*
- * @Deprecated (since 3.3) Known delegate names are not usefully behavior-specific; use getAllDelegateDomains()
+ * @deprecated (since 3.3) Known delegate names are not usefully behavior-specific; use getAllDelegateDomains()
*/
@Deprecated // since 3.3
protected Map<String, List<DelegateDomain>> delegatedBehaviorMap = null;
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/InvocationBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/InvocationBehavior.java
index 9d8ff2a..106f80b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/InvocationBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/InvocationBehavior.java
@@ -12,7 +12,6 @@
package org.eclipse.ocl.ecore.delegate;
-import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EOperation.Internal.InvocationDelegate;
@@ -40,13 +39,13 @@
}
/**
- * Creates an {@link OCLExpressionCacheAdapter} for expression <code>e</code> and adds
- * it to <code>operation</code>'s adapter list so that {@link #getCachedOCLExpression(Notifier)}
+ * Creates an {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} for expression <code>e</code> and adds
+ * it to <code>operation</code>'s adapter list so that {@link #getCachedOCLExpression(EOperation)}
* will return <code>e</code> when called for <code>operation</code>. To achieve this, any other
- * {@link OCLExpressionCacheAdapter} in <code>operation</code>'s adapter list is removed.
+ * {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} in <code>operation</code>'s adapter list is removed.
*
* @param e if <code>null</code>, any existing cache entry is removed and no new entry
- * is created. {@link #getCachedOCLExpression(Notifier)} will then return <code>null</code>.
+ * is created. {@link #getCachedOCLExpression(EOperation)} will then return <code>null</code>.
*
* @since 3.1
*/
@@ -55,7 +54,7 @@
}
/**
- * Looks for an {@link OCLExpressionCacheAdapter} attached to <code>operation</code>.
+ * Looks for an {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} attached to <code>operation</code>.
* If such an adapter is found, its cached expression is returned. The cached expression
* may be a reserved expression indicating that no OCL expression exists and that an
* unsuccessful attempt to obtain one has been made before.
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomain.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomain.java
index 0d6d108..1eed804 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomain.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomain.java
@@ -97,7 +97,7 @@
* If the EPackage annotation with source {@link #OCL_DELEGATE_URI} has a detail using this key,
* the value is the fully qualified name of the class to be used as the {@link EnvironmentFactory}
* for parsing and evaluation for OCL constraints defined in the EPackage. The class must have a
- * a constructor that takes a single {@link EPackage.Registry} argument.
+ * a constructor that takes a single {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} argument.
*
* @since 3.1
*/
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegateFactory.java
index 9b48b08..a66d895 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegateFactory.java
@@ -34,7 +34,7 @@
/**
* Construct a factory for a known delegate domain.
*
- * @param delegateDomain the delegate domain.
+ * @param delegateURI the delegate domain.
* @since 3.2
*/
public OCLInvocationDelegateFactory(String delegateURI) {
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegateFactory.java
index a421bfa..9ce957b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegateFactory.java
@@ -58,7 +58,7 @@
/**
* Construct a factory for a known delegate domain.
*
- * @param delegateDomain the delegate domain.
+ * @param delegateURI the delegate domain.
* @since 3.2
*/
public OCLQueryDelegateFactory(String delegateURI) {
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegateFactory.java
index a2507ad..5f57cc1 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegateFactory.java
@@ -34,7 +34,7 @@
/**
* Construct a factory for a known delegate domain.
*
- * @param delegateDomain the delegate domain.
+ * @param delegateURI the delegate domain.
* @since 3.2
*/
public OCLSettingDelegateFactory(String delegateURI) {
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegateFactory.java
index 307edb8..f4efe7e 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegateFactory.java
@@ -41,7 +41,7 @@
/**
* Construct a factory for a known delegate domain.
*
- * @param delegateDomain the delegate domain.
+ * @param delegateURI the delegate domain.
* @since 3.2
*/
public OCLValidationDelegateFactory(String delegateURI) {
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/SettingBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/SettingBehavior.java
index ab11cc5..16d4c8f 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/SettingBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/SettingBehavior.java
@@ -11,7 +11,6 @@
*******************************************************************************/
package org.eclipse.ocl.ecore.delegate;
-import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EClass;
@@ -37,13 +36,13 @@
public static final String NAME = "settingDelegates"; //$NON-NLS-1$
/**
- * Creates an {@link OCLExpressionCacheAdapter} for expression <code>e</code> and adds
- * it to <code>property</code>'s adapter list so that {@link #getCachedOCLExpression(Notifier)}
+ * Creates an {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} for expression <code>e</code> and adds
+ * it to <code>property</code>'s adapter list so that {@link #getCachedOCLExpression(EStructuralFeature)}
* will return <code>e</code> when called for <code>property</code>. To achieve this, any other
- * {@link OCLExpressionCacheAdapter} in <code>property</code>'s adapter list is removed.
+ * {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} in <code>property</code>'s adapter list is removed.
*
* @param e if <code>null</code>, any existing cache entry is removed and no new entry
- * is created. {@link #getCachedOCLExpression(Notifier)} will then return <code>null</code>.
+ * is created. {@link #getCachedOCLExpression(EStructuralFeature)} will then return <code>null</code>.
*
* @since 3.1
*/
@@ -52,7 +51,7 @@
}
/**
- * Looks for an {@link OCLExpressionCacheAdapter} attached to <code>property</code>.
+ * Looks for an {@link org.eclipse.ocl.ecore.delegate.AbstractDelegatedBehavior.ExpressionCacheAdapter ExpressionCacheAdapter} attached to <code>property</code>.
* If such an adapter is found, its cached expression is returned. The cached expression
* may be a reserved expression indicating that no OCL expression exists and that an
* unsuccessful attempt to obtain one has been made before.
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationBehavior.java
index ce10bcf..fd14a03 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationBehavior.java
@@ -15,7 +15,6 @@
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EPackage;
@@ -103,10 +102,10 @@
}
/**
- * Creates an {@link OCLInvariantCacheAdapter} for expression <code>e</code> and adds
- * it to <code>n</code>'s adapter list so that {@link #getCachedOCLExpression(Notifier)}
+ * Creates an {@link InvariantCacheAdapter} for expression <code>e</code> and adds
+ * it to <code>n</code>'s adapter list so that {@link #getCachedOCLExpression(EClassifier, String)}
* will return <code>e</code> when called for <code>n</code>. To achieve this, any other
- * {@link OCLInvariantCacheAdapter} in <code>n</code>'s adapter list is removed.
+ * {@link InvariantCacheAdapter} in <code>n</code>'s adapter list is removed.
*
* @param e if <code>null</code>, the respective cache entry for <code>constraintName</code>
* is removed.
@@ -130,7 +129,7 @@
}
/**
- * Looks for an {@link OCLInvariantCacheAdapter} attached to <code>cls</code>.
+ * Looks for an {@link InvariantCacheAdapter} attached to <code>cls</code>.
* If such an adapter is found, a cached expression for <code>constraintName</code> is returned.
* The cached expression may be a reserved expression indicating that no OCL expression exists
* and that an unsuccessful attempt to obtain one has been made before.
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/package.html b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/package.html
index f318253..1456d76 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/package.html
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/package.html
@@ -25,16 +25,16 @@
<p>
This package implements the Ecore binding for the <tt>Types</tt> package of the
OCL Abstract Syntax, as specified by the interfaces in the
-{@link org.eclipse.ocl.ecore} package. The types in this
+{@link org.eclipse.ocl.ecore.EcorePackage org.eclipse.ocl.ecore} package. The types in this
package are not typically used by clients. Rather, instances of the abstract
syntax classes are created either using the
{@linkplain org.eclipse.ocl.ecore.EcoreFactory factory interface}
or by parsing OCL text.
</p>
-@see org.eclipse.ocl.ecore
@see org.eclipse.ocl.ecore.EcorePackage
@see org.eclipse.ocl.ecore.EcoreFactory
+@see org.eclipse.ocl.ecore
</body>
</html>
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/DefaultOppositeEndFinder.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/DefaultOppositeEndFinder.java
index 045b8fa..0e5b0cb 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/DefaultOppositeEndFinder.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/DefaultOppositeEndFinder.java
@@ -25,27 +25,25 @@
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
import org.eclipse.emf.ecore.xmi.impl.EMOFExtendedMetaData;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
import org.eclipse.ocl.ecore.internal.OCLEcorePlugin;
import org.eclipse.ocl.ecore.internal.OCLStatusCodes;
import org.eclipse.ocl.util.CollectionUtil;
/**
* Opposite references declared by the annotation detail
- * {@link EcoreEnvironment#PROPERTY_OPPOSITE_ROLE_NAME_KEY} on an
+ * {@link OppositeEndFinder#PROPERTY_OPPOSITE_ROLE_NAME_KEY} on an
* {@link EAnnotation} with {@link EAnnotation#getSource() source}
* {@link EMOFExtendedMetaData#EMOF_PACKAGE_NS_URI_2_0} are retrieved by
* scanning and caching the Ecore packages that this opposite end finder is
* aware of at the time of the request. The set of those packages is taken to be
- * the set of {@link EPackage}s resolved by an {@link EPackage.Registry}
- * provided to {@link #getInstance(Registry)}, or the default
- * {@link EPackage.Registry} otherwise. In particular, this won't load any Ecore
+ * the set of {@link EPackage}s resolved by an {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry}
+ * provided to {@link #getInstance(org.eclipse.emf.ecore.EPackage.Registry) getInstance(EPackage.Registry)}, or the default
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} otherwise. In particular, this won't load any Ecore
* bundles not yet loaded.
* <p>
*
@@ -53,7 +51,7 @@
* interface it is necessary to resolve a package in the registry on which this
* opposite end finder is based before issuing a request expecting to find
* hidden opposites from that package. This can, e.g., be triggered by calling
- * {@link EPackage.Registry#getEPackage(String)} for the package's URI.<p>
+ * {@link org.eclipse.emf.ecore.EPackage.Registry#getEPackage(String) EPackage.Registry.getEPackage(String)} for the package's URI.<p>
*
* Navigation across those references is performed either by
* {@link EObject#eContainer()} in case of containment references or by looking
@@ -66,7 +64,7 @@
* well-defined query scope and a corresponding query engine.<p>
*
* Instances of this class are cached in a {@link WeakHashMap}, keyed by the
- * {@link EPackage.Registry} object used for {@link #getInstance(Registry)}.
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} object used for {@link #getInstance(org.eclipse.emf.ecore.EPackage.Registry) getInstance(EPackage.Registry)}.
* This means that if the registry gets eligible for garbage collection then
* so will this opposite end finder.<p>
*
@@ -92,13 +90,13 @@
* resolved is compared to {@link #packages}. Packages that got resolved in the
* registry but weren't cached yet are cached before executing the request.
*/
- private final Registry registry;
+ private final EPackage.Registry registry;
/**
- * Scans all packages from the default {@link EPackage.Registry} that have already been
+ * Scans all packages from the default {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} that have already been
* loaded. While this is convenient, please keep in mind that this may be fairly random a
* definition of a package set as loading of packages happens on demand. You will get more
- * predictable results using {@link #getInstance(Set<EPackage>)}.
+ * predictable results using {@link #getInstance(org.eclipse.emf.ecore.EPackage.Registry) getInstance(EPackage.Registry)}.
*/
public static DefaultOppositeEndFinder getInstance() {
return getInstance(EPackage.Registry.INSTANCE);
@@ -108,7 +106,7 @@
* Scans all packages from the <code>registry</code> specified that have already been
* loaded. While this is convenient, please keep in mind that this may be fairly random a
* definition of a package set as loading of packages happens on demand. You will get more
- * predictable results using {@link #getInstance(Set<EPackage>)}.
+ * predictable results using {@link #getInstance(org.eclipse.emf.ecore.EPackage.Registry) getInstance(EPackage.Registry)}.
*/
public static DefaultOppositeEndFinder getInstance(EPackage.Registry registry) {
DefaultOppositeEndFinder result;
@@ -123,7 +121,7 @@
return result;
}
- public DefaultOppositeEndFinder(Registry registry) {
+ public DefaultOppositeEndFinder(EPackage.Registry registry) {
this.registry = registry;
this.packages = new HashSet<EPackage>();
this.oppositeCache = new HashMap<EClass, Map<String,Set<EReference>>>();
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/EcoreEnvironmentFactoryWithHiddenOpposites.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/EcoreEnvironmentFactoryWithHiddenOpposites.java
index 49281eb..43605b4 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/EcoreEnvironmentFactoryWithHiddenOpposites.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/EcoreEnvironmentFactoryWithHiddenOpposites.java
@@ -19,14 +19,14 @@
* An environment factory which can be used to provide a non-<code>null</code>
* {@link OppositeEndFinder} to the OCL environment. This enables lookup and
* evaluation of so-called "hidden opposites" which are represented by
- * annotations with key "Property.oppositeRoleName" on the forward reference
+ * annotations with key "Property#oppositeRoleName" on the forward reference
* and which allow for querying the opposite direction by simple dotted syntax
* and by cleanly providing a scope for the opposite lookup.<p>
*
* If no {@link OppositeEndFinder} is provided to a constructor, a
* {@link DefaultOppositeEndFinder} is used that is either specific to the
- * {@link EPackage.Registry registry} provided or that is aligned with the
- * default {@link EPackage.Registry#INSTANCE package registry}.
+ * {@link Registry registry} provided or that is aligned with the
+ * default {@link Registry#INSTANCE package registry}.
*
* @author Axel Uhl (auhl)
* @since 3.1
@@ -35,7 +35,7 @@
extends EcoreEnvironmentFactory {
/**
- * A default instance that works with the default {@link EPackage.Registry#INSTANCE package registry}.
+ * A default instance that works with the default {@link Registry#INSTANCE package registry}.
*/
public static final EcoreEnvironmentFactoryWithHiddenOpposites INSTANCE = new EcoreEnvironmentFactoryWithHiddenOpposites();
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/ExtentMap.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/ExtentMap.java
index 77f9947..82b078b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/ExtentMap.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/ExtentMap.java
@@ -17,6 +17,8 @@
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.ocl.ecore.OCL;
@@ -65,7 +67,7 @@
* by the underlying map, meaning that additions to <code>cls</code>'s extent add to the collection
* returned, and removals from the extent remove from the collection.
*
- * @param key
+ * @param cls
* a class in the model
*/
public Set<EObject> get(Object cls) {
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/OppositeEndFinder.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/OppositeEndFinder.java
index 2e02311..8f2fb52 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/OppositeEndFinder.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/OppositeEndFinder.java
@@ -11,6 +11,7 @@
package org.eclipse.ocl.ecore.opposites;
import java.lang.reflect.Constructor;
+import java.rmi.registry.Registry;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -21,21 +22,19 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.ETypedElement;
import org.eclipse.emf.ecore.xmi.impl.EMOFExtendedMetaData;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
import org.eclipse.ocl.ecore.delegate.OCLDelegateDomain;
/**
* Implementations shall be able to find and navigate "hidden references" on a classifier by name. Such references can be declared
- * by the annotation detail {@link EcoreEnvironment#PROPERTY_OPPOSITE_ROLE_NAME_KEY} on an {@link EAnnotation} with
+ * by the annotation detail {@link #PROPERTY_OPPOSITE_ROLE_NAME_KEY} on an {@link EAnnotation} with
* {@link EAnnotation#getSource() source} {@link EMOFExtendedMetaData#EMOF_PACKAGE_NS_URI_2_0} on an {@link EReference}, thus
* declaring the name for the otherwise non-existing opposite.<br>
* <b>ATTENTION</b><br>
* Per convention each {@link OppositeEndFinder implementation} must offer a {@code public} {@link Constructor constructor} with the
- * {@link EPackage.Registry registry} as {@link Constructor#getParameterTypes() parameter} to support loading by the
+ * {@link Registry registry} as {@link Constructor#getParameterTypes() parameter} to support loading by the
* {@link OCLDelegateDomain} and therefore link between ecore model and {@link OppositeEndFinder finder}.
*
* @author Axel Uhl
@@ -53,7 +52,7 @@
* Looks for {@link EReference}s whose {@link ETypedElement#getEType() type} is <code>classifier</code> or any of
* <code>classifier</code>'s super types and that owns an {@link EAnnotation annotation} with source
* {@link EMOFExtendedMetaData#EMOF_PACKAGE_NS_URI_2_0} containing a detail entry with key
- * {@link EcoreEnvironment#PROPERTY_OPPOSITE_ROLE_NAME_KEY} and the value equalling <code>name</code>. Such references are
+ * {@link #PROPERTY_OPPOSITE_ROLE_NAME_KEY} and the value equalling <code>name</code>. Such references are
* added to <code>ends</code>.
*/
void findOppositeEnds(EClassifier classifier, String name, List<EReference> ends);
@@ -62,7 +61,7 @@
* Finds all {@link EReference}s whose {@link ETypedElement#getEType() type} is <code>classifier</code> or any of
* <code>classifier</code>'s super types and that own an {@link EAnnotation annotation} with source
* {@link EMOFExtendedMetaData#EMOF_PACKAGE_NS_URI_2_0} containing a detail entry with key
- * {@link EcoreEnvironment#PROPERTY_OPPOSITE_ROLE_NAME_KEY}. The value of the annotation detail is entered into the resulting
+ * {@link #PROPERTY_OPPOSITE_ROLE_NAME_KEY}. The value of the annotation detail is entered into the resulting
* map as a key, the {@link EReference} on which the annotation was found is entered into the result map as the corresponding
* value.
* <p>
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/package.html b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/package.html
index e1550f4..861d8e3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/package.html
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/package.html
@@ -37,7 +37,7 @@
Java implementations, rather than defining additional operations using OCL).
</p>
<p>
-This package also extends the types of the OCL {@link org.eclipse.ocl.types Types}
+This package also extends the types of the OCL {@link org.eclipse.ocl.types.TypesPackage Types}
package to define the generalization relationships to the Ecore metamodel's
counterparts to the UML Classifier ({@link org.eclipse.emf.ecore.EClassifier})
and DataType ({@link org.eclipse.emf.ecore.EDataType}) metaclasses. This
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreSwitch.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreSwitch.java
index 37d9977..ef981f0 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreSwitch.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreSwitch.java
@@ -122,7 +122,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/package.html b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/package.html
index 88ee4bc..4690c1f 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/package.html
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/package.html
@@ -24,12 +24,12 @@
<h2>Package Specification</h2>
<p>
This package contains the EMF-generated utilities, such as the adapter factory
-and switch, for the {@link org.eclipse.ocl.ecore} package.
+and switch, for the {@link org.eclipse.ocl.ecore.EcorePackage org.eclipse.ocl.ecore} package.
</p>
-@see org.eclipse.ocl.ecore
@see org.eclipse.ocl.ecore.EcorePackage
@see org.eclipse.ocl.ecore.EcoreFactory
+@see org.eclipse.ocl.ecore
</body>
</html>
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/AbstractVisitor.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/AbstractVisitor.java
index c2d09d4..346eb36 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/AbstractVisitor.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/AbstractVisitor.java
@@ -45,7 +45,7 @@
/**
* Initializes me with an initial value for my result.
*
- * @param initialValue my initial result value
+ * @param result my initial result value
*/
protected AbstractVisitor(T result) {
super(result);
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/VisitorExtension.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/VisitorExtension.java
index 017ae9c..27372ee 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/VisitorExtension.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/VisitorExtension.java
@@ -19,7 +19,6 @@
* <!-- end-user-doc -->
*
*
- * @see org.eclipse.ocl.utilities.UtilitiesPackage#getVisitorExtension()
* @model interface="true" abstract="true"
*/
public interface VisitorExtension<T> {
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLSwitch.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLSwitch.java
index 42f2c98..88f2f41 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLSwitch.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLSwitch.java
@@ -125,7 +125,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java
index d005765..a784bf5 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java
@@ -1155,7 +1155,7 @@
* @param option the problem option
* @return whether I have a setting for it that is not OK
*
- * @see ProblemHandler.Severity#OK
+ * @see org.eclipse.ocl.lpg.ProblemHandler.Severity#OK
*/
public boolean notOK(Option<ProblemHandler.Severity> option) {
ProblemHandler.Severity sev = getValue(option);
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java
index 380480a..5b94dd6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java
@@ -912,8 +912,6 @@
* <tt>T</tt> or <tt>T2</tt>) against the source type of the operation or
* the type of the actual argument, as appropriate.
*
- * @param env
- * the OCL environment
* @param owner
* the operation source type
* @param paramType
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EnvironmentFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EnvironmentFactory.java
index cb31069..ee9cc9c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EnvironmentFactory.java
@@ -259,7 +259,7 @@
/**
* Creates an instance of the OCLFactoryWithHistory object for this environment.
*
- * @param environment an OCL environment (must not be <code>null</code>)
+ * @param env an OCL environment (must not be <code>null</code>)
*
* @return an OCLFactoryWithHistory instance for this environment
* @since 3.1
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeChecker.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeChecker.java
index 82df998..68db9e6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeChecker.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeChecker.java
@@ -294,7 +294,6 @@
*
* @param dynamicType
* @param staticOperation
- * @return
*/
O getDynamicOperation(C dynamicType, O staticOperation);
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTSwitch.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTSwitch.java
index c7506cd..2502022 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTSwitch.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTSwitch.java
@@ -105,7 +105,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsSwitch.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsSwitch.java
index 2cf7a86..bcd6a34 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsSwitch.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsSwitch.java
@@ -96,7 +96,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/package.html
index d555c7b..2527bcc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/package.html
@@ -23,12 +23,12 @@
<h2>Package Specification</h2>
<p>
This package contains the EMF-generated utilities, such as the adapter factory
-and switch, for the {@link org.eclipse.ocl.expressions} package.
+and switch, for the {@link org.eclipse.ocl.expressions.ExpressionsPackage Expressions} package.
</p>
-@see org.eclipse.ocl.expressions
@see org.eclipse.ocl.expressions.ExpressionsPackage
@see org.eclipse.ocl.expressions.ExpressionsFactory
+@see org.eclipse.ocl.expressions
</body>
</html>
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/CachedTypeChecker.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/CachedTypeChecker.java
index 77ff7a1..0e9cfbd 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/CachedTypeChecker.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/CachedTypeChecker.java
@@ -163,8 +163,7 @@
* Returns null if there is no operation or more than one.
*
* @param name2operationOrOperations
- * @param staticOperation
- * @return
+ * @param operation
*/
protected O getExactMatchingOperation(Map<String, Object> name2operationOrOperations, O operation) {
String requiredName = uml.getName(operation);
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java
index a5b23be..527c6fb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java
@@ -542,7 +542,7 @@
* Gets the name of a named <code>elem</code>ent with its initial character
* in lower case.
*
- * @param elem a named element
+ * @param name a named element
* @return the element's name, with an initial lower case letter
*/
public static String initialLower(String name) {
@@ -912,8 +912,6 @@
* @param constraintType the kind of constraint for which to get completion
* suggestions
* @param txt the string we got from client that contains the ocl expression
- * @param context the context classifier or operation to use for the ocl
- * expression parsing
* @return a list of {@link Choice}s representing the syntax help choices
* for the user; could be empty
*/
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java
index 20ac322..7af9832 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java
@@ -343,8 +343,8 @@
* within it using {@link #decodeEscapeSequence}.
*<p>
* For MDT/OCL 1.3.0 compatibility, a problem is reported if double
- * quotes are present and the {@link #ProblemOption.ELEMENT_NAME_QUOTE_ESCAPE}
- * severity is not {@link #ProblemHandler.Severity.OK}.
+ * quotes are present and the {@link ProblemOption#ELEMENT_NAME_QUOTE_ESCAPE}
+ * severity is not {@link ProblemHandler.Severity#OK}.
*
* @param token containing string to be decoded
* @return string value of <code>token</code> with escapes replaced
@@ -382,11 +382,11 @@
/**
* Removes any quotes surrounding the string value of a token
- * using {@link #unSingleQuote(String,int)} and optionally decode any
+ * using {@link #unSingleQuote(String)} and optionally decode any
* escape sequences within it using {@link #decodeEscapeSequence}.
*<p>
* For MDT/OCL 1.3.0 compatibility, escape sequences conversion can be disabled
- * by resetting {@link #ParsingOption.USE_BACKSLASH_ESCAPE_PROCESSING}.
+ * by resetting {@link ParsingOptions#USE_BACKSLASH_ESCAPE_PROCESSING}.
*
* @param token containing string to be decoded
* @return string value of <code>token</code> with escapes replaced
@@ -595,7 +595,7 @@
/**
* Return the value of the next character if it is an octal character.
*
- * @param c potentially octal character
+ * @param i potentially octal character
* @return the hex value or -1 if the next character is not a octal character
* @since 3.0
*/
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EvaluationOptions.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EvaluationOptions.java
index 5a00c0a..f3a6b23 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EvaluationOptions.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EvaluationOptions.java
@@ -118,7 +118,7 @@
* @param option the option
* @param value the option's value
*
- * @see Cusotmizable#setOption(Option, Object)
+ * @see Customizable#setOption(Option, Object)
*/
public static <T> void setOption(EvaluationEnvironment<?, ?, ?, ?, ?> env,
Option<T> option, T value) {
@@ -133,7 +133,7 @@
* Obtains the value of the specified option's setting in the the given
* environment's options map, adapting the environment as necessary to the
* {@link Customizable} API. If not already set, return the option's
- * {@linkplain #getDefaultValue() default value}.
+ * {@linkplain Option#getDefaultValue() default value}.
*
* @param env an evaluation environment on which to query an option
* @param option an option to query
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ParsingOptions.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ParsingOptions.java
index 4d41db5..39c0047 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ParsingOptions.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ParsingOptions.java
@@ -13,6 +13,7 @@
package org.eclipse.ocl.options;
+import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
import org.eclipse.ocl.Environment;
import org.eclipse.ocl.lpg.BasicEnvironment;
import org.eclipse.ocl.util.OCLUtil;
@@ -91,7 +92,7 @@
/**
* <p>
* Static instance for the implicit-root-class option token. It is returned
- * via an unchecked cast by the {@link #implicitRootClass()} method.
+ * via an unchecked cast by the {@link #implicitRootClass(Environment)} method.
* </p>
*/
public static final Option<?> IMPLICIT_ROOT_CLASS =
@@ -151,7 +152,7 @@
* root environment is created with a fresh
* {@link EPackageRegistryImpl#EPackageRegistryImpl() registry} that is
* populated with the packages required, e.g., by copying all contents
- * of the {@link EPackage.Registry#INSTANCE default package registry}
+ * of the {@link org.eclipse.emf.ecore.EPackage.Registry#INSTANCE default package registry}
* using {@link java.util.Map#putAll(java.util.Map)}. Note, that this
* will copy unresolved package descriptors to the new registry without
* resolving them.
@@ -164,7 +165,7 @@
/**
* <p>
* Static instance for the lookup-package-by-aliase option token. It is returned
- * via an unchecked cast by the {@link #implicitRootClass()} method.
+ * via an unchecked cast by the {@link #implicitRootClass(Environment)} method.
* </p>
* @since 3.1
*/
@@ -285,7 +286,7 @@
* @param option the option
* @param value the option's value
*
- * @see Cusotmizable#setOption(Option, Object)
+ * @see Customizable#setOption(Option, Object)
*/
public static <T> void setOption(Environment<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?> env,
Option<T> option, T value) {
@@ -303,7 +304,7 @@
* Obtains the value of the specified option's setting in the the given
* environment's options map, adapting the environment as necessary to the
* {@link Customizable} API. If not already set, return the option's
- * {@linkplain #getDefaultValue() default value}.
+ * {@linkplain Option#getDefaultValue() default value}.
*
* @param env an environment on which to query an option
* @param option an option to query
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLAnalyzer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLAnalyzer.java
index 64fbfb2..7a75a12 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLAnalyzer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLAnalyzer.java
@@ -481,8 +481,6 @@
* the rule that we are matching
* @param acc
* the association class call expression
- * @param cstNode
- * context of the call
*/
protected void checkNotReflexive(
Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env,
@@ -960,8 +958,6 @@
* the <code>PrePostOrBodyDeclCS</code> <code>CSTNode</code>
* @param env
* the OCL environment
- * @param operation
- * the context <code>EOperation</code>
* @return the parsed <code>Constraint</code>
*/
protected CT prePostOrBodyDeclCS(
@@ -1230,8 +1226,6 @@
* the <code>InitOrDerValueCS</code> <code>CSTNode</code>
* @param env
* the OCL environment
- * @param property
- * the context <code>EStructuralFeature</code>
* @return the parsed <code>Constraint</code>
*/
protected CT initOrDerValueCS(
@@ -1324,10 +1318,6 @@
* the package environment
* @param constraints
* the constraints list to populate
- *
- * @param the
- * classifier context environment, or <code>null</code> of the
- * classifier could not be resolved
*/
protected Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> classifierContextDeclCS(
ClassifierContextDeclCS classifierContextDeclCS,
@@ -2068,8 +2058,8 @@
*
* @since 1.3
*/
- protected boolean isAtPre(VariableExpCS callExp) {
- IsMarkedPreCS atPre = callExp.getIsMarkedPreCS();
+ protected boolean isAtPre(VariableExpCS variableExp) {
+ IsMarkedPreCS atPre = variableExp.getIsMarkedPreCS();
return atPre != null;
}
@@ -3227,9 +3217,6 @@
* the <code>VariableDeclarationCS</code> <code>CSTNode</code>
* @param env
* the OCL environment
- * @param addToEnvironment
- * boolean whether or not to add the the parsed variable to the
- * environment
* @return the parsed <code>VariableDeclaration</code>
*/
protected TupleLiteralPart<C, P> tupleLiteralPartCS(
@@ -3278,14 +3265,14 @@
* @return the parsed <code>EnumLiteralExp</code>
*/
- protected TypeExp<C> typeCS(CSTNode cstNode,
+ protected TypeExp<C> typeCS(CSTNode enumLiteralExpCS,
Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env,
C type) {
TypeExp<C> astNode = oclFactory.createTypeExp();
- initASTMapping(env, astNode, cstNode, null);
+ initASTMapping(env, astNode, enumLiteralExpCS, null);
astNode.setReferredType(type);
- astNode.setType(getTypeType(cstNode, env, type));
+ astNode.setType(getTypeType(enumLiteralExpCS, env, type));
return astNode;
}
@@ -4634,12 +4621,12 @@
/**
* Creates a dummy expression of invalid-literal type to be a placeholder
* for a (sub)expression that could not be parsed. The resulting expression
- * is {@linkplain #markAsErrorNode(OCLExpression) marked} as an error
+ * is {@linkplain #markAsErrorNode(TypedElement) marked} as an error
* place-holder expression.
*
* @return the dummy invalid-literal expression
*
- * @see #markAsErrorNode(OCLExpression)
+ * @see #markAsErrorNode(TypedElement)
*
* @deprecated Use the
* {@link #createDummyInvalidLiteralExp(Environment, CSTNode)}
@@ -4658,7 +4645,7 @@
/**
* Creates a dummy expression of invalid-literal type to be a placeholder
* for a (sub)expression that could not be parsed. The resulting expression
- * is {@linkplain #markAsErrorNode(OCLExpression) marked} as an error
+ * is {@linkplain #markAsErrorNode(TypedElement) marked} as an error
* place-holder expression.
*
* @param env
@@ -4668,7 +4655,7 @@
*
* @return the dummy invalid-literal expression
*
- * @see #markAsErrorNode(OCLExpression)
+ * @see #markAsErrorNode(TypedElement)
* @see #createDummyInvalidLiteralExp()
*
* @since 1.3
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLParser.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLParser.java
index 10b0d95..4e0676f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLParser.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLParser.java
@@ -185,7 +185,7 @@
* true for a static constraint
* @param simpleNameCS
* the concrete syntax of the constraint name
- * @param oclExpressionCS
+ * @param defExpressionCS
* the concrete syntax of the constraint expression
*
* @return the concrete syntax of the definition constraint
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLFactoryWithHistory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLFactoryWithHistory.java
index 2c2e5d3..f8f2abf 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLFactoryWithHistory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLFactoryWithHistory.java
@@ -56,7 +56,7 @@
* A wrapper for {@link OCLFactory}s that records a history of the objects
* created by it. This is useful in case any objects that were created ended
* up not being used, because an error occurred in parsing, and thus need to
- * be {@linkplain ObjectUtil#dispose() disposed).
+ * be {@linkplain ObjectUtil#dispose(Object) disposed}.
*
* @author Christian W. Damus (cdamus)
*
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.java
index a09bcf8..054c6bb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.java
@@ -308,7 +308,7 @@
* you should do <code>getRhsTokenText(i)</code>
* </p>
* @param i the right hand side token index
-* @result the text of the correspondent right hand side IToken.
+* @return the text of the correspondent right hand side IToken.
*/
@Deprecated
protected String getTokenText(int i) {
@@ -319,7 +319,7 @@
* A convenience method to obtain the text of a right hand side IToken.
*
* @param i the right hand side token index
-* @result the text of the correspondent right hand side IToken.
+* @return the text of the correspondent right hand side IToken.
*
* @since 3.0
*/
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/ValidationVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/ValidationVisitor.java
index 55da698..089b548 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/ValidationVisitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/ValidationVisitor.java
@@ -131,7 +131,7 @@
*
* @param problemObject The object being validated, may be null if unknown
* @param problemMessage The problem with problemObject
- * @param validationContext Optional context of the validator, may be null
+ * @param problemContext Optional context of the validator, may be null
*
* @return TRUE always, since a validation error has been reported.
*/
@@ -1315,7 +1315,7 @@
*
* @param exp the model property call expression to validate
*
- * @Return true if validation must terminate due to an error
+ * @return true if validation must terminate due to an error
* @since 3.1
*/
public Boolean visitFeatureCallExp(FeatureCallExp<C> exp) {
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.java
index 9e2999b..b34dce2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.java
@@ -313,7 +313,7 @@
* you should do <code>getRhsTokenText(i)</code>
* </p>
* @param i the right hand side token index
-* @result the text of the correspondent right hand side IToken.
+* @return the text of the correspondent right hand side IToken.
*/
@Deprecated
protected String getTokenText(int i) {
@@ -324,7 +324,7 @@
* A convenience method to obtain the text of a right hand side IToken.
*
* @param i the right hand side token index
-* @result the text of the correspondent right hand side IToken.
+* @return the text of the correspondent right hand side IToken.
*
* @since 3.0
*/
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesSwitch.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesSwitch.java
index cbeb693..36d7078 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesSwitch.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesSwitch.java
@@ -74,7 +74,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/package.html
index 19b3cf4..fa9a6f7 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/package.html
@@ -23,12 +23,12 @@
<h2>Package Specification</h2>
<p>
This package contains the EMF-generated utilities, such as the adapter factory
-and switch, for the {@link org.eclipse.ocl.types} package.
+and switch, for the {@link org.eclipse.ocl.types.TypesPackage types} package.
</p>
-@see org.eclipse.ocl.types
@see org.eclipse.ocl.types.TypesPackage
@see org.eclipse.ocl.types.TypesFactory
+@see org.eclipse.ocl.types
</body>
</html>
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLUtil.java
index 20d5fde..03c75b9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLUtil.java
@@ -75,7 +75,7 @@
* intrinsically adaptable to this interface it is forcibly adapted to
* the {@link BasicEnvironment} protocol</li>
* <li>{@link ProblemHandler}</li>
- * <li>{@link Environment.Lookup}</li>
+ * <li>{@link org.eclipse.ocl.Environment.Lookup Environment.Lookup}</li>
* </ul>
*
* @param <T> the requested adapter interface
@@ -230,7 +230,7 @@
* environment factories that do not adapt to the following interfaces,
* this method will provide a default implementation for convenience:
* <ul>
- * <li>{@link EnvironmentFactory.Lookup}</li>
+ * <li>{@link org.eclipse.ocl.EnvironmentFactory.Lookup EnvironmentFactory.Lookup}</li>
* </ul>
*
* @param <T> the requested adapter interface
@@ -426,7 +426,7 @@
*
* @return the environment, or <code>null</code> if none can be found
*
- * @see Environment.Registry
+ * @see org.eclipse.ocl.Environment.Registry
*/
public static <PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E>
Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> getValidationEnvironment(
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ExpressionInOCL.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ExpressionInOCL.java
index 7863280..15ab2c3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ExpressionInOCL.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ExpressionInOCL.java
@@ -134,7 +134,7 @@
/**
* Returns the value of the '<em><b>Generated Type</b></em>' containment reference list.
- * The list contents are of type {@link C}.
+ * The list contents are of type C.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Generated Type</em>' containment reference list isn't clear,
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesSwitch.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesSwitch.java
index 4208fa3..b94dd3a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesSwitch.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesSwitch.java
@@ -63,7 +63,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/releng/org.eclipse.ocl.releng.buckminster/.gitignore b/releng/org.eclipse.ocl.releng.buckminster/.gitignore
new file mode 100644
index 0000000..1910f62
--- /dev/null
+++ b/releng/org.eclipse.ocl.releng.buckminster/.gitignore
@@ -0,0 +1 @@
+/javadoc/
diff --git a/releng/org.eclipse.ocl.releng.buckminster/javadoc.ant b/releng/org.eclipse.ocl.releng.buckminster/javadoc.ant
index fd6bfac..0a69888 100644
--- a/releng/org.eclipse.ocl.releng.buckminster/javadoc.ant
+++ b/releng/org.eclipse.ocl.releng.buckminster/javadoc.ant
@@ -48,17 +48,19 @@
<exclude name="**/org/eclipse/ocl/examples/project/**"/>
</fileset>
<excludepackage name="org.osgi.framework"/>
+ <tag name="extends"></tag>
<tag name="generated" description="Generated"></tag>
+ <tag name="implements"></tag>
<tag name="model" description="Model"></tag>
<tag name="noextend"></tag>
<tag name="noimplement"></tag>
<tag name="noinstantiate"></tag>
+ <tag name="nooverride"></tag>
<tag name="noreference"></tag>
<tag name="ordered" description="Ordered"></tag>
- <tag name="Override" description="FiXME typo"></tag>
- <tag name="parameter" description="FiXME typo"></tag>
- <tag name="result" description="FiXME typo"></tag>
- <tag name="Return" description="FiXME typo"></tag>
+ <tag name="Override"></tag>
+ <tag name="SuppressWarnings"></tag>
+ <tag name="wbp.parser.entryPoint"></tag>
</javadoc>
<!-- Compress the output javadoc in a zip file -->
diff --git a/releng/org.eclipse.ocl.releng.buckminster/javadoc/.gitignore b/releng/org.eclipse.ocl.releng.buckminster/javadoc/.gitignore
deleted file mode 100644
index 303f8e3..0000000
--- a/releng/org.eclipse.ocl.releng.buckminster/javadoc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/org/
-/resources/
-/*.css
-/*.html
-/*.zip
-/package-list
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanySwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanySwitch.java
index f635c6e..e23d7ff 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanySwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanySwitch.java
@@ -61,7 +61,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestSwitch.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestSwitch.java
index 12e433a..31d8f51 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestSwitch.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestSwitch.java
@@ -54,7 +54,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2Switch.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2Switch.java
index e89f257..9f88cf3 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2Switch.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2Switch.java
@@ -53,7 +53,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanySwitch.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanySwitch.java
index 8a3f44d..84bdaee 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanySwitch.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanySwitch.java
@@ -48,7 +48,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/company/util/CompanySwitch.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/company/util/CompanySwitch.java
index 7601be9..594bd83 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/company/util/CompanySwitch.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/company/util/CompanySwitch.java
@@ -49,7 +49,7 @@
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
