Project

General

Profile

« Previous | Next » 

Revision 12aed930

Added by Andreas Müller about 5 years ago

cleanup

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
595 595
    @Deprecated
596 596
    protected Language() {
597 597
   		super(TermType.Language);
598
    };
598
    }
599 599

  
600 600
    public Language(UUID uuid) {
601
        super(TermType.Language);
601
        this();
602 602
    	this.setUuid(uuid);
603 603
    }
604

  
605
    //TODO is this really needed and correct? What stands iso639_x2 for?
604 606
    public Language(String iso639_1, String iso639_x2, String englishLabel, String frenchLabel) throws Exception {
605
        super(TermType.Language);
607
        this();
606 608
        if(iso639_1 != null && iso639_1.length() != 2){
607 609
            logger.warn("iso639_1 is not of size 2: "+iso639_1.toString());
608 610
        }
......
612 614
        this.iso639_1=iso639_1;
613 615
//        this.iso639_2=iso639_2;
614 616
        String textEnglish = englishLabel;
615
        String textFrench = englishLabel;
617
        String textFrench = frenchLabel;
616 618
        String label = iso639_x2;
617 619
        String labelAbbrev = null;
618 620
        this.addRepresentation(new Representation(textEnglish, label, labelAbbrev, Language.ENGLISH()));
619 621
        this.addRepresentation(new Representation(textFrench, label, labelAbbrev, Language.FRENCH()));
620 622
    }
621
    public Language(String text, String label, String labelAbbrev, Language lang) {
622
        super(TermType.Language);
623
    	this.addRepresentation(new Representation(text,label,labelAbbrev, lang));
624
    }
623

  
625 624
    public Language(String label, String text, String labelAbbrev) {
626 625
        this(label,text,labelAbbrev, DEFAULT());
627 626
    }
628 627

  
628
    public Language(String text, String label, String labelAbbrev, Language lang) {
629
        super(TermType.Language);
630
        if (StringUtils.isNotBlank(label) || StringUtils.isNotBlank(labelAbbrev) || lang != null){
631
            this.addRepresentation(new Representation(text,label,labelAbbrev, lang));
632
        }
633
    }
634

  
635

  
629 636
//********************************** METHODS *********************************************************/
630 637

  
631
    /* (non-Javadoc)
632
     * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
633
     */
634 638
    @Override
635 639
    public void resetTerms(){
636 640
        termMap = null;
......
638 642
        csvLanguage = null;
639 643
    }
640 644

  
641

  
642 645
    protected static Language getTermByUuid(UUID uuid){
643 646
        if (termMap == null || termMap.isEmpty()){
644 647
            return getTermByClassAndUUID(Language.class, uuid);
......
647 650
        }
648 651
    }
649 652

  
650

  
651

  
652

  
653 653
    public static final Language ENGLISH(){/*@*/ return getTermByUuid(uuidEnglish);/*@*/}
654 654
    public static final Language AFAR(){/*@*/ return getTermByUuid(uuidAfar);/*@*/}
655 655
    public static final Language ABKHAZIAN(){/*@*/ return getTermByUuid(uuidAbkhazian);/*@*/}

Also available in: Unified diff