[251963] Making minor formatting tweaks.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DirectedRelationship.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DirectedRelationship.java
index 46cb5b6..6a20e75 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DirectedRelationship.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DirectedRelationship.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies,, CEA, and others.
+ * Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies, 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
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Relationship.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Relationship.java
index beeb3f6..b5ca72f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Relationship.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Relationship.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies,, CEA, and others.
+ * Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies, 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
* which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SequenceNode.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SequenceNode.java
index cd38ab6..8ef2909 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SequenceNode.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/SequenceNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies,, CEA, and others.
+ * Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies, 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
* which accompanies this distribution, and is available at
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 6f1486b..3b8fa86 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
@@ -1954,22 +1954,20 @@
mergedPackage}));
}
- EAnnotation mergeAnnotation =
- getEAnnotation(
+ EAnnotation eAnnotation = getEAnnotation(
getEAnnotation(resultingPackage,
UML2_UML_PACKAGE_2_0_NS_URI, true),
mergedPackage.getQualifiedName(), true);
- mergeAnnotation.getReferences().add(
- resultingEObject);
+ eAnnotation.getReferences().add(resultingEObject);
+
if (!UML2Util.isEmpty(mergedPackage.getURI())) {
- mergeAnnotation.getDetails().put(
+ eAnnotation.getDetails().put(
ANNOTATION_DETAIL__URI,
mergedPackage.getURI());
}
} else if (OPTION__REPORT.equals(options
- .get(OPTION__CAPABILITIES))
- && diagnostics != null) {
+ .get(OPTION__CAPABILITIES)) && diagnostics != null) {
diagnostics
.add(new BasicDiagnostic(
@@ -5925,19 +5923,21 @@
/**
* Processes the capability trace information (if any) in the root
- * packages' UML annotations to generate merge trace statements in the
+ * packages' UML annotations to generate trace statements in the
* generator documentation comments of Ecore API elements.
*
* @since 4.2
*/
protected void processCapabilityAnnotations(
- Map<String, String> options,
- DiagnosticChain diagnostics, Map<Object, Object> context) {
+ Map<String, String> options, DiagnosticChain diagnostics,
+ Map<Object, Object> context) {
for (org.eclipse.uml2.uml.Package converted : packages) {
EAnnotation annotation = getEAnnotation(converted,
UML2_UML_PACKAGE_2_0_NS_URI, false);
+
if (annotation != null) {
+
for (EAnnotation subAnnotation : annotation
.getEAnnotations()) {
@@ -5957,13 +5957,13 @@
EModelElement ecore = elementToEModelElementMap
.get(next);
+
if (ecore != null) {
// add the trace comment
String doc = UML2Util.isEmpty(capURI)
- ? String
- .format(
+ ? String.format(
"<p>From package %s.</p>", //$NON-NLS-1$
- capName)
+ capName)
: String
.format(
"<p>From package %s (URI {@literal %s}).</p>", //$NON-NLS-1$
