Disabled org.fife hexeditor .. although it is license-compatible (bsd-3) we would need to import it from our old SVN as it does not exist in Maven
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/a8b25433 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/a8b25433 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/a8b25433 Branch: refs/heads/master Commit: a8b2543385627370cbf01dbac9ce95b680191416 Parents: 4ec39a4 Author: Stian Soiland-Reyes <[email protected]> Authored: Thu Aug 18 12:21:48 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Thu Aug 18 12:21:48 2016 +0100 ---------------------------------------------------------------------- taverna-renderers-impl/pom.xml | 7 ------- .../taverna/renderers/impl/HexBinaryRenderer.java | 13 +++++++++---- .../services/org.apache.taverna.renderers.Renderer | 2 +- .../META-INF/spring/renderers-impl-context-osgi.xml | 2 ++ .../META-INF/spring/renderers-impl-context.xml | 2 ++ 5 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a8b25433/taverna-renderers-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-renderers-impl/pom.xml b/taverna-renderers-impl/pom.xml index 8d2e5be..059e141 100644 --- a/taverna-renderers-impl/pom.xml +++ b/taverna-renderers-impl/pom.xml @@ -72,13 +72,6 @@ <artifactId>com.springsource.org.jdom</artifactId> <version>${jdom.version}</version> </dependency> - <!-- - <dependency> - <groupId>org.fife.ui.hex</groupId> - <artifactId>hexeditor</artifactId> - <version>${org.fife.ui.hexeditor.version}</version> - </dependency> ---> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a8b25433/taverna-renderers-impl/src/main/java/org/apache/taverna/renderers/impl/HexBinaryRenderer.java ---------------------------------------------------------------------- diff --git a/taverna-renderers-impl/src/main/java/org/apache/taverna/renderers/impl/HexBinaryRenderer.java b/taverna-renderers-impl/src/main/java/org/apache/taverna/renderers/impl/HexBinaryRenderer.java index 0223efb..7256301 100644 --- a/taverna-renderers-impl/src/main/java/org/apache/taverna/renderers/impl/HexBinaryRenderer.java +++ b/taverna-renderers-impl/src/main/java/org/apache/taverna/renderers/impl/HexBinaryRenderer.java @@ -26,11 +26,12 @@ import java.io.InputStream; import java.nio.file.Path; import javax.swing.JComponent; +import javax.swing.JPanel; import javax.swing.JTextArea; import org.apache.taverna.renderers.RendererException; -import org.fife.ui.hex.swing.HexEditor; +//import org.fife.ui.hex.swing.HexEditor; /** * Renderer for binary data. Uses HexEditor from @@ -60,9 +61,13 @@ public class HexBinaryRenderer extends AbstractRenderer { @Override public JComponent getRendererComponent(Path path) throws RendererException { try (InputStream inputStream = getInputStream(path)) { - HexEditor editor = new HexEditor(); - editor.open(inputStream); - return editor; +// HexEditor editor = new HexEditor(); +// editor.open(inputStream); +// return editor; + // TODO: Include org.fife.HexEditor from + // https://github.com/taverna/taverna-svn/tree/master/taverna/utils/org.fife.ui.hexeditor + + return new JPanel(); } catch (Exception e) { logger.error("unrenderable: failed to create binhex renderer", e); return new JTextArea(RENDER_FAILED_MSG + e.getMessage()); http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a8b25433/taverna-renderers-impl/src/main/resources/META-INF/services/org.apache.taverna.renderers.Renderer ---------------------------------------------------------------------- diff --git a/taverna-renderers-impl/src/main/resources/META-INF/services/org.apache.taverna.renderers.Renderer b/taverna-renderers-impl/src/main/resources/META-INF/services/org.apache.taverna.renderers.Renderer index 07f7dff..8c5b5be 100644 --- a/taverna-renderers-impl/src/main/resources/META-INF/services/org.apache.taverna.renderers.Renderer +++ b/taverna-renderers-impl/src/main/resources/META-INF/services/org.apache.taverna.renderers.Renderer @@ -1,5 +1,5 @@ org.apache.taverna.renderers.impl.AdvancedImageRenderer -org.apache.taverna.renderers.impl.HexBinaryRenderer +#org.apache.taverna.renderers.impl.HexBinaryRenderer org.apache.taverna.renderers.impl.TextRenderer org.apache.taverna.renderers.impl.TextRtfRenderer org.apache.taverna.renderers.impl.TextXMLRenderer http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a8b25433/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context-osgi.xml b/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context-osgi.xml index 093a930..aef9ccb 100644 --- a/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context-osgi.xml +++ b/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context-osgi.xml @@ -25,7 +25,9 @@ http://www.springframework.org/schema/osgi/spring-osgi.xsd";> <service ref="AdvancedImageRenderer" interface="org.apache.taverna.renderers.Renderer" /> + <!-- <service ref="HexBinaryRenderer" interface="org.apache.taverna.renderers.Renderer" /> + --> <service ref="TextRenderer" interface="org.apache.taverna.renderers.Renderer" /> <service ref="TextRtfRenderer" interface="org.apache.taverna.renderers.Renderer" /> <service ref="TextXMLRenderer" interface="org.apache.taverna.renderers.Renderer" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a8b25433/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context.xml ---------------------------------------------------------------------- diff --git a/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context.xml b/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context.xml index cd9170b..3a287f6 100644 --- a/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context.xml +++ b/taverna-renderers-impl/src/main/resources/META-INF/spring/renderers-impl-context.xml @@ -22,7 +22,9 @@ http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="AdvancedImageRenderer" class="org.apache.taverna.renderers.impl.AdvancedImageRenderer" /> + <!-- <bean id="HexBinaryRenderer" class="org.apache.taverna.renderers.impl.HexBinaryRenderer" /> + --> <bean id="TextRenderer" class="org.apache.taverna.renderers.impl.TextRenderer" /> <bean id="TextRtfRenderer" class="org.apache.taverna.renderers.impl.TextRtfRenderer" /> <bean id="TextXMLRenderer" class="org.apache.taverna.renderers.impl.TextXMLRenderer" />
