| commit | c5df1148aa55967eaba37796dc5b62cd1ad462c0 | [log] [tgz] |
|---|---|---|
| author | Stian Soiland-Reyes <stain@apache.org> | Fri Jan 18 14:44:04 2019 +0000 |
| committer | Stian Soiland-Reyes <stain@apache.org> | Fri Jan 18 14:44:04 2019 +0000 |
| tree | dc58f2632a1ac3397d613b6b835ebdda4473ced3 | |
| parent | b48657fd5533b7a034df0c8b61a5cb7beb6f1d4e [diff] |
ASF comment in mediatypes.txt
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 @@ // 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