You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/06/11 17:57:40 UTC
[1/2] incubator-taverna-workbench git commit: Catch ParseException
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 0c723d627 -> 8502f8dee
Catch ParseException
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/195c3cef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/195c3cef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/195c3cef
Branch: refs/heads/master
Commit: 195c3cefc709606d6586d62d95fe85be1966fbf4
Parents: 0c723d6
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 11 16:56:49 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 11 16:56:49 2015 +0100
----------------------------------------------------------------------
.../taverna/workbench/models/graph/svg/SVGGraphController.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/195c3cef/taverna-graph-model/src/main/java/org/apache/taverna/workbench/models/graph/svg/SVGGraphController.java
----------------------------------------------------------------------
diff --git a/taverna-graph-model/src/main/java/org/apache/taverna/workbench/models/graph/svg/SVGGraphController.java b/taverna-graph-model/src/main/java/org/apache/taverna/workbench/models/graph/svg/SVGGraphController.java
index 7eb6453..c613fa5 100644
--- a/taverna-graph-model/src/main/java/org/apache/taverna/workbench/models/graph/svg/SVGGraphController.java
+++ b/taverna-graph-model/src/main/java/org/apache/taverna/workbench/models/graph/svg/SVGGraphController.java
@@ -51,6 +51,7 @@ import static org.apache.batik.util.SVGConstants.SVG_Y1_ATTRIBUTE;
import static org.apache.batik.util.SVGConstants.SVG_Y2_ATTRIBUTE;
import static org.apache.batik.util.SVGConstants.SVG_Y_ATTRIBUTE;
+
import java.awt.Color;
import java.awt.Point;
import java.awt.Rectangle;
@@ -75,6 +76,7 @@ import org.apache.taverna.workbench.models.graph.GraphEdge;
import org.apache.taverna.workbench.models.graph.GraphElement;
import org.apache.taverna.workbench.models.graph.GraphNode;
import org.apache.taverna.workbench.models.graph.dot.GraphLayout;
+import org.apache.taverna.workbench.models.graph.dot.ParseException;
import org.apache.batik.bridge.UpdateManager;
import org.apache.batik.dom.svg.SVGOMAnimationElement;
@@ -224,6 +226,8 @@ public class SVGGraphController extends GraphController {
logger.warn("Invalid dot returned");
else
actualBounds = graphLayout.layoutGraph(this, graph, layout, bounds);
+ } catch (ParseException e) {
+ throw new RuntimeException("Can't parse dot", e);
} catch (IOException e) {
outputMessage(dotErrorMessage);
setDotMissing(true);
[2/2] incubator-taverna-workbench git commit: No,
xmlgraphs 1.7 - API incompatibility with 1.8 :-//
Posted by st...@apache.org.
No, xmlgraphs 1.7 - API incompatibility with 1.8 :-//
Semantic Versioning, please..
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/8502f8de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/8502f8de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/8502f8de
Branch: refs/heads/master
Commit: 8502f8deed0bc4199281aa342f1478c6e497b96c
Parents: 195c3ce
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 11 16:57:09 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 11 16:57:09 2015 +0100
----------------------------------------------------------------------
batik-osgi/pom.xml | 13 ++++++++-----
pom.xml | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/8502f8de/batik-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/batik-osgi/pom.xml b/batik-osgi/pom.xml
index 68864d1..2f0779b 100644
--- a/batik-osgi/pom.xml
+++ b/batik-osgi/pom.xml
@@ -24,10 +24,13 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>batik-osgi</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Batik OSGi</name>
<description>Apache Batik wrapped as an OSGi bundle</description>
+ <properties>
+ <xmlbridge.version>1.8</xmlbridge.version>
+ </properties>
<build>
<plugins>
<plugin>
@@ -64,7 +67,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svg-dom</artifactId>
- <version>1.8</version>
+ <version>1.7</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -80,7 +83,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
- <version>1.8</version>
+ <version>1.7</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -96,7 +99,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-swing</artifactId>
- <version>1.8</version>
+ <version>1.7</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -108,7 +111,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-util</artifactId>
- <version>1.8</version>
+ <version>1.7</version>
<scope>provided</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/8502f8de/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8816a34..f04d99a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
<taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
<org.icepdf.version>4.2.0</org.icepdf.version>
- <batik.version>1.8.0-SNAPSHOT</batik.version>
+ <batik.version>1.7.0-SNAPSHOT</batik.version>
<org.fife.ui.hexeditor.version>1.1-SNAPSHOT</org.fife.ui.hexeditor.version>
</properties>