Project

General

Profile

Revision fd5fd2c8

IDfd5fd2c8e489e88676e8f54dd8b86b994cc57ef1
Parent cb67ca59
Child 5044803f

Added by Andreas Müller over 5 years ago

#6000 Use new CASUAL Method instead of derpeacted INTRODUCED_ADVENTITIOUS

View differences:

cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceUtilities.java
108 108
            defaultPresenceAbsenceTermBaseColors.put(PresenceAbsenceTerm.NATIVE_DOUBTFULLY_NATIVE(), Color.decode("0x377eb8"));
109 109
            defaultPresenceAbsenceTermBaseColors.put(PresenceAbsenceTerm.CULTIVATED(), Color.decode("0x984ea3"));
110 110
            defaultPresenceAbsenceTermBaseColors.put(PresenceAbsenceTerm.INTRODUCED(), Color.decode("0xff7f00"));
111
            defaultPresenceAbsenceTermBaseColors.put(PresenceAbsenceTerm.INTRODUCED_ADVENTITIOUS(), Color.decode("0xffff33"));
111
            defaultPresenceAbsenceTermBaseColors.put(PresenceAbsenceTerm.CASUAL(), Color.decode("0xffff33"));
112 112
            defaultPresenceAbsenceTermBaseColors.put(PresenceAbsenceTerm.INTRODUCED_CULTIVATED(), Color.decode("0xa65628"));
113 113
            defaultPresenceAbsenceTermBaseColors.put(PresenceAbsenceTerm.NATURALISED(), Color.decode("0xf781bf"));
114 114
        }
cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EuroPlusMedCondensedDistributionComposerTest.java
70 70
        distributions.add(Distribution.NewInstance(berlin, PresenceAbsenceTerm.NATIVE()));
71 71
        distributions.add(Distribution.NewInstance(italy, PresenceAbsenceTerm.PRESENT_DOUBTFULLY()));
72 72

  
73
        distributions.add(Distribution.NewInstance(france, PresenceAbsenceTerm.INTRODUCED_ADVENTITIOUS()));
73
        distributions.add(Distribution.NewInstance(france, PresenceAbsenceTerm.CASUAL()));
74 74
        distributions.add(Distribution.NewInstance(ileDeFrance, PresenceAbsenceTerm.CULTIVATED()));
75 75
        distributions.add(Distribution.NewInstance(spain, PresenceAbsenceTerm.NATURALISED()));
76 76

  
cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/FloraCubaCondensedDistributionComposerTest.java
90 90
        PresenceAbsenceTerm.NATIVE_DOUBTFULLY_NATIVE().setSymbol("d");
91 91
        PresenceAbsenceTerm.NATIVE_REPORTED_IN_ERROR().setSymbol("-");
92 92
        PresenceAbsenceTerm.REPORTED_IN_ERROR().setSymbol("-");
93
        PresenceAbsenceTerm.INTRODUCED_ADVENTITIOUS().setSymbol("a");
93
        PresenceAbsenceTerm.CASUAL().setSymbol("a");
94 94
        PresenceAbsenceTerm.CULTIVATED().setSymbol("c");
95 95
        PresenceAbsenceTerm.NATURALISED().setSymbol("n");
96 96
        PresenceAbsenceTerm.CULTIVATED_PRESENCE_QUESTIONABLE().setSymbol("?c");
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java
745 745
			case 240: return PresenceAbsenceTerm.INTRODUCED_DOUBTFULLY_INTRODUCED();
746 746
			case 250: return PresenceAbsenceTerm.INTRODUCED();
747 747
			case 260: return PresenceAbsenceTerm.INTRODUCED_UNCERTAIN_DEGREE_OF_NATURALISATION();
748
			case 270: return PresenceAbsenceTerm.INTRODUCED_ADVENTITIOUS();
748
			case 270: return PresenceAbsenceTerm.CASUAL();
749 749
			case 280: return PresenceAbsenceTerm.NATURALISED();
750 750
			case 310: return PresenceAbsenceTerm.NATIVE_REPORTED_IN_ERROR();
751 751
			case 320: return PresenceAbsenceTerm.NATIVE_PRESENCE_QUESTIONABLE();
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTerm.java
207 207
  		} else if (abbrev.equalsIgnoreCase("c"))  { return PresenceAbsenceTerm.CULTIVATED();
208 208
  		} else if (abbrev.equalsIgnoreCase("e"))  { return PresenceAbsenceTerm.ENDEMIC_FOR_THE_RELEVANT_AREA();
209 209
  		} else if (abbrev.equalsIgnoreCase("i"))  { return PresenceAbsenceTerm.INTRODUCED();
210
  		} else if (abbrev.equalsIgnoreCase("ia")) { return PresenceAbsenceTerm.INTRODUCED_ADVENTITIOUS();
210
  		} else if (abbrev.equalsIgnoreCase("ia")) { return PresenceAbsenceTerm.CASUAL();
211 211
  		} else if (abbrev.equalsIgnoreCase("ic")) { return PresenceAbsenceTerm.INTRODUCED_CULTIVATED();
212 212
  		} else if (abbrev.equalsIgnoreCase("id")) { return PresenceAbsenceTerm.INTRODUCED_DOUBTFULLY_INTRODUCED();
213 213
  		} else if (abbrev.equalsIgnoreCase("in")) { return PresenceAbsenceTerm.NATURALISED();
......
324 324
		return getTermByUuid(uuidI);
325 325
	}
326 326

  
327
    /**
328
     * Casual alien or introduced: adventive (casual)
329
     *
330
     * @see #INTRODUCED_ADVENTITIOUS()
331
     */
332
    public static final PresenceAbsenceTerm CASUAL(){
333
        return getTermByUuid(uuidIA);
334
    }
335

  
327 336
	/**
328 337
	 * This term is of questional value. Introduced often is handled as opposite
329 338
	 * of adventitious/adventive and describes how the alien species came
330 339
	 * - on purpose for cultivation (introduced) or not (adventive).
331 340
	 * Adventitious or better adventive is often a synonym for casual which might
332 341
	 * be the better term here.
342
	 *
343
	 * @deprecated better use {@link #CASUAL()}, which has the same result (same semantics, but more precise)
333 344
	 */
334 345
	@Deprecated
335 346
	public static final PresenceAbsenceTerm INTRODUCED_ADVENTITIOUS(){
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/TransmissionEngineDistribution.java
1017 1017
        priorityMap.put(PresenceAbsenceTerm.INTRODUCED_PRESENCE_QUESTIONABLE(), 50);
1018 1018
        priorityMap.put(PresenceAbsenceTerm.INTRODUCED_DOUBTFULLY_INTRODUCED(), 80);
1019 1019
        priorityMap.put(PresenceAbsenceTerm.INTRODUCED(), 90);
1020
        priorityMap.put(PresenceAbsenceTerm.INTRODUCED_ADVENTITIOUS(), 100);
1020
        priorityMap.put(PresenceAbsenceTerm.CASUAL(), 100);
1021 1021
        priorityMap.put(PresenceAbsenceTerm.NATURALISED(), 110);
1022 1022
        priorityMap.put(PresenceAbsenceTerm.NATIVE_DOUBTFULLY_NATIVE(), 120); // null
1023 1023
        priorityMap.put(PresenceAbsenceTerm.NATIVE(), 130); // null

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)