minor: remove IVocabularyTerm.setUrl() from the Master Data API. Executing the...

minor: remove IVocabularyTerm.setUrl() from the Master Data API. Executing the method has no effect. Old implementation method kept to ensure backward-compatibility with already existing Master Data Registration Scripts

SVN: 23472

openbis/dist/server/export-master-data.py

@@ -68,13 +68,11 @@ def exportVocabulary(vocabulary, out):
         term_var = getVarName("VOCABULARY_TERM", vocabulary.getCode() + "_" + term.getCode())
         term_code = codeLiteral(term.getCode())
         term_description = strLiteral(term.getDescription())
-        term_url = strLiteral(term.getUrl())
         term_label = strLiteral(term.getLabel())
         term_ordinal = term.getOrdinal()
         out.write("""
 %(term_var)s = tr.createNewVocabularyTerm(%(term_code)s)
 %(term_var)s.setDescription(%(term_description)s)
-%(term_var)s.setUrl(%(term_url)s)
 %(term_var)s.setLabel(%(term_label)s)
 %(term_var)s.setOrdinal(%(term_ordinal)s)
 %(var)s.addTerm(%(term_var)s)

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTerm.java

@@ -31,11 +31,6 @@ public interface IVocabularyTerm extends IVocabularyTermImmutable
      */
     void setLabel(String label);
 
-    /**
-     * Set a URL where containing additional information for the term.
-     */
-    void setUrl(String url);
-
     /**
      * Set position of the term in the context of its vocabulary.
      */

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTerm.java

@@ -40,6 +40,9 @@ public class VocabularyTerm extends VocabularyTermImmutable implements IVocabula
         getVocabularyTerm().setLabel(label);
     }
 
+    /**
+     * Keep for backward-compatibility reasons. Executing the method has no effect.
+     */
     public void setUrl(String url)
     {
         getVocabularyTerm().setUrl(url);

screening/dist/core-plugins/screening/1/as/initialize-master-data.py

@@ -45,21 +45,18 @@ vocabulary_PLATE_GEOMETRY.setChosenFromList(True)
 
 vocabulary_term_PLATE_GEOMETRY_1536_WELLS_32X48 = tr.createNewVocabularyTerm('1536_WELLS_32X48')
 vocabulary_term_PLATE_GEOMETRY_1536_WELLS_32X48.setDescription(None)
-vocabulary_term_PLATE_GEOMETRY_1536_WELLS_32X48.setUrl(None)
 vocabulary_term_PLATE_GEOMETRY_1536_WELLS_32X48.setLabel('1536 Wells, 32x48')
 vocabulary_term_PLATE_GEOMETRY_1536_WELLS_32X48.setOrdinal(3)
 vocabulary_PLATE_GEOMETRY.addTerm(vocabulary_term_PLATE_GEOMETRY_1536_WELLS_32X48)
 
 vocabulary_term_PLATE_GEOMETRY_96_WELLS_8X12 = tr.createNewVocabularyTerm('96_WELLS_8X12')
 vocabulary_term_PLATE_GEOMETRY_96_WELLS_8X12.setDescription(None)
-vocabulary_term_PLATE_GEOMETRY_96_WELLS_8X12.setUrl(None)
 vocabulary_term_PLATE_GEOMETRY_96_WELLS_8X12.setLabel('96 Wells, 8x12')
 vocabulary_term_PLATE_GEOMETRY_96_WELLS_8X12.setOrdinal(2)
 vocabulary_PLATE_GEOMETRY.addTerm(vocabulary_term_PLATE_GEOMETRY_96_WELLS_8X12)
 
 vocabulary_term_PLATE_GEOMETRY_384_WELLS_16X24 = tr.createNewVocabularyTerm('384_WELLS_16X24')
 vocabulary_term_PLATE_GEOMETRY_384_WELLS_16X24.setDescription(None)
-vocabulary_term_PLATE_GEOMETRY_384_WELLS_16X24.setUrl(None)
 vocabulary_term_PLATE_GEOMETRY_384_WELLS_16X24.setLabel('384 Wells, 16x24')
 vocabulary_term_PLATE_GEOMETRY_384_WELLS_16X24.setOrdinal(1)
 vocabulary_PLATE_GEOMETRY.addTerm(vocabulary_term_PLATE_GEOMETRY_384_WELLS_16X24)
@@ -97,21 +94,18 @@ vocabulary_MICROSCOPE.setChosenFromList(True)
 
 vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICRO_2 = tr.createNewVocabularyTerm('MD_IMAGEXPRESS_MICRO_2')
 vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICRO_2.setDescription(None)
-vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICRO_2.setUrl(None)
 vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICRO_2.setLabel(None)
 vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICRO_2.setOrdinal(3)
 vocabulary_MICROSCOPE.addTerm(vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICRO_2)
 
 vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICROLIVE = tr.createNewVocabularyTerm('MD_IMAGEXPRESS_MICROLIVE')
 vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICROLIVE.setDescription(None)
-vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICROLIVE.setUrl(None)
 vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICROLIVE.setLabel(None)
 vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICROLIVE.setOrdinal(2)
 vocabulary_MICROSCOPE.addTerm(vocabulary_term_MICROSCOPE_MD_IMAGEXPRESS_MICROLIVE)
 
 vocabulary_term_MICROSCOPE_BD_PATHWAY_855 = tr.createNewVocabularyTerm('BD_PATHWAY_855')
 vocabulary_term_MICROSCOPE_BD_PATHWAY_855.setDescription(None)
-vocabulary_term_MICROSCOPE_BD_PATHWAY_855.setUrl(None)
 vocabulary_term_MICROSCOPE_BD_PATHWAY_855.setLabel(None)
 vocabulary_term_MICROSCOPE_BD_PATHWAY_855.setOrdinal(1)
 vocabulary_MICROSCOPE.addTerm(vocabulary_term_MICROSCOPE_BD_PATHWAY_855)