Project

General

Profile

« Previous | Next » 

Revision 143dd6ba

Added by Patrick Plitzner over 5 years ago

ref #6554 Rename ISelectable interface to avoid ambiguity for checkboxes

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/AbstractComboElement.java
25 25
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
26 26
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
27 27
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
28
import eu.etaxonomy.taxeditor.ui.element.ISelectable;
28
import eu.etaxonomy.taxeditor.ui.element.ISelectableColorChange;
29 29
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
30 30

  
31 31
/**
......
35 35
 */
36 36
public abstract class AbstractComboElement<T> extends
37 37
AbstractCdmFormElement implements SelectionListener,
38
IEnableableFormElement, ISelectable,
38
IEnableableFormElement, ISelectableColorChange,
39 39
DisposeListener {
40 40

  
41 41
    protected static final int DEFAULT_VISIBLE_ITEMS = 10;
......
94 94

  
95 95
    /** {@inheritDoc} */
96 96
    @Override
97
    public void setSelected(boolean selected) {
97
    public void setSelectedForColorChange(boolean selected) {
98 98
        setBackground(selected ? SELECTED : getPersistentBackground());
99 99
    }
100 100

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
339 339

  
340 340
	/** {@inheritDoc} */
341 341
	@Override
342
    public void setSelected(boolean selected) {
342
    public void setSelectedForColorChange(boolean selected) {
343 343
		if (selected) {
344 344
			setBackground(Display.getCurrent().getSystemColor(
345 345
					SWT.COLOR_LIST_SELECTION));
......
357 357

  
358 358
		IStructuredSelection selection = (IStructuredSelection) event
359 359
				.getSelection();
360
		setSelected(false);
360
		setSelectedForColorChange(false);
361 361

  
362 362
		Object selectedObject = selection.getFirstElement();
363 363

  
364 364
		if (selectedObject != null && selectedObject.equals(getEntity())) {
365
			setSelected(true);
365
			setSelectedForColorChange(true);
366 366
		}
367 367
	}
368 368

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java
25 25
 * @created Nov 5, 2009
26 26
 * @version 1.0
27 27
 */
28
public class CheckboxElement extends AbstractCdmFormElement implements SelectionListener, IEnableableFormElement, ISelectable {
28
public class CheckboxElement extends AbstractCdmFormElement implements SelectionListener, IEnableableFormElement, ISelectableColorChange {
29 29

  
30 30
	private final Button checkbox;
31 31

  
......
97 97

  
98 98
	/** {@inheritDoc} */
99 99
	@Override
100
    public void setSelected(boolean selected) {
100
    public void setSelectedForColorChange(boolean selected) {
101 101
		setBackground(selected ? SELECTED : getPersistentBackground());
102 102
	}
103 103

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/GatheringEventUnitElement.java
25 25
 * @created 23 Jul. 2013
26 26
 * @version 1.0
27 27
 */
28
public class GatheringEventUnitElement extends AbstractCdmFormElement implements ISelectable {
28
public class GatheringEventUnitElement extends AbstractCdmFormElement implements ISelectableColorChange {
29 29

  
30 30
	private final Label label;
31 31
	private final MinMaxTextSection section_minMaxText;
......
98 98
	}
99 99

  
100 100
	@Override
101
	public void setSelected(boolean selected) {
101
	public void setSelectedForColorChange(boolean selected) {
102 102
		setBackground(selected ? SELECTED : getPersistentBackground());
103 103
	}
104 104

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEntityElement.java
20 20
 * @created Feb 16, 2010
21 21
 * @version 1.0
22 22
 */
23
public interface IEntityElement<ENTITY> extends ICdmFormElement, ISelectable {
23
public interface IEntityElement<ENTITY> extends ICdmFormElement, ISelectableColorChange {
24 24

  
25 25
	/**
26 26
	 * Returns the entity of this composite.
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ISelectable.java
1
/**
2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
4
* http://www.e-taxonomy.eu
5
* 
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9

  
10
package eu.etaxonomy.taxeditor.ui.element;
11

  
12
import org.eclipse.swt.SWT;
13
import org.eclipse.swt.graphics.Color;
14
import org.eclipse.swt.widgets.Display;
15

  
16

  
17
/**
18
 * <p>ISelectable interface.</p>
19
 *
20
 * @author n.hoffmann
21
 * @created Feb 22, 2010
22
 * @version 1.0
23
 */
24
public interface ISelectable{
25
	
26
	/** Constant <code>SELECTED</code> */
27
	public static Color SELECTED = Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION);
28
	/** Constant <code>NOT_SELECTED</code> */
29
	public static Color NOT_SELECTED = Display.getCurrent().getSystemColor(SWT.COLOR_WHITE);
30
	
31
	/**
32
	 * <p>setSelected</p>
33
	 *
34
	 * @param selected a boolean.
35
	 */
36
	public void setSelected(boolean selected);
37
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ISelectableColorChange.java
1
/**
2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9

  
10
package eu.etaxonomy.taxeditor.ui.element;
11

  
12
import org.eclipse.swt.SWT;
13
import org.eclipse.swt.graphics.Color;
14
import org.eclipse.swt.widgets.Display;
15

  
16

  
17
/**
18
 * Interface used for color change when selecting a widget
19
 * @author n.hoffmann
20
 * @created Feb 22, 2010
21
 * @version 1.0
22
 */
23
public interface ISelectableColorChange{
24

  
25
	public static Color SELECTED = Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION);
26
	public static Color NOT_SELECTED = Display.getCurrent().getSystemColor(SWT.COLOR_WHITE);
27

  
28
	/**
29
	 * Sets the widget to selected or unselected invoking a color change
30
	 */
31
	public void setSelectedForColorChange(boolean selected);
32
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
28 28
 * @author n.hoffmann
29 29
 * @created Mar 31, 2010
30 30
 */
31
public class PartialElement extends AbstractCdmFormElement implements ISelectable {
31
public class PartialElement extends AbstractCdmFormElement implements ISelectableColorChange {
32 32

  
33 33
	private Label label;
34 34
	private NumberWithLabelElement number_day;
......
148 148
	}
149 149

  
150 150
	@Override
151
	public void setSelected(boolean selected) {
151
	public void setSelectedForColorChange(boolean selected) {
152 152
		setBackground(selected ? SELECTED : getPersistentBackground());
153 153
	}
154 154

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
29 29
 * @created Oct 15, 2010
30 30
 */
31 31
public class PointElement extends AbstractCdmFormElement implements
32
		IEntityElement<Point>, ISelectable {
32
		IEntityElement<Point>, ISelectableColorChange {
33 33

  
34 34
	private Point point;
35 35

  
......
208 208
	}
209 209

  
210 210
	@Override
211
    public void setSelected(boolean selected) {
211
    public void setSelectedForColorChange(boolean selected) {
212 212
		setBackground(selected ? SELECTED : getPersistentBackground());
213 213
	}
214 214

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/SelectionArbitrator.java
144 144
//		}
145 145

  
146 146
		try{
147
		    entityElement.setSelected(false);
147
		    entityElement.setSelectedForColorChange(false);
148 148
		    ISelection selection = event.getSelection();
149 149
	        if(selection != null && selection instanceof StructuredSelection){
150 150
	            Object selectedElement = ((StructuredSelection) selection).getFirstElement();
151 151
	            if(entityElement.getEntity() != null && entityElement.getEntity().equals(selectedElement)){
152
	                entityElement.setSelected(true);
152
	                entityElement.setSelectedForColorChange(true);
153 153
	            }
154 154
	        }
155 155
		}catch(SWTException e){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextActionElement.java
21 21
 * @author nho
22 22
 * @version $Id: $
23 23
 */
24
public class TextActionElement extends AbstractCdmFormElement implements ModifyListener, ISelectable{
24
public class TextActionElement extends AbstractCdmFormElement implements ModifyListener, ISelectableColorChange{
25 25

  
26 26
	private Label label;
27 27
	private Text text;
......
128 128
	}
129 129
	
130 130
	@Override
131
	public void setSelected(boolean selected) {
131
	public void setSelectedForColorChange(boolean selected) {
132 132
		setBackground(selected ? SELECTED : getPersistentBackground());
133 133
	}
134 134
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
25 25
 * @version $Id: $
26 26
 */
27 27
public class TextWithLabelElement extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement,
28
        ISelectable {
28
        ISelectableColorChange {
29 29

  
30 30
    protected Text text;
31 31
    private Label label;
......
219 219
    }
220 220

  
221 221
    @Override
222
    public void setSelected(boolean selected) {
222
    public void setSelectedForColorChange(boolean selected) {
223 223
        setBackground(selected ? SELECTED : getPersistentBackground());
224 224
    }
225 225

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TimePeriodElementBase.java
9 9

  
10 10
public abstract class TimePeriodElementBase<T extends TimePeriod> 
11 11
		extends AbstractCdmFormElement 
12
		implements ISelectable {
12
		implements ISelectableColorChange {
13 13
	
14 14
	/**
15 15
	 * <p>
......
118 118
	}
119 119

  
120 120
	@Override
121
	public void setSelected(boolean selected) {
121
	public void setSelectedForColorChange(boolean selected) {
122 122
		setBackground(selected ? SELECTED : getPersistentBackground());
123 123
	}
124 124

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ToggleableTextElement.java
36 36
 * @created Nov 18, 2009
37 37
 * @version 1.0
38 38
 */
39
public class ToggleableTextElement extends AbstractCdmFormElement implements SelectionListener, ModifyListener, IEnableableFormElement, ISelectable {
39
public class ToggleableTextElement extends AbstractCdmFormElement implements SelectionListener, ModifyListener, IEnableableFormElement, ISelectableColorChange {
40 40

  
41 41
	private final Text text_cache;
42 42
	private final Button btnToggleProtectTitleCache;
......
181 181
	}
182 182

  
183 183
	@Override
184
	public void setSelected(boolean selected) {
184
	public void setSelectedForColorChange(boolean selected) {
185 185
		setBackground(selected ? SELECTED : getPersistentBackground());
186 186
	}
187 187
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java
33 33
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
34 34
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
35 35
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
36
import eu.etaxonomy.taxeditor.ui.element.ISelectable;
36
import eu.etaxonomy.taxeditor.ui.element.ISelectableColorChange;
37 37
import eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmCompositeController;
38 38

  
39 39
/**
......
42 42
 *
43 43
 */
44 44
public class EnumTermComboController<T extends IEnumTerm<T>> extends AbstractCdmFormElement implements SelectionListener,
45
IEnableableFormElement, ISelectable, CdmCompositeController {
45
IEnableableFormElement, ISelectableColorChange, CdmCompositeController {
46 46

  
47 47
    private static CdmEnumDataHolder[] cdmEnumDataHolders = {
48 48
        new CdmEnumDataHolder<NomenclaturalCode>(){
......
239 239

  
240 240
    /** {@inheritDoc} */
241 241
    @Override
242
    public void setSelected(boolean selected) {
242
    public void setSelectedForColorChange(boolean selected) {
243 243
        setBackground(selected ? SELECTED : getPersistentBackground());
244 244
    }
245 245

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java
20 20
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
21 21
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
22 22
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
23
import eu.etaxonomy.taxeditor.ui.element.ISelectable;
23
import eu.etaxonomy.taxeditor.ui.element.ISelectableColorChange;
24 24
import eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmCompositeController;
25 25

  
26 26
/**
......
32 32
 * @version $Id: $
33 33
 */
34 34
public class TextWithLabelElementController extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement,
35
        ISelectable, CdmCompositeController {
35
        ISelectableColorChange, CdmCompositeController {
36 36

  
37 37
    protected Text text;
38 38
//    private Label label;
......
177 177
    }
178 178

  
179 179
    @Override
180
    public void setSelected(boolean selected) {
180
    public void setSelectedForColorChange(boolean selected) {
181 181
        setBackground(selected ? SELECTED : getPersistentBackground());
182 182
    }
183 183

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
115 115
	}
116 116

  
117 117
    @Override
118
    public void setSelected(boolean selected) {
118
    public void setSelectedForColorChange(boolean selected) {
119 119
		Composite section = getLayoutComposite().getParent();
120 120
		section.setBackground(selected ? SELECTED : getPersistentBackground());
121 121
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
27 27
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
28 28
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
29 29
import eu.etaxonomy.taxeditor.ui.element.IEntityElement;
30
import eu.etaxonomy.taxeditor.ui.element.ISelectable;
30
import eu.etaxonomy.taxeditor.ui.element.ISelectableColorChange;
31 31
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
32 32

  
33 33
/**
......
139 139
	 * Mark <code>this</code> element as selected.
140 140
	 */
141 141
	@Override
142
    public void setSelected(boolean selected) {
142
    public void setSelectedForColorChange(boolean selected) {
143 143

  
144 144
		for (ICdmFormElement element : getElements()) {
145
			if (element instanceof ISelectable) {
146
				((ISelectable) element).setSelected(selected);
145
			if (element instanceof ISelectableColorChange) {
146
				((ISelectableColorChange) element).setSelectedForColorChange(selected);
147 147
			}
148 148
		}
149 149
		setBackground(selected ? SELECTED : getPersistentBackground());
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java
71 71

  
72 72
	/** {@inheritDoc} */
73 73
	@Override
74
	public void setSelected(boolean selected) {
74
	public void setSelectedForColorChange(boolean selected) {
75 75

  
76 76
	}
77 77

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CdmBaseElement.java
42 42
	 * @see eu.etaxonomy.taxeditor.ui.element.ISelectable#setSelected(boolean)
43 43
	 */
44 44
	@Override
45
	public void setSelected(boolean selected) {
45
	public void setSelectedForColorChange(boolean selected) {
46 46
		// this entity element is not likely to get selected
47 47
	}
48 48

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionElement.java
108 108
	}
109 109

  
110 110
	@Override
111
	public void setSelected(boolean selected) {
111
	public void setSelectedForColorChange(boolean selected) {
112 112
		// this entity element is not likely to get selected
113 113
	}
114 114
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailSection.java
105 105
                            EventUtility.postEvent(WorkbenchEventConstants.REFRESH_TAXON_DETAILS, true);
106 106
                            EventUtility.postEvent(WorkbenchEventConstants.REFRESH_SUPPLEMENTAL, true);
107 107
                            EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAME_EDITOR, rel.getToTaxon());
108
                            ((TaxonRelationshipDetailElement)detailElement).getTaxonElement().setSelected(true);;
108
                            ((TaxonRelationshipDetailElement)detailElement).getTaxonElement().setSelectedForColorChange(true);;
109 109

  
110 110

  
111 111
	                    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
348 348

  
349 349
	/** {@inheritDoc} */
350 350
	@Override
351
	public void setSelected(boolean selected) {
351
	public void setSelectedForColorChange(boolean selected) {
352 352
		setBackground(selected ? SELECTED : getPersistentBackground());
353 353
	}
354 354

  

Also available in: Unified diff