Project

General

Profile

« Previous | Next » 

Revision afb8223a

Added by Andreas Müller over 3 years ago

cleanup

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/AbstractComboElement.java
94 94

  
95 95
        Color color = AbstractUtility.getColor(colorId);
96 96
        combo.setBackground(color);
97
        if (label != null) {
98
            label.setBackground(color);
99
        }
100 97
    }
101 98

  
102 99
    public void setVisibleItemCount(int count){
......
225 222
    @Override
226 223
    public String toString() {
227 224
        if (label != null){
228
            return CdmUtils.concat("ComboElement", label.getText());
225
            return CdmUtils.concat("", "ComboElement[", label.getText(),"]");
229 226
        }else{
230 227
            return super.toString();
231 228
        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java
118 118
            label.setBackground(color);
119 119
        }
120 120
	}
121
	public void setIndent(int indent){
121

  
122
    public void setIndent(int indent){
122 123
	    TableWrapData tableWrapData = (TableWrapData)label.getLayoutData();
123 124
        if (tableWrapData == null){
124 125
            tableWrapData = new TableWrapData();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
252 252
        text.setForeground(color);
253 253
    }
254 254

  
255
    @Override
256
    public String toString() {
257
        if (label != null){
258
            return CdmUtils.concat("", "TextWithLabelElement[", label.getText(),"]");
259
        }else{
260
            return super.toString();
261
        }
262
    }
255 263
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TimePeriodElement.java
6 6
 * The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
 * See LICENSE.TXT at the top of this package for the full license terms.
8 8
 */
9

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

  
12
import org.eclipse.ui.forms.widgets.Section;
11
import org.eclipse.ui.forms.widgets.ExpandableComposite;
13 12

  
14 13
import eu.etaxonomy.cdm.model.common.TimePeriod;
15 14

  
16 15
/**
17
 * <p>
18 16
 * TimePeriodElement class.
19
 * </p>
20 17
 *
21 18
 * @author n.hoffmann
22 19
 * @created Nov 17, 2009
......
24 21
public class TimePeriodElement
25 22
			extends TimePeriodElementBase<TimePeriod> {
26 23

  
27
    
28 24
    public TimePeriodElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString,
29 25
			TimePeriod timePeriod, int style) {
30 26
		super(formFactory, parentElement, labelString, timePeriod, style);
......
33 29
	@Override
34 30
	protected DateDetailSection<TimePeriod> createDateDetailSection() {
35 31
		return formFactory.createDateDetailSection(this,
36
				Section.TWISTIE);
32
				ExpandableComposite.TWISTIE);
37 33
	}
38 34

  
39

  
40
}
35
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TimePeriodElementBase.java
1
/**
2
* Copyright (C) 2018 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
*/
1 9
package eu.etaxonomy.taxeditor.ui.element;
2 10

  
3 11
import org.eclipse.jface.util.PropertyChangeEvent;
......
15 23
    protected DateDetailSection<T> section_dateDetails;
16 24

  
17 25
	/**
18
	 * <p>
19 26
	 * Constructor for TimePeriodElement.
20
	 * </p>
21
	 *
22
	 * @param style
23
	 *            a int.
24
	 * @param formFactory
25
	 *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
26
	 *            object.
27
	 * @param parentElement
28
	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
29
	 *            object.
30
	 * @param labelString
31
	 *            a {@link java.lang.String} object.
32
	 * @param timePeriod
33
	 *            a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
34 27
	 */
35 28
	public TimePeriodElementBase(CdmFormFactory formFactory,
36 29
			ICdmFormElement parentElement, String labelString,
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ToggleableTextElement.java
176 176
		text_cache.setBackground(color);
177 177
	}
178 178

  
179
	@Override
179
    @Override
180 180
	public void setBackground(Color color) {
181 181
		label.setBackground(color);
182 182
		container.setBackground(color);
......
190 190
    @Override
191 191
    public String toString() {
192 192
        if (label != null){
193
            return CdmUtils.concat("ComboElement", label.getText());
193
            return CdmUtils.concat("", "ToggleableTextElement[", label.getText(),"]");
194 194
        }else{
195 195
            return super.toString();
196 196
        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/VerbatimTimePeriodElement.java
15 15
/**
16 16
 * @author k.luther
17 17
 * @since 15.05.2018
18
 *
19 18
 */
20
public class VerbatimTimePeriodElement 
19
public class VerbatimTimePeriodElement
21 20
			extends TimePeriodElementBase<VerbatimTimePeriod> {
22 21

  
23
    
22

  
24 23
    public VerbatimTimePeriodElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString,
25 24
			VerbatimTimePeriod timePeriod, int style) {
26 25
		super(formFactory, parentElement, labelString, timePeriod, style);
......
33 32
	}
34 33

  
35 34
    /**
36
     * <p>
37 35
     * Setter for the field <code>timePeriod</code>.
38
     * </p>
39
     *
40
     * @param timePeriod
41
     *            the timePeriod to set
42 36
     */
43 37
    @Override
44 38
    public void setTimePeriod(VerbatimTimePeriod timePeriod) {
45 39
        super.setTimePeriod(timePeriod);
46 40
    }
47

  
48

  
49

  
50

  
51
}
41
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
113 113

  
114 114
	/**
115 115
	 * Sets all field to the given enablement state except the objects in
116
	 * collection except
116
	 * the collection except parameter.
117 117
	 *
118 118
	 * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#setEnabled(boolean)
119
	 * @param enabled
120
	 *            a boolean.
121
	 * @param except
122
	 *            a {@link java.util.Collection} object.
123 119
	 */
124 120
	public void setEnabled(boolean enabled, Collection<Object> except) {
125 121
	    this.enabled = enabled;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
36 36
import eu.etaxonomy.taxeditor.store.CdmStore;
37 37
import eu.etaxonomy.taxeditor.store.StoreUtil;
38 38
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
39
import eu.etaxonomy.taxeditor.ui.element.CacheRelevance;
39 40
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
41
import eu.etaxonomy.taxeditor.ui.element.ICacheRelevantFormElement;
40 42
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
41 43
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
42 44
import eu.etaxonomy.taxeditor.ui.element.ISelectableElement;
45
import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
43 46

  
44 47
/**
45 48
 * This class visualizes an CDM entity of type ENTITY.
......
51 54
 */
52 55
public abstract class AbstractCdmDetailSection<ENTITY>
53 56
			extends AbstractFormSection<ENTITY>
54
			implements IEnableableFormElement, IExpansionListener {
57
			implements IEnableableFormElement, IExpansionListener, ICacheRelevantFormElement  {
55 58

  
56 59
	protected AbstractCdmDetailElement<ENTITY> detailElement;
57 60

  
......
209 212
	}
210 213

  
211 214
	@Override
212
    public void setIrrelevant(boolean irrelevant) {
215
    public void updateCacheRelevance() {
213 216
		if (detailElement != null) {
214
			detailElement.setIrrelevant(irrelevant);
217
			detailElement.updateCacheRelevance();
215 218
		}
216 219
	}
217 220

  
218 221
	@Override
222
    public void addDependsOnCache(ToggleableTextElement toggleElement) {
223
	    if (detailElement != null) {
224
            detailElement.addDependsOnCache(toggleElement);
225
        }
226
    }
227

  
228
    @Override
229
    public CacheRelevance cacheRelevance() {
230
        return detailElement.cacheRelevance();
231
    }
232

  
233
    @Override
219 234
    public void expansionStateChanging(ExpansionEvent e) {
220 235
		// logger.warn("Expansion State Changing");
221 236
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberSection.java
15 15
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
16 16
import eu.etaxonomy.cdm.model.agent.Person;
17 17
import eu.etaxonomy.cdm.model.agent.Team;
18
import eu.etaxonomy.taxeditor.ui.element.CacheRelevance;
18 19
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
20
import eu.etaxonomy.taxeditor.ui.element.ICacheRelevantFormElement;
19 21
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
22
import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
20 23
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCollectionSection;
21 24

  
22 25
/**
......
25 28
 * @author n.hoffmann
26 29
 * @created Apr 30, 2010
27 30
 */
28
public class TeamMemberSection extends AbstractUnboundEntityCollectionSection<Team, Person> {
31
public class TeamMemberSection
32
        extends AbstractUnboundEntityCollectionSection<Team, Person>
33
        implements ICacheRelevantFormElement {
29 34

  
30 35
    private boolean isNomenclaturalTeam = false;
31 36

  
......
113 118
        return false;
114 119
    }
115 120

  
116
}
121
    @Override
122
    public void updateCacheRelevance() {
123
        System.out.println("setIrrelevant NOT YET implemented in " + this.getClass().getName());
124
    }
125

  
126
    @Override
127
    public void addDependsOnCache(ToggleableTextElement toggleElement) {
128
        System.out.println("addDependsOnCache NOT YET implemented in " + this.getClass().getName());
129
    }
130

  
131
    @Override
132
    public CacheRelevance cacheRelevance() {
133
        System.out.println("isCached NOT YET implemented in " + this.getClass().getName());
134
        return CacheRelevance.NONE;
135
    }
136

  
137

  
138
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9

  
10 9
package eu.etaxonomy.taxeditor.ui.section.name;
11 10

  
12 11
import org.eclipse.jface.viewers.ISelectionProvider;
......
25 24
/**
26 25
 * @author n.hoffmann
27 26
 * @created 05.06.2009
28
 * @version 1.0
29 27
 */
30 28
public class AuthorshipDetailSection extends AbstractCdmDetailSection<INonViralName> implements ITaxonBaseDetailSection {
31 29

  
32
	private TaxonBase taxonBase;
33

  
30
	private TaxonBase<?> taxonBase;
34 31

  
35 32
	public AuthorshipDetailSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement,
36 33
			ISelectionProvider selectionProvider, int style) {
......
38 35

  
39 36
	}
40 37

  
41
	/** {@inheritDoc} */
42 38
	@Override
43 39
    public void setTaxonBase(TaxonBase entity) {
44 40
		this.taxonBase = entity;
......
46 42
		setEntity(name);
47 43
	}
48 44

  
49
	/** {@inheritDoc} */
50 45
	@Override
51 46
	public String getHeading() {
52 47
		return "Authorship";
......
78 73
	public void updateContent(){
79 74
		((AuthorshipDetailElement)this.detailElement).updateContent();
80 75
	}
81

  
82
}
76
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
77 77

  
78 78
	/**
79 79
	 * Constructor for ReferenceBaseDetailElement.
80
	 *
81
	 * @param cdmFormFactory
82
	 *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
83
	 *            object.
84
	 * @param formElement
85
	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
86
	 *            object.
87
	 * @param style
88
	 *            a int.
89 80
	 */
90 81
	public ReferenceDetailElement(CdmFormFactory cdmFormFactory,
91
			ICdmFormElement formElement, int style, boolean isWizard) {
82
			ICdmFormElement formElement, int style) {
92 83
		super(cdmFormFactory, formElement);
93
		this.isWizard = isWizard;
94 84
	}
95 85

  
96 86
	@Override
......
121 111
		// author team
122 112
		if(referenceType != null && !referenceType.equals(ReferenceType.Journal) && !referenceType.equals(ReferenceType.PrintSeries) ) {
123 113
            selection_authorTeam = formFactory
124
            		.createSelectionElement(TeamOrPersonBase.class,//getConversationHolder(),
114
            		.createSelectionElement(TeamOrPersonBase.class,
125 115
            		        formElement, "Author",
126 116
            				entity.getAuthorship(),
127 117
            				EntitySelectionElement.ALL, style);
......
143 133
//				if (referenceType.equals(ReferenceType.Proceedings)) {
144 134
//				    text_isbn = formFactory.createTextWithLabelElement(this, "ISBN",
145 135
//		                    entity.getIsbn(), style);
146
//                }
136
//              }
147 137
				if (referenceType.isPublication()) {
148 138
					createPublicationControls(this, referenceType, entity,
149 139
							SWT.NULL);
......
175 165
		handleToggleableCacheField();
176 166
	}
177 167

  
178
	private void createWebPageControls(ReferenceDetailElement referenceDetailElement, Reference reference, int style) {
168
    private void createWebPageControls(ReferenceDetailElement referenceDetailElement, Reference reference, int style) {
179 169
		DateTime accessed = reference.getAccessed();
180 170

  
181 171
		text_accessed = formFactory.createDateElement(referenceDetailElement, "Accessed", accessed, style, false);
......
228 218

  
229 219
		if (createInReferenceWidget) {
230 220
			selection_inReference = formFactory
231
					.createSelectionElement(Reference.class,//getConversationHolder(),
221
					.createSelectionElement(Reference.class,
232 222
					        element, label,
233 223
							reference.getInReference(),
234 224
							EntitySelectionElement.ALL, style);
......
237 227

  
238 228
	/**
239 229
	 * Creates additional controls to edit a generic reference
240
	 *
241
	 * @param element
242
	 * @param reference
243
	 * @param listener
244
	 * @param style
245 230
	 */
246 231
	private void createGenericControls(ICdmFormElement element,
247 232
			Reference reference, int style) {

Also available in: Unified diff