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/07/14 14:41:02 UTC
[1/2] incubator-taverna-workbench git commit: TAVERNA-988
taverna-perspective-results Path <- File
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 673dec08f -> e50757cc2
TAVERNA-988 taverna-perspective-results Path <- File
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/ebf6fe89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/ebf6fe89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/ebf6fe89
Branch: refs/heads/master
Commit: ebf6fe89a1347e21b258387250b1495ea3ad1d16
Parents: 673dec0
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jul 14 15:20:17 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jul 14 15:20:17 2016 +0100
----------------------------------------------------------------------
.../ui/perspectives/results/ResultsPerspective.java | 7 +++----
.../results/ResultsPerspectiveComponent.java | 3 ++-
.../ui/perspectives/results/RunSelectorComponent.java | 5 +++--
.../apache/taverna/ui/perspectives/results/RunTab.java | 12 ++++++++----
4 files changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ebf6fe89/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspective.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspective.java b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspective.java
index a4b2e5f..4583fa9 100644
--- a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspective.java
+++ b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspective.java
@@ -22,6 +22,8 @@ package org.apache.taverna.ui.perspectives.results;
import static org.apache.taverna.workbench.icons.WorkbenchIcons.resultsPerspectiveIcon;
import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.List;
import javax.swing.ImageIcon;
@@ -69,10 +71,7 @@ public class ResultsPerspective implements PerspectiveSPI, EventHandler {
@Override
public JComponent getPanel() {
if (resultsPerspectiveComponent == null) {
- File runStore = new File(
- applicationConfiguration.getApplicationHomeDir(),
- RUN_STORE_DIRECTORY);
- runStore.mkdirs();
+ Path runStore = applicationConfiguration.getApplicationHomeDir().resolve(RUN_STORE_DIRECTORY);
resultsPerspectiveComponent = new ResultsPerspectiveComponent(
runService, selectionManager, colourManager,
activityIconManager, workbenchConfiguration,
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ebf6fe89/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java
index def978c..5259bb0 100644
--- a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java
+++ b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/ResultsPerspectiveComponent.java
@@ -29,6 +29,7 @@ import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Font;
import java.io.File;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
@@ -91,7 +92,7 @@ public class ResultsPerspectiveComponent extends JPanel implements Updatable {
ColourManager colourManager, ActivityIconManager activityIconManager,
WorkbenchConfiguration workbenchConfiguration, RendererRegistry rendererRegistry,
List<SaveAllResultsSPI> saveAllResultsSPIs,
- List<SaveIndividualResultSPI> saveIndividualResultSPIs, File runStore) {
+ List<SaveIndividualResultSPI> saveIndividualResultSPIs, Path runStore) {
this.runService = runService;
this.selectionManager = selectionManager;
this.colourManager = colourManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ebf6fe89/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunSelectorComponent.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunSelectorComponent.java b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunSelectorComponent.java
index e45f921..80190d3 100644
--- a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunSelectorComponent.java
+++ b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunSelectorComponent.java
@@ -20,6 +20,7 @@
package org.apache.taverna.ui.perspectives.results;
import java.io.File;
+import java.nio.file.Path;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.SwingAwareObserver;
@@ -40,10 +41,10 @@ public class RunSelectorComponent extends TabSelectorComponent<String> {
private final RunService runService;
private final SelectionManager selectionManager;
- private final File runStore;
+ private final Path runStore;
public RunSelectorComponent(RunService runSevice,
- SelectionManager selectionManager, File runStore) {
+ SelectionManager selectionManager, Path runStore) {
this.runService = runSevice;
this.selectionManager = selectionManager;
this.runStore = runStore;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ebf6fe89/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunTab.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunTab.java b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunTab.java
index a42d380..742d94d 100644
--- a/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunTab.java
+++ b/taverna-perspective-results/src/main/java/org/apache/taverna/ui/perspectives/results/RunTab.java
@@ -27,6 +27,8 @@ import static org.apache.taverna.workbench.icons.WorkbenchIcons.workingIcon;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import javax.swing.JOptionPane;
@@ -52,10 +54,10 @@ public class RunTab extends Tab<String> {
private final SelectionManager selectionManager;
private final RunService runService;
- private final File runStore;
+ private final Path runStore;
public RunTab(final String runID, final SelectionManager selectionManager,
- final RunService runService, File runStore) {
+ final RunService runService, Path runStore) {
super(getRunName(runService, runID), runID);
this.selectionManager = selectionManager;
this.runService = runService;
@@ -93,10 +95,12 @@ public class RunTab extends Tab<String> {
// workflow may have finished by now
}
}
- File file = new File(runStore, getName() + ".wfRun");
+ Path file = runStore.resolve(getName() + ".wfRun");
try {
- if (!file.exists())
+ if (! Files.exists(file)) {
+ Files.createDirectories(file.getParent());
runService.save(selection, file);
+ }
} catch (IOException e) {
logger.warn("Failed to save workflow run to " + file, e);
}
[2/2] incubator-taverna-workbench git commit: TAVERNA-992: Attempt to
use Apache Tika for mime type guessing
Posted by st...@apache.org.
TAVERNA-992: Attempt to use Apache Tika for mime type guessing
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/e50757cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/e50757cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/e50757cc
Branch: refs/heads/master
Commit: e50757cc2de2e6794ba0925d70f12c70259fbef0
Parents: ebf6fe8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jul 14 15:37:00 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jul 14 15:37:00 2016 +0100
----------------------------------------------------------------------
.../RenderedProcessorResultComponent.java | 24 ++++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e50757cc/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java
index c83dbd5..4e376b1 100644
--- a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java
+++ b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/RenderedProcessorResultComponent.java
@@ -25,10 +25,9 @@ import static java.awt.BorderLayout.NORTH;
import static java.awt.event.ItemEvent.SELECTED;
import static javax.swing.BoxLayout.LINE_AXIS;
import static javax.swing.SwingUtilities.invokeLater;
-import static org.apache.taverna.results.ResultsUtils;
+import static org.apache.commons.lang.StringEscapeUtils.escapeHtml;
import static org.apache.taverna.workbench.icons.WorkbenchIcons.refreshIcon;
import static org.apache.taverna.workbench.views.results.processor.ProcessorResultTreeNode.ProcessorResultTreeNodeState.RESULT_REFERENCE;
-import static org.apache.commons.lang.StringEscapeUtils.escapeHtml;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -66,18 +65,21 @@ import javax.swing.text.JTextComponent;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;
+import org.apache.log4j.Logger;
+import org.apache.taverna.databundle.DataBundles;
+import org.apache.taverna.databundle.ErrorDocument;
import org.apache.taverna.lang.ui.DialogTextArea;
import org.apache.taverna.renderers.Renderer;
import org.apache.taverna.renderers.RendererException;
import org.apache.taverna.renderers.RendererRegistry;
import org.apache.taverna.renderers.RendererUtils;
+import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
import org.apache.taverna.workbench.views.results.saveactions.SaveIndividualResultSPI;
+import org.apache.tika.detect.DefaultDetector;
+import org.apache.tika.detect.Detector;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.mime.MediaType;
-import org.apache.log4j.Logger;
-
-import org.apache.taverna.databundle.DataBundles;
-import org.apache.taverna.databundle.ErrorDocument;
-import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
import eu.medsea.mimeutil.MimeType;
/**
@@ -461,6 +463,14 @@ public class RenderedProcessorResultComponent extends JPanel {
}
}
+ private MediaType getMimeTypes(InputStream inputstream) throws IOException {
+ Detector detector = new DefaultDetector(DefaultDetector.class.getClassLoader());
+ Metadata metadata = new Metadata();
+ // TODO: propagate relevant metadata
+ MediaType x = detector.detect(inputstream, metadata);
+ return x;
+ }
+
/**
* Renders the result panel using the last used renderer.
*/