From e5266f33b1b9d0de5429f059dbee54c54e1b1a3d Mon Sep 17 00:00:00 2001
From: Tori Salvatore <36680169+torisalvatore@users.noreply.github.com>
Date: Thu, 17 Dec 2020 21:23:25 -0800
Subject: [PATCH 1/2] Improvement to local Workbench runtime
---
WorkbenchProject/pom.xml | 58 ++++++++-----------
.../provvisualizer/controller/ProVisCtrl.java | 17 +++++-
.../WorkbenchDashboard.java | 7 ++-
3 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/WorkbenchProject/pom.xml b/WorkbenchProject/pom.xml
index 21c5a50..54308b2 100644
--- a/WorkbenchProject/pom.xml
+++ b/WorkbenchProject/pom.xml
@@ -16,47 +16,44 @@
UTF-8
+
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.6.2
-
- 1.8
- 1.8
-
-
-
org.apache.maven.plugins
- maven-jar-plugin
- 3.0.2
+ maven-compiler-plugin
+ 3.6.2
-
-
- true
- lib/
- edu.uwb.braingrid.workbenchdashboard.WorkbenchDashboard
-
-
+ 1.8
+ 1.8
org.apache.maven.plugins
- maven-dependency-plugin
- 2.1
+ maven-shade-plugin
+ 3.2.4
- copy-dependencies
- package
- copy-dependencies
+ shade
- ${project.build.directory}/lib
- false
- false
- true
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+ true
+
+
+ edu.uwb.braingrid.workbenchdashboard.WorkbenchDashboard
+
+
@@ -67,11 +64,6 @@
maven-surefire-plugin
2.19.1
-
org.junit.jupiter
junit-jupiter-engine
diff --git a/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/controller/ProVisCtrl.java b/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/controller/ProVisCtrl.java
index b4c4839..7ef294b 100644
--- a/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/controller/ProVisCtrl.java
+++ b/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/controller/ProVisCtrl.java
@@ -530,9 +530,20 @@ private void initNodeEdge(String provFileURI) {
while (iter.hasNext()) {
stmt = iter.nextStatement();
- if (stmt.getSubject().toString().contains("local:"))
- continue;
- String predicateStr = stmt.getPredicate().toString();
+
+ if (stmt.getSubject().toString().contains("local:")) {
+ System.out.println("Continuing on stmt subject: " + stmt.getSubject().toString());
+ // continue;
+ }
+ String predicateStr = stmt.getPredicate().toString();
+
+ System.out.println("iterator stmt subject: " + stmt.getSubject().toString());
+ System.out.println("\t\tobject: " + stmt.getObject().toString());
+ System.out.println("\t\tpredicate: " + stmt.getObject().toString());
+
+ // TODO: Figure out why .xml files referenced in .ttl files have invalid paths. (Default to ~/.xml instead of their actual location in the working directory.)
+ // TODO: Figure out why output files aren't included in the provenance data
+
if (predicateStr.equals(ProvUtility.RDF_TYPE)) {
String subjectStr = stmt.getSubject().toString();
String objectStr = stmt.getObject().toString();
diff --git a/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbenchdashboard/WorkbenchDashboard.java b/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbenchdashboard/WorkbenchDashboard.java
index a658e06..3b7fece 100644
--- a/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbenchdashboard/WorkbenchDashboard.java
+++ b/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbenchdashboard/WorkbenchDashboard.java
@@ -124,11 +124,12 @@ public void handle(KeyEvent arg0) {
});
- URL is = Resources.getResource("braingrid/color-logo.png");
- Image image = new Image(is.getFile());
+ // URL is = Resources.getResource("braingrid/color-logo.png");
+ // System.out.println(is.getPath());
+ // Image image = new Image(is.getFile());
primaryStage.setTitle("BrainGrid Workbench");
- primaryStage.getIcons().add(image);
+ // primaryStage.getIcons().add(image);
primaryStage.setScene(scene);
primaryStage.setMaximized(true);
From c8cae51fddc0ddbd02dd4e0b2b6947d07744e1af Mon Sep 17 00:00:00 2001
From: Tori Salvatore <36680169+torisalvatore@users.noreply.github.com>
Date: Thu, 17 Dec 2020 21:46:23 -0800
Subject: [PATCH 2/2] Fix getNodeFileLocalAbsolutePath to not prepend artifacts
path
---
.../workbench/provvisualizer/utility/FileUtility.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/utility/FileUtility.java b/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/utility/FileUtility.java
index 145da7d..2825f36 100644
--- a/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/utility/FileUtility.java
+++ b/WorkbenchProject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/utility/FileUtility.java
@@ -38,8 +38,7 @@ public static String getNodeFileLocalRelativePath(Node node){
}
public static String getNodeFileLocalAbsolutePath(Node node){
- return System.getProperty("user.dir") + File.separator + ARTIFACTS_DIR + File.separator +
- getNodeFileLocalRelativePath(node);
+ return getNodeFileLocalRelativePath(node);
}
public static List fileToLines(String filename) {