diff options
author | Ed Willink | 2016-05-23 19:14:15 +0000 |
---|---|---|
committer | Ed Willink | 2016-05-23 19:14:15 +0000 |
commit | b95f176b2aa43c70500d05aa320e9051a9b5db21 (patch) | |
tree | 7d4f7712bb62e1479981f67de10f0b683fb244d6 | |
parent | cb105ee8a48f031752709b6b743f3de60934cdde (diff) | |
download | org.eclipse.ocl-b95f176b2aa43c70500d05aa320e9051a9b5db21.tar.gz org.eclipse.ocl-b95f176b2aa43c70500d05aa320e9051a9b5db21.tar.xz org.eclipse.ocl-b95f176b2aa43c70500d05aa320e9051a9b5db21.zip |
[releng] Fix many Java doc issues, including CCE on
template-parameter-method
37 files changed, 49 insertions, 64 deletions
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/CodeGenHelper.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/CodeGenHelper.java index 19aaea6e4d..6321bf6cfe 100644 --- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/CodeGenHelper.java +++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/CodeGenHelper.java @@ -26,7 +26,7 @@ public interface CodeGenHelper @NonNull String getCopyright(@NonNull String indentation); /** - * Return the <%...%> escaped name for a type. + * Return the <%...%> escaped name for a type. */ @Nullable LibraryOperation loadClass(@NonNull ExpressionInOCL query, @NonNull File targetFolder, @NonNull String packageName, @NonNull String className, boolean saveSource) throws Exception; 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 c244c12eb5..702f1c3dc9 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 @@ -67,7 +67,7 @@ public interface TypeDescriptor /** * Append cgValue to js casting an internally typed Ecore value to requiredClassName. This is primarily used to - * cast a {@link List<...>} to an {@link EList<...>}. The default just appends the value name of cgValue. + * cast a List<...> to an EList<...>. The default just appends the value name of cgValue. */ void appendEcoreValue(@NonNull JavaStream js, @NonNull String requiredClassName, @NonNull CGValuedElement cgValue); @@ -114,7 +114,7 @@ public interface TypeDescriptor @NonNull EcoreDescriptor getEcoreDescriptor(@NonNull CodeGenerator codeGenerator, @Nullable Class<?> instanceClass); /** - * Return the basic Java class for this descriptor. e.g. {@link List<?>} for an unboxed collection. + * Return the basic Java class for this descriptor. e.g. List<?> for an unboxed collection. */ @NonNull Class<?> getJavaClass(); @@ -131,7 +131,7 @@ public interface TypeDescriptor @NonNull UnboxedDescriptor getUnboxedDescriptor(@NonNull CodeGenerator codeGenerator); /** - * Return the basic Java class for this descriptor. e.g. {@link List<?>} for an unboxed collection. + * Return the basic Java class for this descriptor. e.g. List<?> for an unboxed collection. * Returns null for no Java class known. */ @Nullable Class<?> hasJavaClass(); diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java index 99e042fb76..7af7ada96e 100644 --- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java +++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java @@ -325,7 +325,7 @@ public class OCLinEcoreTablesUtils /** * Rewrite double imports to suit the EMF generators. If importManager is null, as is the case * since it is not obvious how to re-use the ImportManager between the OCL pre-generate and the Ecore generate - * sessions, an import such as <%x.y.@p.q z%> is chnaged to x.y.@<%p.q%> z so that the @p.q gets handler by + * sessions, an import such as <%x.y.@p.q z%> is chnaged to x.y.@<%p.q%> z so that the @p.q gets handler by * the Ecore ImportmManager. If importManager is non-null both imports are shortened. */ public @NonNull String rewriteManagedImports(@NonNull String source) 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 0a86ac88de..da3cba18e7 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 @@ -339,7 +339,7 @@ public abstract class InternalDebuggableExecutor * Attempts to load the transformation referred by this executor and checks * if it is valid for execution. * <p> - * <b>Remark:</b></br> Only the first performs the actual transformation + * <b>Remark:</b><br> Only the first performs the actual transformation * loading, subsequent calls to this method will return the existing * diagnostic. * diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLQueryDelegate.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLQueryDelegate.java index 5781219132..f456ebe4a4 100644 --- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLQueryDelegate.java +++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLQueryDelegate.java @@ -34,7 +34,6 @@ import org.eclipse.ocl.pivot.internal.delegate.OCLQueryDelegateFactory; import org.eclipse.ocl.pivot.internal.messages.PivotMessagesInternal; import org.eclipse.ocl.pivot.utilities.ClassUtil; import org.eclipse.ocl.pivot.utilities.OCL; -import org.eclipse.ocl.pivot.utilities.ParserException; import org.eclipse.ocl.pivot.utilities.Query; import org.eclipse.ocl.pivot.utilities.SemanticException; import org.eclipse.ocl.pivot.utilities.StringUtil; @@ -63,9 +62,6 @@ public class OCLQueryDelegate implements QueryDelegate * name and types of variables used in my expression * @param expression * the expression that I handle - * - * @throws ParserException - * if the expression is invalid */ public OCLQueryDelegate(@NonNull OCLDelegateDomain delegateDomain, @NonNull EClassifier context, @Nullable Map<String, EClassifier> parameters, @NonNull String expression) { this.delegateDomain = delegateDomain; 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 176e677cb6..1aa1de97e5 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 @@ -183,8 +183,8 @@ public interface AbstractNode extends EObject { @NonNull AbstractNode @NonNull [] getVisibleChildren(); /** - * Update the grayed status of this node and all its descendants, returning >0 if this node and its children are consistently enabled, - * <0 is consistently disbaled and 0 otherwise. + * Update the grayed status of this node and all its descendants, returning >0 if this node and its children are consistently enabled, + * <0 is consistently disbaled and 0 otherwise. */ int refreshGrayed(); 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 5c90860b70..0147a87445 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 @@ -31,7 +31,6 @@ public interface IValidityExporter extends IValidityExporterDescriptor * The Root Node to export * @param fileName * The target file name or null if not known and not to be reported - * @throws IOException */ @NonNull String export(@NonNull RootNode rootNode, @Nullable String fileName); diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ConstrainingURI.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ConstrainingURI.java index d34f89633a..83d8694771 100644 --- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ConstrainingURI.java +++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ConstrainingURI.java @@ -23,7 +23,6 @@ public final class ConstrainingURI implements Comparable<ConstrainingURI> { /** * It is possible to have multiple "identical" contexts defined in an OCL file : - * <p> * <pre> * context EClass * inv invariant1 : not name.oclIsUndefined() @@ -31,7 +30,6 @@ public final class ConstrainingURI implements Comparable<ConstrainingURI> * context EClass * inv invariant2 : if interface then name.startsWith('I') else true endif; * </pre> - * </p> * * 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. 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 8d2ebb6eeb..1db687beab 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 @@ -55,7 +55,7 @@ public abstract class AbstractPathCache<StepType> { * * <pre> * let a:Tuple{x1:X=self.myX1, x2:X=self.myX2} in - * Set{a.x1, a.x2}->collect(x | x.name) + * Set{a.x1, a.x2}->collect(x | x.name) * </pre> * * If this expression is analyzed for an attribute change event of an <tt>X.name</tt>, the iterator variable <tt>x</tt> is @@ -72,7 +72,7 @@ public abstract class AbstractPathCache<StepType> { * literal part names on the "stack" as the one cached. * <p> * - * The <tt>List<String></tt> element of the key pair may be <tt>null</tt>. It <em>must</em> be <tt>null</tt> instead of + * The <tt>List<String></tt> element of the key pair may be <tt>null</tt>. It <em>must</em> be <tt>null</tt> instead of * passing an empty list to avoid ambiguities. */ private final Map<Pair<OCLExpression, List<String>>, StepType> subexpressionToPath = new HashMap<Pair<OCLExpression, List<String>>, StepType>(); @@ -116,9 +116,9 @@ public abstract class AbstractPathCache<StepType> { /** * Also adds <code>path</code> to {@link #allSteps}. If the source type is <code>null</code> and the step is not * absolute, this path cache registers as a listener on the step (see - * {@link StepType#addSourceTypeChangeListener(SourceTypeChangeListener)}. If the target type is <code>null</code>, this + * <code>StepType.addSourceTypeChangeListener(SourceTypeChangeListener)</code>. If the target type is <code>null</code>, this * path cache registers as target type listener on the step (see - * {@link StepType#addTargetTypeChangeListener(TargetTypeChangeListener)}. If the step is not marked as always empty, + * <code>StepType.addTargetTypeChangeListener(TargetTypeChangeListener)</code>. If the step is not marked as always empty, * this path cache registers as listener for a change in the step's always-empty setting. If any of these change events are * received, the respective step is re-hashed into {@link #allSteps}. */ diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TracebackCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TracebackCache.java index 12a0524c24..e43156b6f4 100644 --- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TracebackCache.java +++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TracebackCache.java @@ -36,7 +36,7 @@ import org.eclipse.ocl.examples.impactanalyzer.util.Tuple.Pair; * * Variable values are valid only in a scope, called a "dynamic scope." While syntactically the variable's static scope is limited * to a certain {@link OCLExpression}, e.g., the {@link LetExp#getIn() in} expression of a - * <code>let<code> expression for the variable defined by the <code>let</code> expression, the same expression may be evaluated + * <code>let</code> expression for the variable defined by the <code>let</code> expression, the same expression may be evaluated * several times during the evaluation of some other expression. Each evaluation of the static scope expression represents a * dynamic scope for the variables whose static scope is being evaluated. * <p> @@ -68,7 +68,7 @@ import org.eclipse.ocl.examples.impactanalyzer.util.Tuple.Pair; * iterator variable expression to the {@link LoopExp}'s source expression, all kinds of in-between expressions that are containers to * the iterator variable expression are left as well. Therefore, the common container of the from/to expressions needs to be * determined, and all variables whose static scope is any of from, or any of from's direct or transitive containers that - * are still contained (directly or transitively) in the common container of from/to, are considered out of scope.<p> + * are still contained (directly or transitively) in the common container of from/to, are considered out of scope.</p> * * @author Axel Uhl (D043530) * 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 7b66592c03..23b8619654 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 @@ -27,7 +27,7 @@ import org.eclipse.ocl.ecore.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} + * 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/console/OCLResource.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLResource.java index fcaaaf64f8..f06a55b317 100644 --- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLResource.java +++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLResource.java @@ -97,7 +97,7 @@ public class OCLResource * * @throws RuntimeException if anything goes wrong in parsing * @throws IOException if anything goes wrong in saving - * @throws OCLParsingException if anything goes wrong in parsing + * @throws ParserException if anything goes wrong in parsing */ public static void save(String path, OCLDocument document, String expression) throws IOException, ParserException { 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 96254ebbf1..f747dc0974 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 @@ -69,7 +69,7 @@ public class AbstractVisitor<T> * its source and qualifiers (if any). Note that in the case of a opposite property * call expression as a qualifier of an association class call, the * opposite property call does not have a source and, therefore, the - * <code>sourceResult</tt> will be <code>null</code> in that case. + * <code>sourceResult</code> will be <code>null</code> in that case. * * @param callExp the opposite property call expression * @param sourceResult the result of visiting the expression's source diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUseSwitch.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUseSwitch.java index 49e4845b87..4df3e330fc 100644 --- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUseSwitch.java +++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUseSwitch.java @@ -602,7 +602,7 @@ public class UML2ASUseSwitch extends UMLSwitch<Object> } /** - * @Deprecated no longer used + * @deprecated no longer used */ @Deprecated public org.eclipse.uml2.uml.@Nullable Property getOtherEnd(@NonNull List<org.eclipse.uml2.uml.Property> umlMemberEnds, org.eclipse.uml2.uml.@NonNull Property umlProperty) { diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IterationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IterationManager.java index 131b631ebc..f7ac2826ff 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IterationManager.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IterationManager.java @@ -55,7 +55,6 @@ public interface IterationManager * <br> * This is used by non-iterate iteration that intervene between the body evaluation * and accumulator update. - * @throws Exception */ @Nullable Object evaluateBody(); @@ -88,13 +87,12 @@ public interface IterationManager boolean hasCurrent(); /** - * Update the accumulator witrh the result of a body iteration. + * Update the accumulator with the result of a body iteration. * <br> * This implements the body of an iterate iteration for which the accumulator value may * be assigned to a completely independent value. * * Returns null for the iteration to continue, non-null to terminate. - * @throws Exception * @throws InvalidValueException */ @Nullable Object updateAccumulator(Object newValue); diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/HTMLBuffer.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/HTMLBuffer.java index 0271ecb138..3b3e009904 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/HTMLBuffer.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/HTMLBuffer.java @@ -82,14 +82,14 @@ public class HTMLBuffer } /** - * End a colored font by emitting a </font> tag. + * End a colored font by emitting a </font> tag. */ public void endFontColor() { appendUntag("font"); } /** - * End a tagged font by emitting a </fontName> tag. + * End a tagged font by emitting a </fontName> tag. */ public void endFontName(String fontName) { appendUntag(fontName); @@ -104,7 +104,7 @@ public class HTMLBuffer } /** - * End a paragraph by emitting a </p> tag, unless no paragraph is active. + * End a paragraph by emitting a </p> tag, unless no paragraph is active. */ public void endParagraph() { if (inPara) { @@ -114,7 +114,7 @@ public class HTMLBuffer } /** - * End underlining by emitting a </u> tag. + * End underlining by emitting a </u> tag. */ public void endUnderline() { appendUntag("u"); @@ -126,14 +126,14 @@ public class HTMLBuffer } /** - * Start a colored font by emitting a <font color="colorName"> tag. + * Start a colored font by emitting a <font color="colorName"> tag. */ public void startFontColor(String colorName) { appendTag("font color=\"" + colorName + "\""); } /** - * Start a tagged font by emitting a <fontName> tag. + * Start a tagged font by emitting a <fontName> tag. */ public void startFontName(String fontName) { appendTag(fontName); @@ -148,7 +148,7 @@ public class HTMLBuffer } /** - * Start a paragraph by emitting a <p> tag, unless a paragraph is already active. + * Start a paragraph by emitting a <p> tag, unless a paragraph is already active. */ public void startParagraph() { if (!inPara) { @@ -158,7 +158,7 @@ public class HTMLBuffer } /** - * Start underlining by emitting a <u> tag. + * Start underlining by emitting a <u> tag. */ public void startUnderline() { appendTag("u"); diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SequenceValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SequenceValueImpl.java index c29a0c7026..02db10adad 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SequenceValueImpl.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SequenceValueImpl.java @@ -305,7 +305,7 @@ public abstract class SequenceValueImpl extends CollectionValueImpl implements S /** * Implementation of the OCL - * <tt>Sequence::subSequence(lower : Integer, upper : Integer) : Sequence(T)</tt></li> + * <tt>Sequence::subSequence(lower : Integer, upper : Integer) : Sequence(T)</tt> * operation. * * @param lower the 1-based (in OCL fashion) inclusive lower bound diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIteration.java index 921981aca7..158f5d0236 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIteration.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIteration.java @@ -61,7 +61,6 @@ public abstract class AbstractIteration extends AbstractFeature implements Libra * <p> * Derived classes may override this method to change the iteration algorithm or override * the call-backs to customize the default iteration. - * @throws Exception */ @Override public @Nullable Object evaluateIteration(@NonNull IterationManager iterationManager) { @@ -102,7 +101,6 @@ public abstract class AbstractIteration extends AbstractFeature implements Libra * * @param iterationManager the iteration context * @return non-CARRY_ON premature result of iteration, or CARRY_ON if complete - * @throws Exception */ protected abstract @Nullable Object updateAccumulator(@NonNull IterationManager iterationManager); } diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryIteration.java index 1b2f2fc057..88b65dd8e2 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryIteration.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryIteration.java @@ -42,7 +42,6 @@ public interface LibraryIteration extends LibraryFeature * * @param iterationManager the iteration space * @return the result - * @throws Exception * * @throws InvalidValueException if a body evaluates to invalid */ diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryProperty.java index a485fefe4c..346512be1a 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryProperty.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryProperty.java @@ -28,9 +28,6 @@ public interface LibraryProperty extends LibraryFeature */ public interface LibraryPropertyExtension extends LibraryProperty { - /** - * @throws Exception - */ @Nullable Object evaluate(@NonNull Executor executor, @NonNull TypeId returnTypeId, @Nullable Object sourceValue); } diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ClosureIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ClosureIteration.java index 627fe368f1..3e3a671733 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ClosureIteration.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ClosureIteration.java @@ -47,7 +47,6 @@ public class ClosureIteration extends AbstractIteration /** * Recursively evaluates the iterator body expression. - * @throws Exception */ @Override protected @Nullable Object updateAccumulator(@NonNull IterationManager iterationManager) { diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanEqualOperation.java index 529c240d22..5509e3a6de 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanEqualOperation.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanEqualOperation.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.ocl.pivot.library.AbstractSimpleBinaryOperation; /** - * StringGreaterThanEqualOperation realises the String::>=() library operation. + * StringGreaterThanEqualOperation realises the String::>=() library operation. */ public class StringGreaterThanEqualOperation extends AbstractSimpleBinaryOperation { diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanOperation.java index 9b2fa9fa37..3987cfa00b 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanOperation.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanOperation.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.ocl.pivot.library.AbstractSimpleBinaryOperation; /** - * StringGreaterThanOperation realises the String::>() library operation. + * StringGreaterThanOperation realises the String::>() library operation. */ public class StringGreaterThanOperation extends AbstractSimpleBinaryOperation { diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanEqualOperation.java index 6093db7f6f..5d560140fd 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanEqualOperation.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanEqualOperation.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.ocl.pivot.library.AbstractSimpleBinaryOperation; /** - * StringLessThanEqualOperation realises the String::<=() library operation. + * StringLessThanEqualOperation realises the String::<=() library operation. */ public class StringLessThanEqualOperation extends AbstractSimpleBinaryOperation { diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanOperation.java index fe4dcd07a9..36002dbabe 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanOperation.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanOperation.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.ocl.pivot.library.AbstractSimpleBinaryOperation; /** - * StringLessThanOperation realises the String::<() library operation. + * StringLessThanOperation realises the String::<() library operation. */ public class StringLessThanOperation extends AbstractSimpleBinaryOperation { diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ClassUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ClassUtil.java index 82dcc9e8fd..d1ffa0d43e 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ClassUtil.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ClassUtil.java @@ -96,7 +96,7 @@ public class ClassUtil /** * Return the non-null adapterClass if iAdfaptable has an adapterClass adapter. * - * This method just delegates to IAdaptable.getAdapter() but avoids the hazard from the unconstrained Class<T> declaration. + * This method just delegates to IAdaptable.getAdapter() but avoids the hazard from the unconstrained Class<T> declaration. * * @since 1.1 */ diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java index a1ea17ee21..bf02a9c239 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java @@ -950,7 +950,7 @@ public class PivotUtil } /** - * Return true if type uses an aggregate (->) rather than object (.) navigation operator. + * Return true if type uses an aggregate (->) rather than object (.) navigation operator. */ public static boolean isAggregate(Type type) { return (type instanceof CollectionType) || (type instanceof MapType); diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ToStringVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ToStringVisitor.java index 1fbd6ea07f..ccd4c73410 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ToStringVisitor.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ToStringVisitor.java @@ -968,7 +968,7 @@ public class ToStringVisitor extends AbstractExtendingVisitor<@Nullable String, /** * Callback for an OperationCallExp visit. * - * Look at the source to determine operator ( -> or . ) + * Look at the source to determine operator ( -> or . ) * * @param oc * the operation call expression diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Value.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Value.java index 35dbf70918..a237573835 100644 --- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Value.java +++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Value.java @@ -73,7 +73,7 @@ public interface Value * <p> * Java-null for a null OCL value * <p> - * Objects for other things, List<?> for collections + * Objects for other things, List<?> for collections * * @generated NOT */ diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSLeft2RightVisitor.java index 3f0b00ab5d..0501e74ae6 100644 --- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSLeft2RightVisitor.java +++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSLeft2RightVisitor.java @@ -272,7 +272,7 @@ public class EssentialOCLCSLeft2RightVisitor extends AbstractEssentialOCLCSLeft2 return variableExp; } - /** + /* * let iterations = invocations->selectByKind(Iteration)->select(owningClass <> null) in * let bestIteratorSize = iterations->collect(ownedIterators->size())->min() in * let bestSizeIterations = iterations->select(ownedIterators->size() = bestIteratorSize) in @@ -561,7 +561,7 @@ public class EssentialOCLCSLeft2RightVisitor extends AbstractEssentialOCLCSLeft2 } /** - * Resolve an invocation such as name() or source.name(...) or source->name(...) to the best candidate from invocations. + * Resolve an invocation such as name() or source.name(...) or source->name(...) to the best candidate from invocations. * <p> * sourceExp is null for an implicit source invocation. * <p> @@ -689,7 +689,7 @@ public class EssentialOCLCSLeft2RightVisitor extends AbstractEssentialOCLCSLeft2 } /** - * Resolve an invocation such as source.name or source->name + * Resolve an invocation such as source.name or source->name */ protected @NonNull OCLExpression resolveExplicitSourceNavigation(@NonNull OCLExpression sourceExp, @NonNull NameExpCS csNameExp) { PathNameCS ownedPathName = ClassUtil.nonNullState(csNameExp.getOwnedPathName()); @@ -755,7 +755,7 @@ public class EssentialOCLCSLeft2RightVisitor extends AbstractEssentialOCLCSLeft2 } /** - * Resolve an invocation such as name() or source.name(...) or source->name(...) + * Resolve an invocation such as name() or source.name(...) or source->name(...) */ protected @NonNull OCLExpression resolveInvocation(@Nullable OCLExpression sourceExp, @NonNull RoundBracketedClauseCS csRoundBracketedClause) { AbstractNameExpCS csNameExp = csRoundBracketedClause.getOwningNameExp(); 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 d9de847567..6b8f85c18e 100644 --- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java +++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java @@ -53,7 +53,7 @@ import org.eclipse.ocl.utilities.TypedElement; * <li>determination of implicit source variables for operation calls, * attribute navigations, etc.</li> * <li>tracking of operation bodies and attribute initializers/derivations</li> - * <li>storage of additional attributes and operations</tt> + * <li>storage of additional attributes and operations</li> * </ul> * <p> * along with some subclass hook methods and convenience methods. diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LazyExtentMap.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LazyExtentMap.java index d0e4dba9ce..5a83d8141f 100644 --- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LazyExtentMap.java +++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LazyExtentMap.java @@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * <p> * <b>Note</b> that this implementation violates the contract of the * {@link Map} API as follows: + * </p> * <ul> * <li>the {@link Map#entrySet()} method does not return entries * for any keys that have not already been queried via the @@ -35,6 +36,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * <li>concomitant to the above item, the {@link Map#keySet()} * and {@link Map#values()} methods also are not complete</li> * </ul> + * <p> * In practice, this does not matter because this map is only used for providing * class extents to the OCL engine, and it only does look-up by key. * Moreover, this isn't strictly a violation of any contract because there is 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 0480da4e9e..38180a572c 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 @@ -130,8 +130,8 @@ public abstract class AbstractParser { * specific parser invocation method. * * When repair count is 0, no Error token recoveries occur. - * When repair count is > 0, it limits the number of Error token recoveries. - * When repair count is < 0, the number of error token recoveries is unlimited. + * When repair count is > 0, it limits the number of Error token recoveries. + * When repair count is < 0, the number of error token recoveries is unlimited. * * @param defaultRepairCount * the default repair count 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 9a58a04287..879f039798 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 @@ -4132,7 +4132,7 @@ public abstract class AbstractOCLAnalyzer<PK, C, O, P, EL, PM, S, COA, SSA, CT, } /** - * OperationCallExpCS for an -> + * OperationCallExpCS for an -> * * @param operationCallExpCS * the <code>OperationCallExpCS</code> <code>CSTNode</code> diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ToStringVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ToStringVisitor.java index b6bbbfff99..ee973d0434 100644 --- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ToStringVisitor.java +++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ToStringVisitor.java @@ -147,7 +147,7 @@ public class ToStringVisitor<C, O, P, EL, PM, S, COA, SSA, CT> /** * Callback for an OperationCallExp visit. * - * Look at the source to determine operator ( -> or . ) + * Look at the source to determine operator ( -> or . ) * @param oc the operation call expression * @return string */ diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java index f96c91c33d..482d6e62cb 100644 --- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java +++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java @@ -174,7 +174,7 @@ public abstract class AbstractVisitor<T, C, O, P, EL, PM, S, COA, SSA, CT> * its source and qualifiers (if any). Note that in the case of a property * call expression as a qualifier of an association class call, the * property call does not have a source and, therefore, the - * <code>sourceResult</tt> will be <code>null</code> in that case. + * <code>sourceResult</code> will be <code>null</code> in that case. * * @param callExp the property call expression, if there is a source * @param sourceResult the result of visiting the expression's source diff --git a/releng/org.eclipse.ocl.releng.buckminster/javadoc.ant b/releng/org.eclipse.ocl.releng.buckminster/javadoc.ant index 6cd11785c6..6b579d2129 100644 --- a/releng/org.eclipse.ocl.releng.buckminster/javadoc.ant +++ b/releng/org.eclipse.ocl.releng.buckminster/javadoc.ant @@ -47,9 +47,8 @@ <exclude name="**/org/eclipse/ocl/examples/editor/ui/**"/> <exclude name="**/org/eclipse/ocl/examples/modelregistry/**"/> <exclude name="**/org/eclipse/ocl/examples/project/**"/> - <exclude name="**/org/eclipse/ocl/examples/xtext2lpg/**"/> + <exclude name="**/org.eclipse.ocl.examples.autogen/**"/> <exclude name="**/org.eclipse.ocl.examples.xtext2lpg/**"/> - <exclude name="**/org.eclipse.equinox.p2.repository/**"/> </fileset> <excludepackage name="org.osgi.framework"/> <tag name="extends"></tag> |