Project

General

Profile

Revision d35a91f7

IDd35a91f78b1285319b908d141f8026c40099423d
Parent c209fbc1
Child 684783aa

Added by Andreas Müller 2 months ago

Revert "Revert "cleanup" and "fix #9129 add AdditionalMediaCopyright preference predicate""

This reverts commit c209fbc15a181c5be945a00cef29768f468ad12b.

View differences:

cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/UriUtils.java
126 126
     */
127 127
    public static long getResourceLength(URI uri, Map<String, String> requestHeaders) throws ClientProtocolException, IOException, HttpException{
128 128
        if(requestHeaders == null){
129
            requestHeaders = new HashMap<String, String>();
129
            requestHeaders = new HashMap<>();
130 130
        }
131 131

  
132 132
        if(! uri.isAbsolute()){
......
141 141
                }
142 142

  
143 143
                if(contentLengths.length > 1){
144
                    throw new HttpException("Multiple Conten-Length headers sent");
144
                    throw new HttpException("Multiple Content-Length headers sent");
145 145
                }
146 146

  
147 147
                Header contentLength = contentLengths[0];
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java
117 117
        state.setCheck(true);
118 118

  
119 119
        if (config instanceof FactExcelImportConfiguratorBase<?>){
120
            //TODO work in progress
120 121
            ExcelFormatAnalyzer<?> analyzer = ((FactExcelImportConfiguratorBase<?>)config).getAnalyzer();
121 122
            ExcelFormatAnalyzeResult analyzeResult = analyzer.invoke();
122 123
            //TODO very preliminary for development only
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferencePredicate.java
153 153
    SearchForIdentifierAsDefault(UUID.fromString("b059f371-c9ee-4dca-b419-bdf142f14876"), "Search For Identifier As Default", "search.selectionDialog.searchForIdentifierAsDefault", Boolean.FALSE),
154 154
    SearchForIdentifierAndTitleCache(UUID.fromString("5b5c2c6d-071a-4b3c-b645-8db5c704b63b"), "Search For Identifier And TitleCache", "search.selectionDialog.searchForIdentifierAndTitleCache", Boolean.TRUE),
155 155
    SortTaxaByRankAndName(UUID.fromString("2b7e90b2-1722-4bbf-989a-113281fa0b30"), "Sort Taxa By Rank And Name", "search.selectionDialog.sortTaxaByRankAndName", Boolean.FALSE),
156
    NamedAreaSearchForAbbrev(UUID.fromString("1db58b79-048b-4981-9cd1-51cb2b915c8a"), "Search Field for Names Areas", "search.selectionDialog.searchField", NamedAreaSearchField.NoAbbrev),
156
    NamedAreaSearchForAbbrev(UUID.fromString("1db58b79-048b-4981-9cd1-51cb2b915c8a"), "Search Field for Named Areas", "search.selectionDialog.searchField", NamedAreaSearchField.NoAbbrev),
157 157

  
158
    //Media
159
    AdditionalMediaCopyright(UUID.fromString("c55aa7ca-4a6a-4a40-b4f1-e75030cd38bc"), "Additional media copyright","copyright.additional.media", null);
158 160

  
159 161
    ;
160 162

  

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)