Project

General

Profile

Revision 3a229ea1

ID3a229ea123e639a2c6df065d43ef44ed39525ba9
Parent 3ae8a2bb
Child 9b9ce4a5

Added by Andreas Kohlbecker over 2 years ago

ref #7223 ReferencePropertyDefinitions adding Proceedings and code cleaning

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferencePropertyDefinitions.java
34 34
    private static Map<String, String> iBook = new HashMap<>();
35 35
    private static Map<String, String> iBookSection = new HashMap<>();
36 36
    private static Map<String, String> iInProceedings = new HashMap<>();
37
    private static Map<String, String> iProceedings = new HashMap<>();
37 38
    private static Map<String, String> iJournal = new HashMap<>();
38 39
    private static Map<String, String> iPrintSeries = new HashMap<>();
39 40
    private static Map<String, String> iThesis = new HashMap<>();
......
85 86
        map = iBookSection;
86 87
        put(map, "inReference", "inBook");
87 88

  
89
        iProceedings = merge(iPrintedUnitBase);
90
        map = iProceedings;
91
        put(map, "organization");
92

  
88 93
        iInProceedings = merge(iSection);
89 94
        map = iInProceedings;
90 95
        put(map, "seriesPart");
......
117 122

  
118 123
        switch (type){
119 124
        case Article:
120
            return merge(iSection, iVolumeReference, iArticle);
125
            return iArticle;
121 126
        case Book:
122
            return merge(iPrintedUnitBase, iBook);
127
            return iBook;
123 128
        case BookSection:
124
            return merge(iSection, iBookSection);
129
            return iBookSection;
125 130
        case CdDvd:
126 131
            throw new UnimplemetedCaseException(type);
127 132
        case Database:
......
129 134
        case Generic:
130 135
            throw new UnimplemetedCaseException(type);
131 136
        case InProceedings:
132
            return merge(iSection, iInProceedings);
137
            return iInProceedings;
133 138
        case Journal:
134
            return merge(iPublicationBase, iJournal);
139
            return iJournal;
135 140
        case Map:
136 141
            throw new UnimplemetedCaseException(type);
137 142
        case Patent:
......
141 146
        case PrintSeries:
142 147
            return iPublicationBase;
143 148
        case Proceedings:
144
            throw new UnimplemetedCaseException(type);
149
            return iProceedings;
145 150
        case Report:
146 151
            throw new UnimplemetedCaseException(type);
147 152
        case Section:
148 153
            return iSection;
149 154
        case Thesis:
150
            return merge(iPublicationBase, iThesis);
155
            return iThesis;
151 156
        case WebPage:
152 157
            throw new UnimplemetedCaseException(type);
153 158
        default:

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)