Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / ILocationService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java
index 4550996981c80be3a91363be9eeebd088290a747..5db06fe0777572f55cfbc74e53548b6504d0886a 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java
@@ -1,9 +1,8 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -12,64 +11,67 @@ package eu.etaxonomy.cdm.api.service;
 
 import java.util.List;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 
 /**
  * @author n.hoffman
- * @created 08.04.2009
- * @version 1.0
+ * @since 08.04.2009
  */
 public interface ILocationService extends IService<DefinedTermBase> {
 
-       
+
        public static enum NamedAreaVocabularyType{
                TDWG_AREA, COUNTRY, WATERBODY, CONTINENT
        }
-       
+
     /**
      * Returns a list of NamedArea Types "TDWG Areas", "ISO Country Codes"
-     * 
+     *
      * @return
      */
     public List<NamedAreaVocabularyType> getNamedAreaVocabularyTypes();
-    
+
     /**
      *  - these would be top-level areas for nested area vocabularies, e.g. North America and Europe, but NOT USA, Germany - alternatively:
-     * 
+     *
      * @param vocabularyType
      * @return
      * @deprecated use TermService#getVocabulary(VocabularyType) instead
      */
+    @Deprecated
     public OrderedTermVocabulary<NamedArea> getNamedAreaVocabulary(NamedAreaVocabularyType vocabularyType);
-    
+
     /**
-     * 
+     *
      * @return
      * @deprecated use TermService#getVocabulary(VocabularyType) instead
      */
+    @Deprecated
     public TermVocabulary<NamedAreaType> getNamedAreaTypeVocabulary();
-    
+
     /**
      * @return
      * @deprecated use TermService#getVocabulary(VocabularyType) instead
      */
+    @Deprecated
     public OrderedTermVocabulary<NamedAreaLevel> getNamedAreaLevelVocabulary();
-    
+
     /**
-     * 
+     *
      * @return
      * @deprecated use TermService#getVocabulary(VocabularyType) instead
      */
+    @Deprecated
     public OrderedTermVocabulary<PresenceAbsenceTerm> getPresenceAbsenceTermVocabulary();
-   
+
     /**
-     * 
+     *
      */
     public List<NamedArea> getTopLevelNamedAreasByVocabularyType(NamedAreaVocabularyType vocabularyType);
 }