[468230] Correcting Javadoc warnings.
diff --git a/doc/org.eclipse.uml2.doc/build/README b/doc/org.eclipse.uml2.doc/build/README
index 4082882..2fc5732 100644
--- a/doc/org.eclipse.uml2.doc/build/README
+++ b/doc/org.eclipse.uml2.doc/build/README
@@ -1,9 +1,9 @@
1. Download and unzip latest Eclipse SDK into, e.g., /Applications/Eclipse/UML2_Javadoc.
-2. Download and unzip EMF, XSD, and EMF Validation into, e.g., /Applications/Eclipse/UML2_Javadoc/eclipse/plugins.
-3. Copy org.eclipse.uml2.doc into, e.g., /Applications/Eclipse/UML2_Javadoc/eclipse/workspace.
-4. Copy UML2 plugins (org.eclipse.uml2/plugins/*) into, e.g., /Applications/Eclipse/UML2_Javadoc/eclipse/workspace.
-5. From a command prompt cd to, e.g., /Applications/Eclipse/UML2_Javadoc/eclipse/workspace/org.eclipse.uml2.doc/build.
-6. Run, e.g., sh antJavadoc.sh /Applications/Eclipse/UML2_Javadoc/eclipse > javadoc.out.
+2. Download and unzip EMF, XSD, and EMF Validation into, e.g., /Applications/Eclipse/UML2_Javadoc/Eclipse.app/Contents/Eclipse/plugins.
+3. Copy org.eclipse.uml2.doc into, e.g., /Applications/Eclipse/UML2_Javadoc/Eclipse.app/Contents/Eclipse/workspace.
+4. Copy UML2 plugins (org.eclipse.uml2/plugins/*) into, e.g., /Applications/Eclipse/UML2_Javadoc/Eclipse.app/Contents/Eclipse/workspace.
+5. From a command prompt cd to, e.g., /Applications/Eclipse/UML2_Javadoc/Eclipse.app/Contents/Eclipse/workspace/org.eclipse.uml2.doc/build.
+6. Run, e.g., sh antJavadoc.sh /Applications/Eclipse/UML2_Javadoc/Eclipse.app/Contents/Eclipse > javadoc.out.
7. Change directory to ../references.
8. Run, e.g., tar -czf uml2_javadoc.tar.gz javadoc/.
9. Run, e.g., scp uml2_javadoc.tar.gz khussey@build.eclipse.org:~khussey/uml2_javadoc.tar.gz.
diff --git a/doc/org.eclipse.uml2.doc/build/antJavadoc.sh b/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
index ce4a998..95ef007 100644
--- a/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
+++ b/doc/org.eclipse.uml2.doc/build/antJavadoc.sh
@@ -19,7 +19,7 @@
debug=1; if [ $debug -gt 0 ]; then echo "[antJd] debug: "$debug; fi
if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home; fi
+if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_40.jdk/Contents/Home; fi
export PATH=${PATH}:${ANT_HOME}/bin
# current directory - all but the name of this script, no trailing slash
diff --git a/doc/org.eclipse.uml2.doc/build/javadoc.xml.template b/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
index b0cf31d..89823c1 100644
--- a/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
+++ b/doc/org.eclipse.uml2.doc/build/javadoc.xml.template
@@ -39,10 +39,10 @@
overview="${overview}"
windowtitle="${windowTitle}"
- footer="Copyright 2003, 2014 IBM Corporation, CEA, and others.<br> All Rights Reserved."
+ footer="Copyright 2003, 2015 IBM Corporation, CEA, and others.<br> All Rights Reserved."
access="protected"
- additionalparam="-breakiterator -tag model:X -tag generated:X -tag ordered:X"
+ additionalparam="-breakiterator -tag model:X -tag generated:X -tag ordered:X -Xdoclint:none"
author="false"
breakiterator="true"
charset="UTF-8"
diff --git a/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/genmodel/GenFeature.java b/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/genmodel/GenFeature.java
index 5a88128..49365c1 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/genmodel/GenFeature.java
+++ b/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/genmodel/GenFeature.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
* Kenn Hussey (Embarcadero Technologies) - 208016
- * Kenn Hussey (CEA) - 394623, 212765, 451350
+ * Kenn Hussey (CEA) - 394623, 212765, 451350, 468230
*
*/
package org.eclipse.uml2.codegen.ecore.genmodel;
@@ -163,7 +163,7 @@
* type parameter references. By default, this will just do
* <code>getKeyFeatureParameter(getGenClass(), index, formal)</code>.
*
- * @see #getKeyFeatureParameter(GenClass, boolean)
+ * @see #getKeyFeatureParameter(GenClass, int, boolean)
*/
@Deprecated
String getKeyFeatureParameter(int index, boolean formal);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/AttributeOwner.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/AttributeOwner.java
index 3f32dde..9b44913 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/AttributeOwner.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/AttributeOwner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014 CEA and others.
+ * Copyright (c) 2013, 2015 CEA and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
*
* Contributors:
* Christian W. Damus (CEA) - initial API and implementation
+ * Kenn Hussey (CEA) - 468230
*
*/
package org.eclipse.uml2.uml;
@@ -67,10 +68,10 @@
* and/or {@code type}.
*
* @param name
- * the attribute name to match, or {@null} to match any
+ * the attribute name to match, or {@code null} to match any
* attribute name
* @param type
- * the attribute type to match, or {@null} to match any
+ * the attribute type to match, or {@code null} to match any
* attribute type
*
* @return any matching attribute, or {@code null} if not found
@@ -84,10 +85,10 @@
* (optionally irrespective of case) and/or {@code type}.
*
* @param name
- * the attribute name to match, or {@null} to match any
+ * the attribute name to match, or {@code null} to match any
* attribute name
* @param type
- * the attribute type to match, or {@null} to match any
+ * the attribute type to match, or {@code null} to match any
* attribute type
* @param ignoreCase
* whether to match names case-insensitively
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/OperationOwner.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/OperationOwner.java
index 6faeed7..5fede80 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/OperationOwner.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/OperationOwner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014 CEA and others.
+ * Copyright (c) 2013, 2015 CEA and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
*
* Contributors:
* Christian W. Damus (CEA) - initial API and implementation
+ * Kenn Hussey (CEA) - 468230
*
*/
package org.eclipse.uml2.uml;
@@ -82,13 +83,13 @@
* {@code name}, {@code parameterNames}, and {@code parameterTypes}.
*
* @param name
- * the operation name to match, or {@null} to match any
+ * the operation name to match, or {@code null} to match any
* operation name
* @param parameterNames
- * the parameter names to match, or {@null} to match any
+ * the parameter names to match, or {@code null} to match any
* parameter names
* @param parameterTypes
- * the parameter types to match, or {@null} to match any
+ * the parameter types to match, or {@code null} to match any
* signature
*
* @return any matching operation, or {@code null} if not found
@@ -104,13 +105,13 @@
* (optionally case-insensitive), and {@code parameterTypes}.
*
* @param name
- * the operation name to match, or {@null} to match any
+ * the operation name to match, or {@code null} to match any
* operation name
* @param parameterNames
- * the parameter names to match, or {@null} to match any
+ * the parameter names to match, or {@code null} to match any
* parameter names
* @param parameterTypes
- * the parameter types to match, or {@null} to match any
+ * the parameter types to match, or {@code null} to match any
* signature
* @param ignoreCase
* whether matching of operation and parameter names is
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
index 8eeef12..80215c5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
@@ -10,7 +10,7 @@
* Kenn Hussey (Embarcadero Technologies) - 199624, 184249, 204406, 208125, 204200, 213218, 213903, 220669, 208016, 226396, 271470
* Nicolas Rouquette (JPL) - 260120, 313837
* Kenn Hussey - 286329, 313601, 314971, 344907, 236184, 335125
- * Kenn Hussey (CEA) - 327039, 358792, 364419, 366350, 307343, 382637, 273949, 389542, 389495, 316165, 392833, 399544, 322715, 163556, 212765, 397324, 204658, 408612, 411731, 269598, 422000, 416833, 424568, 427167, 418466, 419324, 429994, 433157, 439915, 446388, 454864, 458906, 461374, 463066
+ * Kenn Hussey (CEA) - 327039, 358792, 364419, 366350, 307343, 382637, 273949, 389542, 389495, 316165, 392833, 399544, 322715, 163556, 212765, 397324, 204658, 408612, 411731, 269598, 422000, 416833, 424568, 427167, 418466, 419324, 429994, 433157, 439915, 446388, 454864, 458906, 461374, 463066, 468230
* Yann Tanguy (CEA) - 350402
* Christian W. Damus (CEA) - 392833, 251963, 405061, 409396, 176998, 180744, 403374, 416833, 420338, 405065, 431342
* E.D.Willink - 420338
@@ -3107,7 +3107,7 @@
* derivative.
*
* @return whether I am a package merge operation ({@code true}) or
- * something else ({@false})
+ * something else ({@code false})
*
* @since 5.0
*/
@@ -3139,12 +3139,14 @@
}
/**
- * Merges the contents of (all of) the elements merged by the specified
- * package using the specified options, reporting problems to the
+ * Merges the contents of (all of) the specified elements into the
+ * given element using the specified options, reporting problems to the
* specified diagnostics, within the specified context.
*
- * @param package_
- * The receiving package.
+ * @param receivingElement
+ * The receiving templateable element.
+ * @param mergedElements
+ * The elements to merge.
* @param options
* The options to use.
* @param diagnostics
@@ -3546,7 +3548,7 @@
* the given object. A template is one that has a signature bound by a
* template binding that we are expanding.
*
- * @param eObject
+ * @param mergedEObject
* an object
*
* @return its nearest containing template, which may be itself
@@ -3581,7 +3583,7 @@
* (recursively) the given object. A bound template is one that has a
* template binding that we are expanding.
*
- * @param eObject
+ * @param resultingEObject
* an object
*
* @return its nearest containing bound template, which may be itself
@@ -4222,7 +4224,7 @@
* <p>
* As of the 4.2 API version, if the Ecore name differs for any reason
* from the original UML name, it is recorded for
- * {@linkplain UMLUtil#getOriginalName(ENamedElement) later retrieval}.
+ * {@linkplain UMLUtil.UML2EcoreConverter#getOriginalName(ENamedElement) later retrieval}.
* </p>
*
* @param eNamedElement
@@ -4233,7 +4235,7 @@
* whether to ensure that the name is a valid Java
* identifier, munging it if necessary
*
- * @see UMLUtil#getOriginalName(ENamedElement)
+ * @see UMLUtil.UML2EcoreConverter#getOriginalName(ENamedElement)
* @see UML2Util#getValidJavaIdentifier(String)
*/
protected void setName(ENamedElement eNamedElement, final String name,
