Project

General

Profile

« Previous | Next » 

Revision 683611da

Added by Alex Theys about 12 years ago

AT: Committing working from home files

View differences:

.gitattributes
1062 1062
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java -text
1063 1063
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java -text
1064 1064
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java -text
1065
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java -text
1065 1066
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java -text
1066 1067
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java -text
1067 1068
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/StateEditorInput.java -text
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
17 17
import eu.etaxonomy.cdm.model.description.CategoricalData;
18 18
import eu.etaxonomy.cdm.model.description.DescriptionBase;
19 19
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
20
import eu.etaxonomy.cdm.model.description.Modifier;
20 21
import eu.etaxonomy.cdm.model.description.State;
21 22
import eu.etaxonomy.cdm.model.description.StateData;
22 23
import eu.etaxonomy.cdm.model.description.TextData;
......
47 48
		else if (element instanceof CategoricalData) {
48 49
			//String text = "";
49 50
			//TextData textData = categoricalDescriptionBuilder.build((CategoricalData) element, getLanguageList());
50
			if (((CategoricalData) element).getStates() != null) {
51
			if (!((CategoricalData) element).getStates().isEmpty()) {
51 52
				for (StateData statedata : ((CategoricalData) element).getStates()) {
52 53
					if(statedata.getState() != null) {
53
						text = text + statedata.getState().getTitleCache();
54
						text = text + statedata.getState().getTitleCache() + "; ";
54 55
					}
55
					else {
56
					/*else {
56 57
						text = "No data provided";
57
					}
58
					}*/
58 59
				}
59 60
			}
60
			if (((CategoricalData) element).getStatesOnly() != null) {
61
				for (State state : ((CategoricalData) element).getStatesOnly()) {
62
					if (state != null) {
63
						text = text + state.getTitleCache();
64
					}
65
					else {
66
						text = "No data provided";
67
					}
61
			
62
			if (!((CategoricalData) element).getModifiers().isEmpty()) {
63
				for (Modifier modifier : ((CategoricalData) element).getModifiers()) {
64
					text = text + modifier.getTitleCache();
68 65
				}
69 66
			}
67

  
70 68
			
71 69
			//text = textData.getText(CdmStore.getDefaultLanguage());
72 70
			if (text == null || text.length() == 0) {
eu.etaxonomy.taxeditor.store/plugin.xml
344 344
                  style="push">
345 345
               <parameter
346 346
                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
347
                     value="eu.etaxonomy.cdm.model.description.Feature">
347
                     value="eu.etaxonomy.cdm.model.common.MarkerType">
348 348
               </parameter>
349 349
            </command>
350 350
            <command
......
369 369
                     value="eu.etaxonomy.cdm.model.description.Feature">
370 370
               </parameter>
371 371
            </command>
372
            <command
373
                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
374
                  label="Modifier"
375
                  style="push">
376
               <parameter
377
                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
378
                     value="eu.etaxonomy.cdm.model.description.Modifier">
379
               </parameter>
380
            </command>
372 381
         </menu>
373 382
      </menuContribution>
374 383
      <menuContribution
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java
15 15
import eu.etaxonomy.cdm.model.common.ExtensionType;
16 16
import eu.etaxonomy.cdm.model.common.MarkerType;
17 17
import eu.etaxonomy.cdm.model.description.Feature;
18
import eu.etaxonomy.cdm.model.description.Modifier;
18 19
import eu.etaxonomy.cdm.model.description.State;
19 20
import eu.etaxonomy.cdm.model.location.NamedArea;
20 21
import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
......
51 52
		if (clazz == State.class){
52 53
			return new StateEditorInput();
53 54
		}
55
		if (clazz == Modifier.class){
56
			return new ModifierEditorInput();
57
		}
54 58
		
55 59
		return null;
56 60
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java
1
// $Id$
2
/**
3
* Copyright (C) 2009 EDIT
4
* European Distributed Institute of Taxonomy 
5
* http://www.e-taxonomy.eu
6
* 
7
* The contents of this file are subject to the Mozilla Public License Version 1.1
8
* See LICENSE.TXT at the top of this package for the full license terms.
9
*/
10
package eu.etaxonomy.taxeditor.editor.definedterm.input;
11

  
12
import java.util.Arrays;
13
import java.util.List;
14

  
15
import eu.etaxonomy.cdm.model.description.Modifier;
16

  
17

  
18
/**
19
 * @author n.hoffmann
20
 * @date Jan 24, 2012
21
 *
22
 */
23
public class ModifierEditorInput extends AbstractDefinedTermEditorInput<Modifier> {
24

  
25
	private List<String> termClasses = Arrays.asList(new String[]{
26
			Modifier.class.getName()
27
	});
28
	
29
	/* (non-Javadoc)
30
	 * @see org.eclipse.ui.IEditorInput#getName()
31
	 */
32
	@Override
33
	public String getName() {
34
		return "Modifier";
35
	}
36

  
37
	/* (non-Javadoc)
38
	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#getTermClasses()
39
	 */
40
	@Override
41
	public List<String> getTermClasses() {
42
		return termClasses;
43
	}
44

  
45
	/* (non-Javadoc)
46
	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#createTermInstance()
47
	 */
48
	@Override
49
	public Modifier createTermInstance() {
50
		return Modifier.NewInstance();
51
	}
52

  
53
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
1 1
package eu.etaxonomy.taxeditor.ui.section.userecords;
2 2

  
3

  
4

  
5 3
import java.util.ArrayList;
6 4
import java.util.List;
5
import java.util.Map;
6
import java.util.Set;
7 7
import java.util.UUID;
8 8

  
9 9
import org.apache.log4j.Logger;
......
11 11
import org.eclipse.swt.events.SelectionListener;
12 12
import org.eclipse.ui.forms.widgets.Section;
13 13

  
14
import eu.etaxonomy.cdm.api.service.IService;
14 15
import eu.etaxonomy.cdm.api.service.IVocabularyService;
15 16
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
16 17
import eu.etaxonomy.cdm.model.common.Language;
17 18
import eu.etaxonomy.cdm.model.common.LanguageString;
19
import eu.etaxonomy.cdm.model.common.Marker;
20
import eu.etaxonomy.cdm.model.common.MarkerType;
18 21
import eu.etaxonomy.cdm.model.common.TermVocabulary;
19 22
import eu.etaxonomy.cdm.model.description.CategoricalData;
20 23
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
24
import eu.etaxonomy.cdm.model.description.Modifier;
21 25
import eu.etaxonomy.cdm.model.description.State;
22 26
import eu.etaxonomy.cdm.model.description.StateData;
23 27
import eu.etaxonomy.taxeditor.store.CdmStore;
......
33 37
import eu.etaxonomy.taxeditor.ui.section.description.detail.AbstractDetailedDescriptionDetailElement;
34 38

  
35 39
//public class UseRecordDetailElement extends AbstractDetailedDescriptionDetailElement<CategoricalData> {
36
public class UseRecordDetailElement extends AbstractCdmDetailElement<CategoricalData> implements SelectionListener {
40
public class UseRecordDetailElement extends
41
		AbstractCdmDetailElement<CategoricalData> implements SelectionListener {
37 42

  
38
	
39 43
	private static final Logger logger = Logger
40 44
			.getLogger(DescriptionElementDetailElement.class);
41
	
42
	//private CheckboxElement checkbox_orderRelevant;
45

  
46
	// private CheckboxElement checkbox_orderRelevant;
43 47
	private TermComboElement<State> combo_UseCategory;
44 48
	private TermComboElement<State> combo_UseSubCategory;
45
	//private AbstractDetailedDescriptionDetailElement detailElement;
46
	
47
	/*public UseRecordDetailElement(CdmFormFactory formFactory,
48
			ICdmFormElement formElement, CategoricalData entity, int style) {
49
		super(formFactory, formElement, entity, style);
50
	}*/
51
	/*public UseRecordDetailElement(CdmFormFactory formFactory,
52
			ICdmFormElement formElement, int style) {*/
49
	private TermComboElement<Modifier> combo_PlantPart;
50

  
51
	// private AbstractDetailedDescriptionDetailElement detailElement;
52

  
53
	/*
54
	 * public UseRecordDetailElement(CdmFormFactory formFactory, ICdmFormElement
55
	 * formElement, CategoricalData entity, int style) { super(formFactory,
56
	 * formElement, entity, style); }
57
	 */
58
	/*
59
	 * public UseRecordDetailElement(CdmFormFactory formFactory, ICdmFormElement
60
	 * formElement, int style) {
61
	 */
53 62
	public UseRecordDetailElement(CdmFormFactory formFactory,
54 63
			ICdmFormElement formElement) {
55 64
		super(formFactory, formElement);
56 65
	}
57
	
66

  
58 67
	/** {@inheritDoc} */
59 68
	@Override
60 69
	protected void createControls(ICdmFormElement formElement,
61 70
			CategoricalData entity, int style) {
71

  
72
		// State state = State.NewInstance("Tato", "Toto", "Titi");
73
		// checkbox_orderRelevant = formFactory.createCheckbox(formElement,
74
		// "Order Relevant", entity.getOrderRelevant(), style);
75
		combo_UseCategory = formFactory.createTermComboElement(State.class,	this, "Use Category", null, style);
76
		combo_UseCategory.addSelectionListener(this);
77
		combo_UseSubCategory = formFactory.createTermComboElement(State.class, this, "Use Sub Category", null, style);
78
		combo_PlantPart = formFactory.createTermComboElement(Modifier.class, this, "Plant Part", null, style);
79
		// List<State> listOfTerms = TermStore.getTerms(State.class,null ,
80
		// false);
81

  
82
		// UUID uuidUseCategory =
83
		// UUID.fromString("2bb365af-ce6c-4196-a30b-e69b05099ed0");
84
		// TermVocabulary termVoc =
85
		// CdmStore.getService(IVocabularyService.class).find(uuidUseCategory);
86
		List<State> termsToAdd = setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false));
62 87
		
88
		List<Modifier> plantPartsToAdd = setPlantPartsComboTerms(TermStore.getTerms(Modifier.class, null, false));
89
		// combo_UseCategory.setTerms(setUseCategoryComboTerms(listOfTerms));
90
		combo_UseCategory.setTerms(termsToAdd);
91
		combo_UseCategory.setSelection(useCategorySelection());
63 92
		
64
		//State state = State.NewInstance("Tato", "Toto", "Titi");
65
		//checkbox_orderRelevant = formFactory.createCheckbox(formElement, "Order Relevant", entity.getOrderRelevant(), style);
66
		combo_UseCategory = formFactory.createTermComboElement(State.class, this, "Use Category", null , style);
67
		combo_UseCategory.addSelectionListener(this);
68
		combo_UseSubCategory = formFactory.createTermComboElement(State.class, this, "Use Sub Category", null , style);
69
		//List<State> listOfTerms = TermStore.getTerms(State.class,null , false);
93
		List<State> termsSubCategory = setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false), combo_UseCategory.getSelection());
70 94
		
95
		if (termsSubCategory != null) {
96
			
97
			combo_UseSubCategory.setTerms(termsSubCategory);
98
			combo_UseSubCategory.setSelection(useSubCategorySelection());
99
			combo_UseSubCategory.setEnabled(true);
100
		}
101
		else {
102
			combo_UseSubCategory.setEnabled(false);
103
		}
104
		combo_PlantPart.setTerms(plantPartsToAdd);
105
		combo_PlantPart.setSelection(plantPartSelection());
71 106
		
72
		//UUID uuidUseCategory = UUID.fromString("2bb365af-ce6c-4196-a30b-e69b05099ed0"); 
73
		//TermVocabulary termVoc = CdmStore.getService(IVocabularyService.class).find(uuidUseCategory);
74
		List<State> termsToAdd = setUseCategoryComboTerms(TermStore.getTerms(State.class,null , false));
75
		//combo_UseCategory.setTerms(setUseCategoryComboTerms(listOfTerms));
76
		combo_UseCategory.setTerms(termsToAdd);
107

  
108
		// getPreferredTerms(State.class));
109
		// UseSubCategory_stateData =
110
		// formFactory.createTermComboElement(State.class, this,
111
		// "Use Sub Category", null , style);
112
		// createEntityDetailSection(EntityDetailType.USE_CAT,
113
		// getConversationHolder(), formElement, Section.EXPANDED);
114
		// UseSubCategory_stateData = (UseSubCategorySection)
115
		// formFactory.createEntityDetailSection(EntityDetailType.USE_SUBCAT,
116
		// getConversationHolder(), formElement,Section.EXPANDED);
117
		// UseCategory_stateData.setEntity(entity);
118
		// UseSubCategory_stateData.setEntity(entity);
119
		// UseCategory_stateData.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2,
120
		// 1));
121
		// UseSubCategory_stateData.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2,
122
		// 1));
123

  
124
	}
125

  
126

  
127

  
128
	private Modifier plantPartSelection() {
129
		/*if(!getEntity().getModifiers().isEmpty()) {
130
			for (Modifier modifier : getEntity().getModifiers()) {
131
				if (modifier.getMarkers() != null) {
132
					for (Marker marker : modifier.getMarkers()) {
133
						if(marker.getMarkerType().getTitleCache().equals("PlantPart")) {
134
							return modifier;
135
						}
136
						else {
137
							return null;
138
						}
139
					}
140
				}
141
				else {
142
					return null;
143
				}
144
					
145
			}
146
		} else {
147
			return null;
148
		}
149
		return null;*/
150
		//for testing purposes
77 151
		
78
				//getPreferredTerms(State.class));
79
		//UseSubCategory_stateData = formFactory.createTermComboElement(State.class, this, "Use Sub Category", null , style);
80
		//createEntityDetailSection(EntityDetailType.USE_CAT, getConversationHolder(), formElement, Section.EXPANDED);
81
		//UseSubCategory_stateData = (UseSubCategorySection) formFactory.createEntityDetailSection(EntityDetailType.USE_SUBCAT, getConversationHolder(), formElement,Section.EXPANDED);
82
		//UseCategory_stateData.setEntity(entity);
83
		//UseSubCategory_stateData.setEntity(entity);
84
		//UseCategory_stateData.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
85
		//UseSubCategory_stateData.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
152
		Modifier modiftoreturn = Modifier.NewInstance();
153
		if (!getEntity().getModifiers().isEmpty()) {
154
			for (Modifier modifier : getEntity().getModifiers()){
155
				modiftoreturn = modifier;
156
			}
157
			return modiftoreturn;
158
		}
159
		return null;
86 160
		
87 161
	}
162

  
163
	private State useCategorySelection() {
164
		/*if (!getEntity().getStates().isEmpty()) {
165
			for (StateData statedata : getEntity().getStates()) {
166
				if (statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
167
					if(statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == "Use Category") {
168
						if(statedata.getState() !=null) {
169
							return statedata.getState();
170
						}
171
					}
172
				}				
173
			}
174
		}
175
		else {
176
			return null;
177
		}
178
		return null;*/
179
		//for testing purposes
180
		int countStates =0;
181
		for (StateData state : getEntity().getStates()) {
182
			if (countStates == 0) {
183
				return state.getState();
184
			}
185
			countStates++;
186
		}
187
		return null;
188
	}
88 189
	
89
	
190
	private State useSubCategorySelection() {
191
		/*if (!getEntity().getStates().isEmpty() && combo_UseCategory.getSelection() != null) {
192
			for (StateData statedata : getEntity().getStates()) {
193
				if (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
194
					if(statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == "Use SubCategory") {
195
						if(statedata.getState() !=null) {
196
							return statedata.getState();
197
						}
198
						
199
					}
200
				}				
201
			}
202
		}
203
		else {
204
			return null;
205
		}
206
		return null;*/
207
		int countStates =0;
208
		for (StateData state : getEntity().getStates()) {
209
			if ((countStates == 1)) {
210
				return state.getState();
211
			}
212
			countStates++;
213
		}
214
		return null;
215
		
216
	}
217

  
218
	private List<Modifier> setPlantPartsComboTerms(List<Modifier> listOfTerms) {
219
		List<Modifier> termsToAdd = new ArrayList<Modifier>();
220
		for (Modifier term : listOfTerms) {
221

  
222
			if ((term.getPartOf() != null)
223
					&& (term.getPartOf().getTitleCache().equals("Plant Part"))) {
224
				termsToAdd.add(term);
225
			}
226
		}
227
		
228
		return termsToAdd;
229
	}
230

  
90 231
	private List<State> setUseCategoryComboTerms(List<State> listOfTerms) {
91 232
		List<State> termsToAdd = new ArrayList<State>();
92
		for(State term : listOfTerms) {
93
			
94
			if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals("Use Category"))) {
233
		for (State term : listOfTerms) {
234

  
235
			if ((term.getPartOf() != null)
236
					&& (term.getPartOf().getTitleCache().equals("Use Category"))) {
95 237
				termsToAdd.add(term);
96 238
			}
97 239
		}
98 240
		return termsToAdd;
99
		
241

  
100 242
	}
101
	
243

  
102 244
	private List<State> setUseCategoryComboTerms(List<State> listOfTerms,
103 245
			State selectedUseCategory) {
104 246
		List<State> termsToAdd = new ArrayList<State>();
105
		for(State term : listOfTerms) {
106
			if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(selectedUseCategory.getTitleCache()))) {
107
				termsToAdd.add(term);
247
		if (combo_UseCategory.getSelection() != null) {
248
			
249
			for (State term : listOfTerms) {
250
				if ((term.getPartOf() != null)
251
						&& (term.getPartOf().getTitleCache()
252
								.equals(selectedUseCategory.getTitleCache()))) {
253
					termsToAdd.add(term);
254
				}
255
	
108 256
			}
109
				
110 257
		}
111
		
258
		else if (!getEntity().getStates().isEmpty()) {
259
			for (StateData stateData : getEntity().getStates()) {
260
				if (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
261
					if ((stateData.getState() != null) && (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == "Use Category")) {
262
						for (State term : listOfTerms) {
263
							if ((term.getPartOf() != null)
264
									&& (term.getPartOf().getTitleCache()
265
											.equals(stateData.getState().getTitleCache()))) {
266
								termsToAdd.add(term);
267
							}
268
						}
269
						
270
					}
271
				}
272
			}
273
			
274
		}
275
			
276
		else {
277
			return null;
278
		}
279

  
112 280
		// TODO Auto-generated method stub
113 281
		return termsToAdd;
114 282
	}
......
116 284
	/** {@inheritDoc} */
117 285
	@Override
118 286
	public void handleEvent(Object eventSource) {
119
		/*if(eventSource == checkbox_orderRelevant){
120
			getEntity().setOrderRelevant(checkbox_orderRelevant.getSelection());
121
		}*/
122
		if(eventSource == combo_UseCategory){
123
			/*TermVocabulary<State> useCategoryVocabulary = TermVocabulary.NewInstance("Use category vocabulary", "use categories", null, null); 
124
			State useCategory1 = State.NewInstance("My first use category", "use category 1", null);
125
			useCategoryVocabulary.addTerm(useCategory1);
126
			getEntity().addState(useCategory1);*/
127
			StateData stateData = StateData.NewInstance(combo_UseCategory.getSelection());
128
			stateData.setState(combo_UseCategory.getSelection());
129
			//List<State> currentStates = new ArrayList<State>();
130
			//currentStates.add(combo_UseCategory.getSelection());
131
			getEntity().addState(stateData);
132
			//getEntity().addState(combo_UseCategory.getSelection());
133
			//.setOrderRelevant(combo_UseCategory.getSelection());
287
		/*
288
		 * if(eventSource == checkbox_orderRelevant){
289
		 * getEntity().setOrderRelevant(checkbox_orderRelevant.getSelection());
290
		 * }
291
		 */
292
		if (eventSource == combo_UseCategory) {
293
			if (combo_UseCategory.getSelection() != null) {
294
				if (!getEntity().getStates().isEmpty()) {
295
					for (StateData existingStateData : getEntity().getStates()) {
296
						Map<Language, LanguageString> modifyingText = existingStateData
297
								.getModifyingText();
298
	
299
						if (modifyingText.get(CdmStore.getDefaultLanguage()) != null) {
300
							if (modifyingText.get(CdmStore.getDefaultLanguage())
301
									.getText() == "Use Category") {
302
								getEntity().removeState(existingStateData);
303
								StateData stateData = StateData.NewInstance(combo_UseCategory.getSelection());
304
								stateData.setState(combo_UseCategory.getSelection());
305
								//stateData.addModifyingText("Use Category", CdmStore.getDefaultLanguage());
306
								//stateData.putModifyingText(CdmStore.getDefaultLanguage(),"Use Category");
307
								getEntity().addState(stateData);
308
							} else {
309
								StateData stateData = StateData
310
										.NewInstance(combo_UseCategory.getSelection());
311
								stateData.setState(combo_UseCategory.getSelection());
312
								//stateData.addModifyingText("Use Category", CdmStore.getDefaultLanguage());
313
								//stateData.putModifyingText(CdmStore.getDefaultLanguage(),"Use Category");
314
								getEntity().addState(stateData);
315
							}
316
	
317
						} else {
318
							StateData stateData = StateData
319
									.NewInstance(combo_UseCategory.getSelection());
320
							stateData.setState(combo_UseCategory.getSelection());
321
							//stateData.addModifyingText("Use Category", CdmStore.getDefaultLanguage());
322
							//stateData.putModifyingText(CdmStore.getDefaultLanguage(), "Use Category");
323
							getEntity().addState(stateData);
324
						}
325
					}
326
				}
327
				else {
328
					StateData stateData = StateData
329
							.NewInstance(combo_UseCategory.getSelection());
330
					stateData.setState(combo_UseCategory.getSelection());
331
					//stateData.addModifyingText("Use Category", CdmStore.getDefaultLanguage());
332
					//LanguageString languageString = LanguageString.NewInstance("Use Category", CdmStore.getDefaultLanguage());
333
					//IService object = (IService) CdmStore.getCurrentApplicationConfiguration().getBean(IService.class.getName());
334
					//object.save(languageString);
335
					//stateData.putModifyingText(languageString);
336
					getEntity().addState(stateData);
337
				}
338
				combo_UseSubCategory.setEnabled(true);
339
	
340
			}
341
		}
342
		if (eventSource == combo_UseSubCategory) {
343
			if (combo_UseSubCategory.getSelection() != null) {
344
				if (!getEntity().getStates().isEmpty()) {
345
					for (StateData existingStateData : getEntity().getStates()) {
346
						Map<Language, LanguageString> modifyingText = existingStateData
347
								.getModifyingText();
348
	
349
						if (modifyingText.get(CdmStore.getDefaultLanguage()) != null) {
350
							if (modifyingText.get(CdmStore.getDefaultLanguage())
351
									.getText() == "Use SubCategory") {
352
								getEntity().removeState(existingStateData);
353
								StateData stateData = StateData.NewInstance(combo_UseSubCategory.getSelection());
354
								stateData.setState(combo_UseSubCategory.getSelection());
355
								//stateData.addModifyingText("Use SubCategory", CdmStore.getDefaultLanguage());
356
								//stateData.putModifyingText(CdmStore.getDefaultLanguage(),"Use SubCategory");
357
								getEntity().addState(stateData);
358
							} else {
359
								StateData stateData = StateData
360
										.NewInstance(combo_UseSubCategory.getSelection());
361
								stateData.setState(combo_UseSubCategory.getSelection());
362
								//stateData.addModifyingText("Use SubCategory", CdmStore.getDefaultLanguage());
363
								//stateData.putModifyingText(CdmStore.getDefaultLanguage(),"Use SubCategory");
364
								getEntity().addState(stateData);
365
							}
366
	
367
						} else {
368
							StateData stateData = StateData
369
									.NewInstance(combo_UseSubCategory.getSelection());
370
							stateData.setState(combo_UseSubCategory.getSelection());
371
							//stateData.addModifyingText("Use SubCategory", CdmStore.getDefaultLanguage());
372
							//stateData.putModifyingText(CdmStore.getDefaultLanguage(), "Use SubCategory");
373
							getEntity().addState(stateData);
374
						}
375
					}
376
				}
377
				else {
378
					StateData stateData = StateData
379
							.NewInstance(combo_UseSubCategory.getSelection());
380
					stateData.setState(combo_UseSubCategory.getSelection());
381
					//stateData.addModifyingText("Use SubCategory", CdmStore.getDefaultLanguage());
382
					//LanguageString languageString = LanguageString.NewInstance("Use SubCategory", CdmStore.getDefaultLanguage());
383
					//IService object = (IService) CdmStore.getCurrentApplicationConfiguration().getBean(IService.class.getName());
384
					//object.save(languageString);
385
					//stateData.putModifyingText(languageString);
386
					getEntity().addState(stateData);
387
				}
388
	
389
			}
390
		}
391
		if (eventSource == combo_PlantPart) {
392
			if (combo_PlantPart.getSelection() != null) {
393
				Set<Modifier> modifiers = getEntity().getModifiers();
394
				if(!modifiers.isEmpty()) {
395
					for (Modifier modifier : modifiers) {
396
						if (modifier.getMarkers() != null) {
397
							for (Marker marker : modifier.getMarkers()) {
398
								if (marker.getMarkerType().getTitleCache().equals("PlantPart")) {
399
									/*getEntity().removeModifier(modifier);
400
									Modifier plantPart = combo_PlantPart.getSelection();
401
									plantPart.addMarker(marker);
402
									getEntity().addModifier(plantPart);*/
403
									getEntity().addModifier(combo_PlantPart.getSelection());
404
								} 
405
								else {
406
									/*MarkerType markerType = MarkerType.NewInstance("PlantPart", "PlantPart", null);
407
									Marker markerPlantPart = Marker.NewInstance(markerType, false);
408
									Modifier plantPart = combo_PlantPart.getSelection();
409
									plantPart.addMarker(markerPlantPart);
410
									getEntity().addModifier(plantPart);*/
411
									getEntity().addModifier(combo_PlantPart.getSelection());
412
								}
413
									
414
									
415
							}
416
								
417
						}
418
						else {
419
							/*MarkerType markerType = MarkerType.NewInstance("PlantPart", "PlantPart", null);
420
							Marker marker = Marker.NewInstance(markerType, false);
421
							Modifier plantPart = combo_PlantPart.getSelection();
422
							plantPart.addMarker(marker);
423
							getEntity().addModifier(plantPart);*/
424
							getEntity().addModifier(combo_PlantPart.getSelection());
425
						}
426
							
427
					}	
428
				}
429
				else {
430
					/*MarkerType markerType = MarkerType.NewInstance("PlantPart", "PlantPart", null);
431
					Marker marker = Marker.NewInstance(markerType, false);
432
					Modifier plantPart = combo_PlantPart.getSelection();
433
					plantPart.addMarker(marker);
434
					getEntity().addModifier(plantPart);*/
435
					getEntity().addModifier(combo_PlantPart.getSelection());
436
				}
437
			}
134 438
		}
135 439
	}
136 440
	
441

  
137 442
	/** {@inheritDoc} */
138 443
	@Override
139 444
	public void setEntity(CategoricalData entity) {
140
//		section_stateData.setEntity(entity);
445
		// section_stateData.setEntity(entity);
141 446
		super.setEntity(entity);
142 447
	}
143 448

  
......
145 450
	public void widgetSelected(SelectionEvent e) {
146 451
		State selectedUseCategory = combo_UseCategory.getSelection();
147 452
		if (selectedUseCategory != null) {
148
			combo_UseSubCategory.setTerms(setUseCategoryComboTerms(TermStore.getTerms(State.class,null , false), selectedUseCategory));
149
			/*selectedLanguageString = getMultilanguageText().get(
150
					selectedLanguage);
151

  
152
			element_languageString.setLanguageString(selectedLanguageString);*/
453
			combo_UseSubCategory.setTerms(setUseCategoryComboTerms(
454
					TermStore.getTerms(State.class, null, false),
455
					selectedUseCategory));
456
			/*
457
			 * selectedLanguageString = getMultilanguageText().get(
458
			 * selectedLanguage);
459
			 * 
460
			 * element_languageString.setLanguageString(selectedLanguageString);
461
			 */
153 462
		}
154
		
155
	}
156 463

  
157
	
464
	}
158 465

  
159 466
	@Override
160 467
	public void widgetDefaultSelected(SelectionEvent e) {
161 468
		// TODO Auto-generated method stub
162
		
469

  
163 470
	}
164
	
165 471

  
166 472
}

Also available in: Unified diff