Revert "Revert "cleanup" and "fix #9129 add AdditionalMediaCopyright preference predi...

This reverts commit c209fbc15a181c5be945a00cef29768f468ad12b.

diff --git a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/UriUtils.java b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/UriUtils.java
index 6bb3da6b9161aeff53f227021651d0b7248da829..4774b1f4dd094ff01803c6f46b4bac8548e6a843 100644 (file)
--- a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/UriUtils.java
+++ b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/UriUtils.java
@@ -126,7 +126,7 @@ public class UriUtils {
      */
     public static long getResourceLength(URI uri, Map<String, String> requestHeaders) throws ClientProtocolException, IOException, HttpException{
         if(requestHeaders == null){
-            requestHeaders = new HashMap<String, String>();
+            requestHeaders = new HashMap<>();
         }
 
         if(! uri.isAbsolute()){
@@ -141,7 +141,7 @@ public class UriUtils {
                 }
 
                 if(contentLengths.length > 1){
-                    throw new HttpException("Multiple Conten-Length headers sent");
+                    throw new HttpException("Multiple Content-Length headers sent");
                 }
 
                 Header contentLength = contentLengths[0];

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java
index 9b180cffa6bc96e1fae9590c549725f2b55af6e8..3ae621db99a29847ff58601a54605c93a870006f 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java
@@ -117,6 +117,7 @@ public class CdmApplicationAwareDefaultImport<T extends IImportConfigurator> imp
         state.setCheck(true);\r
 \r
         if (config instanceof FactExcelImportConfiguratorBase<?>){\r
+            //TODO work in progress\r
             ExcelFormatAnalyzer<?> analyzer = ((FactExcelImportConfiguratorBase<?>)config).getAnalyzer();\r
             ExcelFormatAnalyzeResult analyzeResult = analyzer.invoke();\r
             //TODO very preliminary for development only\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java
index 85e301dd21a8c450d2af7c4a0a5c8e41491c5774..a6f2b44dc4a5a487c2a14f940ab40b4ec38ba52f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java
@@ -153,8 +153,10 @@ public enum PreferencePredicate implements IEnumTerm<PreferencePredicate>, IPref
     SearchForIdentifierAsDefault(UUID.fromString("b059f371-c9ee-4dca-b419-bdf142f14876"), "Search For Identifier As Default", "search.selectionDialog.searchForIdentifierAsDefault", Boolean.FALSE),\r
     SearchForIdentifierAndTitleCache(UUID.fromString("5b5c2c6d-071a-4b3c-b645-8db5c704b63b"), "Search For Identifier And TitleCache", "search.selectionDialog.searchForIdentifierAndTitleCache", Boolean.TRUE),\r
     SortTaxaByRankAndName(UUID.fromString("2b7e90b2-1722-4bbf-989a-113281fa0b30"), "Sort Taxa By Rank And Name", "search.selectionDialog.sortTaxaByRankAndName", Boolean.FALSE),\r
-    NamedAreaSearchForAbbrev(UUID.fromString("1db58b79-048b-4981-9cd1-51cb2b915c8a"), "Search Field for Names Areas", "search.selectionDialog.searchField", NamedAreaSearchField.NoAbbrev),\r
+    NamedAreaSearchForAbbrev(UUID.fromString("1db58b79-048b-4981-9cd1-51cb2b915c8a"), "Search Field for Named Areas", "search.selectionDialog.searchField", NamedAreaSearchField.NoAbbrev),\r
 \r
+    //Media\r
+    AdditionalMediaCopyright(UUID.fromString("c55aa7ca-4a6a-4a40-b4f1-e75030cd38bc"), "Additional media copyright","copyright.additional.media", null);\r
 \r
     ;\r
 \r