Updates to runtime
removed cell styles in attempt to determine saving issue
updates to manifest for acceleo
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/CDAValueUtil.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/CDAValueUtil.java
index 4f11cba..1a1bbc1 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/CDAValueUtil.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/CDAValueUtil.java
@@ -290,7 +290,7 @@
}
- static CellStyle getDocumentDateStyle(Workbook workbook) {
+ static CellStyle getDocumentDateStylezzz(Workbook workbook) {
if (!GenerateCDADataHandler.documentDateStyles.containsKey(workbook)) {
CellStyle documentDateStyle = workbook.createCellStyle();
CreationHelper createHelper = workbook.getCreationHelper();
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 ede4e33..07100d1 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
@@ -917,7 +917,7 @@
return cdaMetrics;
}
- void format(String fileLocation, IProgressMonitor monitor) throws IOException {
+ void formatxxx(String fileLocation, IProgressMonitor monitor) throws IOException {
// FileInputStream fis = new FileInputStream(fileLocation);
@@ -2262,11 +2262,11 @@
/**
* @TODO Add preference for formatting
*/
- if (false && (folder != null
- ? folder.members().length
- : 1) < 50) {
- format(fileLocation, monitor);
- }
+ // if (false && (folder != null
+ // ? folder.members().length
+ // : 1) < 50) {
+ // format(fileLocation, monitor);
+ // }
monitor.subTask(
"Completed Saving " + CDAValueUtil.DATE_FORMAT3.format(new Date()) + "_" + (folder != null
? folder.getName().toUpperCase()
@@ -3542,11 +3542,11 @@
/**
* @TODO Add preference for formatting
*/
- if (false && (folder != null
- ? folder.members().length
- : 1) < 50) {
- format(fileLocation, monitor);
- }
+ // if (false && (folder != null
+ // ? folder.members().length
+ // : 1) < 50) {
+ // format(fileLocation, monitor);
+ // }
monitor.subTask(
"Completed Saving " + CDAValueUtil.DATE_FORMAT3.format(new Date()) + "_" + (folder != null
? folder.getName().toUpperCase()
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 3c7f23b..d3b403f 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
@@ -1171,7 +1171,7 @@
if (documentMetadata.documentDate != null) {
cell = row.createCell(offset++);
- cell.setCellStyle(CDAValueUtil.getDocumentDateStyle(row.getSheet().getWorkbook()));
+ // cell.setCellStyle(CDAValueUtil.getDocumentDateStyle(row.getSheet().getWorkbook()));
cell.setCellValue(documentMetadata.documentDate);
} else {
row.createCell(offset++);
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda.ui/META-INF/MANIFEST.MF b/cda/plugins/org.eclipse.mdht.uml.cda.ui/META-INF/MANIFEST.MF
index c4f4e5e..a98445c 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda.ui/META-INF/MANIFEST.MF
+++ b/cda/plugins/org.eclipse.mdht.uml.cda.ui/META-INF/MANIFEST.MF
@@ -38,10 +38,10 @@
org.eclipse.mdht.dita.ui,
org.eclipse.pde.ui,
org.eclipse.emf.ecore,
- org.eclipse.acceleo.common;bundle-version="3.3.0",
- org.eclipse.acceleo.model;bundle-version="3.3.0",
- org.eclipse.acceleo.profiler;bundle-version="3.3.0",
- org.eclipse.acceleo.engine;bundle-version="3.3.0",
+ org.eclipse.acceleo.common,
+ org.eclipse.acceleo.model,
+ org.eclipse.acceleo.profiler,
+ org.eclipse.acceleo.engine,
com.google.guava
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mdht.uml.cda.ui.acceleo.main,
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 d795420..11b9e29 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
@@ -407,7 +407,7 @@
// create a validation result object to collect diagnostics produced during validation
ValidationResult result = new ValidationResult();
ClinicalDocument clinicalDocument = CDAUtil.load(
- new FileInputStream("samples/aaa/Immunization_eICR.07152020.xml"), result);
+ new FileInputStream("samples/Sample_CCDA_CCD_b1_Ambulatory_v2.xml"), result);
System.out.println("\n***** Reserialization of sample *****");
System.out.println(clinicalDocument);
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/TestSTDC.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/TestSTDC.java
index ffd1e28..757a0e7 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/TestSTDC.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/TestSTDC.java
@@ -24,11 +24,10 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.FeatureMapUtil;
import org.eclipse.mdht.uml.cda.CDAFactory;
-import org.eclipse.mdht.uml.cda.Patient;
-import org.eclipse.mdht.uml.cda.Performer2;
-import org.eclipse.mdht.uml.cda.SubjectPerson;
+import org.eclipse.mdht.uml.cda.Observation;
import org.eclipse.mdht.uml.cda.util.CDAUtil;
import org.eclipse.mdht.uml.hl7.datatypes.DatatypesFactory;
+import org.eclipse.mdht.uml.hl7.datatypes.IVL_REAL;
import org.eclipse.mdht.uml.hl7.datatypes.ST;
/**
@@ -135,27 +134,39 @@
* @throws Exception
*/
public static void main(String[] args) throws Exception {
- Patient p = CDAFactory.eINSTANCE.createPatient();
+ // Patient p = CDAFactory.eINSTANCE.createPatient();
+ //
+ // p.setEthnicGroupCode(DatatypesFactory.eINSTANCE.createCE("11a", "22"));
+ // p.getSDTCEthnicGroupCodes().add(DatatypesFactory.eINSTANCE.createCE("11b", "22"));
+ // p.getSDTCEthnicGroupCodes().add(DatatypesFactory.eINSTANCE.createCE("11c", "22"));
+ //
+ // p.getSDTCEthnicGroupCodes().add(DatatypesFactory.eINSTANCE.createCE("11d", "22"));
+ //
+ // p.getGuardians().add(CDAFactory.eINSTANCE.createGuardian());
+ // p.getGuardians().add(CDAFactory.eINSTANCE.createGuardian());
+ // p.getGuardians().add(CDAFactory.eINSTANCE.createGuardian());
+ // CDAUtil.saveSnippet(p, System.out);
+ //
+ // SubjectPerson sp = CDAFactory.eINSTANCE.createSubjectPerson();
+ // populate(sp, 4);
+ // CDAUtil.saveSnippet(sp, System.out);
+ //
+ // System.out.println("asdfasdf");
+ // Performer2 performer2 = CDAFactory.eINSTANCE.createPerformer2();
+ // populate(performer2, 4);
+ // CDAUtil.saveSnippet(performer2, System.out);
- p.setEthnicGroupCode(DatatypesFactory.eINSTANCE.createCE("11a", "22"));
- p.getSDTCEthnicGroupCodes().add(DatatypesFactory.eINSTANCE.createCE("11b", "22"));
- p.getSDTCEthnicGroupCodes().add(DatatypesFactory.eINSTANCE.createCE("11c", "22"));
+ Observation observation = CDAFactory.eINSTANCE.createObservation();
+ IVL_REAL real = DatatypesFactory.eINSTANCE.createIVL_REAL();
+ real.setLow(DatatypesFactory.eINSTANCE.createIVXB_REAL());
+ real.getLow().setValue(9.0);
+ real.setHigh(DatatypesFactory.eINSTANCE.createIVXB_REAL());
+ real.getHigh().setValue(9.0);
+ real.setCenter(DatatypesFactory.eINSTANCE.createIVXB_REAL());
- p.getSDTCEthnicGroupCodes().add(DatatypesFactory.eINSTANCE.createCE("11d", "22"));
+ observation.getValues().add(real);
+ CDAUtil.saveSnippet(observation, System.out);
- p.getGuardians().add(CDAFactory.eINSTANCE.createGuardian());
- p.getGuardians().add(CDAFactory.eINSTANCE.createGuardian());
- p.getGuardians().add(CDAFactory.eINSTANCE.createGuardian());
- CDAUtil.saveSnippet(p, System.out);
-
- SubjectPerson sp = CDAFactory.eINSTANCE.createSubjectPerson();
- populate(sp, 4);
- CDAUtil.saveSnippet(sp, System.out);
-
- System.out.println("asdfasdf");
- Performer2 performer2 = CDAFactory.eINSTANCE.createPerformer2();
- populate(performer2, 4);
- CDAUtil.saveSnippet(performer2, System.out);
// sp.setAdministrativeGenderCode(DatatypesFactory.eINSTANCE);
}
