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 2016/10/24 07:03:45 UTC
[4/6] incubator-taverna-workbench git commit: Update to Jena 3
Update to Jena 3
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/b219f5d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/b219f5d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/b219f5d3
Branch: refs/heads/master
Commit: b219f5d3cc2a9789420687c0741c1773bac25d7b
Parents: a053fbd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 21 12:26:47 2016 +0200
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 21 12:26:47 2016 +0200
----------------------------------------------------------------------
.../reference/ui/WorkflowLaunchWindow.java | 41 +++++++++-----------
1 file changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/b219f5d3/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/WorkflowLaunchWindow.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/WorkflowLaunchWindow.java b/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/WorkflowLaunchWindow.java
index 7473d20..2e1a454 100644
--- a/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/WorkflowLaunchWindow.java
+++ b/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/WorkflowLaunchWindow.java
@@ -16,7 +16,6 @@ package org.apache.taverna.reference.ui;
* limitations under the License.
*/
-import static com.hp.hpl.jena.sparql.graph.GraphFactory.makeDefaultModel;
import static java.awt.BorderLayout.CENTER;
import static java.awt.BorderLayout.EAST;
import static java.awt.BorderLayout.SOUTH;
@@ -24,9 +23,9 @@ import static java.awt.BorderLayout.WEST;
import static javax.swing.BoxLayout.X_AXIS;
import static javax.swing.JOptionPane.ERROR_MESSAGE;
import static javax.swing.JOptionPane.showMessageDialog;
-import static org.apache.taverna.workbench.icons.WorkbenchIcons.closeIcon;
import static org.apache.jena.riot.Lang.TURTLE;
import static org.apache.jena.riot.RDFLanguages.contentTypeToLang;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.closeIcon;
import java.awt.BorderLayout;
import java.awt.Dimension;
@@ -61,27 +60,22 @@ import javax.swing.JToolBar;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import org.apache.taverna.lang.observer.Observable;
-import org.apache.taverna.lang.observer.Observer;
-import org.apache.taverna.lang.ui.DialogTextArea;
-import org.apache.taverna.reference.ui.referenceactions.ReferenceActionSPI;
-import org.apache.taverna.workbench.edits.EditManager;
-import org.apache.taverna.workbench.edits.EditManager.AbstractDataflowEditEvent;
-import org.apache.taverna.workbench.edits.EditManager.EditManagerEvent;
-import org.apache.taverna.workbench.file.FileManager;
-import org.apache.taverna.workbench.file.events.ClosedDataflowEvent;
-import org.apache.taverna.workbench.file.events.FileManagerEvent;
-import org.apache.taverna.workbench.report.ReportManager;
-import org.apache.taverna.workbench.ui.Workbench;
-
import org.apache.batik.swing.JSVGCanvas;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.riot.RIOT;
import org.apache.log4j.Logger;
-
import org.apache.taverna.configuration.database.DatabaseConfiguration;
import org.apache.taverna.databundle.DataBundles;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
+import org.apache.taverna.lang.ui.DialogTextArea;
+import org.apache.taverna.reference.ui.referenceactions.ReferenceActionSPI;
+import org.apache.taverna.robundle.Bundle;
import org.apache.taverna.scufl2.api.annotation.Annotation;
import org.apache.taverna.scufl2.api.common.Scufl2Tools;
import org.apache.taverna.scufl2.api.common.URITools;
@@ -89,11 +83,14 @@ import org.apache.taverna.scufl2.api.common.WorkflowBean;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.api.core.Workflow;
import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
-
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import org.apache.taverna.robundle.Bundle;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.edits.EditManager.AbstractDataflowEditEvent;
+import org.apache.taverna.workbench.edits.EditManager.EditManagerEvent;
+import org.apache.taverna.workbench.file.FileManager;
+import org.apache.taverna.workbench.file.events.ClosedDataflowEvent;
+import org.apache.taverna.workbench.file.events.FileManagerEvent;
+import org.apache.taverna.workbench.report.ReportManager;
+import org.apache.taverna.workbench.ui.Workbench;
/**
* A simple workflow launch window, uses a tabbed layout to display a set of named RegistrationPanel
@@ -427,7 +424,7 @@ public abstract class WorkflowLaunchWindow extends JFrame {
private Model annotationsForBean(WorkflowBundle workflowBundle,
WorkflowBean bean) {
- Model model = makeDefaultModel();
+ Model model = ModelFactory.createDefaultModel();
for (Annotation annotation : scufl2Tools.annotationsFor(bean,
workflowBundle)) {
// System.out.println(annotation.getBody());