BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2e6a998)
rename RightsTerm -> RightsType #3593
authorAndreas Müller <a.mueller@bgbm.org>
Wed, 30 Oct 2013 13:18:27 +0000 (13:18 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Wed, 30 Oct 2013 13:18:27 +0000 (13:18 +0000)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java patch | blob | history
eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml patch | blob | history
eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml patch | blob | history

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
index 9290201b4d889399ae512e6a9790fcfede76d671..255d22a5b54d69c295ad0ede3f3464457cb531fd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
@@ -258,7 +258,7 @@ public class TermManager extends ContextListenerAdapter{
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
-//     public List<RightsTerm> getPreferredRightsTypes() {     return getFilteredTerms(TermStore.getRightsTypes());}
+//     public List<RightsType> getPreferredRightsTypes() {     return getFilteredTerms(TermStore.getRightsTypes());}
 //     
 //     /**
 //      * <p>getPreferredNamedAreaTypes</p>
diff --git a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
index 7d0868eff15e7174b4cf6f4492ed18c5287c9693..a584bfedd7b70e2ef13fe677f7c8485eb63b76b0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
+++ b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
@@ -2008,9 +2008,9 @@
   <DEFINEDTERMBASE DTYPE="StatisticalMeasure" ID="2011" CREATED="2009-01-28 17:07:06.0" UUID="8372a89a-35ad-4755-a881-7edae6c37c8f" URI="" VOCABULARY_ID="24"/>\r
   <DEFINEDTERMBASE DTYPE="StatisticalMeasure" ID="2012" CREATED="2009-01-28 17:07:06.0" UUID="4d22cf5e-89ff-4de3-a9ae-12dbeda3faba" URI="" VOCABULARY_ID="24"/>\r
   <DEFINEDTERMBASE DTYPE="StatisticalMeasure" ID="2013" CREATED="2009-01-28 17:07:06.0" UUID="2c8b42e5-154c-42bd-a301-03b483275dd6" URI="" VOCABULARY_ID="24"/>\r
-  <DEFINEDTERMBASE DTYPE="RightsTerm" ID="2014" CREATED="2009-01-28 17:07:06.0" UUID="67c0d47e-8985-1014-8845-c84599f9992c" URI="" VOCABULARY_ID="25"/>\r
-  <DEFINEDTERMBASE DTYPE="RightsTerm" ID="2015" CREATED="2009-01-28 17:07:06.0" UUID="a50b4def-b3ac-4508-b50a-e0f249e3a1d7" URI="" VOCABULARY_ID="25"/>\r
-  <DEFINEDTERMBASE DTYPE="RightsTerm" ID="2016" CREATED="2009-01-28 17:07:06.0" UUID="d1ef838e-b195-4f28-b8eb-0d3be080bd37" URI="" VOCABULARY_ID="25"/>\r
+  <DEFINEDTERMBASE DTYPE="RightsType" ID="2014" CREATED="2009-01-28 17:07:06.0" UUID="67c0d47e-8985-1014-8845-c84599f9992c" URI="" VOCABULARY_ID="25"/>\r
+  <DEFINEDTERMBASE DTYPE="RightsType" ID="2015" CREATED="2009-01-28 17:07:06.0" UUID="a50b4def-b3ac-4508-b50a-e0f249e3a1d7" URI="" VOCABULARY_ID="25"/>\r
+  <DEFINEDTERMBASE DTYPE="RightsType" ID="2016" CREATED="2009-01-28 17:07:06.0" UUID="d1ef838e-b195-4f28-b8eb-0d3be080bd37" URI="" VOCABULARY_ID="25"/>\r
   <DEFINEDTERMBASE_CONTINENT DEFINEDTERMBASE_ID="505" CONTINENTS_ID="493"/>\r
   <DEFINEDTERMBASE_CONTINENT DEFINEDTERMBASE_ID="506" CONTINENTS_ID="493"/>\r
   <DEFINEDTERMBASE_CONTINENT DEFINEDTERMBASE_ID="507" CONTINENTS_ID="492"/>\r
@@ -6389,7 +6389,7 @@
   <REPRESENTATION ID="2079" CREATED="2009-01-28 17:07:06.0" UUID="236963d0-f863-4faf-b463-9a4723133635" TEXT="" ABBREVIATEDLABEL="" LABEL="TypicalLowerBoundary" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2080" CREATED="2009-01-28 17:07:06.0" UUID="b3f49565-fd20-4c66-a25b-35009e4ff16a" TEXT="" ABBREVIATEDLABEL="" LABEL="Variance" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2081" CREATED="2009-01-28 17:07:06.0" UUID="1dca8240-f5d0-427b-8379-ee6d4f40d719" TEXT="" ABBREVIATEDLABEL="" LABEL="Min" LANGUAGE_ID="406"/>\r
-  <REPRESENTATION ID="2082" CREATED="2009-01-28 17:07:06.0" UUID="7dc2410e-834f-4d21-a12f-d2439a96fd03" TEXT="eu.etaxonomy.cdm.model.media.RightsTerm" LABEL="RightsTerm" LANGUAGE_ID="406"/>\r
+  <REPRESENTATION ID="2082" CREATED="2009-01-28 17:07:06.0" UUID="7dc2410e-834f-4d21-a12f-d2439a96fd03" TEXT="eu.etaxonomy.cdm.model.media.RightsType" LABEL="RightsTerm" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2083" CREATED="2009-01-28 17:07:06.0" UUID="ec1d903d-4c14-43f9-84e2-c4d3e47d8cd0" TEXT="" ABBREVIATEDLABEL="" LABEL="license" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2084" CREATED="2009-01-28 17:07:06.0" UUID="faa0537a-0740-47c6-8c93-d7aac8697e32" TEXT="" ABBREVIATEDLABEL="" LABEL="access rights" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2085" CREATED="2009-01-28 17:07:06.0" UUID="2827e22f-340d-45fe-94ee-544e2b22d585" TEXT="" ABBREVIATEDLABEL="" LABEL="copyright" LANGUAGE_ID="406"/>\r
@@ -6418,7 +6418,7 @@
   <TERMVOCABULARY DTYPE="TermVocabulary" ID="22" CREATED="2009-01-28 17:07:06.0" UUID="a7dc20c9-e6b3-459e-8f05-8d6d8fceb465" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.occurrence.PreservationMethod"/>\r
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="23" CREATED="2009-01-28 17:07:06.0" UUID="fe87ea8d-6e0a-4e5d-b0da-0ab8ea67ca77" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.occurrence.DeterminationModifier"/>\r
   <TERMVOCABULARY DTYPE="TermVocabulary" ID="24" CREATED="2009-01-28 17:07:06.0" UUID="066cc62e-7213-495e-a020-97a1233bc037" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.description.StatisticalMeasure"/>\r
-  <TERMVOCABULARY DTYPE="TermVocabulary" ID="25" CREATED="2009-01-28 17:07:06.0" UUID="8627c526-73af-44d9-902c-11c1f11b60b4" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.media.RightsTerm"/>\r
+  <TERMVOCABULARY DTYPE="TermVocabulary" ID="25" CREATED="2009-01-28 17:07:06.0" UUID="8627c526-73af-44d9-902c-11c1f11b60b4" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.media.RightsType"/>\r
   <TERMVOCABULARY_REPRESENTATION TERMVOCABULARY_ID="1" REPRESENTATIONS_ID="1"/>\r
   <TERMVOCABULARY_REPRESENTATION TERMVOCABULARY_ID="2" REPRESENTATIONS_ID="487"/>\r
   <TERMVOCABULARY_REPRESENTATION TERMVOCABULARY_ID="3" REPRESENTATIONS_ID="497"/>\r
diff --git a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
index 7d0868eff15e7174b4cf6f4492ed18c5287c9693..34690bec94a6252ae6bc93899d910f6f8b902748 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
+++ b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
@@ -2008,9 +2008,9 @@
   <DEFINEDTERMBASE DTYPE="StatisticalMeasure" ID="2011" CREATED="2009-01-28 17:07:06.0" UUID="8372a89a-35ad-4755-a881-7edae6c37c8f" URI="" VOCABULARY_ID="24"/>\r
   <DEFINEDTERMBASE DTYPE="StatisticalMeasure" ID="2012" CREATED="2009-01-28 17:07:06.0" UUID="4d22cf5e-89ff-4de3-a9ae-12dbeda3faba" URI="" VOCABULARY_ID="24"/>\r
   <DEFINEDTERMBASE DTYPE="StatisticalMeasure" ID="2013" CREATED="2009-01-28 17:07:06.0" UUID="2c8b42e5-154c-42bd-a301-03b483275dd6" URI="" VOCABULARY_ID="24"/>\r
-  <DEFINEDTERMBASE DTYPE="RightsTerm" ID="2014" CREATED="2009-01-28 17:07:06.0" UUID="67c0d47e-8985-1014-8845-c84599f9992c" URI="" VOCABULARY_ID="25"/>\r
-  <DEFINEDTERMBASE DTYPE="RightsTerm" ID="2015" CREATED="2009-01-28 17:07:06.0" UUID="a50b4def-b3ac-4508-b50a-e0f249e3a1d7" URI="" VOCABULARY_ID="25"/>\r
-  <DEFINEDTERMBASE DTYPE="RightsTerm" ID="2016" CREATED="2009-01-28 17:07:06.0" UUID="d1ef838e-b195-4f28-b8eb-0d3be080bd37" URI="" VOCABULARY_ID="25"/>\r
+  <DEFINEDTERMBASE DTYPE="RightsType" ID="2014" CREATED="2009-01-28 17:07:06.0" UUID="67c0d47e-8985-1014-8845-c84599f9992c" URI="" VOCABULARY_ID="25"/>\r
+  <DEFINEDTERMBASE DTYPE="RightsType" ID="2015" CREATED="2009-01-28 17:07:06.0" UUID="a50b4def-b3ac-4508-b50a-e0f249e3a1d7" URI="" VOCABULARY_ID="25"/>\r
+  <DEFINEDTERMBASE DTYPE="RightsType" ID="2016" CREATED="2009-01-28 17:07:06.0" UUID="d1ef838e-b195-4f28-b8eb-0d3be080bd37" URI="" VOCABULARY_ID="25"/>\r
   <DEFINEDTERMBASE_CONTINENT DEFINEDTERMBASE_ID="505" CONTINENTS_ID="493"/>\r
   <DEFINEDTERMBASE_CONTINENT DEFINEDTERMBASE_ID="506" CONTINENTS_ID="493"/>\r
   <DEFINEDTERMBASE_CONTINENT DEFINEDTERMBASE_ID="507" CONTINENTS_ID="492"/>\r
@@ -6389,7 +6389,7 @@
   <REPRESENTATION ID="2079" CREATED="2009-01-28 17:07:06.0" UUID="236963d0-f863-4faf-b463-9a4723133635" TEXT="" ABBREVIATEDLABEL="" LABEL="TypicalLowerBoundary" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2080" CREATED="2009-01-28 17:07:06.0" UUID="b3f49565-fd20-4c66-a25b-35009e4ff16a" TEXT="" ABBREVIATEDLABEL="" LABEL="Variance" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2081" CREATED="2009-01-28 17:07:06.0" UUID="1dca8240-f5d0-427b-8379-ee6d4f40d719" TEXT="" ABBREVIATEDLABEL="" LABEL="Min" LANGUAGE_ID="406"/>\r
-  <REPRESENTATION ID="2082" CREATED="2009-01-28 17:07:06.0" UUID="7dc2410e-834f-4d21-a12f-d2439a96fd03" TEXT="eu.etaxonomy.cdm.model.media.RightsTerm" LABEL="RightsTerm" LANGUAGE_ID="406"/>\r
+  <REPRESENTATION ID="2082" CREATED="2009-01-28 17:07:06.0" UUID="7dc2410e-834f-4d21-a12f-d2439a96fd03" TEXT="eu.etaxonomy.cdm.model.media.RightsType" LABEL="RightsType" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2083" CREATED="2009-01-28 17:07:06.0" UUID="ec1d903d-4c14-43f9-84e2-c4d3e47d8cd0" TEXT="" ABBREVIATEDLABEL="" LABEL="license" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2084" CREATED="2009-01-28 17:07:06.0" UUID="faa0537a-0740-47c6-8c93-d7aac8697e32" TEXT="" ABBREVIATEDLABEL="" LABEL="access rights" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="2085" CREATED="2009-01-28 17:07:06.0" UUID="2827e22f-340d-45fe-94ee-544e2b22d585" TEXT="" ABBREVIATEDLABEL="" LABEL="copyright" LANGUAGE_ID="406"/>\r
@@ -6418,7 +6418,7 @@
   <TERMVOCABULARY DTYPE="TermVocabulary" ID="22" CREATED="2009-01-28 17:07:06.0" UUID="a7dc20c9-e6b3-459e-8f05-8d6d8fceb465" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.occurrence.PreservationMethod"/>\r
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="23" CREATED="2009-01-28 17:07:06.0" UUID="fe87ea8d-6e0a-4e5d-b0da-0ab8ea67ca77" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.occurrence.DeterminationModifier"/>\r
   <TERMVOCABULARY DTYPE="TermVocabulary" ID="24" CREATED="2009-01-28 17:07:06.0" UUID="066cc62e-7213-495e-a020-97a1233bc037" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.description.StatisticalMeasure"/>\r
-  <TERMVOCABULARY DTYPE="TermVocabulary" ID="25" CREATED="2009-01-28 17:07:06.0" UUID="8627c526-73af-44d9-902c-11c1f11b60b4" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.media.RightsTerm"/>\r
+  <TERMVOCABULARY DTYPE="TermVocabulary" ID="25" CREATED="2009-01-28 17:07:06.0" UUID="8627c526-73af-44d9-902c-11c1f11b60b4" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.media.RightsType"/>\r
   <TERMVOCABULARY_REPRESENTATION TERMVOCABULARY_ID="1" REPRESENTATIONS_ID="1"/>\r
   <TERMVOCABULARY_REPRESENTATION TERMVOCABULARY_ID="2" REPRESENTATIONS_ID="487"/>\r
   <TERMVOCABULARY_REPRESENTATION TERMVOCABULARY_ID="3" REPRESENTATIONS_ID="497"/>\r