Revision 0ed18126
Added by Andreas Müller 7 months ago
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java | ||
|---|---|---|
| 193 | 193 |
|
| 194 | 194 |
private List<String> getPropertyPaths(){
|
| 195 | 195 |
List<String> taxonBasePropertyPaths = Arrays.asList(new String[] {
|
| 196 |
"descriptions.descriptionElements.*", |
|
| 197 |
"typeDesignations"}); |
|
| 196 |
"descriptions.descriptionElements.*",
|
|
| 197 |
"typeDesignations"});
|
|
| 198 | 198 |
|
| 199 | 199 |
return taxonBasePropertyPaths; |
| 200 | 200 |
} |
| 201 |
|
|
| 202 |
} |
|
| 201 |
} |
|
| eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java | ||
|---|---|---|
| 15 | 15 |
import java.util.Map; |
| 16 | 16 |
import java.util.UUID; |
| 17 | 17 |
|
| 18 |
import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger; |
|
| 18 |
import org.apache.logging.log4j.LogManager; |
|
| 19 |
import org.apache.logging.log4j.Logger; |
|
| 19 | 20 |
|
| 20 | 21 |
import eu.etaxonomy.cdm.api.service.IService; |
| 21 | 22 |
import eu.etaxonomy.cdm.api.service.UpdateResult; |
| ... | ... | |
| 38 | 39 |
*/ |
| 39 | 40 |
public class CdmEntitySession implements ICdmEntitySession {
|
| 40 | 41 |
|
| 41 |
private static final Logger logger = LogManager.getLogger(CdmEntitySession.class);
|
|
| 42 |
private static final Logger logger = LogManager.getLogger(); |
|
| 42 | 43 |
|
| 43 | 44 |
private final CdmEntitySessionManager cdmEntitySessionManager; |
| 44 | 45 |
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java | ||
|---|---|---|
| 304 | 304 |
|
| 305 | 305 |
public Taxon getTaxon(){
|
| 306 | 306 |
if(taxonNode!=null){
|
| 307 |
Taxon taxon = CdmBase.deproxy(taxonNode.getTaxon(), Taxon.class);
|
|
| 307 |
Taxon taxon = CdmBase.deproxy(taxonNode.getTaxon()); |
|
| 308 | 308 |
return taxon; |
| 309 | 309 |
} |
| 310 | 310 |
return null; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/CdmEntitySessionInput.java | ||
|---|---|---|
| 53 | 53 |
cdmEntitySession.dispose(); |
| 54 | 54 |
} |
| 55 | 55 |
cdmEntitySession = null; |
| 56 |
|
|
| 57 | 56 |
} |
| 58 | 57 |
|
| 59 | 58 |
public abstract void merge(); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java | ||
|---|---|---|
| 15 | 15 |
import javax.inject.Inject; |
| 16 | 16 |
import javax.inject.Named; |
| 17 | 17 |
|
| 18 |
import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger; |
|
| 18 |
import org.apache.logging.log4j.LogManager; |
|
| 19 |
import org.apache.logging.log4j.Logger; |
|
| 19 | 20 |
import org.eclipse.e4.core.contexts.IEclipseContext; |
| 20 | 21 |
import org.eclipse.e4.core.di.annotations.Optional; |
| 21 | 22 |
import org.eclipse.e4.ui.di.PersistState; |
| ... | ... | |
| 37 | 38 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 38 | 39 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 39 | 40 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 40 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
|
| 41 | 41 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
| 42 | 42 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 43 | 43 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| ... | ... | |
| 290 | 290 |
((DetailsViewerE4)viewer).setDetailsEnabled(isEnabled); |
| 291 | 291 |
} |
| 292 | 292 |
((DetailsViewerE4)viewer).setInput(element, part); |
| 293 |
|
|
| 293 |
|
|
| 294 | 294 |
} |
| 295 | 295 |
|
| 296 | 296 |
else{
|
| ... | ... | |
| 306 | 306 |
} |
| 307 | 307 |
} |
| 308 | 308 |
} |
| 309 |
|
|
| 309 |
|
|
| 310 | 310 |
} |
| 311 | 311 |
|
| 312 | 312 |
protected Object createPartObject(MPart activePart) {
|
Also available in: Unified diff
cleanup