This is an automated email from the ASF dual-hosted git repository.
stain pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-taverna-workbench-common-activities.git
The following commit(s) were added to refs/heads/master by this push:
new c5df114 ASF comment in mediatypes.txt
c5df114 is described below
commit c5df1148aa55967eaba37796dc5b62cd1ad462c0
Author: Stian Soiland-Reyes <[email protected]>
AuthorDate: Fri Jan 18 14:44:04 2019 +0000
ASF comment in mediatypes.txt
---
.../rest/ui/config/RESTActivityConfigurationPanel.java | 5 ++++-
.../taverna/activities/rest/ui/config/mediatypes.txt | 14 ++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git
a/taverna-rest-activity-ui/src/main/java/org/apache/taverna/activities/rest/ui/config/RESTActivityConfigurationPanel.java
b/taverna-rest-activity-ui/src/main/java/org/apache/taverna/activities/rest/ui/config/RESTActivityConfigurationPanel.java
index 21d67da..11491ef 100644
---
a/taverna-rest-activity-ui/src/main/java/org/apache/taverna/activities/rest/ui/config/RESTActivityConfigurationPanel.java
+++
b/taverna-rest-activity-ui/src/main/java/org/apache/taverna/activities/rest/ui/config/RESTActivityConfigurationPanel.java
@@ -512,7 +512,10 @@ public class RESTActivityConfigurationPanel extends
MultiPageActivityConfigurati
// media types must be ASCII and can't have whitespace
Scanner scanner = new Scanner(typesStream, "ascii");
while (scanner.hasNext()) {
- types.add(scanner.next());
+ String line = scanner.next();
+ if (! line.startsWith("#")) {
+ types.add(line);
+ }
}
scanner.close();
} finally {
diff --git
a/taverna-rest-activity-ui/src/main/resources/org/apache/taverna/activities/rest/ui/config/mediatypes.txt
b/taverna-rest-activity-ui/src/main/resources/org/apache/taverna/activities/rest/ui/config/mediatypes.txt
index 4f0f0f4..7ac9d09 100644
---
a/taverna-rest-activity-ui/src/main/resources/org/apache/taverna/activities/rest/ui/config/mediatypes.txt
+++
b/taverna-rest-activity-ui/src/main/resources/org/apache/taverna/activities/rest/ui/config/mediatypes.txt
@@ -1,3 +1,17 @@
+# 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.
application/atom+xml
application/http
application/javascript
