Updates to dita transform
Fixed issues wiht processing tables generation
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.ant/ant_tasks/cdatools.ant.tasks.jar b/cda/plugins/org.eclipse.mdht.uml.cda.ant/ant_tasks/cdatools.ant.tasks.jar
index 957eac9..0a678e8 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.ant/ant_tasks/cdatools.ant.tasks.jar
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.ant/ant_tasks/cdatools.ant.tasks.jar
Binary files differ
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.ant/tasks/org/eclipse/mdht/uml/cda/ant/taskdefs/TransformToDita.java b/cda/plugins/org.eclipse.mdht.uml.cda.ant/tasks/org/eclipse/mdht/uml/cda/ant/taskdefs/TransformToDita.java
index edd6c19..50d640d 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.ant/tasks/org/eclipse/mdht/uml/cda/ant/taskdefs/TransformToDita.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.ant/tasks/org/eclipse/mdht/uml/cda/ant/taskdefs/TransformToDita.java
@@ -13,6 +13,8 @@
*******************************************************************************/
package org.eclipse.mdht.uml.cda.ant.taskdefs;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
@@ -147,6 +149,20 @@
c.getDeclaredField("eINSTANCE");
}
} catch (Throwable t) {
+
+ ClassLoader cl = ClassLoader.getSystemClassLoader();
+
+ ;
+
+ // AppClassLoader acl = cl;
+ // cl.get
+
+ URL[] urls = ((URLClassLoader) (Thread.currentThread().getContextClassLoader())).getURLs();
+
+ for (URL url : urls) {
+ System.err.println(url.getFile());
+ }
+
logWarning(
"Unable to load Run time, Samples will not be generated! " + t.getMessage() +
generatedPackage);
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.core/src/org/eclipse/mdht/uml/cda/core/util/CDAModelUtil.java b/cda/plugins/org.eclipse.mdht.uml.cda.core/src/org/eclipse/mdht/uml/cda/core/util/CDAModelUtil.java
index 0e27894..17f53d1 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.core/src/org/eclipse/mdht/uml/cda/core/util/CDAModelUtil.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.core/src/org/eclipse/mdht/uml/cda/core/util/CDAModelUtil.java
@@ -3389,18 +3389,22 @@
}
public static boolean isInlineClass(Class _class) {
+ // System.err.println("isInlineClass" + _class.getQualifiedName());
Inline inline = CDAProfileUtil.getInline(_class);
if (inline != null) {
+ // System.err.println("isInlineClass1 true");
return true;
}
if (_class.getOwner() instanceof Class) {
+ // System.err.println("isInlineClass2 true");
return true;
}
for (Comment comment : _class.getOwnedComments()) {
if (comment.getBody().startsWith("INLINE")) {
+ // System.err.println("isInlineClass3 true");
return true;
}
}
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.dita/src/org/eclipse/mdht/uml/cda/dita/TableGenerator.java b/cda/plugins/org.eclipse.mdht.uml.cda.dita/src/org/eclipse/mdht/uml/cda/dita/TableGenerator.java
index baaa1e9..2968b33 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.dita/src/org/eclipse/mdht/uml/cda/dita/TableGenerator.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.dita/src/org/eclipse/mdht/uml/cda/dita/TableGenerator.java
@@ -23,6 +23,7 @@
import java.util.Map;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
@@ -588,22 +589,28 @@
if (relativePath != null) {
tableBuffer.append(String.format("<row><entry>%s</entry>", relativePath));
} else {
- tableBuffer.append(String.format("<row><entry>%s</entry>", (isAttribute
- ? "@"
- : "") + property.getName()));
+ tableBuffer.append(
+ String.format(
+ "<row><entry>%s</entry>", (isAttribute
+ ? "@"
+ : "") + property.getName()));
}
// Cardinality
- tableBuffer.append(String.format("<entry>%s..%s</entry>", property.getLower(), (property.getUpper() >= 0
- ? property.getUpper()
- : "*")));
+ tableBuffer.append(
+ String.format(
+ "<entry>%s..%s</entry>", property.getLower(), (property.getUpper() >= 0
+ ? property.getUpper()
+ : "*")));
Validation validation = getValidation((Class) element.getOwner(), property.getName());
// Verb
- tableBuffer.append(String.format("<entry>%s</entry>", (validation != null
- ? getSeverity(validation.getSeverity())
- : "")));
+ tableBuffer.append(
+ String.format(
+ "<entry>%s</entry>", (validation != null
+ ? getSeverity(validation.getSeverity())
+ : "")));
// if (isAttribute) {
// tableBuffer.append(String.format("<entry>%s</entry>", "NO"));
@@ -768,15 +775,19 @@
}
if (from != null && from.getQualifiedName().equals(umlClass.getQualifiedName())) {
+ // System.err.println("caseAssociation1" + from.getQualifiedName());
+ // System.err.println("caseAssociation2" + umlClass.getQualifiedName());
if (to instanceof Class) {
Class toClass = (Class) to;
if (CDAModelUtil.isPublishSeperately(toClass)) {
+ // System.err.println("caseAssociation3" + toClass);
addContains(toClass);
}
if (CDAModelUtil.getTemplateId(toClass) != null) {
+ // System.err.println("caseAssociation4" + toClass);
addContains(toClass);
}
@@ -797,13 +808,12 @@
}
}
- }
-
- if (to instanceof Class && CDAModelUtil.isInlineClass((Class) to) &&
- !CDAModelUtil.isPublishSeperately((Class) to)) {
- // If we have a reference to inline class
- // check for uses of templated classes
- walkInlineClass((Class) to);
+ if (to instanceof Class && CDAModelUtil.isInlineClass((Class) to) &&
+ !CDAModelUtil.isPublishSeperately((Class) to)) {
+ // If we have a reference to inline class
+ // check for uses of templated classes
+ walkInlineClass((Class) to);
+ }
}
return super.caseAssociation(association);
@@ -817,10 +827,12 @@
Class toClass = (Class) p.getType();
if (CDAModelUtil.isPublishSeperately(toClass)) {
+ // System.err.println("walkInlineClass1" + toClass);
addContains(toClass);
}
if (CDAModelUtil.getTemplateId(toClass) != null) {
+ // System.err.println("walkInlineClass2" + toClass);
addContains(toClass);
}
@@ -864,6 +876,8 @@
AssociationSwitch associationSwitch = new AssociationSwitch(umlClass);
+ // System.err.println("createTable2 " + umlClass);
+
org.eclipse.uml2.uml.Package topPackage = UMLUtil.getTopPackage(umlClass);
for (Element element : topPackage.getOwnedElements()) {
@@ -887,7 +901,10 @@
contains = getAnXref(topPackage, (Class) associationSwitch.getContains().get(rowCtr));
}
- tableBuffer.append("<row><entry>" + containedBy + "</entry><entry>" + contains + "</entry></row>");
+ if (!StringUtils.isEmpty(contains) || !StringUtils.isEmpty(containedBy)) {
+ tableBuffer.append("<row><entry>" + containedBy + "</entry><entry>" + contains + "</entry></row>");
+ }
+
}
} else {
// insert blank row for dita
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.dita/src/org/eclipse/mdht/uml/cda/dita/TransformClassContent.java b/cda/plugins/org.eclipse.mdht.uml.cda.dita/src/org/eclipse/mdht/uml/cda/dita/TransformClassContent.java
index 62c251c..fe347f3 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.dita/src/org/eclipse/mdht/uml/cda/dita/TransformClassContent.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.dita/src/org/eclipse/mdht/uml/cda/dita/TransformClassContent.java
@@ -285,6 +285,7 @@
appendConformanceRules(writer, umlClass);
appendAggregateRules(writer, umlClass);
// if (transformerOptions.isIncludeTableView()) {
+ // System.err.println("AppendBody " + umlClass);
appendTable(writer, umlClass);
// }
appendExample(writer, umlClass);
@@ -541,9 +542,10 @@
EObject eObject = "custom-only".equals(xmlGeneratorType)
? null
- : instanceGenerator.createInstance(umlClass, exampleDepth > 0
- ? exampleDepth
- : 2);
+ : instanceGenerator.createInstance(
+ umlClass, exampleDepth > 0
+ ? exampleDepth
+ : 2);
if (eObject == null && !"original-only".equals(xmlGeneratorType) || "custom".equals(xmlGeneratorType) ||
"custom-if-data-present".equals(xmlGeneratorType)) {
ArrayList<ModelStatus> statuses = new ArrayList<ModelStatus>();
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/SectionOperations.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/SectionOperations.java
index dbf9e28..0391a5f 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/SectionOperations.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/SectionOperations.java
@@ -398,6 +398,7 @@
text.getMixed().addAll(value.getMixed());
section.setText(text);
} catch (Exception e) {
+ e.printStackTrace();
}
return text;
}
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/Main3.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/Main3.java
new file mode 100644
index 0000000..a60a30c
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/Main3.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2021 seanmuir.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * seanmuir - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.mdht.uml.cda.tests;
+
+import org.eclipse.mdht.uml.cda.CDAFactory;
+import org.eclipse.mdht.uml.cda.ClinicalDocument;
+import org.eclipse.mdht.uml.cda.Observation;
+import org.eclipse.mdht.uml.cda.Participant2;
+import org.eclipse.mdht.uml.cda.ParticipantRole;
+import org.eclipse.mdht.uml.cda.PlayingEntity;
+import org.eclipse.mdht.uml.cda.Section;
+import org.eclipse.mdht.uml.cda.util.CDAUtil;
+import org.eclipse.mdht.uml.hl7.datatypes.DatatypesFactory;
+
+/**
+ * @author seanmuir
+ *
+ */
+public class Main3 {
+
+ /**
+ * @param args
+ * @throws Exception
+ */
+ public static void main(String[] args) throws Exception {
+ ClinicalDocument cd = CDAFactory.eINSTANCE.createClinicalDocument();
+ Section section = CDAFactory.eINSTANCE.createSection();
+ Observation observation = CDAFactory.eINSTANCE.createObservation();
+ ParticipantRole pr = CDAFactory.eINSTANCE.createParticipantRole();
+ PlayingEntity pe = CDAFactory.eINSTANCE.createPlayingEntity();
+ pe.setSDTCBirthTime(DatatypesFactory.eINSTANCE.createTS("2021"));
+ pr.setPlayingEntity(pe);
+
+ Participant2 p2 = CDAFactory.eINSTANCE.createParticipant2();
+ p2.setParticipantRole(pr);
+
+ observation.getParticipants().add(p2);
+ // observation.getParticipantRoles().add(pr);
+ section.addObservation(observation);
+ cd.addSection(section);
+ CDAUtil.save(cd, System.out);
+
+ }
+
+}
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.project b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.project
index 12181bd..e8ef64e 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.project
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -25,10 +30,17 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
</natures>
</projectDescription>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.settings/org.eclipse.wst.common.component b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..057ea82
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="org.eclipse.mdht.uml.hl7.datatypes">
+ <wb-resource deploy-path="/" source-path="/src"/>
+ </wb-module>
+</project-modules>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.settings/org.eclipse.wst.common.project.facet.core.xml b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..1b22d70
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.7"/>
+ <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.classpath b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.classpath
index 0215967..751c8f2 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.project b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.project
index 89084af..0ca727b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.project
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -25,10 +30,18 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.jdt.core.prefs b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.jdt.core.prefs
index 55fed74..37a26a3 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.jdt.core.prefs
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Mon May 16 11:12:20 EDT 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -86,6 +85,7 @@
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=36
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -93,16 +93,19 @@
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=36
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=36
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=49
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -163,9 +166,12 @@
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
@@ -181,11 +187,12 @@
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -215,6 +222,8 @@
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -238,12 +247,16 @@
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -289,6 +302,8 @@
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -324,8 +339,11 @@
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -351,5 +369,9 @@
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=false
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.wst.common.component b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..c551924
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="org.eclipse.mdht.uml.hl7.rim">
+ <wb-resource deploy-path="/" source-path="/src"/>
+ </wb-module>
+</project-modules>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.wst.common.project.facet.core.xml b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..1b22d70
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.7"/>
+ <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.rim/src/META-INF/MANIFEST.MF b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
diff --git a/core/plugins/org.openhealthtools.mdht.transform.core/META-INF/MANIFEST.MF b/core/plugins/org.openhealthtools.mdht.transform.core/META-INF/MANIFEST.MF
index e2504b7..906a01e 100644
--- a/core/plugins/org.openhealthtools.mdht.transform.core/META-INF/MANIFEST.MF
+++ b/core/plugins/org.openhealthtools.mdht.transform.core/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@
Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-
Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport
Export-Package: org.openhealthtools.mdht.transform.core,org.openhealth
tools.mdht.transform.core.impl
