Revision 63bf9921
Added by Katja Luther over 6 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java | ||
|---|---|---|
| 133 | 133 |
*/ |
| 134 | 134 |
@Override |
| 135 | 135 |
public String getName() {
|
| 136 |
if(taxonNode != null){
|
|
| 136 |
if(taxonNode != null && taxonNode.getTaxon() !=null){
|
|
| 137 | 137 |
return taxonNode.getTaxon().getName().getTitleCache(); |
| 138 | 138 |
}else{
|
| 139 | 139 |
return classification.getTitleCache(); |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
import org.apache.log4j.Logger; |
| 25 | 25 |
import org.eclipse.core.runtime.IProgressMonitor; |
| 26 |
import org.eclipse.core.runtime.IStatus; |
|
| 27 |
import org.eclipse.core.runtime.Status; |
|
| 28 |
import org.eclipse.core.runtime.jobs.Job; |
|
| 26 |
|
|
| 29 | 27 |
import org.eclipse.e4.ui.di.Focus; |
| 30 | 28 |
import org.eclipse.e4.ui.di.Persist; |
| 31 | 29 |
import org.eclipse.e4.ui.model.application.ui.MDirtyable; |
| 32 | 30 |
import org.eclipse.e4.ui.model.application.ui.basic.MPart; |
| 33 | 31 |
import org.eclipse.e4.ui.workbench.modeling.ESelectionService; |
| 34 | 32 |
import org.eclipse.jface.viewers.ISelectionChangedListener; |
| 35 |
import org.eclipse.jface.viewers.IStructuredSelection; |
|
| 36 |
import org.eclipse.jface.viewers.SelectionChangedEvent; |
|
| 33 |
|
|
| 37 | 34 |
import org.eclipse.jface.viewers.StructuredViewer; |
| 38 | 35 |
import org.eclipse.jface.viewers.TableViewer; |
| 39 | 36 |
import org.eclipse.jface.viewers.TableViewerColumn; |
| ... | ... | |
| 44 | 41 |
import org.eclipse.swt.layout.GridData; |
| 45 | 42 |
import org.eclipse.swt.layout.GridLayout; |
| 46 | 43 |
import org.eclipse.swt.widgets.Composite; |
| 47 |
import org.eclipse.swt.widgets.Display; |
|
| 44 |
|
|
| 48 | 45 |
import org.eclipse.swt.widgets.Label; |
| 49 | 46 |
import org.eclipse.swt.widgets.Menu; |
| 50 | 47 |
import org.eclipse.swt.widgets.MenuItem; |
| ... | ... | |
| 60 | 57 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 61 | 58 |
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; |
| 62 | 59 |
import eu.etaxonomy.cdm.api.service.ITaxonNodeService; |
| 63 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
|
| 64 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
|
| 60 |
|
|
| 65 | 61 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
| 66 | 62 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
| 67 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
|
| 63 |
|
|
| 68 | 64 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| 69 | 65 |
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; |
| 70 | 66 |
import eu.etaxonomy.taxeditor.editor.EditorUtil; |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
import javax.inject.Inject; |
| 9 | 9 |
|
| 10 |
|
|
| 10 | 11 |
import org.apache.commons.lang.StringUtils; |
| 11 | 12 |
import org.apache.log4j.Logger; |
| 12 | 13 |
import org.eclipse.e4.ui.workbench.modeling.ESelectionService; |
| ... | ... | |
| 15 | 16 |
import org.eclipse.jface.viewers.ComboBoxViewerCellEditor; |
| 16 | 17 |
import org.eclipse.jface.viewers.EditingSupport; |
| 17 | 18 |
import org.eclipse.jface.viewers.ICellEditorListener; |
| 19 |
import org.eclipse.jface.viewers.ISelection; |
|
| 18 | 20 |
import org.eclipse.jface.viewers.ISelectionChangedListener; |
| 19 | 21 |
import org.eclipse.jface.viewers.LabelProvider; |
| 22 |
import org.eclipse.jface.viewers.SelectionChangedEvent; |
|
| 23 |
import org.eclipse.jface.viewers.StructuredSelection; |
|
| 20 | 24 |
import org.eclipse.jface.viewers.TableViewer; |
| 21 | 25 |
import org.eclipse.swt.SWT; |
| 22 | 26 |
import org.eclipse.swt.widgets.Composite; |
| ... | ... | |
| 43 | 47 |
private final ChecklistEditorE4 editor; |
| 44 | 48 |
// private final IDescriptionService descriptionService; |
| 45 | 49 |
private final int columnIndex; |
| 46 |
private ICellEditorListener selectionChangedListener;
|
|
| 50 |
private ISelectionChangedListener selectionChangedListener;
|
|
| 47 | 51 |
|
| 48 | 52 |
@Inject |
| 49 | 53 |
private ESelectionService selService; |
| ... | ... | |
| 115 | 119 |
result.concat(" ("+ status.getSymbol() + ")");
|
| 116 | 120 |
} |
| 117 | 121 |
} |
| 118 |
|
|
| 122 |
|
|
| 123 |
fireStateChanged(distributionForColumn); |
|
| 119 | 124 |
return result; |
| 120 | 125 |
} |
| 121 | 126 |
return null; |
| 122 | 127 |
} |
| 123 | 128 |
|
| 129 |
protected void fireStateChanged(Distribution dist) {
|
|
| 130 |
if (dist!= null){
|
|
| 131 |
ISelection selection = new StructuredSelection(dist); |
|
| 132 |
SelectionChangedEvent evt = new SelectionChangedEvent(viewer, selection); |
|
| 133 |
// selectionChangedListener.selectionChanged(evt); |
|
| 134 |
|
|
| 135 |
} |
|
| 136 |
} |
|
| 137 |
|
|
| 124 | 138 |
@Override |
| 125 | 139 |
protected void setValue(Object element, Object value) {
|
| 126 | 140 |
if (element instanceof Taxon && value instanceof PresenceAbsenceTerm) {
|
Also available in: Unified diff
fix NPE in Distribution Editor