From 7c6bc637c13401baca308ba2a6a390cdf0e72f6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 6 Sep 2013 23:16:10 +0000 Subject: [PATCH] move static waterbody methods to NamedArea --- .../cdm/model/location/NamedArea.java | 26 +++++++++++++++++++ .../model/location/WaterbodyOrCountry.java | 21 --------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java index 2b841b91df..fb990698e3 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java @@ -105,6 +105,20 @@ public class NamedArea extends OrderedTermBase implements Cloneable { public static final UUID uuidContinentVocabulary = UUID.fromString("e72cbcb6-58f8-4201-9774-15d0c6abc128"); public static final UUID uuidWaterbodyVocabulary = UUID.fromString("35a62b25-f541-4f12-a7c7-17d90dec3e03"); + + private static final UUID uuidArcticOcean = UUID.fromString("af4271e5-8897-4e6f-9db7-54ea4f28cfc0"); + private static final UUID uuidAtlanticOcean = UUID.fromString("77e79804-1b17-4c99-873b-933fe216e3da"); + private static final UUID uuidPacificOcean = UUID.fromString("3d68a327-104c-49d5-a2d8-c71c6600181b"); + private static final UUID uuidIndianOcean = UUID.fromString("ff744a37-5990-462c-9c20-1e85a9943851"); + private static final UUID uuidSouthernOcean = UUID.fromString("ef04f363-f67f-4a2c-8d98-110de4c5f654"); + private static final UUID uuidMediterraneanSea = UUID.fromString("8811a47e-29d6-4455-8f83-8916b78a692f"); + private static final UUID uuidBlackSea = UUID.fromString("4cb4bbae-9aab-426c-9025-e34f809165af"); + private static final UUID uuidCaspianSea = UUID.fromString("598fec0e-b93a-4947-a1f3-601e380797f7"); + private static final UUID uuidRedSea = UUID.fromString("ee69385e-6c80-405c-be6e-974e9fd1e297"); + private static final UUID uuidPersianGulf = UUID.fromString("8dc16e70-74b8-4143-95cf-a659a319a854"); + + + private static Map tdwgAbbrevMap = null; private static Map tdwglabelMap = null; @@ -115,6 +129,18 @@ public class NamedArea extends OrderedTermBase implements Cloneable { private static Map termMap = null; + public static final NamedArea ARCTICOCEAN () { return waterbodyMap.get(uuidArcticOcean );} + public static final NamedArea ATLANTICOCEAN () { return waterbodyMap.get(uuidAtlanticOcean );} + public static final NamedArea PACIFICOCEAN () { return waterbodyMap.get(uuidPacificOcean );} + public static final NamedArea INDIANOCEAN () { return waterbodyMap.get(uuidIndianOcean );} + public static final NamedArea SOUTHERNOCEAN () { return waterbodyMap.get(uuidSouthernOcean );} + public static final NamedArea MEDITERRANEANSEA () { return waterbodyMap.get(uuidMediterraneanSea );} + public static final NamedArea BLACKSEA () { return waterbodyMap.get(uuidBlackSea );} + public static final NamedArea CASPIANSEA () { return waterbodyMap.get(uuidCaspianSea );} + public static final NamedArea REDSEA () { return waterbodyMap.get(uuidRedSea );} + public static final NamedArea PERSIANGULF () { return waterbodyMap.get(uuidPersianGulf );} + + //************************* FACTORY METHODS ****************************************/ /** diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java index e4c7554bd2..b5b39770cd 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java @@ -322,17 +322,6 @@ public class WaterbodyOrCountry extends NamedArea { private static final UUID uuidYemen = UUID.fromString("713e1840-ff18-4a96-bc32-3da2b048c77d"); private static final UUID uuidZambiaRepublicof = UUID.fromString("90318040-d346-4c8f-be69-fa8ade0b12d9"); private static final UUID uuidZimbabwe = UUID.fromString("aa96ca19-46ab-40ad-a494-e4842f13eb4c"); - - private static final UUID uuidArcticOcean = UUID.fromString("af4271e5-8897-4e6f-9db7-54ea4f28cfc0"); - private static final UUID uuidAtlanticOcean = UUID.fromString("77e79804-1b17-4c99-873b-933fe216e3da"); - private static final UUID uuidPacificOcean = UUID.fromString("3d68a327-104c-49d5-a2d8-c71c6600181b"); - private static final UUID uuidIndianOcean = UUID.fromString("ff744a37-5990-462c-9c20-1e85a9943851"); - private static final UUID uuidSouthernOcean = UUID.fromString("ef04f363-f67f-4a2c-8d98-110de4c5f654"); - private static final UUID uuidMediterraneanSea = UUID.fromString("8811a47e-29d6-4455-8f83-8916b78a692f"); - private static final UUID uuidBlackSea = UUID.fromString("4cb4bbae-9aab-426c-9025-e34f809165af"); - private static final UUID uuidCaspianSea = UUID.fromString("598fec0e-b93a-4947-a1f3-601e380797f7"); - private static final UUID uuidRedSea = UUID.fromString("ee69385e-6c80-405c-be6e-974e9fd1e297"); - private static final UUID uuidPersianGulf = UUID.fromString("8dc16e70-74b8-4143-95cf-a659a319a854"); public static final WaterbodyOrCountry AFGHANISTAN () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidAfghanistan );} public static final WaterbodyOrCountry ALBANIAPEOPLESSOCIALISTREPUBLICOF () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidAlbaniaPeoplesSocialistRepublicof );} @@ -573,16 +562,6 @@ public class WaterbodyOrCountry extends NamedArea { public static final WaterbodyOrCountry YEMEN () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidYemen );} public static final WaterbodyOrCountry ZAMBIAREPUBLICOF () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidZambiaRepublicof );} public static final WaterbodyOrCountry ZIMBABWE () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidZimbabwe );} - public static final WaterbodyOrCountry ARCTICOCEAN () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidArcticOcean );} - public static final WaterbodyOrCountry ATLANTICOCEAN () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidAtlanticOcean );} - public static final WaterbodyOrCountry PACIFICOCEAN () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidPacificOcean );} - public static final WaterbodyOrCountry INDIANOCEAN () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidIndianOcean );} - public static final WaterbodyOrCountry SOUTHERNOCEAN () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidSouthernOcean );} - public static final WaterbodyOrCountry MEDITERRANEANSEA () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidMediterraneanSea );} - public static final WaterbodyOrCountry BLACKSEA () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidBlackSea );} - public static final WaterbodyOrCountry CASPIANSEA () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidCaspianSea );} - public static final WaterbodyOrCountry REDSEA () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidRedSea );} - public static final WaterbodyOrCountry PERSIANGULF () { return (WaterbodyOrCountry)termMap.get(WaterbodyOrCountry.uuidPersianGulf );} //****************** FACTORY METHODS ******************************/ -- 2.34.1