Revision e7923b05
Added by Cherian Mathew over 8 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java | ||
---|---|---|
10 | 10 |
|
11 | 11 |
package eu.etaxonomy.taxeditor.editor.key.polytomous; |
12 | 12 |
|
13 |
import java.util.List; |
|
14 |
|
|
15 | 13 |
import org.eclipse.core.runtime.IProgressMonitor; |
16 | 14 |
import org.eclipse.jface.action.GroupMarker; |
17 | 15 |
import org.eclipse.jface.action.MenuManager; |
... | ... | |
318 | 316 |
} |
319 | 317 |
|
320 | 318 |
if (element instanceof PolytomousKeyNode) { |
321 |
List<PolytomousKeyNode> children = ((PolytomousKeyNode) element) |
|
322 |
.getParent().getChildren(); |
|
323 |
viewer.update(((PolytomousKeyNode) element) |
|
324 |
.getParent(), null); |
|
325 |
for (PolytomousKeyNode child : children) { |
|
319 |
PolytomousKeyNode node = (PolytomousKeyNode) element; |
|
320 |
viewer.update(node, null); |
|
321 |
for (PolytomousKeyNode child : node.getChildren()) { |
|
326 | 322 |
viewer.update(child, null); |
327 | 323 |
} |
328 | 324 |
|
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RemotingCreatePolytomousKeyNodeOperation.java | ||
---|---|---|
15 | 15 |
import eu.etaxonomy.cdm.api.application.CdmApplicationState; |
16 | 16 |
import eu.etaxonomy.cdm.api.application.CdmChangeEvent.Action; |
17 | 17 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
18 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
|
19 | 18 |
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode; |
20 | 19 |
import eu.etaxonomy.taxeditor.operation.RemotingCdmMergeOperation; |
21 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
|
22 | 20 |
|
23 | 21 |
/** |
24 | 22 |
* @author cmathew |
... | ... | |
44 | 42 |
protected CdmBase doMergeExecute(IProgressMonitor monitor, IAdaptable info) throws Exception { |
45 | 43 |
PolytomousKeyNode childNode = PolytomousKeyNode.NewInstance(); |
46 | 44 |
parentNode.addChild(childNode); |
47 |
childNode.getModifyingText().put(CdmStore.getDefaultLanguage(),LanguageString.NewInstance("",CdmStore.getDefaultLanguage())); |
|
48 |
return CdmApplicationState.getCurrentAppConfig().getPolytomousKeyNodeService().merge(childNode);
|
|
45 |
//childNode.getModifyingText().put(CdmStore.getDefaultLanguage(),LanguageString.NewInstance("",CdmStore.getDefaultLanguage()));
|
|
46 |
return CdmApplicationState.getCurrentAppConfig().getPolytomousKeyNodeService().merge(parentNode);
|
|
49 | 47 |
} |
50 | 48 |
|
51 | 49 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmUIDataChangeService.java | ||
---|---|---|
27 | 27 |
*/ |
28 | 28 |
@Override |
29 | 29 |
public void fireChangeEvent(final CdmChangeEvent event, boolean async) { |
30 |
|
|
30 | 31 |
for(final ICdmChangeListener listener : listeners) { |
31 | 32 |
// Update the user interface asynchronously |
32 | 33 |
if(async) { |
... | ... | |
36 | 37 |
listener.onChange(event); |
37 | 38 |
} |
38 | 39 |
}); |
40 |
} else { |
|
41 |
// Update the user interface synchronously |
|
42 |
Display.getDefault().syncExec(new Runnable() { |
|
43 |
@Override |
|
44 |
public void run() { |
|
45 |
listener.onChange(event); |
|
46 |
} |
|
47 |
}); |
|
39 | 48 |
} |
40 |
// Update the user interface synchronously |
|
41 |
Display.getDefault().syncExec(new Runnable() { |
|
42 |
@Override |
|
43 |
public void run() { |
|
44 |
listener.onChange(event); |
|
45 |
} |
|
46 |
}); |
|
47 | 49 |
} |
48 | 50 |
} |
49 | 51 |
|
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/KeyStatementElement.java | ||
---|---|---|
1 | 1 |
// $Id$ |
2 | 2 |
/** |
3 | 3 |
* Copyright (C) 2007 EDIT |
4 |
* European Distributed Institute of Taxonomy
|
|
4 |
* European Distributed Institute of Taxonomy |
|
5 | 5 |
* http://www.e-taxonomy.eu |
6 |
*
|
|
6 |
* |
|
7 | 7 |
* The contents of this file are subject to the Mozilla Public License Version 1.1 |
8 | 8 |
* See LICENSE.TXT at the top of this package for the full license terms. |
9 | 9 |
*/ |
... | ... | |
13 | 13 |
import org.eclipse.jface.util.PropertyChangeEvent; |
14 | 14 |
|
15 | 15 |
import eu.etaxonomy.cdm.model.description.KeyStatement; |
16 |
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode; |
|
16 | 17 |
|
17 | 18 |
/** |
18 | 19 |
* @author n.hoffmann |
... | ... | |
52 | 53 |
return keyStatement; |
53 | 54 |
} |
54 | 55 |
|
56 |
public void update(PolytomousKeyNode node) { |
|
57 |
if(node.getStatement() == null) { |
|
58 |
node.setStatement(KeyStatement.NewInstance(element_languageString.getLanguageString().getLanguage(), |
|
59 |
element_languageString.getLanguageString().getText())); |
|
60 |
} else { |
|
61 |
node.getStatement().getLabel().put(element_languageString.getLanguageString().getLanguage(), |
|
62 |
element_languageString.getLanguageString()); |
|
63 |
} |
|
64 |
} |
|
65 |
|
|
55 | 66 |
/* |
56 | 67 |
* (non-Javadoc) |
57 |
*
|
|
68 |
* |
|
58 | 69 |
* @see |
59 | 70 |
* eu.etaxonomy.taxeditor.ui.forms.MultilanguageTextElement#propertyChange |
60 | 71 |
* (org.eclipse.jface.util.PropertyChangeEvent) |
... | ... | |
64 | 75 |
if (event == null) { |
65 | 76 |
return; |
66 | 77 |
} |
67 |
|
|
78 |
|
|
68 | 79 |
if (keyStatement == null) { |
69 | 80 |
Object eventSource = event.getSource(); |
70 | 81 |
if (eventSource == element_languageString) { |
71 |
|
|
82 |
|
|
72 | 83 |
if(element_languageString.getLanguageString() != null) { |
73 |
// for the case when the user copy / pastes text into the
|
|
84 |
// for the case when the user copy / pastes text into the |
|
74 | 85 |
// (LanguageStringWithLabelElement) element_languageString text field |
75 | 86 |
setKeyStatement(KeyStatement.NewInstance(element_languageString.getLanguageString().getLanguage(), |
76 | 87 |
element_languageString.getLanguageString().getText())); |
77 | 88 |
} else { |
78 |
setKeyStatement(KeyStatement.NewInstance()); |
|
89 |
//setKeyStatement(KeyStatement.NewInstance());
|
|
79 | 90 |
} |
80 | 91 |
} |
81 | 92 |
} |
82 |
|
|
93 |
|
|
83 | 94 |
super.propertyChange(event); |
84 |
|
|
95 |
|
|
85 | 96 |
} |
86 | 97 |
|
87 | 98 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java | ||
---|---|---|
197 | 197 |
|
198 | 198 |
if (multilanguageText != null) { |
199 | 199 |
if (multilanguageText.isEmpty()) { |
200 |
multilanguageText.put( |
|
201 |
CdmStore.getDefaultLanguage(), |
|
202 |
LanguageString.NewInstance("", |
|
203 |
CdmStore.getDefaultLanguage())); |
|
200 |
// multilanguageText.put(
|
|
201 |
// CdmStore.getDefaultLanguage(),
|
|
202 |
// LanguageString.NewInstance("",
|
|
203 |
// CdmStore.getDefaultLanguage()));
|
|
204 | 204 |
} |
205 | 205 |
if (PreferencesUtil.isMultilanguageTextEditingCapability()) { |
206 | 206 |
combo_language.setTerms(getLanguages()); |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java | ||
---|---|---|
1 | 1 |
/** |
2 |
*
|
|
2 |
* |
|
3 | 3 |
*/ |
4 | 4 |
package eu.etaxonomy.taxeditor.ui.section.key; |
5 | 5 |
|
... | ... | |
16 | 16 |
|
17 | 17 |
/** |
18 | 18 |
* @author n.hoffmann |
19 |
*
|
|
19 |
* |
|
20 | 20 |
*/ |
21 | 21 |
public class PolytomousKeyNodeDetailElement extends |
22 | 22 |
AbstractCdmDetailElement<PolytomousKeyNode> { |
... | ... | |
97 | 97 |
|
98 | 98 |
/* |
99 | 99 |
* (non-Javadoc) |
100 |
*
|
|
100 |
* |
|
101 | 101 |
* @see |
102 | 102 |
* eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java |
103 | 103 |
* .lang.Object) |
... | ... | |
108 | 108 |
getEntity().getParent().setQuestion( |
109 | 109 |
element_question.getKeyStatement()); |
110 | 110 |
} else if (eventSource == element_statement) { |
111 |
getEntity().setStatement(element_statement.getKeyStatement()); |
|
111 |
//getEntity().setStatement(element_statement.getKeyStatement()); |
|
112 |
element_statement.update(getEntity()); |
|
112 | 113 |
} else if (eventSource == selection_feature) { |
113 | 114 |
getEntity().getParent().setFeature(selection_feature.getEntity()); |
114 | 115 |
} else if (eventSource == selection_taxon) { |
Also available in: Unified diff
#5247 Use updated entities