diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 9d51945..d28b472 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,8 +1,7 @@ -#Wed Mar 13 11:54:06 CET 2013 =\=\=\=\=\=\= <<<<<<<=.mine >>>>>>>=.r71295 eclipse.preferences.version=1 -lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.0.5-SNAPSHOT +lastWarOutDir=/home/gioia/workspace/reports/target/reports-4.0.5-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2dc054b..7cfe79f 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,6 +5,12 @@ + + uses + + + uses + diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java index fab8f60..02a81e8 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java @@ -53,8 +53,9 @@ public class Headerbar extends Composite{ private static final String EXPORT_OPENXML = "Export to OpenXML (docx)"; private static final String EXPORT_HTML = "Export to HTML"; private static final String EXPORT_FIMES = "Export to FiMES XML"; + private static final String EXPORT_XML = "Export to XML"; private static final String EXPORT_ENCRYPTED_REPORT = "Save Encrypted Version to Desktop"; - + private static final String VIEW_USER_COMMENTS = "View user comments"; String location; @@ -90,6 +91,8 @@ public class Headerbar extends Composite{ private MenuItem optionFimes; + private MenuItem optionXML; + private MenuItem optionEncryptedModel; private MenuItem viewMetadata; @@ -349,12 +352,14 @@ public class Headerbar extends Composite{ optionPDF = new MenuItem("Export to PDF", true, getDisabledExportMenuItemCmd()); optionHTML = new MenuItem(""+ EXPORT_HTML +"", true, getDisabledExportMenuItemCmd()); optionFimes = new MenuItem(""+ EXPORT_FIMES +"", true, getDisabledExportMenuItemCmd()); + optionXML = new MenuItem(""+ EXPORT_XML +"", true, getDisabledExportMenuItemCmd()); optionEncryptedModel = new MenuItem(""+ EXPORT_ENCRYPTED_REPORT +"", true, getDisabledExportMenuItemCmd()); exportsMenu.addItem(optionDOCX); exportsMenu.addItem(optionHTML); exportsMenu.addItem(optionPDF); + exportsMenu.addItem(optionXML); exportsMenu.addItem(optionEncryptedModel); //optionsMenu.addItem(optionPDF); //exportsMenu.addItem(optionFimes); @@ -410,6 +415,9 @@ public class Headerbar extends Composite{ optionFimes.setHTML(EXPORT_FIMES); optionFimes.setCommand(generateFimes); + optionXML.setHTML(EXPORT_XML); + optionXML.setCommand(generatedXML); + optionEncryptedModel.setHTML(EXPORT_ENCRYPTED_REPORT); optionEncryptedModel.setCommand(generateEncryptedModel); // @@ -631,6 +639,12 @@ public class Headerbar extends Composite{ } }; + Command generatedXML = new Command() { + public void execute() { + presenter.generateManifestation(templateModel, ExportManifestationType.XML); + } + }; + Command generateEncryptedModel = new Command() { @Override diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java index 285b1d7..15356bb 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java @@ -680,7 +680,9 @@ public class Presenter { case PDF: popup.export(reportModel, TypeExporter.PDF); break; - + case XML: + popup.export(reportModel, TypeExporter.XML); + break; }