Project

General

Profile

« Previous | Next » 

Revision d4657a24

Added by Andreas Müller almost 10 years ago

better handling of abbreviated title cache in references, series -> seriesPart and some improvements in the reference cache strategies #4280, #4239

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
9 9

  
10 10
package eu.etaxonomy.cdm.model.reference;
11 11

  
12
import java.beans.PropertyChangeEvent;
13
import java.beans.PropertyChangeListener;
12 14
import java.net.URI;
13 15
import java.util.List;
14 16

  
......
176 178
    //TODO Val #3379
177 179
//    @NullOrNotEmpty
178 180
	@Length(max = 255)
181
    @Deprecated //series and seriesPart are duplicates #4293 
179 182
	protected String series;
180 183

  
181 184
    @XmlElement(name = "Volume")
......
365 368
	protected Reference(ReferenceType type) {
366 369
		this.type = type;
367 370
	}
371
	
372
	@Override
373
    protected void initListener(){
374
        PropertyChangeListener listener = new PropertyChangeListener() {
375
            @Override
376
            public void propertyChange(PropertyChangeEvent ev) {
377
            	if (!ev.getPropertyName().equals("titleCache") && !ev.getPropertyName().equals("abbrevTitleCache") && !ev.getPropertyName().equals("cacheStrategy")){
378
            		if (! isProtectedTitleCache()){
379
            			titleCache = null;	
380
            		}
381
            		if (! isProtectedAbbrevTitleCache()){
382
            			abbrevTitleCache = null;	
383
            		}
384
            	}
385
            }
386
        };
387
        addPropertyChangeListener(listener);
388
    }
368 389

  
369 390

  
370 391
//*************************** GETTER / SETTER ******************************************/
......
427 448
		this.editor = editor;
428 449
	}
429 450

  
430
	@Override
431
    public String getSeries() {
432
		return series;
433
	}
434

  
435
	@Override
436
    public void setSeries(String series) {
437
		this.series = series;
438
	}
451
//	@Override
452
//    public String getSeries() {
453
//		return series;
454
//	}
455
//
456
//	@Override
457
//    public void setSeries(String series) {
458
//		this.series = series;
459
//	}
439 460

  
440 461
	@Override
441 462
    public String getVolume() {
......
872 893
		}
873 894
	}
874 895

  
875
	/* (non-Javadoc)
876
	 * @see eu.etaxonomy.cdm.model.common.IdentifiableEntity#generateTitle()
877
	 */
896

  
878 897
	@Override
879 898
    public String generateTitle() {
880 899
		rectifyCacheStrategy();
......
922 941
	}
923 942

  
924 943

  
925

  
926
	/* (non-Javadoc)
927
	 * @see eu.etaxonomy.cdm.model.common.IParsable#getHasProblem()
928
	 */
929 944
	@Override
930 945
    public int getParsingProblem(){
931 946
		return this.parsingProblem;
932 947
	}
933 948

  
934
	/* (non-Javadoc)
935
	 * @see eu.etaxonomy.cdm.model.common.IParsable#setHasProblem(boolean)
936
	 */
937 949
	@Override
938 950
    public void setParsingProblem(int parsingProblem){
939 951
		this.parsingProblem = parsingProblem;
940 952
	}
941 953

  
942
	/* (non-Javadoc)
943
	 * @see eu.etaxonomy.cdm.model.common.IParsable#hasProblem()
944
	 */
945 954
	@Override
946 955
    public boolean hasProblem(){
947 956
		return parsingProblem != 0;
948 957
	}
949 958

  
950
	/* (non-Javadoc)
951
	 * @see eu.etaxonomy.cdm.model.common.IParsable#hasProblem(eu.etaxonomy.cdm.strategy.parser.ParserProblem)
952
	 */
953 959
	@Override
954 960
    public boolean hasProblem(ParserProblem problem) {
955 961
		return getParsingProblems().contains(problem);
956 962
	}
957 963

  
958

  
959
	/* (non-Javadoc)
960
	 * @see eu.etaxonomy.cdm.model.common.IParsable#problemStarts()
961
	 */
962 964
	@Override
963 965
    public int getProblemStarts(){
964 966
		return this.problemStarts;
965 967
	}
966 968

  
967
	/* (non-Javadoc)
968
	 * @see eu.etaxonomy.cdm.model.common.IParsable#setProblemStarts(int)
969
	 */
970 969
	@Override
971 970
    public void setProblemStarts(int start) {
972 971
		this.problemStarts = start;
973 972
	}
974 973

  
975
	/* (non-Javadoc)
976
	 * @see eu.etaxonomy.cdm.model.common.IParsable#problemEnds()
977
	 */
978 974
	@Override
979 975
    public int getProblemEnds(){
980 976
		return this.problemEnds;
981 977
	}
982 978

  
983
	/* (non-Javadoc)
984
	 * @see eu.etaxonomy.cdm.model.common.IParsable#setProblemEnds(int)
985
	 */
986 979
	@Override
987 980
    public void setProblemEnds(int end) {
988 981
		this.problemEnds = end;
989 982
	}
990 983

  
991
	/* (non-Javadoc)
992
	 * @see eu.etaxonomy.cdm.model.common.IParsable#addProblem(eu.etaxonomy.cdm.strategy.parser.NameParserWarning)
993
	 */
994 984
	@Override
995 985
    public void addParsingProblem(ParserProblem warning){
996 986
		parsingProblem = ParserProblem.addProblem(parsingProblem, warning);
997 987
	}
998 988

  
999
	/* (non-Javadoc)
1000
	 * @see eu.etaxonomy.cdm.model.common.IParsable#removeParsingProblem(eu.etaxonomy.cdm.strategy.parser.ParserProblem)
1001
	 */
1002 989
	@Override
1003 990
    public void removeParsingProblem(ParserProblem problem) {
1004 991
		parsingProblem = ParserProblem.removeProblem(parsingProblem, problem);
1005 992
	}
1006 993

  
1007
	/* (non-Javadoc)
1008
	 * @see eu.etaxonomy.cdm.model.common.IParsable#getParsingProblems()
1009
	 */
1010 994
	@Override
1011 995
    @Transient
1012 996
	public List<ParserProblem> getParsingProblems() {

Also available in: Unified diff