Updates to xls generation and build
modified java target
removed specific classpaths from projects
add null flavor to spreadsheets
do not save meta data sheets when running in filter mode
diff --git a/cda/plugins/.classpath b/cda/plugins/.classpath
new file mode 100644
index 0000000..e59a565
--- /dev/null
+++ b/cda/plugins/.classpath
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.api.dotnet/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.api.java/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.api.schematron/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.api/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.cda.xml.ui/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.report/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda.ant/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda.ant/tasks"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda.core/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda.dita/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda.resources/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda.transform/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda.ui/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda.validation/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.cda/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.hl7.datatypes/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.hl7.rim/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.hl7.vocab/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.term.core/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.term.transform/src"/>
+ <classpathentry kind="src" path="org.eclipse.mdht.uml.term.ui/src"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.api.dotnet/target/org.eclipse.mdht.api.dotnet-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.api.dotnet/target/org.eclipse.mdht.api.dotnet-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.api.java/target/org.eclipse.mdht.api.java-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.api.java/target/org.eclipse.mdht.api.java-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.api.schematron/target/org.eclipse.mdht.api.schematron-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.api.schematron/target/org.eclipse.mdht.api.schematron-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.api/target/org.eclipse.mdht.api-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.api/target/org.eclipse.mdht.api-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/jericho/jericho-html-3.4.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/lib/commons-codec-1.10.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/lib/commons-collections4-4.1.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/ooxml-lib/curvesapi-1.04.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/ooxml-lib/xmlbeans-2.6.0.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-3.16.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-examples-3.16.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-excelant-3.16.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-ooxml-3.16.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-ooxml-schemas-3.16.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/poi-3.16/poi-scratchpad-3.16.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/target/org.eclipse.mdht.cda.xml.ui-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.cda.xml.ui/target/org.eclipse.mdht.cda.xml.ui-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.ant/ant_tasks/cdatools.ant.tasks.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.ant/target/org.eclipse.mdht.uml.cda.ant-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.ant/target/org.eclipse.mdht.uml.cda.ant-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.core/target/org.eclipse.mdht.uml.cda.core-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.core/target/org.eclipse.mdht.uml.cda.core-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.dita/target/org.eclipse.mdht.uml.cda.dita-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.dita/target/org.eclipse.mdht.uml.cda.dita-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.resources/target/org.eclipse.mdht.uml.cda.resources-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.resources/target/org.eclipse.mdht.uml.cda.resources-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.transform/target/org.eclipse.mdht.uml.cda.transform-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.transform/target/org.eclipse.mdht.uml.cda.transform-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.ui/target/org.eclipse.mdht.uml.cda.ui-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.ui/target/org.eclipse.mdht.uml.cda.ui-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.validation/target/org.eclipse.mdht.uml.cda.validation-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda.validation/target/org.eclipse.mdht.uml.cda.validation-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda/target/org.eclipse.mdht.uml.cda-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.cda/target/org.eclipse.mdht.uml.cda-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.hl7.datatypes/target/org.eclipse.mdht.uml.hl7.datatypes-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.hl7.datatypes/target/org.eclipse.mdht.uml.hl7.datatypes-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.hl7.rim/target/org.eclipse.mdht.uml.hl7.rim-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.hl7.rim/target/org.eclipse.mdht.uml.hl7.rim-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.hl7.vocab/target/org.eclipse.mdht.uml.hl7.vocab-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.hl7.vocab/target/org.eclipse.mdht.uml.hl7.vocab-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.term.core/target/org.eclipse.mdht.uml.term.core-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.term.core/target/org.eclipse.mdht.uml.term.core-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.term.transform/target/org.eclipse.mdht.uml.term.transform-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.term.transform/target/org.eclipse.mdht.uml.term.transform-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.term.ui/target/org.eclipse.mdht.uml.term.ui-3.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="org.eclipse.mdht.uml.term.ui/target/org.eclipse.mdht.uml.term.ui-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="output" path="org.eclipse.mdht.api/bin"/>
+</classpath>
diff --git a/cda/plugins/org.eclipse.mdht.api.dotnet/.classpath b/cda/plugins/org.eclipse.mdht.api.dotnet/.classpath
index b1dabee..64ed6b3 100644
--- a/cda/plugins/org.eclipse.mdht.api.dotnet/.classpath
+++ b/cda/plugins/org.eclipse.mdht.api.dotnet/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cda/plugins/org.eclipse.mdht.api.java/.classpath b/cda/plugins/org.eclipse.mdht.api.java/.classpath
index b1dabee..64ed6b3 100644
--- a/cda/plugins/org.eclipse.mdht.api.java/.classpath
+++ b/cda/plugins/org.eclipse.mdht.api.java/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cda/plugins/org.eclipse.mdht.api.schematron/.classpath b/cda/plugins/org.eclipse.mdht.api.schematron/.classpath
index b1dabee..64ed6b3 100644
--- a/cda/plugins/org.eclipse.mdht.api.schematron/.classpath
+++ b/cda/plugins/org.eclipse.mdht.api.schematron/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cda/plugins/org.eclipse.mdht.api/.classpath b/cda/plugins/org.eclipse.mdht.api/.classpath
index b1dabee..16d067f 100644
--- a/cda/plugins/org.eclipse.mdht.api/.classpath
+++ b/cda/plugins/org.eclipse.mdht.api/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
index 683a105..7a93de5 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
@@ -1275,7 +1275,7 @@
} else {
/**
* @TODO
- * Add to preferences versus default here
+ * Add to preferences versus default here
*/
this.filesFilter = "C62TXT";
}
@@ -1937,6 +1937,18 @@
"Serializing " + CDAValueUtil.DATE_FORMAT3.format(new Date()) + "_" + folder.getName().toUpperCase() +
"_SA.xlsx");
+ if (!sectionFilter.isEmpty()) {
+ /*
+ * To limit size - do not serialize these tabs when using section filter option
+ * It was simpler to remove after tracking then modifying logic to process
+ *
+ */
+ wb.removeSheetAt(wb.getSheetIndex("Demographics"));
+ wb.removeSheetAt(wb.getSheetIndex("Encounters"));
+ wb.removeSheetAt(wb.getSheetIndex("Metrics"));
+ wb.removeSheetAt(wb.getSheetIndex("Sections"));
+
+ }
console.println("Start Saving " + currentProcessingTime);
try (OutputStream fileOut = Files.newOutputStream(Paths.get(fileLocation))) {
@@ -2330,7 +2342,8 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.core.resources.IResource#copy(org.eclipse.core.resources.IProjectDescription, boolean, org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.core.resources.IResource#copy(org.eclipse.core.resources.IProjectDescription, boolean,
+ * org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
public void copy(IProjectDescription description, boolean force, IProgressMonitor monitor)
@@ -2341,7 +2354,8 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.core.resources.IResource#copy(org.eclipse.core.resources.IProjectDescription, int, org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.core.resources.IResource#copy(org.eclipse.core.resources.IProjectDescription, int,
+ * org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
public void copy(IProjectDescription description, int updateFlags, IProgressMonitor monitor)
@@ -2824,7 +2838,8 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.core.resources.IResource#move(org.eclipse.core.resources.IProjectDescription, int, org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.core.resources.IResource#move(org.eclipse.core.resources.IProjectDescription, int,
+ * org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
public void move(IProjectDescription description, int updateFlags, IProgressMonitor monitor)
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
index 1f51cee..50f9d4d 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
@@ -76,6 +76,15 @@
import org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraints;
import org.openhealthtools.mdht.uml.cda.consol.PolicyActivity;
+/*
+ * xxProcedures
+xx Allergies
+xx Meds
+xx Problems
+xx Immunizations
+Vital Signs
+ */
+
/**
* @author seanmuir
*
@@ -414,7 +423,7 @@
row.createCell(offset++).setCellValue("");
}
- offset = SpreadsheetSerializer.appendCode(
+ offset = SpreadsheetSerializer.appendCodeShowNullFlavor(
row, offset, substanceAdministration.getSection(), substanceAdministration.getCode(),
substanceAdministration.getText());
@@ -634,7 +643,7 @@
problemCode = (CD) any;
}
}
- offset = SpreadsheetSerializer.appendCode(
+ offset = SpreadsheetSerializer.appendCodeShowNullFlavor(
row, offset, problemObservation.getSection(), problemCode, problemObservation.getText());
offset = SpreadsheetSerializer.appendOrganizationAndAuthor(row, offset, problemObservation.getAuthors());
@@ -1328,7 +1337,7 @@
row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(ivlts));
- offset = SpreadsheetSerializer.appendCode(
+ offset = SpreadsheetSerializer.appendCodeShowNullFlavor(
row, offset, resultObservation.getSection(), resultObservation.getCode(), resultObservation.getText());
String value = "";
@@ -1648,7 +1657,7 @@
row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(procedureActivityAct.getEffectiveTime()));
- offset = SpreadsheetSerializer.appendCode(
+ offset = SpreadsheetSerializer.appendCodeShowNullFlavor(
row, offset, procedureActivityAct.getSection(), procedureActivityAct.getCode(),
procedureActivityAct.getText());
@@ -1717,7 +1726,7 @@
row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(procedureActivityObservation.getEffectiveTime()));
- offset = SpreadsheetSerializer.appendCode(
+ offset = SpreadsheetSerializer.appendCodeShowNullFlavor(
row, offset, procedureActivityObservation.getSection(), procedureActivityObservation.getCode(),
procedureActivityObservation.getText());
@@ -1751,7 +1760,7 @@
row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(procedureActivityProcedure.getEffectiveTime()));
- offset = SpreadsheetSerializer.appendCode(
+ offset = SpreadsheetSerializer.appendCodeShowNullFlavor(
row, offset, procedureActivityProcedure.getSection(), procedureActivityProcedure.getCode(),
procedureActivityProcedure.getText());
@@ -1956,7 +1965,7 @@
if (manufacturedProduct.getManufacturedMaterial().getCode() != null) {
- offset = SpreadsheetSerializer.appendCode(
+ offset = SpreadsheetSerializer.appendCodeShowNullFlavor(
row, offset, substanceAdministration.getSection(),
manufacturedProduct.getManufacturedMaterial().getCode(), substanceAdministration.getText());
hasCode = true;
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.ant/.classpath b/cda/plugins/org.eclipse.mdht.uml.cda.ant/.classpath
index 578fd79..6e125e6 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.ant/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.ant/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin-tasks" path="tasks"/>
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.core/.classpath b/cda/plugins/org.eclipse.mdht.uml.cda.core/.classpath
index 3d1f8e3..0215967 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.core/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.core/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <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.cda.dita/.classpath b/cda/plugins/org.eclipse.mdht.uml.cda.dita/.classpath
index 098194c..1fa3e68 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.dita/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.dita/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.resources/.classpath b/cda/plugins/org.eclipse.mdht.uml.cda.resources/.classpath
index b1dabee..64ed6b3 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.resources/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.resources/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.transform/.classpath b/cda/plugins/org.eclipse.mdht.uml.cda.transform/.classpath
index b1dabee..64ed6b3 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.transform/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.transform/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.ui/.classpath b/cda/plugins/org.eclipse.mdht.uml.cda.ui/.classpath
index b1dabee..64ed6b3 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.ui/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.ui/src/org/eclipse/mdht/uml/cda/ui/acceleo/main/Generate.java b/cda/plugins/org.eclipse.mdht.uml.cda.ui/src/org/eclipse/mdht/uml/cda/ui/acceleo/main/Generate.java
index db818a3..acd7b42 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.ui/src/org/eclipse/mdht/uml/cda/ui/acceleo/main/Generate.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.ui/src/org/eclipse/mdht/uml/cda/ui/acceleo/main/Generate.java
@@ -404,14 +404,20 @@
/*
* TODO If you need additional resource factories registrations, you can register them here. the following line
- * (in comment) is an example of the resource factory registration for UML.
+ * (in comment) is an example of the resource factory registration.
*
* If you want to use the generator in stand alone, the resource factory registration will be required.
*
* To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents).
*/
- // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
+ // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(XyzResource.FILE_EXTENSION, XyzResource.Factory.INSTANCE);
+
+ /*
+ * Some metamodels require a very complex setup for standalone usage. For example, if you want to use a generator
+ * targetting UML models in standalone, you NEED to use the following:
+ */
+ // UMLResourcesUtil.init(resourceSet)
}
}
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.validation/.classpath b/cda/plugins/org.eclipse.mdht.uml.cda.validation/.classpath
index 3d1f8e3..0215967 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.validation/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.validation/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <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.cda/.classpath b/cda/plugins/org.eclipse.mdht.uml.cda/.classpath
index 6cb7a2d..e866fe7 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/.classpath
@@ -2,7 +2,11 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="schema/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/Main.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/Main.java
index 6c70862..d795420 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/Main.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/Main.java
@@ -14,27 +14,15 @@
import java.io.FileOutputStream;
import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.mdht.uml.cda.AssignedAuthor;
-import org.eclipse.mdht.uml.cda.Author;
import org.eclipse.mdht.uml.cda.CDAFactory;
import org.eclipse.mdht.uml.cda.ClinicalDocument;
import org.eclipse.mdht.uml.cda.Encounter;
import org.eclipse.mdht.uml.cda.Entry;
-import org.eclipse.mdht.uml.cda.InfrastructureRootTypeId;
-import org.eclipse.mdht.uml.cda.Organization;
-import org.eclipse.mdht.uml.cda.Patient;
-import org.eclipse.mdht.uml.cda.PatientRole;
-import org.eclipse.mdht.uml.cda.Person;
-import org.eclipse.mdht.uml.cda.RecordTarget;
import org.eclipse.mdht.uml.cda.Section;
import org.eclipse.mdht.uml.cda.util.CDAUtil;
import org.eclipse.mdht.uml.cda.util.ValidationResult;
import org.eclipse.mdht.uml.hl7.datatypes.CE;
import org.eclipse.mdht.uml.hl7.datatypes.DatatypesFactory;
-import org.eclipse.mdht.uml.hl7.datatypes.II;
-import org.eclipse.mdht.uml.hl7.datatypes.PN;
-import org.eclipse.mdht.uml.hl7.datatypes.ST;
-import org.eclipse.mdht.uml.hl7.datatypes.TS;
import org.eclipse.mdht.uml.hl7.vocab.ActClass;
import org.eclipse.mdht.uml.hl7.vocab.NullFlavor;
import org.eclipse.mdht.uml.hl7.vocab.x_DocumentEncounterMood;
@@ -339,86 +327,87 @@
}
public static void main(String[] args) throws Exception {
- ClinicalDocument doc = CDAFactory.eINSTANCE.createClinicalDocument();
-
- InfrastructureRootTypeId typeId = CDAFactory.eINSTANCE.createInfrastructureRootTypeId();
- typeId.setExtension("POCD_HD000040");
- doc.setTypeId(typeId);
-
- II id = DatatypesFactory.eINSTANCE.createII("2.16.840.1.113883.19.4", "c266");
- doc.setId(id);
-
- II templateId = DatatypesFactory.eINSTANCE.createII("2.16.840.1.113883.3.27.1776");
- doc.getTemplateIds().add(templateId);
-
- CE code = DatatypesFactory.eINSTANCE.createCE("11488-4", "2.16.840.1.113883.6.1", "LOINC", "Consultation note");
- doc.setCode(code);
-
- ST title = DatatypesFactory.eINSTANCE.createST("Good Health Clinic Consultation Note");
- doc.setTitle(title);
-
- TS effectiveTime = DatatypesFactory.eINSTANCE.createTS("20000407");
- doc.setEffectiveTime(effectiveTime);
-
- CE confidentialityCode = DatatypesFactory.eINSTANCE.createCE("N", "2.16.840.1.113883.5.25");
- doc.setConfidentialityCode(confidentialityCode);
-
- RecordTarget recordTarget = CDAFactory.eINSTANCE.createRecordTarget();
- doc.getRecordTargets().add(recordTarget);
-
- PatientRole patientRole = CDAFactory.eINSTANCE.createPatientRole();
- recordTarget.setPatientRole(patientRole);
-
- Patient patient = CDAFactory.eINSTANCE.createPatient();
- patientRole.setPatient(patient);
-
- PN name = DatatypesFactory.eINSTANCE.createPN();
- name.addGiven("Henry").addFamily("Levin").addSuffix("the 7th");
- patient.getNames().add(name);
-
- CE administrativeGenderCode = DatatypesFactory.eINSTANCE.createCE("M", "2.16.840.1.113883.5.1");
- patient.setAdministrativeGenderCode(administrativeGenderCode);
-
- TS birthTime = DatatypesFactory.eINSTANCE.createTS("19320924");
- patient.setBirthTime(birthTime);
-
- Organization providerOrganization = CDAFactory.eINSTANCE.createOrganization();
- providerOrganization.getIds().add(DatatypesFactory.eINSTANCE.createII("2.16.840.1.113883.19.5"));
- patientRole.setProviderOrganization(providerOrganization);
-
- Author author = CDAFactory.eINSTANCE.createAuthor();
- author.setTime(DatatypesFactory.eINSTANCE.createTS("2000040714"));
- doc.getAuthors().add(author);
-
- AssignedAuthor assignedAuthor = CDAFactory.eINSTANCE.createAssignedAuthor();
- assignedAuthor.getIds().add(DatatypesFactory.eINSTANCE.createII("2.16.840.1.113883.19.5", "KP00017"));
- author.setAssignedAuthor(assignedAuthor);
-
- Person assignedPerson = CDAFactory.eINSTANCE.createPerson();
- assignedAuthor.setAssignedPerson(assignedPerson);
-
- name = DatatypesFactory.eINSTANCE.createPN();
- name.addGiven("Bob").addFamily("Dolin").addSuffix("MD");
- assignedPerson.getNames().add(name);
-
- Section section = CDAFactory.eINSTANCE.createSection();
- Encounter encounter = CDAFactory.eINSTANCE.createEncounter();
-
- encounter.setPriorityCode(DatatypesFactory.eINSTANCE.createCE("code", "system"));
- encounter.setEffectiveTime(DatatypesFactory.eINSTANCE.createIVL_TS("low", "high"));
- encounter.getSDTCDischargeDispositionCodes().add(DatatypesFactory.eINSTANCE.createCE("code", "system"));
- encounter.addAct(CDAFactory.eINSTANCE.createAct());
-
- section.addEncounter(encounter);
- doc.addSection(section);
-
- System.out.println("***** Constructed example *****");
- CDAUtil.save(doc, System.out);
- System.out.println();
+ // ClinicalDocument doc = CDAFactory.eINSTANCE.createClinicalDocument();
+ //
+ // InfrastructureRootTypeId typeId = CDAFactory.eINSTANCE.createInfrastructureRootTypeId();
+ // typeId.setExtension("POCD_HD000040");
+ // doc.setTypeId(typeId);
+ //
+ // II id = DatatypesFactory.eINSTANCE.createII("2.16.840.1.113883.19.4", "c266");
+ // doc.setId(id);
+ //
+ // II templateId = DatatypesFactory.eINSTANCE.createII("2.16.840.1.113883.3.27.1776");
+ // doc.getTemplateIds().add(templateId);
+ //
+ // CE code = DatatypesFactory.eINSTANCE.createCE("11488-4", "2.16.840.1.113883.6.1", "LOINC", "Consultation note");
+ // doc.setCode(code);
+ //
+ // ST title = DatatypesFactory.eINSTANCE.createST("Good Health Clinic Consultation Note");
+ // doc.setTitle(title);
+ //
+ // TS effectiveTime = DatatypesFactory.eINSTANCE.createTS("20000407");
+ // doc.setEffectiveTime(effectiveTime);
+ //
+ // CE confidentialityCode = DatatypesFactory.eINSTANCE.createCE("N", "2.16.840.1.113883.5.25");
+ // doc.setConfidentialityCode(confidentialityCode);
+ //
+ // RecordTarget recordTarget = CDAFactory.eINSTANCE.createRecordTarget();
+ // doc.getRecordTargets().add(recordTarget);
+ //
+ // PatientRole patientRole = CDAFactory.eINSTANCE.createPatientRole();
+ // recordTarget.setPatientRole(patientRole);
+ //
+ // Patient patient = CDAFactory.eINSTANCE.createPatient();
+ // patientRole.setPatient(patient);
+ //
+ // PN name = DatatypesFactory.eINSTANCE.createPN();
+ // name.addGiven("Henry").addFamily("Levin").addSuffix("the 7th");
+ // patient.getNames().add(name);
+ //
+ // CE administrativeGenderCode = DatatypesFactory.eINSTANCE.createCE("M", "2.16.840.1.113883.5.1");
+ // patient.setAdministrativeGenderCode(administrativeGenderCode);
+ //
+ // TS birthTime = DatatypesFactory.eINSTANCE.createTS("19320924");
+ // patient.setBirthTime(birthTime);
+ //
+ // Organization providerOrganization = CDAFactory.eINSTANCE.createOrganization();
+ // providerOrganization.getIds().add(DatatypesFactory.eINSTANCE.createII("2.16.840.1.113883.19.5"));
+ // patientRole.setProviderOrganization(providerOrganization);
+ //
+ // Author author = CDAFactory.eINSTANCE.createAuthor();
+ // author.setTime(DatatypesFactory.eINSTANCE.createTS("2000040714"));
+ // doc.getAuthors().add(author);
+ //
+ // AssignedAuthor assignedAuthor = CDAFactory.eINSTANCE.createAssignedAuthor();
+ // assignedAuthor.getIds().add(DatatypesFactory.eINSTANCE.createII("2.16.840.1.113883.19.5", "KP00017"));
+ // author.setAssignedAuthor(assignedAuthor);
+ //
+ // Person assignedPerson = CDAFactory.eINSTANCE.createPerson();
+ // assignedAuthor.setAssignedPerson(assignedPerson);
+ //
+ // name = DatatypesFactory.eINSTANCE.createPN();
+ // name.addGiven("Bob").addFamily("Dolin").addSuffix("MD");
+ // assignedPerson.getNames().add(name);
+ //
+ // Section section = CDAFactory.eINSTANCE.createSection();
+ // Encounter encounter = CDAFactory.eINSTANCE.createEncounter();
+ //
+ // encounter.setPriorityCode(DatatypesFactory.eINSTANCE.createCE("code", "system"));
+ // encounter.setEffectiveTime(DatatypesFactory.eINSTANCE.createIVL_TS("low", "high"));
+ // encounter.getSDTCDischargeDispositionCodes().add(DatatypesFactory.eINSTANCE.createCE("code", "system"));
+ // encounter.addAct(CDAFactory.eINSTANCE.createAct());
+ //
+ // section.addEncounter(encounter);
+ // doc.addSection(section);
+ //
+ // System.out.println("***** Constructed example *****");
+ // CDAUtil.save(doc, System.out);
+ // System.out.println();
// create a validation result object to collect diagnostics produced during validation
ValidationResult result = new ValidationResult();
- ClinicalDocument clinicalDocument = CDAUtil.load(new FileInputStream("samples/SampleCDADocument.xml"), result);
+ ClinicalDocument clinicalDocument = CDAUtil.load(
+ new FileInputStream("samples/aaa/Immunization_eICR.07152020.xml"), result);
System.out.println("\n***** Reserialization of sample *****");
System.out.println(clinicalDocument);
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.classpath b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.classpath
index 3bc2475..751c8f2 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.classpath
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <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/.classpath b/cda/plugins/org.eclipse.mdht.uml.hl7.rim/.classpath
index 3d1f8e3..0215967 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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <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.term.core/src/org/eclipse/mdht/uml/term/core/util/TermProfileUtil.java b/cda/plugins/org.eclipse.mdht.uml.term.core/src/org/eclipse/mdht/uml/term/core/util/TermProfileUtil.java
index d745462..e4a3f64 100644
--- a/cda/plugins/org.eclipse.mdht.uml.term.core/src/org/eclipse/mdht/uml/term/core/util/TermProfileUtil.java
+++ b/cda/plugins/org.eclipse.mdht.uml.term.core/src/org/eclipse/mdht/uml/term/core/util/TermProfileUtil.java
@@ -109,6 +109,11 @@
}
public static CodeSystemVersion getCodeSystemVersion(Enumeration umlEnumeration) {
+
+ for (Object foo : umlEnumeration.getStereotypeApplications()) {
+ System.out.println("aaaaa " + foo.getClass().getCanonicalName());
+ }
+
CodeSystemVersion codeSystemVersion = null;
Stereotype stereotype = TermProfileUtil.getAppliedStereotype(
umlEnumeration, ITermProfileConstants.CODE_SYSTEM_VERSION);
diff --git a/core/plugins/org.eclipse.mdht.metamodel.traceability.edit/.classpath b/core/plugins/org.eclipse.mdht.metamodel.traceability.edit/.classpath
index 3d1f8e3..0215967 100644
--- a/core/plugins/org.eclipse.mdht.metamodel.traceability.edit/.classpath
+++ b/core/plugins/org.eclipse.mdht.metamodel.traceability.edit/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <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/core/plugins/org.eclipse.mdht.metamodel.traceability.editor/.classpath b/core/plugins/org.eclipse.mdht.metamodel.traceability.editor/.classpath
index 3d1f8e3..0215967 100644
--- a/core/plugins/org.eclipse.mdht.metamodel.traceability.editor/.classpath
+++ b/core/plugins/org.eclipse.mdht.metamodel.traceability.editor/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <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/core/plugins/org.eclipse.mdht.metamodel.traceability/.classpath b/core/plugins/org.eclipse.mdht.metamodel.traceability/.classpath
index 3d1f8e3..0215967 100644
--- a/core/plugins/org.eclipse.mdht.metamodel.traceability/.classpath
+++ b/core/plugins/org.eclipse.mdht.metamodel.traceability/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <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/core/plugins/org.eclipse.mdht.transformation.ocl/.classpath b/core/plugins/org.eclipse.mdht.transformation.ocl/.classpath
index b1dabee..64ed6b3 100644
--- a/core/plugins/org.eclipse.mdht.transformation.ocl/.classpath
+++ b/core/plugins/org.eclipse.mdht.transformation.ocl/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/plugins/org.eclipse.mdht.transformation.ocl2csharp/.classpath b/core/plugins/org.eclipse.mdht.transformation.ocl2csharp/.classpath
index b1dabee..64ed6b3 100644
--- a/core/plugins/org.eclipse.mdht.transformation.ocl2csharp/.classpath
+++ b/core/plugins/org.eclipse.mdht.transformation.ocl2csharp/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/plugins/org.eclipse.mdht.transformation.ocl2java/.classpath b/core/plugins/org.eclipse.mdht.transformation.ocl2java/.classpath
index b1dabee..64ed6b3 100644
--- a/core/plugins/org.eclipse.mdht.transformation.ocl2java/.classpath
+++ b/core/plugins/org.eclipse.mdht.transformation.ocl2java/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/plugins/org.eclipse.mdht.transformation.ocl2xpath/.classpath b/core/plugins/org.eclipse.mdht.transformation.ocl2xpath/.classpath
index b1dabee..64ed6b3 100644
--- a/core/plugins/org.eclipse.mdht.transformation.ocl2xpath/.classpath
+++ b/core/plugins/org.eclipse.mdht.transformation.ocl2xpath/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/plugins/org.eclipse.mdht.uml.ui.properties/.classpath b/core/plugins/org.eclipse.mdht.uml.ui.properties/.classpath
index 098194c..1fa3e68 100644
--- a/core/plugins/org.eclipse.mdht.uml.ui.properties/.classpath
+++ b/core/plugins/org.eclipse.mdht.uml.ui.properties/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/plugins/org.eclipse.mdht.uml.ui/plugin.xml b/core/plugins/org.eclipse.mdht.uml.ui/plugin.xml
index 387f187..fcddd82 100644
--- a/core/plugins/org.eclipse.mdht.uml.ui/plugin.xml
+++ b/core/plugins/org.eclipse.mdht.uml.ui/plugin.xml
@@ -656,15 +656,20 @@
commandId="org.eclipse.mdht.uml.ui.cmd.smartconstraint.localiseclass">
<enabledWhen>
<with variable="selection">
- <iterate
- ifEmpty="false">
- <not>
- <test
- forcePluginActivation="false"
- property="org.eclipse.mdht.uml.ui.isLocalised">
- </test>
- </not>
- </iterate>
+ <and>
+ <instanceof
+ value="org.eclipse.uml2.uml.Classifier">
+ </instanceof>
+ <iterate
+ ifEmpty="false">
+ <not>
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.mdht.uml.ui.isLocalised">
+ </test>
+ </not>
+ </iterate>
+ </and>
</with>
</enabledWhen>
diff --git a/core/plugins/org.eclipse.mdht.validation.ocl2java/.classpath b/core/plugins/org.eclipse.mdht.validation.ocl2java/.classpath
index b1dabee..64ed6b3 100644
--- a/core/plugins/org.eclipse.mdht.validation.ocl2java/.classpath
+++ b/core/plugins/org.eclipse.mdht.validation.ocl2java/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/plugins/org.openhealthtools.mdht.transform.core/.classpath b/core/plugins/org.openhealthtools.mdht.transform.core/.classpath
index ad32c83..16d067f 100644
--- a/core/plugins/org.openhealthtools.mdht.transform.core/.classpath
+++ b/core/plugins/org.openhealthtools.mdht.transform.core/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/pom.xml b/pom.xml
index 23047bc..e03e1d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,14 +10,14 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>1.7.0</tycho-version>
- <tychoExtrasVersion>1.7.0</tychoExtrasVersion>
+ <tycho-version>2.0.0</tycho-version>
+ <tychoExtrasVersion>2.0.0</tychoExtrasVersion>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/mdht/org.eclipse.mdht</tycho.scmUrl>
<jarSignerVersion>1.1.2</jarSignerVersion>
<findbugs.version>3.0.1</findbugs.version>
<xtext.version>2.7.3</xtext.version>
- <java.source.version>1.7</java.source.version>
- <java.target.version>1.7</java.target.version>
+ <java.source.version>11</java.source.version>
+ <java.target.version>11</java.target.version>
<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
<skipAllTests>false</skipAllTests>
<skipInnerTests>true</skipInnerTests>
@@ -32,8 +32,8 @@
<mdht.repo.main>${eclipse.download}/modeling/mdht/updates/nightly/${mdht.eclipse.target}</mdht.repo.main>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
@@ -107,41 +107,7 @@
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtext.version}</version>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
