Merge branch 'master' into private/eclipse-4.7

[simantics/platform.git] / bundles / org.simantics.document / src / org / simantics / document / Exportable.java

diff --git a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java
index a1053dd83001dafde9e6923f2a569b3b3d8f1585..0908fd0f41d1e1a699e484859e3a1d92f9b85118 100644 (file)
--- a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java
+++ b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java
@@ -18,8 +18,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
-import org.eclipse.mylyn.wikitext.core.parser.MarkupParser;
-import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage;
+import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage;
+import org.eclipse.mylyn.wikitext.parser.MarkupParser;
 import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
@@ -105,7 +105,7 @@ public class Exportable implements IExportable {
        }
 
        @Override
-       public void export(Document document, PdfWriter writer) throws DocumentException {
+       public int export(Document document, PdfWriter writer) throws DocumentException {
 
                File temp = Simantics.getTempfile("wikiPdfExport", "pdf");
                try {
@@ -113,6 +113,7 @@ public class Exportable implements IExportable {
                        temp.getParentFile().mkdirs();
                        PhantomJSDriver.print(html, settings, temp);
                        
+                       int result = 0;
                PdfContentByte cb = writer.getDirectContent();
                PdfReader reader = new PdfReader(new BufferedInputStream(new FileInputStream(temp)));
                for (int i = 1; i <= reader.getNumberOfPages(); i++) {
@@ -123,8 +124,10 @@ public class Exportable implements IExportable {
                        //add the page to the destination pdf
                        float pts = Utilities.millimetersToPoints(10);
                        cb.addTemplate(page, pts, pts);
+                       ++result;
                }
 
+               return result;
                } catch (IOException e) {
 
                        throw new DocumentException(e);