use famfamfam silk icons from webjars
as it is CC-BY 2.5 license
Remove fold.png unfold.png xpath_attribute.png
as they have unknown IP origin.
diff --git a/taverna-xpath-activity-ui/pom.xml b/taverna-xpath-activity-ui/pom.xml
index ff914b0..c2a7834 100644
--- a/taverna-xpath-activity-ui/pom.xml
+++ b/taverna-xpath-activity-ui/pom.xml
@@ -66,5 +66,10 @@
<artifactId>taverna-activity-tools</artifactId>
<version>${taverna.workbench.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>famfamfam-silk</artifactId>
+ <version>1.3-1</version>
+ </dependency>
</dependencies>
</project>
diff --git a/taverna-xpath-activity-ui/src/main/java/org/apache/taverna/activities/xpath/ui/servicedescription/XPathActivityIcon.java b/taverna-xpath-activity-ui/src/main/java/org/apache/taverna/activities/xpath/ui/servicedescription/XPathActivityIcon.java
index 02bc8de..2a00d62 100644
--- a/taverna-xpath-activity-ui/src/main/java/org/apache/taverna/activities/xpath/ui/servicedescription/XPathActivityIcon.java
+++ b/taverna-xpath-activity-ui/src/main/java/org/apache/taverna/activities/xpath/ui/servicedescription/XPathActivityIcon.java
@@ -1,20 +1,20 @@
package org.apache.taverna.activities.xpath.ui.servicedescription;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
import java.awt.Color;
import java.net.URI;
@@ -33,27 +33,29 @@
// --- LOCATIONS OF ICONS USED IN THE XPath ACTIVITY ---
- private static final String FAMFAMFAM_SILK_PATH = "famfamfam_silk/";
- private static final String FOLDS_PATH = "folds/";
+ /* from famfamfam-silk webjar
+ * http://www.famfamfam.com/lab/icons/silk/
+ */
+ private static final String FAMFAMFAM_SILK_PATH = "/META-INF/resources/webjars/famfamfam-silk/1.3/icons/";
public static final String XPATH_ACTIVITY_ICON = FAMFAMFAM_SILK_PATH + "page_white_code.png";
- public static final String XPATH_ACTIVITY_CONFIGURATION_PARSE_XML_ICON = "arrow_right.png";
+ public static final String XPATH_ACTIVITY_CONFIGURATION_PARSE_XML_ICON = FAMFAMFAM_SILK_PATH + "arrow_right.png";
public static final String XML_TREE_ROOT_ICON = FAMFAMFAM_SILK_PATH + "page_white_code.png";
public static final String XML_TREE_NODE_ICON = FAMFAMFAM_SILK_PATH + "tag.png";
- public static final String XML_TREE_ATTRIBUTE_ICON = "xpath_attribute.png";
+ public static final String XML_TREE_ATTRIBUTE_ICON = FAMFAMFAM_SILK_PATH + "textfield.png";
public static final String XML_TREE_EXPAND_ALL_ICON = FAMFAMFAM_SILK_PATH
- + "text_linespacing.png";
+ + "folder_explore.png";
public static final String XML_TREE_COLLAPSE_ALL_ICON = FAMFAMFAM_SILK_PATH
- + "text_linespacing (collapse).png";
+ + "folder.png";
public static final String XPATH_STATUS_OK_ICON = FAMFAMFAM_SILK_PATH + "accept.png";
public static final String XPATH_STATUS_ERROR_ICON = FAMFAMFAM_SILK_PATH + "exclamation.png";
public static final String XPATH_STATUS_UNKNOWN_ICON = FAMFAMFAM_SILK_PATH + "help.png";
- public static final String FOLD_ICON = FOLDS_PATH + "fold.png";
- public static final String UNFOLD_ICON = FOLDS_PATH + "unfold.png";
+ public static final String FOLD_ICON = FAMFAMFAM_SILK_PATH + "text_indent.png";
+ public static final String UNFOLD_ICON = FAMFAMFAM_SILK_PATH + "text_indent_remove.png";
// ------
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/arrow_right.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/arrow_right.png
deleted file mode 100644
index 2cf15f1..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/arrow_right.png
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/accept.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/accept.png
deleted file mode 100644
index 89c8129..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/accept.png
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/exclamation.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/exclamation.png
deleted file mode 100644
index c37bd06..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/exclamation.png
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/help.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/help.png
deleted file mode 100644
index 5c87017..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/help.png
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/page_white_code.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/page_white_code.png
deleted file mode 100644
index 0c76bd1..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/page_white_code.png
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/tag.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/tag.png
deleted file mode 100644
index e093032..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/tag.png
+++ /dev/null
Binary files differ
diff --git "a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/text_linespacing \050collapse\051.png" "b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/text_linespacing \050collapse\051.png"
deleted file mode 100644
index ff09e31..0000000
--- "a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/text_linespacing \050collapse\051.png"
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/text_linespacing.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/text_linespacing.png
deleted file mode 100644
index 1a91cbd..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/famfamfam_silk/text_linespacing.png
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/folds/fold.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/folds/fold.png
deleted file mode 100644
index a13d280..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/folds/fold.png
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/folds/unfold.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/folds/unfold.png
deleted file mode 100644
index 589e2c9..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/folds/unfold.png
+++ /dev/null
Binary files differ
diff --git a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/xpath_attribute.png b/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/xpath_attribute.png
deleted file mode 100644
index 3fa7811..0000000
--- a/taverna-xpath-activity-ui/src/main/resources/org/apache/taverna/activities/xpath/ui/servicedescription/xpath_attribute.png
+++ /dev/null
Binary files differ
