Revision 4e6a6782
Added by Andreas Müller over 3 years ago
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java | ||
---|---|---|
181 | 181 |
|
182 | 182 |
@Override |
183 | 183 |
public String getTypeText(Object entity) { |
184 |
if((entity instanceof TaxonName) && (((TaxonName) entity).getNomenclaturalCode() != null)){
|
|
185 |
return ((TaxonName) entity).getNomenclaturalCode().getTitleCache();
|
|
184 |
if((entity instanceof TaxonName) && (((TaxonName) entity).getNameType() != null)){
|
|
185 |
return ((TaxonName) entity).getNameType().getTitleCache();
|
|
186 | 186 |
} |
187 | 187 |
return super.getTypeText(entity); |
188 | 188 |
} |
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java | ||
---|---|---|
39 | 39 |
*/ |
40 | 40 |
public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObservationBase> { |
41 | 41 |
|
42 |
private static final long serialVersionUID = 1014860873939989973L; |
|
43 | 42 |
|
44 | 43 |
public static final String ID = "bulkeditor.input.occurrence"; //$NON-NLS-1$ |
45 | 44 |
|
... | ... | |
220 | 219 |
@Override |
221 | 220 |
public SpecimenOrObservationBase<?> save(SpecimenOrObservationBase entity) { |
222 | 221 |
return CdmStore.getService(IOccurrenceService.class).merge(entity, true).getMergedEntity(); |
223 |
|
|
224 | 222 |
} |
225 | 223 |
|
226 | 224 |
@Override |
... | ... | |
247 | 245 |
List<String> propertyPaths = Arrays.asList(new String[]{}); |
248 | 246 |
return CdmStore.getService(IOccurrenceService.class).load(entityUuid, propertyPaths); |
249 | 247 |
} |
250 |
} |
|
248 |
} |
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java | ||
---|---|---|
220 | 220 |
public void merge() { |
221 | 221 |
|
222 | 222 |
} |
223 |
|
|
224 |
} |
|
223 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermTreeMenu.java | ||
---|---|---|
148 | 148 |
return result; |
149 | 149 |
} |
150 | 150 |
} |
151 |
|
|
152 |
|
|
153 | 151 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java | ||
---|---|---|
27 | 27 |
/** |
28 | 28 |
* @author pplitzner |
29 | 29 |
* @since Jul 12, 2017 |
30 |
* |
|
31 | 30 |
*/ |
32 | 31 |
public class CreateFeatureTreeHandler { |
33 | 32 |
|
... | ... | |
39 | 38 |
return; |
40 | 39 |
} |
41 | 40 |
Object[] expandedElements = ((AbstractTermTreeEditor)editor).getViewer().getExpandedElements(); |
42 |
TermTree newTree = TermTree.NewInstance(editor.getTermType()); |
|
41 |
TermTree<?> newTree = TermTree.NewInstance(editor.getTermType());
|
|
43 | 42 |
newTree.setAllowDuplicates(false); |
44 | 43 |
newTree.setFlat(false); |
45 | 44 |
newTree.setOrderRelevant(true); |
... | ... | |
66 | 65 |
menuItem.setVisible(canExecute); |
67 | 66 |
return canExecute; |
68 | 67 |
} |
69 |
|
|
70 |
} |
|
68 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java | ||
---|---|---|
255 | 255 |
ICdmFormElement parentElement = getParentElement(); |
256 | 256 |
if (parentElement instanceof NameRelationshipDetailElement){ |
257 | 257 |
NameRelationship rel = ((NameRelationshipDetailElement)parentElement).getEntity(); |
258 |
code = rel.getToName().getNomenclaturalCode();
|
|
258 |
code = rel.getToName().getNameType();
|
|
259 | 259 |
}else if (parentElement instanceof NomenclaturalStatusElement){ |
260 | 260 |
ICdmFormElement parent = ((NomenclaturalStatusElement)parentElement).getParentElement(); |
261 | 261 |
TaxonName name = ((NomenclaturalStatusSection)parent).getEntity(); |
262 |
code = name.getNomenclaturalCode();
|
|
262 |
code = name.getNameType();
|
|
263 | 263 |
} |
264 | 264 |
List<NomenclaturalCodeEdition> elements = NomenclaturalCodeEdition.forCode(code); |
265 | 265 |
LinkedHashMap<NomenclaturalCodeEdition, String> orderedTerms = AbstractUtility.orderTerms(elements); |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java | ||
---|---|---|
1 |
//$Id$ |
|
2 |
|
|
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 |
*/ |
|
3 | 9 |
package eu.etaxonomy.taxeditor.ui.dialog.selection; |
4 | 10 |
|
5 | 11 |
import java.lang.reflect.Field; |
... | ... | |
42 | 48 |
* |
43 | 49 |
* @author c.mathew |
44 | 50 |
* @created 18.07.2013 |
45 |
* @version 1.0 |
|
46 | 51 |
*/ |
47 | 52 |
public abstract class AbstractFilteredCdmEnumSelectionDialog<T extends IEnumTerm> extends |
48 | 53 |
FilteredItemsSelectionDialog implements IConversationEnabled { |
... | ... | |
52 | 57 |
protected List<T> model; |
53 | 58 |
private String settings; |
54 | 59 |
|
55 |
|
|
56 |
|
|
57 | 60 |
/** |
58 | 61 |
* <p>Constructor for AbstractFilteredCdmResourceSelectionDialog.</p> |
59 | 62 |
* |
... | ... | |
149 | 152 |
return cdmEnum.getMessage(); |
150 | 153 |
} |
151 | 154 |
|
152 |
|
|
153 |
/** {@inheritDoc} */ |
|
154 | 155 |
@Override |
155 | 156 |
public void refresh() { |
156 | 157 |
initModel(); |
... | ... | |
162 | 163 |
*/ |
163 | 164 |
abstract protected void initModel(); |
164 | 165 |
|
165 |
/* (non-Javadoc) |
|
166 |
* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createFilter() |
|
167 |
*/ |
|
168 |
/** {@inheritDoc} */ |
|
169 | 166 |
@Override |
170 | 167 |
protected ItemsFilter createFilter() { |
171 | 168 |
return new ItemsFilter() { |
... | ... | |
197 | 194 |
}; |
198 | 195 |
} |
199 | 196 |
|
200 |
|
|
201 | 197 |
/** |
202 | 198 |
* Set the filter input to the Agent's title cache |
203 | 199 |
* |
... | ... | |
231 | 227 |
((Text) getPatternControl()).setText(pattern); |
232 | 228 |
} |
233 | 229 |
|
234 |
/* (non-Javadoc) |
|
235 |
* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#fillContentProvider(org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.AbstractContentProvider, org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.ItemsFilter, org.eclipse.core.runtime.IProgressMonitor) |
|
236 |
*/ |
|
237 |
/** {@inheritDoc} */ |
|
238 | 230 |
@Override |
239 | 231 |
protected void fillContentProvider(AbstractContentProvider contentProvider, |
240 | 232 |
ItemsFilter itemsFilter, IProgressMonitor progressMonitor) |
... | ... | |
258 | 250 |
} |
259 | 251 |
} |
260 | 252 |
|
261 |
/* (non-Javadoc) |
|
262 |
* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getDialogSettings() |
|
263 |
*/ |
|
264 |
/** {@inheritDoc} */ |
|
265 | 253 |
@Override |
266 | 254 |
protected IDialogSettings getDialogSettings() { |
267 | 255 |
IDialogSettings settings = TaxeditorStorePlugin.getDefault().getDialogSettings().getSection(getSettings()); |
... | ... | |
272 | 260 |
return settings; |
273 | 261 |
} |
274 | 262 |
|
275 |
/* (non-Javadoc) |
|
276 |
* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getElementName(java.lang.Object) |
|
277 |
*/ |
|
278 |
/** {@inheritDoc} */ |
|
279 | 263 |
@Override |
280 | 264 |
public String getElementName(Object item) { |
281 |
return ((IEnumTerm) item).getMessage();
|
|
265 |
return ((IEnumTerm) item).getLabel();
|
|
282 | 266 |
} |
283 | 267 |
|
284 |
/* (non-Javadoc) |
|
285 |
* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getItemsComparator() |
|
286 |
*/ |
|
287 |
/** {@inheritDoc} */ |
|
288 | 268 |
@Override |
289 | 269 |
protected Comparator getItemsComparator() { |
290 | 270 |
return new Comparator<IEnumTerm>() { |
... | ... | |
380 | 360 |
if (element == null) { |
381 | 361 |
return null; |
382 | 362 |
} |
383 |
return ((IEnumTerm) element).getMessage();
|
|
363 |
return ((IEnumTerm) element).getLabel();
|
|
384 | 364 |
} |
385 | 365 |
}; |
386 | 366 |
|
387 |
/* (non-Javadoc) |
|
388 |
* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite) |
|
389 |
*/ |
|
390 |
/** {@inheritDoc} */ |
|
391 | 367 |
@Override |
392 | 368 |
protected Control createExtendedContentArea(Composite parent) { |
393 | 369 |
if(getNewWizardLinkText() != null){ |
... | ... | |
402 | 378 |
protected SelectionListener getNewWizardLinkSelectionListener(){ |
403 | 379 |
return new SelectionAdapter() { |
404 | 380 |
|
405 |
/* (non-Javadoc) |
|
406 |
* @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) |
|
407 |
*/ |
|
408 | 381 |
@Override |
409 | 382 |
public void widgetSelected(SelectionEvent e) { |
410 | 383 |
|
411 |
AbstractNewEntityWizard wizard = getNewEntityWizard(e.text); |
|
384 |
AbstractNewEntityWizard<T> wizard = getNewEntityWizard(e.text);
|
|
412 | 385 |
wizard.init(null, null); |
413 | 386 |
WizardDialog dialog = new WizardDialog(getShell(), wizard); |
414 | 387 |
int status = dialog.open(); |
... | ... | |
435 | 408 |
return conversation; |
436 | 409 |
} |
437 | 410 |
|
438 |
/** {@inheritDoc} */ |
|
439 | 411 |
@Override |
440 | 412 |
public void update(CdmDataChangeMap changeEvents) {} |
441 |
|
|
442 |
} |
|
413 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.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.dialog.selection; |
11 | 10 |
|
12 | 11 |
import java.text.Collator; |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java | ||
---|---|---|
26 | 26 |
* |
27 | 27 |
* @author n.hoffmann |
28 | 28 |
* @created Mar 5, 2010 |
29 |
* @version 1.0 |
|
30 | 29 |
*/ |
31 |
public class DescriptionDetailElement extends AbstractIdentifiableEntityDetailElement<DescriptionBase> { |
|
30 |
public class DescriptionDetailElement extends AbstractIdentifiableEntityDetailElement<DescriptionBase<?>> {
|
|
32 | 31 |
|
33 | 32 |
// private EntitySelectionElement<FeatureTree> selection_featureTree; |
34 | 33 |
private TextWithLabelElement txtDescriptionTypes; |
... | ... | |
78 | 77 |
setIrrelevant(toggleable_cache.getState(), Arrays.asList(new Object[] { toggleable_cache })); |
79 | 78 |
} |
80 | 79 |
} |
81 |
} |
|
80 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java | ||
---|---|---|
23 | 23 |
* |
24 | 24 |
* @author n.hoffmann |
25 | 25 |
* @created Mar 5, 2010 |
26 |
* @version 1.0 |
|
27 | 26 |
*/ |
28 |
public class DescriptionDetailSection extends AbstractCdmDetailSection<DescriptionBase> { |
|
27 |
public class DescriptionDetailSection extends AbstractCdmDetailSection<DescriptionBase<?>> {
|
|
29 | 28 |
|
30 | 29 |
/** |
31 | 30 |
* <p>Constructor for DescriptionDetailSection.</p> |
... | ... | |
42 | 41 |
|
43 | 42 |
} |
44 | 43 |
|
45 |
/** {@inheritDoc} */ |
|
46 | 44 |
@Override |
47 | 45 |
public String getHeading() { |
48 | 46 |
return "Description"; |
49 | 47 |
} |
50 | 48 |
|
51 |
/* (non-Javadoc) |
|
52 |
* @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) |
|
53 |
*/ |
|
54 | 49 |
@Override |
55 |
protected AbstractCdmDetailElement<DescriptionBase> createCdmDetailElement(AbstractCdmDetailSection<DescriptionBase> parentElement, int style) {
|
|
50 |
protected AbstractCdmDetailElement<DescriptionBase<?>> createCdmDetailElement(AbstractCdmDetailSection<DescriptionBase<?>> parentElement, int style) {
|
|
56 | 51 |
return formFactory.createDescriptionDetailElement(parentElement, style); |
57 | 52 |
} |
58 | 53 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureTreeDetailElement.java | ||
---|---|---|
78 | 78 |
} |
79 | 79 |
|
80 | 80 |
} |
81 |
|
|
82 |
} |
|
81 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureTreeDetailElementForNode.java | ||
---|---|---|
20 | 20 |
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; |
21 | 21 |
|
22 | 22 |
/** |
23 |
* |
|
24 | 23 |
* @author pplitzner |
25 | 24 |
* @since Dec 21, 2017 |
26 |
* |
|
27 | 25 |
*/ |
28 | 26 |
public class FeatureTreeDetailElementForNode extends AbstractCdmDetailElement<TermTree> { |
29 | 27 |
|
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java | ||
---|---|---|
58 | 58 |
toggleable_cache = formFactory.createToggleableTextField(formElement, "Cache", entity.getTitleCache(), entity.isProtectedTitleCache() || entity.isProtectedFullTitleCache(), style); |
59 | 59 |
|
60 | 60 |
combo_nomenclaturalCode = formFactory.createEnumComboElement(NomenclaturalCode.class, formElement, style); |
61 |
combo_nomenclaturalCode.setSelection(entity.getNomenclaturalCode());
|
|
61 |
combo_nomenclaturalCode.setSelection(entity.getNameType());
|
|
62 | 62 |
if (entity.getNameType().equals(NomenclaturalCode.ICNB)){ |
63 | 63 |
text_nameApprobation = formFactory.createTextWithLabelElement(formElement, "Name Approbation", entity.getNameApprobation(),style); |
64 | 64 |
} |
... | ... | |
72 | 72 |
} |
73 | 73 |
if (config.isNomenclaturalCodeActived()){ |
74 | 74 |
combo_nomenclaturalCode = formFactory.createEnumComboElement(NomenclaturalCode.class, formElement, style); |
75 |
combo_nomenclaturalCode.setSelection(entity.getNomenclaturalCode());
|
|
75 |
combo_nomenclaturalCode.setSelection(entity.getNameType());
|
|
76 | 76 |
} |
77 | 77 |
if (entity.getNameType().equals(NomenclaturalCode.ICNB)){ |
78 | 78 |
if (config.isNameApprobiationActivated()){ |
Also available in: Unified diff
cleanup