Merge lp:~danilovesky/workcraft/trunk-export-png into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/.classpath'
--- CircuitPlugin/.classpath	2015-10-17 21:21:21 +0000
+++ CircuitPlugin/.classpath	2016-01-25 00:18:22 +0000
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/WorkcraftCore"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/CpogsPlugin"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-awt-util.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/STGPlugin"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/MpsatVerificationPlugin"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/PcompPlugin"/>

=== modified file 'PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tools/ShowSg.java'
--- PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tools/ShowSg.java	2016-01-21 16:35:51 +0000
+++ PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tools/ShowSg.java	2016-01-25 00:18:22 +0000
@@ -5,10 +5,10 @@
 
 import org.workcraft.Framework;
 import org.workcraft.Tool;
+import org.workcraft.gui.DesktopApi;
 import org.workcraft.plugins.petri.PetriNetModel;
 import org.workcraft.plugins.petrify.tasks.DrawSgResult;
 import org.workcraft.plugins.petrify.tasks.DrawSgTask;
-import org.workcraft.plugins.workspace.handlers.SystemOpen;
 import org.workcraft.tasks.ProgressMonitor;
 import org.workcraft.tasks.Result;
 import org.workcraft.tasks.Result.Outcome;
@@ -63,7 +63,8 @@
 			@Override
 			public void finished(Result<? extends DrawSgResult> result, String description) {
 				if (result.getOutcome() == Outcome.FINISHED) {
-					SystemOpen.open(result.getReturnValue().getPsFile());
+					DesktopApi.open(result.getReturnValue().getPsFile());
+					//SystemOpen.open(result.getReturnValue().getPsFile());
 				} else  if (result.getOutcome() != Outcome.CANCELLED) {
 					String errorMessage = "Petrify tool chain execution failed :-(";
 					Throwable cause = result.getCause();

=== added file 'ThirdParty/batik/batik-anim-1.8.jar'
Binary files ThirdParty/batik/batik-anim-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-anim-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-anim.jar'
Binary files ThirdParty/batik/batik-anim.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-anim.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-awt-util-1.8.jar'
Binary files ThirdParty/batik/batik-awt-util-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-awt-util-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-awt-util.jar'
Binary files ThirdParty/batik/batik-awt-util.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-awt-util.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-bridge-1.8.jar'
Binary files ThirdParty/batik/batik-bridge-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-bridge-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-bridge.jar'
Binary files ThirdParty/batik/batik-bridge.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-bridge.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-codec-1.8.jar'
Binary files ThirdParty/batik/batik-codec-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-codec-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-codec.jar'
Binary files ThirdParty/batik/batik-codec.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-codec.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-css-1.8.jar'
Binary files ThirdParty/batik/batik-css-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-css-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-css.jar'
Binary files ThirdParty/batik/batik-css.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-css.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-dom-1.8.jar'
Binary files ThirdParty/batik/batik-dom-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-dom-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-dom.jar'
Binary files ThirdParty/batik/batik-dom.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-dom.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-ext-1.8.jar'
Binary files ThirdParty/batik/batik-ext-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-ext-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-ext.jar'
Binary files ThirdParty/batik/batik-ext.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-ext.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-extension-1.8.jar'
Binary files ThirdParty/batik/batik-extension-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-extension-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-extension.jar'
Binary files ThirdParty/batik/batik-extension.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-extension.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-gui-util-1.8.jar'
Binary files ThirdParty/batik/batik-gui-util-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-gui-util-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-gui-util.jar'
Binary files ThirdParty/batik/batik-gui-util.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-gui-util.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-gvt-1.8.jar'
Binary files ThirdParty/batik/batik-gvt-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-gvt-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-gvt.jar'
Binary files ThirdParty/batik/batik-gvt.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-gvt.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-parser-1.8.jar'
Binary files ThirdParty/batik/batik-parser-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-parser-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-parser.jar'
Binary files ThirdParty/batik/batik-parser.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-parser.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-rasterizer-1.8.jar'
Binary files ThirdParty/batik/batik-rasterizer-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-rasterizer-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== added file 'ThirdParty/batik/batik-script-1.8.jar'
Binary files ThirdParty/batik/batik-script-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-script-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-script.jar'
Binary files ThirdParty/batik/batik-script.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-script.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-svg-dom-1.8.jar'
Binary files ThirdParty/batik/batik-svg-dom-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-svg-dom-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-svg-dom.jar'
Binary files ThirdParty/batik/batik-svg-dom.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-svg-dom.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-svggen-1.8.jar'
Binary files ThirdParty/batik/batik-svggen-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-svggen-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-svggen.jar'
Binary files ThirdParty/batik/batik-svggen.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-svggen.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-swing-1.8.jar'
Binary files ThirdParty/batik/batik-swing-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-swing-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-swing.jar'
Binary files ThirdParty/batik/batik-swing.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-swing.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-transcoder-1.8.jar'
Binary files ThirdParty/batik/batik-transcoder-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-transcoder-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-transcoder.jar'
Binary files ThirdParty/batik/batik-transcoder.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-transcoder.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-util-1.8.jar'
Binary files ThirdParty/batik/batik-util-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-util-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-util.jar'
Binary files ThirdParty/batik/batik-util.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-util.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/batik-xml-1.8.jar'
Binary files ThirdParty/batik/batik-xml-1.8.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/batik-xml-1.8.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/batik-xml.jar'
Binary files ThirdParty/batik/batik-xml.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/batik-xml.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/fop-transcoder-allinone.jar'
Binary files ThirdParty/batik/fop-transcoder-allinone.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/fop-transcoder-allinone.jar	2016-01-25 00:18:22 +0000 differ
=== added file 'ThirdParty/batik/xml-apis-1.3.04.jar'
Binary files ThirdParty/batik/xml-apis-1.3.04.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/xml-apis-1.3.04.jar	2016-01-25 00:18:22 +0000 differ
=== added file 'ThirdParty/batik/xml-apis-ext-1.3.04.jar'
Binary files ThirdParty/batik/xml-apis-ext-1.3.04.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/xml-apis-ext-1.3.04.jar	2016-01-25 00:18:22 +0000 differ
=== removed file 'ThirdParty/batik/xml-apis-ext.jar'
Binary files ThirdParty/batik/xml-apis-ext.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/xml-apis-ext.jar	1970-01-01 00:00:00 +0000 differ
=== removed file 'ThirdParty/batik/xml-apis.jar'
Binary files ThirdParty/batik/xml-apis.jar	2010-02-25 19:24:09 +0000 and ThirdParty/batik/xml-apis.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'ThirdParty/batik/xmlgraphics-commons-2.1.jar'
Binary files ThirdParty/batik/xmlgraphics-commons-2.1.jar	1970-01-01 00:00:00 +0000 and ThirdParty/batik/xmlgraphics-commons-2.1.jar	2016-01-25 00:18:22 +0000 differ
=== modified file 'WorkcraftCore/.classpath'
--- WorkcraftCore/.classpath	2015-12-17 16:50:15 +0000
+++ WorkcraftCore/.classpath	2016-01-25 00:18:22 +0000
@@ -2,26 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-anim.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-awt-util.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-bridge.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-codec.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-css.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-dom.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-ext.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-extension.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-gui-util.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-gvt.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-parser.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-script.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-svg-dom.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-svggen.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-swing.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-transcoder.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-util.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/batik-xml.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/xml-apis-ext.jar"/>
-	<classpathentry kind="lib" path="/ThirdParty/batik/xml-apis.jar"/>
 	<classpathentry kind="lib" path="/ThirdParty/flexdock-0.5.1.jar"/>
 	<classpathentry kind="lib" path="/ThirdParty/javaparser-1.0.7.jar"/>
 	<classpathentry kind="lib" path="/ThirdParty/jedit.jar"/>
@@ -33,5 +13,28 @@
 	<classpathentry kind="lib" path="/ThirdParty/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="/ThirdParty/"/>
 	<classpathentry kind="lib" path="/ThirdParty/jga-0.8-lgpl.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-bridge-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-dom-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-util-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-script-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-svg-dom-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-gvt-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-svggen-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-codec-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-css-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-ext-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-extension-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-gui-util-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-parser-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-rasterizer-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-swing-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-transcoder-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-xml-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/xml-apis-1.3.04.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/xml-apis-ext-1.3.04.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-awt-util-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/batik-anim-1.8.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/xmlgraphics-commons-2.1.jar"/>
+	<classpathentry kind="lib" path="/ThirdParty/batik/fop-transcoder-allinone.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

=== modified file 'WorkcraftCore/src/org/workcraft/gui/workspace/WorkspacePopupProvider.java'
--- WorkcraftCore/src/org/workcraft/gui/workspace/WorkspacePopupProvider.java	2016-01-14 18:28:55 +0000
+++ WorkcraftCore/src/org/workcraft/gui/workspace/WorkspacePopupProvider.java	2016-01-25 00:18:22 +0000
@@ -68,10 +68,8 @@
 
 		final File file = workspace.getFile(path);
 
-		if(file.isDirectory())
-		{
+		if(file.isDirectory()) {
 			popup.addSeparator();
-
 			{
 				final JMenuItem miLink = new JMenuItem("Link external files or directories...");
 				miLink.addActionListener(new ActionListener() {
@@ -125,31 +123,29 @@
 		{
 			popup.addSeparator();
 			final WorkspaceEntry openFile = workspace.getOpenFile(path);
-			if (openFile==null)
-			{
+			if (openFile==null) {
 				if(file.exists()) {
-					if(file.getName().endsWith(FileFilters.DOCUMENT_EXTENSION))
-					{
+					if(file.getName().endsWith(FileFilters.DOCUMENT_EXTENSION)) {
 						final JMenuItem miOpen = new JMenuItem("Open");
-						miOpen.addActionListener(new ActionListener()
-						{ 
-							@Override public void actionPerformed(ActionEvent e) {
+						miOpen.addActionListener(new ActionListener() { 
+							@Override 
+							public void actionPerformed(ActionEvent e) {
 								framework.getMainWindow().openWork(file);
 							}
-						}
-						);
+						});
 						popup.add(miOpen);
 					}
 
 					for (PluginInfo<? extends FileHandler> info : framework.getPluginManager().getPlugins(FileHandler.class)) {
 						FileHandler handler = info.getSingleton();
 
-						if (!handler.accept(file))
-							continue;
+						if ( !handler.accept(file) ) {
+							continue;
+						}
 						JMenuItem mi = new JMenuItem(handler.getDisplayName());
 						handlers.put(mi, handler);
 						mi.addActionListener(new ActionListener() {
-
+							@Override
 							public void actionPerformed(ActionEvent e) {
 								handlers.get(e.getSource()).execute(file);
 							}
@@ -167,6 +163,7 @@
 
 				JMenuItem miOpenView = new JMenuItem("Open editor");
 				miOpenView.addActionListener(new ActionListener() {
+					@Override
 					public void actionPerformed(ActionEvent e) {
 						framework.getMainWindow().createEditorWindow(openFile);
 					}
@@ -174,6 +171,7 @@
 
 				JMenuItem miSave = new JMenuItem("Save");
 				miSave.addActionListener(new ActionListener() {
+					@Override
 					public void actionPerformed(ActionEvent e) {
 						try {
 							framework.getMainWindow().save(openFile);
@@ -184,6 +182,7 @@
 
 				JMenuItem miSaveAs = new JMenuItem("Save as...");
 				miSaveAs.addActionListener(new ActionListener() {
+					@Override
 					public void actionPerformed(ActionEvent e) {
 						try {
 							framework.getMainWindow().saveAs(openFile);
@@ -238,6 +237,7 @@
 
 			JMenuItem miRemove = new JMenuItem("Delete");
 			miRemove.addActionListener(new ActionListener() {
+				@Override
 				public void actionPerformed(ActionEvent e) {
 					try {
 						workspace.delete(path);

=== modified file 'WorkcraftCore/src/org/workcraft/plugins/BuiltinExporters.java'
--- WorkcraftCore/src/org/workcraft/plugins/BuiltinExporters.java	2014-12-12 18:43:40 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/BuiltinExporters.java	2016-01-25 00:18:22 +0000
@@ -5,6 +5,9 @@
 import org.workcraft.PluginManager;
 import org.workcraft.interop.Exporter;
 import org.workcraft.plugins.interop.DotExporter;
+import org.workcraft.plugins.interop.PSExporter;
+import org.workcraft.plugins.interop.PDFExporter;
+import org.workcraft.plugins.interop.PNGExporter;
 import org.workcraft.plugins.interop.SVGExporter;
 
 public class BuiltinExporters implements Module {
@@ -15,6 +18,9 @@
 		
 		pm.registerClass(Exporter.class, DotExporter.class);
 		pm.registerClass(Exporter.class, SVGExporter.class);
+		pm.registerClass(Exporter.class, PDFExporter.class);
+		pm.registerClass(Exporter.class, PSExporter.class);
+		pm.registerClass(Exporter.class, PNGExporter.class);
 	}
 
 	@Override

=== added file 'WorkcraftCore/src/org/workcraft/plugins/interop/PDFExporter.java'
--- WorkcraftCore/src/org/workcraft/plugins/interop/PDFExporter.java	1970-01-01 00:00:00 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/interop/PDFExporter.java	2016-01-25 00:18:22 +0000
@@ -0,0 +1,110 @@
+/*
+*
+* Copyright 2008,2009 Newcastle University
+*
+* This file is part of Workcraft.
+* 
+* Workcraft is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* Workcraft is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with Workcraft.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+package org.workcraft.plugins.interop;
+
+import java.awt.Dimension;
+import java.awt.geom.Rectangle2D;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.UUID;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.batik.svggen.SVGGraphics2D;
+import org.apache.batik.transcoder.Transcoder;
+import org.apache.batik.transcoder.TranscoderException;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.fop.svg.PDFTranscoder;
+import org.w3c.dom.Document;
+import org.workcraft.dom.Model;
+import org.workcraft.dom.visual.VisualGroup;
+import org.workcraft.dom.visual.VisualModel;
+import org.workcraft.exceptions.ModelValidationException;
+import org.workcraft.exceptions.SerialisationException;
+import org.workcraft.gui.graph.tools.Decorator;
+import org.workcraft.interop.Exporter;
+import org.workcraft.serialisation.Format;
+import org.workcraft.util.XmlUtil;
+
+public class PDFExporter implements Exporter {
+
+	
+	public void export(Model model, OutputStream out) throws IOException,
+			ModelValidationException, SerialisationException {
+		
+		if (model == null)
+			throw new SerialisationException ("Not a visual model");
+
+			try {
+				Document doc = XmlUtil.createDocument();
+				
+				SVGGraphics2D g2d = new SVGGraphics2D(doc);
+				
+				g2d.scale(50, 50);
+				
+				Rectangle2D bounds = ((VisualGroup)model.getRoot()).getBoundingBoxInLocalSpace();
+				
+				g2d.translate(-bounds.getMinX(), -bounds.getMinY());
+				g2d.setSVGCanvasSize(new Dimension((int)(bounds.getWidth()*50), (int)(bounds.getHeight()*50)));
+				
+				((VisualModel)model).draw(g2d, Decorator.Empty.INSTANCE);
+				
+				ByteArrayOutputStream svgOut = new ByteArrayOutputStream();
+				g2d.stream(new OutputStreamWriter(svgOut));
+				ByteArrayInputStream svgIn = new ByteArrayInputStream(svgOut.toByteArray());
+				
+			    Transcoder transcoder = new PDFTranscoder();
+			    TranscoderInput transcoderInput = new TranscoderInput(svgIn);
+			    TranscoderOutput transcoderOutput = new TranscoderOutput(out);
+			    transcoder.transcode(transcoderInput, transcoderOutput);
+			} catch (ParserConfigurationException e) {
+				throw new SerialisationException(e);
+			} catch (TranscoderException e) {
+				throw new SerialisationException(e);
+			}
+		}
+
+	
+	public String getDescription() {
+		return ".pdf (FOP PDF generator)";
+	}
+
+	public String getExtenstion() {
+		return ".pdf";
+	}
+
+	public int getCompatibility(Model model) {
+		if (model instanceof VisualModel)
+			return Exporter.GENERAL_COMPATIBILITY;
+		else
+			return Exporter.NOT_COMPATIBLE;
+	}
+
+	@Override
+	public UUID getTargetFormat() {
+		return Format.PDF;
+	}
+}
\ No newline at end of file

=== added file 'WorkcraftCore/src/org/workcraft/plugins/interop/PNGExporter.java'
--- WorkcraftCore/src/org/workcraft/plugins/interop/PNGExporter.java	1970-01-01 00:00:00 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/interop/PNGExporter.java	2016-01-25 00:18:22 +0000
@@ -0,0 +1,110 @@
+/*
+*
+* Copyright 2008,2009 Newcastle University
+*
+* This file is part of Workcraft.
+* 
+* Workcraft is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* Workcraft is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with Workcraft.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+package org.workcraft.plugins.interop;
+
+import java.awt.Dimension;
+import java.awt.geom.Rectangle2D;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.UUID;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.batik.svggen.SVGGraphics2D;
+import org.apache.batik.transcoder.Transcoder;
+import org.apache.batik.transcoder.TranscoderException;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.w3c.dom.Document;
+import org.workcraft.dom.Model;
+import org.workcraft.dom.visual.VisualGroup;
+import org.workcraft.dom.visual.VisualModel;
+import org.workcraft.exceptions.ModelValidationException;
+import org.workcraft.exceptions.SerialisationException;
+import org.workcraft.gui.graph.tools.Decorator;
+import org.workcraft.interop.Exporter;
+import org.workcraft.serialisation.Format;
+import org.workcraft.util.XmlUtil;
+
+public class PNGExporter implements Exporter {
+
+	
+	public void export(Model model, OutputStream out) throws IOException,
+			ModelValidationException, SerialisationException {
+		
+		if (model == null)
+			throw new SerialisationException ("Not a visual model");
+
+			try {
+				Document doc = XmlUtil.createDocument();
+				
+				SVGGraphics2D g2d = new SVGGraphics2D(doc);
+				
+				g2d.scale(50, 50);
+				
+				Rectangle2D bounds = ((VisualGroup)model.getRoot()).getBoundingBoxInLocalSpace();
+				
+				g2d.translate(-bounds.getMinX(), -bounds.getMinY());
+				g2d.setSVGCanvasSize(new Dimension((int)(bounds.getWidth()*50), (int)(bounds.getHeight()*50)));
+				
+				((VisualModel)model).draw(g2d, Decorator.Empty.INSTANCE);
+				
+				ByteArrayOutputStream svgOut = new ByteArrayOutputStream();
+				g2d.stream(new OutputStreamWriter(svgOut));
+				ByteArrayInputStream svgIn = new ByteArrayInputStream(svgOut.toByteArray());
+				
+			    Transcoder transcoder = new PNGTranscoder();
+			    TranscoderInput transcoderInput = new TranscoderInput(svgIn);
+			    TranscoderOutput transcoderOutput = new TranscoderOutput(out);
+			    transcoder.transcode(transcoderInput, transcoderOutput);
+			} catch (ParserConfigurationException e) {
+				throw new SerialisationException(e);
+			} catch (TranscoderException e) {
+				throw new SerialisationException(e);
+			}
+		}
+
+	
+	public String getDescription() {
+		return ".png (FOP PNG transcoder)";
+	}
+
+	public String getExtenstion() {
+		return ".png";
+	}
+
+	public int getCompatibility(Model model) {
+		if (model instanceof VisualModel)
+			return Exporter.GENERAL_COMPATIBILITY;
+		else
+			return Exporter.NOT_COMPATIBLE;
+	}
+
+	@Override
+	public UUID getTargetFormat() {
+		return Format.PNG;
+	}
+}
\ No newline at end of file

=== added file 'WorkcraftCore/src/org/workcraft/plugins/interop/PSExporter.java'
--- WorkcraftCore/src/org/workcraft/plugins/interop/PSExporter.java	1970-01-01 00:00:00 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/interop/PSExporter.java	2016-01-25 00:18:22 +0000
@@ -0,0 +1,110 @@
+/*
+*
+* Copyright 2008,2009 Newcastle University
+*
+* This file is part of Workcraft.
+* 
+* Workcraft is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* Workcraft is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with Workcraft.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+package org.workcraft.plugins.interop;
+
+import java.awt.Dimension;
+import java.awt.geom.Rectangle2D;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.UUID;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.batik.svggen.SVGGraphics2D;
+import org.apache.batik.transcoder.Transcoder;
+import org.apache.batik.transcoder.TranscoderException;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.fop.render.ps.PSTranscoder;
+import org.w3c.dom.Document;
+import org.workcraft.dom.Model;
+import org.workcraft.dom.visual.VisualGroup;
+import org.workcraft.dom.visual.VisualModel;
+import org.workcraft.exceptions.ModelValidationException;
+import org.workcraft.exceptions.SerialisationException;
+import org.workcraft.gui.graph.tools.Decorator;
+import org.workcraft.interop.Exporter;
+import org.workcraft.serialisation.Format;
+import org.workcraft.util.XmlUtil;
+
+public class PSExporter implements Exporter {
+
+	
+	public void export(Model model, OutputStream out) throws IOException,
+			ModelValidationException, SerialisationException {
+		
+		if (model == null)
+			throw new SerialisationException ("Not a visual model");
+
+			try {
+				Document doc = XmlUtil.createDocument();
+				
+				SVGGraphics2D g2d = new SVGGraphics2D(doc);
+				
+				g2d.scale(50, 50);
+				
+				Rectangle2D bounds = ((VisualGroup)model.getRoot()).getBoundingBoxInLocalSpace();
+				
+				g2d.translate(-bounds.getMinX(), -bounds.getMinY());
+				g2d.setSVGCanvasSize(new Dimension((int)(bounds.getWidth()*50), (int)(bounds.getHeight()*50)));
+				
+				((VisualModel)model).draw(g2d, Decorator.Empty.INSTANCE);
+				
+				ByteArrayOutputStream svgOut = new ByteArrayOutputStream();
+				g2d.stream(new OutputStreamWriter(svgOut));
+				ByteArrayInputStream svgIn = new ByteArrayInputStream(svgOut.toByteArray());
+				
+			    Transcoder transcoder = new PSTranscoder();
+			    TranscoderInput transcoderInput = new TranscoderInput(svgIn);
+			    TranscoderOutput transcoderOutput = new TranscoderOutput(out);
+			    transcoder.transcode(transcoderInput, transcoderOutput);
+			} catch (ParserConfigurationException e) {
+				throw new SerialisationException(e);
+			} catch (TranscoderException e) {
+				throw new SerialisationException(e);
+			}
+		}
+
+	
+	public String getDescription() {
+		return ".ps (FOP PS transcoder)";
+	}
+
+	public String getExtenstion() {
+		return ".ps";
+	}
+
+	public int getCompatibility(Model model) {
+		if (model instanceof VisualModel)
+			return Exporter.GENERAL_COMPATIBILITY;
+		else
+			return Exporter.NOT_COMPATIBLE;
+	}
+
+	@Override
+	public UUID getTargetFormat() {
+		return Format.PS;
+	}
+}
\ No newline at end of file

=== modified file 'WorkcraftCore/src/org/workcraft/plugins/workspace/handlers/SystemOpen.java'
--- WorkcraftCore/src/org/workcraft/plugins/workspace/handlers/SystemOpen.java	2015-11-24 14:16:37 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/workspace/handlers/SystemOpen.java	2016-01-25 00:18:22 +0000
@@ -21,37 +21,23 @@
 
 package org.workcraft.plugins.workspace.handlers;
 
-import java.awt.Desktop;
 import java.io.File;
-import java.io.IOException;
 
+import org.workcraft.gui.DesktopApi;
 import org.workcraft.gui.FileFilters;
 import org.workcraft.workspace.FileHandler;
 
 public class SystemOpen implements FileHandler {
 
+	@Override
 	public boolean accept(File f) {
 		return !f.getName().endsWith(FileFilters.DOCUMENT_EXTENSION);
 	}
-
-
+
+	@Override
 	public void execute(File f) {
-		open(f);
-	}
-
-
-	public static void open(File f) {
-		try {
-			if (System.getProperty ("os.name").contains("Windows")) {
-				Runtime.getRuntime().exec (new String[] {"cmd", "/c", f.getAbsolutePath() });
-			} else {
-				Desktop.getDesktop().open(f);
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
+		DesktopApi.open(f);
+	}
 
 	@Override
 	public String getDisplayName() {

=== modified file 'WorkcraftCore/src/org/workcraft/serialisation/Format.java'
--- WorkcraftCore/src/org/workcraft/serialisation/Format.java	2015-06-29 17:01:11 +0000
+++ WorkcraftCore/src/org/workcraft/serialisation/Format.java	2016-01-25 00:18:22 +0000
@@ -27,7 +27,9 @@
 	public static final UUID STG = UUID.fromString("000199d9-4ac1-4423-b8ea-9017d838e45b");
 	public static final UUID SG = UUID.fromString("f309012a-ab89-4036-bb80-8b1a161e8899");
 	public static final UUID SVG = UUID.fromString("99439c3c-753b-46e3-a5d5-6a0993305a2c");
-	public static final UUID PS  = UUID.fromString("9b5bd9f0-b5cf-11df-8d81-0800200c9a66");
+	public static final UUID PS  = UUID.fromString("9b5bd9f0-b5cf-11df-8d81-0800200c9a66");
+	public static final UUID PDF  = UUID.fromString("fa1da69d-3a17-4296-809e-a71f28066fc0");
+	public static final UUID PNG  = UUID.fromString("c09714a6-cae9-4744-95cb-17ba4d28f5ef");
 	public static final UUID workcraftXML = UUID.fromString("6ea20f69-c9c4-4888-9124-252fe4345309"); 
 	public static final UUID defaultVisualXML = UUID.fromString("2fa9669c-a1bf-4be4-8622-007635d672e5");
 	public static final UUID DOT = UUID.fromString("f1596b60-e294-11de-8a39-0800200c9a66");
@@ -44,6 +46,10 @@
 			return ".svg (Scalable Vector Graphics)";
 		else if (format.equals(PS))
 			return ".ps (PostScript)";
+		else if (format.equals(PDF))
+			return ".pdf (Portable Document Format)";
+		else if (format.equals(PNG))
+			return ".png (Portable Network Graphics)";
 		else if (format.equals(workcraftXML))
 			return ".xml (Workcraft math model)";
 		else if (format.equals(defaultVisualXML))

=== modified file 'WorkcraftCore/src/org/workcraft/util/GUI.java'
--- WorkcraftCore/src/org/workcraft/util/GUI.java	2015-09-10 22:34:47 +0000
+++ WorkcraftCore/src/org/workcraft/util/GUI.java	2016-01-25 00:18:22 +0000
@@ -25,10 +25,10 @@
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
 import org.apache.batik.gvt.GraphicsNode;
 import org.apache.batik.util.XMLResourceDescriptor;
 import org.w3c.dom.Document;
@@ -125,8 +125,7 @@
 			BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
 
 			Graphics2D g2d = (Graphics2D) bufferedImage.getGraphics();
-			if(background!=null)
-			{
+			if (background != null) {
 				g2d.setColor(background);
 				g2d.fillRect(0,0,width, height);
 			}