Project

General

Profile

« Previous | Next » 

Revision d812f38a

Added by Katja Luther over 8 years ago

fixing #5341 and colouring for cache relevant fields #4915 and #4944

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
60 60
	private TextWithLabelElement text_publisher;
61 61
	private TextWithLabelElement text_referenceAbstract;
62 62
	private TextWithLabelElement text_series;
63
	private TextWithLabelElement text_seriesPart;
63
//	private TextWithLabelElement text_seriesPart;
64 64
	private TextWithLabelElement text_volume;
65 65
	private TextWithLabelElement text_abbrevTitle;
66 66
	private TextWithLabelElement text_title;
......
162 162
				"Date Published", entity.getDatePublished(), style);
163 163

  
164 164
		createUriAndAbstract(this, entity, SWT.NULL);
165
		handleToggleableAbbrevTitleField();
166
		handleToggleableCacheField();
165 167
	}
166 168

  
167 169
	/*
......
185 187
		// Object[]{text_cache}));
186 188
		toggleable_cache.setEnabled(getEntity().isProtectedTitleCache());
187 189
		toggleableAbbrevCache.setEnabled(getEntity().isProtectedAbbrevTitleCache());
188
        setIrrelevant(toggleable_cache.getState(), Arrays.asList(new Object[] { toggleable_cache }));
189
        setIrrelevant(toggleableAbbrevCache.getState(), Arrays.asList(new Object[] { toggleableAbbrevCache}));
190
		setIrrelevantReferenceDetail(false);
191
		setIrrelevantReferenceDetail(true);
190 192
	}
191 193

  
192 194
	/**
......
360 362
		text_editor = formFactory.createTextWithLabelElement(element, "Editor",
361 363
				reference.getEditor(), style);
362 364

  
363
		// series part
365
		/* series part
364 366
		text_seriesPart = formFactory.createTextWithLabelElement(element,
365 367
				"Series", reference.getSeriesPart(), style);
366

  
368
*/
367 369
		if (referenceType.equals(ReferenceType.Book)) {
368 370
			// edition
369 371
			text_edition = formFactory.createTextWithLabelElement(element,
......
432 434
			getEntity().setPublisher(text_publisher.getText());
433 435
		} else if (eventSource == text_referenceAbstract) {
434 436
			getEntity().setReferenceAbstract(text_referenceAbstract.getText());
435
		} else if (eventSource == text_seriesPart) {
436
			getEntity().setSeriesPart(text_seriesPart.getText());
437
		} else if (eventSource == text_series) {
438
			getEntity().setSeriesPart(text_series.getText());
437 439
		} else if (eventSource == text_title) {
438 440
			getEntity().setTitle(text_title.getText());
439 441
			toggleable_cache.setText(text_title.getText());
......
474 476
    protected void handleToggleableAbbrevTitleField() {
475 477
        boolean pushedAbbrevState = toggleableAbbrevCache.getState();
476 478
        getEntity().setAbbrevTitleCache(toggleableAbbrevCache.getText(), pushedAbbrevState);
477
        setIrrelevant(pushedAbbrevState, Arrays.asList(new Object[] { toggleableAbbrevCache, toggleable_cache, text_title }));
479
        setIrrelevantReferenceDetail(true);
478 480
        updateToggleableCacheField();
479 481
    }
480 482

  
......
548 550
			}
549 551
		}
550 552
	}
553
	
554
	@Override
555
	protected void handleToggleableCacheField() {
556
       
557
		boolean pushedState = toggleable_cache.getState();
558
        getEntity().setTitleCache(toggleable_cache.getText(), pushedState);
559
        setIrrelevantReferenceDetail(false);
560
        updateToggleableCacheField();
561
    }
562
	
563
	protected void setIrrelevantReferenceDetail(boolean abbrev){
564
		
565
		List<Object> except = new ArrayList();
566
	    except.addAll( Arrays.asList(new Object[] { toggleable_cache, toggleableAbbrevCache, text_editor, text_isbn, text_issn, text_organisation, text_pages, text_placePublished, text_publisher, text_referenceAbstract,  text_uri, selection_institution}));
567
	    boolean pushedState;
568
	    if (abbrev){
569
	      except.add(text_title);
570
	      pushedState = toggleableAbbrevCache.getState();
571
	    } else{
572
	    	except.add(text_abbrevTitle);
573
	    	pushedState = toggleable_cache.getState();
574
	    }
575
	    switch( getEntity().getType()){
576
	    case Journal:
577
	    	except.add(element_timePeriod);
578
	    	break;
579
	    case Book:
580
	    	except.remove(text_series);
581
	    	except.remove(text_edition);
582
	    	break;
583
	    }	
584
	    setIrrelevant(pushedState, except);
585
	}
551 586
}

Also available in: Unified diff