Project

General

Profile

Revision 31e5785c

ID31e5785c8476d0eefc99ec19de7adc471eb580a4
Parent 891057fb
Child 3307e9f1

Added by Katja Luther about 3 years ago

fix #6595: not editable synonyms should be enabled to be clickable

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
456 456
		List<AbstractGroupedContainerE4> groupedComposites = new ArrayList<>();
457 457

  
458 458
		for (AbstractGroupE4 group : getAllGroups()) {
459
			groupedComposites.addAll(group.getGroupedContainers());
459
		    if (group!= null){
460
		        groupedComposites.addAll(group.getGroupedContainers());
461
		    }
460 462
		}
461 463

  
462 464
		return groupedComposites;
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java
340 340

  
341 341
	protected void enableFreeText() {
342 342
		setEnabled(isFreetextEditingAllowed());
343

  
343 344
	}
344 345

  
345 346
	/**
......
479 480
		focusListener = new FocusAdapter() {
480 481
			@Override
481 482
			public void focusGained(FocusEvent e) {
482
				if(!enabled){
483
					return;
484
				}
483
//				if(!enabled){
484
//					return;
485
//				}
486
			    if (getEditor()
487
                        .getGroupedContainers().isEmpty()){
488
			        return;
489
			    }
490

  
485 491
				for (AbstractGroupedContainerE4 container : getEditor()
486 492
						.getGroupedContainers()) {
487 493
					container.colorSelected(NOT_SELECTED);
......
891 897
		Color color = enabled ? control.getForeground() : AbstractUtility.getColor(Resources.COLOR_DISABLED_EDITOR);
892 898

  
893 899
		getNameViewer().getTextWidget().setEditable(enabled);
894
		getNameViewer().getTextWidget().setEnabled(enabled);
900
//		getNameViewer().getTextWidget().setEnabled(enabled);
895 901
		getNameViewer().getTextWidget().setForeground(color);
902

  
903

  
896 904
	}
897 905

  
898 906
	public boolean isEnabled(){

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)