Revision 4c980025
Added by Andreas Müller over 1 year ago
| eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java | ||
|---|---|---|
| 37 | 37 |
import org.springframework.transaction.TransactionStatus; |
| 38 | 38 |
|
| 39 | 39 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 40 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock; |
|
| 41 | 40 |
import eu.etaxonomy.cdm.api.service.IAgentService; |
| 42 | 41 |
import eu.etaxonomy.cdm.api.service.IAnnotationService; |
| 43 | 42 |
import eu.etaxonomy.cdm.api.service.IClassificationService; |
| ... | ... | |
| 394 | 393 |
|
| 395 | 394 |
@Override |
| 396 | 395 |
public ConversationHolder NewConversation() {
|
| 397 |
return new ConversationHolderMock();
|
|
| 396 |
throw new RuntimeException("ConversationHolder not supported by CdmApplicationRemoteConfiguration");
|
|
| 398 | 397 |
} |
| 399 | 398 |
|
| 400 | 399 |
@Override |
| eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java | ||
|---|---|---|
| 13 | 13 |
import java.lang.reflect.InvocationTargetException; |
| 14 | 14 |
import java.lang.reflect.Method; |
| 15 | 15 |
import java.lang.reflect.Type; |
| 16 |
import eu.etaxonomy.cdm.common.URI; |
|
| 17 | 16 |
import java.net.URISyntaxException; |
| 18 | 17 |
import java.net.URL; |
| 19 | 18 |
import java.util.Dictionary; |
| ... | ... | |
| 34 | 33 |
import eu.etaxonomy.cdm.api.service.IService; |
| 35 | 34 |
import eu.etaxonomy.cdm.api.service.ITestService; |
| 36 | 35 |
import eu.etaxonomy.cdm.api.service.longrunningService.ILongRunningTasksService; |
| 36 |
import eu.etaxonomy.cdm.common.URI; |
|
| 37 | 37 |
import eu.etaxonomy.cdm.io.service.IIOService; |
| 38 | 38 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 39 | 39 |
import eu.etaxonomy.taxeditor.service.ICachedCommonService; |
| ... | ... | |
| 214 | 214 |
File file = null; |
| 215 | 215 |
try {
|
| 216 | 216 |
String urlString = FileLocator.resolve(fileURL).toExternalForm().replace(" ", "%20");
|
| 217 |
|
|
| 217 |
|
|
| 218 | 218 |
file = new File(new URI(urlString).getJavaUri()); |
| 219 | 219 |
JarFile jarFile = new JarFile(file); |
| 220 | 220 |
Manifest manifest = jarFile.getManifest(); |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java | ||
|---|---|---|
| 16 | 16 |
import org.eclipse.ui.IMemento; |
| 17 | 17 |
import org.eclipse.ui.IPersistable; |
| 18 | 18 |
|
| 19 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
|
| 20 | 19 |
import eu.etaxonomy.cdm.api.service.ITaxonNodeService; |
| 21 | 20 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
| 22 | 21 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| ... | ... | |
| 31 | 30 |
* @author a.oppermann |
| 32 | 31 |
* @date 25.04.2014 |
| 33 | 32 |
*/ |
| 34 |
public class ChecklistEditorInput extends CdmEntitySessionInput<TaxonNode> implements IPersistable {
|
|
| 33 |
public class ChecklistEditorInput |
|
| 34 |
extends CdmEntitySessionInput<TaxonNode> |
|
| 35 |
implements IPersistable {
|
|
| 35 | 36 |
|
| 36 | 37 |
/** |
| 37 | 38 |
* The selected classification |
| ... | ... | |
| 149 | 150 |
return Arrays.asList(taxonNode); |
| 150 | 151 |
} |
| 151 | 152 |
|
| 152 |
public ConversationHolder getConversation() {
|
|
| 153 |
return null; |
|
| 154 |
} |
|
| 155 |
|
|
| 156 | 153 |
private List<String> getTaxonNodePropertyPaths() {
|
| 157 | 154 |
List<String> taxonNodePropertyPaths = new ArrayList<String>(); |
| 158 | 155 |
for(String propertyPath : getTaxonBasePropertyPaths()) {
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditor.java | ||
|---|---|---|
| 21 | 21 |
import java.util.UUID; |
| 22 | 22 |
|
| 23 | 23 |
import org.apache.commons.collections4.map.LinkedMap; |
| 24 |
import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger; |
|
| 24 |
import org.apache.logging.log4j.LogManager; |
|
| 25 |
import org.apache.logging.log4j.Logger; |
|
| 25 | 26 |
import org.eclipse.jface.layout.GridDataFactory; |
| 26 | 27 |
import org.eclipse.jface.layout.GridLayoutFactory; |
| 27 | 28 |
import org.eclipse.jface.wizard.WizardDialog; |
| ... | ... | |
| 108 | 109 |
public class DistributionEditor extends Composite implements IDistributionEditor{
|
| 109 | 110 |
|
| 110 | 111 |
@SuppressWarnings("unused")
|
| 111 |
private static final Logger logger = LogManager.getLogger(DistributionEditor.class);
|
|
| 112 |
private static final Logger logger = LogManager.getLogger(); |
|
| 112 | 113 |
|
| 113 | 114 |
private static final String DISTRIBUTION_EDITOR = "Distribution Editor"; //$NON-NLS-1$ |
| 114 | 115 |
private static final String LOADING_TAXA = Messages.ChecklistEditor_LOAD_TAXA; |
| eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreConnectorLocal.java | ||
|---|---|---|
| 169 | 169 |
CdmProgressMonitorAdapter subprogressMonitor = CdmProgressMonitorAdapter |
| 170 | 170 |
.CreateSubMonitor(monitor, 3); |
| 171 | 171 |
// genrerate new application controller |
| 172 |
applicationController = getApplicationController(cdmSource,subprogressMonitor); |
|
| 172 |
applicationController = getApplicationController(cdmSource, subprogressMonitor);
|
|
| 173 | 173 |
} |
| 174 | 174 |
|
| 175 | 175 |
if (!monitor.isCanceled()) {
|
| eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/CdmStoreLocal.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
| 21 | 21 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 22 | 22 |
|
| 23 |
|
|
| 24 | 23 |
/** |
| 25 | 24 |
* @author k.luther |
| 26 | 25 |
* @since Sep 18, 2020 |
| ... | ... | |
| 35 | 34 |
*/ |
| 36 | 35 |
protected CdmStoreLocal(ICdmRepository repository, ICdmSource cdmSource) {
|
| 37 | 36 |
super(repository, cdmSource); |
| 38 |
// TODO Auto-generated constructor stub |
|
| 39 | 37 |
} |
| 40 | 38 |
|
| 41 | 39 |
|
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RefreshNodesOperation.java | ||
|---|---|---|
| 16 | 16 |
import org.eclipse.core.runtime.IProgressMonitor; |
| 17 | 17 |
import org.eclipse.core.runtime.IStatus; |
| 18 | 18 |
|
| 19 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
|
| 20 | 19 |
import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService; |
| 21 | 20 |
import eu.etaxonomy.cdm.model.description.PolytomousKey; |
| 22 | 21 |
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode; |
| ... | ... | |
| 47 | 46 |
public IStatus execute(IProgressMonitor monitor, IAdaptable info) |
| 48 | 47 |
throws ExecutionException {
|
| 49 | 48 |
UUID polytomousKeyNodeUuid = key.getRoot().getUuid(); |
| 50 |
ConversationHolder conversation = CdmStore.createConversation(); |
|
| 51 | 49 |
PolytomousKeyNode root = CdmStore.getService(IPolytomousKeyNodeService.class).load(polytomousKeyNodeUuid, null); |
| 52 | 50 |
root.refreshNodeNumbering(); |
| 53 | 51 |
CdmStore.getService(IPolytomousKeyNodeService.class).saveOrUpdate(root); |
| 54 |
conversation.commit(true); |
|
| 55 | 52 |
return postExecute(root); |
| 56 | 53 |
} |
| 57 | 54 |
|
| 58 | 55 |
@Override |
| 59 | 56 |
public IStatus redo(IProgressMonitor monitor, IAdaptable info) |
| 60 | 57 |
throws ExecutionException {
|
| 61 |
// TODO Auto-generated method stub |
|
| 62 | 58 |
return null; |
| 63 | 59 |
} |
| 64 | 60 |
|
| 65 | 61 |
@Override |
| 66 | 62 |
public IStatus undo(IProgressMonitor monitor, IAdaptable info) |
| 67 | 63 |
throws ExecutionException {
|
| 68 |
// TODO Auto-generated method stub |
|
| 69 | 64 |
return null; |
| 70 | 65 |
} |
| 71 | 66 |
} |
| eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/AbstractPublishWizard.java | ||
|---|---|---|
| 15 | 15 |
import org.eclipse.ui.IExportWizard; |
| 16 | 16 |
import org.eclipse.ui.IWorkbench; |
| 17 | 17 |
|
| 18 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
|
| 19 | 18 |
import eu.etaxonomy.cdm.print.PublishConfigurator; |
| 20 | 19 |
import eu.etaxonomy.cdm.print.Publisher; |
| 21 | 20 |
import eu.etaxonomy.cdm.print.out.IPublishOutputModule; |
| 22 | 21 |
import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; |
| 23 | 22 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
| 24 | 23 |
import eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin; |
| 25 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
|
| 26 | 24 |
|
| 27 | 25 |
/** |
| 28 | 26 |
* <p>AbstractPublishWizard class.</p> |
| ... | ... | |
| 71 | 69 |
@Override |
| 72 | 70 |
protected IStatus run(IProgressMonitor monitor) {
|
| 73 | 71 |
monitor.beginTask("Print Publisher", getConfigurator().calculateNumberOfNodes() + 1);
|
| 74 |
ConversationHolder conversation = null; |
|
| 72 |
|
|
| 75 | 73 |
try{
|
| 76 | 74 |
getConfigurator().setProgressMonitor(CdmProgressMonitorAdapter.CreateMonitor(monitor)); |
| 77 | 75 |
|
| 78 | 76 |
if(getConfigurator().isLocal()){
|
| 79 |
conversation = CdmStore.createConversation(); |
|
| 80 |
// we want to enforce that the session is closed and nothing is |
|
| 81 |
// instantiated beneath the regular cdmlib-remote object boundaries |
|
| 82 |
conversation.commit(false); |
|
| 77 |
//TODO conversation not supported anymore as we use only remote |
|
| 78 |
// conversation = CdmStore.createConversation(); |
|
| 79 |
// // we want to enforce that the session is closed and nothing is |
|
| 80 |
// // instantiated beneath the regular cdmlib-remote object boundaries |
|
| 81 |
// conversation.commit(false); |
|
| 83 | 82 |
} |
| 84 | 83 |
|
| 85 | 84 |
Publisher.publish(getConfigurator()); |
| 86 | 85 |
|
| 87 | 86 |
}finally{
|
| 88 | 87 |
monitor.done(); |
| 89 |
if(conversation != null) {
|
|
| 90 |
conversation.close(); |
|
| 91 |
} |
|
| 88 |
// if(conversation != null) {
|
|
| 89 |
// conversation.close();
|
|
| 90 |
// }
|
|
| 92 | 91 |
Display.getDefault().asyncExec(new Runnable() {
|
| 93 | 92 |
@Override |
| 94 | 93 |
public void run() {
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.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.newWizard; |
| 11 | 10 |
|
| 12 | 11 |
import java.util.List; |
| ... | ... | |
| 26 | 25 |
import org.eclipse.swt.widgets.Composite; |
| 27 | 26 |
import org.eclipse.swt.widgets.Text; |
| 28 | 27 |
|
| 29 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
|
| 30 | 28 |
import eu.etaxonomy.cdm.ext.ipni.IIpniService; |
| 31 | 29 |
import eu.etaxonomy.cdm.ext.ipni.IpniService; |
| 32 | 30 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| ... | ... | |
| 35 | 33 |
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; |
| 36 | 34 |
|
| 37 | 35 |
/** |
| 38 |
* <p>ExternalReferenceServiceWizardPage class.</p> |
|
| 39 |
* |
|
| 40 | 36 |
* @author n.hoffmann |
| 41 | 37 |
* @created Sep 16, 2010 |
| 42 | 38 |
*/ |
| 43 | 39 |
public class ExternalReferenceServiceWizardPage extends WizardPage implements SelectionListener, ISelectionChangedListener {
|
| 44 | 40 |
|
| 45 |
private ConversationHolder conversation; |
|
| 46 | 41 |
private CdmFormFactory formFactory; |
| 47 | 42 |
private Reference entity; |
| 48 | 43 |
private Composite control; |
| ... | ... | |
| 52 | 47 |
private Text text_query; |
| 53 | 48 |
private Button button_search; |
| 54 | 49 |
|
| 55 |
protected ExternalReferenceServiceWizardPage(CdmFormFactory formFactory, ConversationHolder conversation, Reference entity) {
|
|
| 50 |
protected ExternalReferenceServiceWizardPage(CdmFormFactory formFactory, Reference entity) {
|
|
| 56 | 51 |
super("ExternalReferenceServiceWizardPage");
|
| 57 | 52 |
this.formFactory = formFactory; |
| 58 | 53 |
this.entity = entity; |
| 59 |
this.conversation = conversation; |
|
| 60 | 54 |
ipniService = new IpniService(); |
| 61 | 55 |
|
| 62 | 56 |
setDescription("Query IPNI service for references");
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java | ||
|---|---|---|
| 161 | 161 |
CdmProgressMonitorAdapter subprogressMonitor = CdmProgressMonitorAdapter |
| 162 | 162 |
.CreateSubMonitor(monitor, 3); |
| 163 | 163 |
// genrerate new application controller |
| 164 |
applicationController = getApplicationController(cdmSource,subprogressMonitor); |
|
| 164 |
applicationController = getApplicationController(cdmSource, subprogressMonitor);
|
|
| 165 | 165 |
} |
| 166 | 166 |
|
| 167 | 167 |
if (!monitor.isCanceled()) {
|
| ... | ... | |
| 175 | 175 |
//loginDialog.onComplete(); |
| 176 | 176 |
CdmStore.getContextManager().notifyContextStart(); |
| 177 | 177 |
loginDialog.onComplete(); |
| 178 |
//TODO AM: is this necessary to be done on display thread?
|
|
| 178 |
//TODO AM: is this necessary to be done on display thread? |
|
| 179 | 179 |
new TermLoader().unloadAllTerms(); |
| 180 | 180 |
Rank.initDefaultTerms(); |
| 181 | 181 |
NomenclaturalStatusType.initDefaultTerms(); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UseObjectStore.java | ||
|---|---|---|
| 80 | 80 |
monitor = new NullProgressMonitor(); |
| 81 | 81 |
} |
| 82 | 82 |
|
| 83 |
ConversationHolder conversation = CdmStore.createConversation(); |
|
| 83 |
//TODO remove ConversationHolder as we do not use it anymore since remoting |
|
| 84 |
ConversationHolder conversation = null; //CdmStore.createConversation(); |
|
| 84 | 85 |
|
| 85 | 86 |
//retrieve terms and vocabularies from db |
| 86 | 87 |
useRecordFeature = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseRecordFeature); |
| ... | ... | |
| 137 | 138 |
// if (palmWebFeatureTree != null){
|
| 138 | 139 |
// CdmStore.getService(ITermTreeService.class).saveOrUpdate(palmWebFeatureTree); |
| 139 | 140 |
// } |
| 140 |
conversation.commit(true); |
|
| 141 |
|
|
| 142 |
// conversation.commit(true); |
|
| 141 | 143 |
|
| 142 | 144 |
} |
| 143 |
conversation.close(); |
|
| 145 |
// conversation.close();
|
|
| 144 | 146 |
} |
| 145 | 147 |
|
| 146 | 148 |
private static void createHumanGroupVocabulary(IProgressMonitor monitor,ConversationHolder conversation) {
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java | ||
|---|---|---|
| 48 | 48 |
// Since descriptiveSystem is a Set of Features that are present or allowed for the current description, |
| 49 | 49 |
// it is similar to a FeatureTree (you can get this information from a feature tree) but not the same. |
| 50 | 50 |
// Please correct this once it is clear what descriptive system will be used for in CDM |
| 51 |
// selection_featureTree = formFactory.createSelectionElement(FeatureTree.class, getConversationHolder(), formElement, "Feature Tree", null, EntitySelectionElement.ALL, style);
|
|
| 51 |
// selection_featureTree = formFactory.createSelectionElement(FeatureTree.class, formElement, "Feature Tree", null, EntitySelectionElement.ALL, style); |
|
| 52 | 52 |
|
| 53 | 53 |
Object typesString = entity.getTypes().stream().filter(type->type instanceof DescriptionType) |
| 54 | 54 |
.map(type->((DescriptionType)type).getLabel()) |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
import org.apache.logging.log4j.LogManager; |
| 14 | 14 |
import org.apache.logging.log4j.Logger; |
| 15 |
|
|
| 16 | 15 |
import org.eclipse.core.runtime.IProgressMonitor; |
| 17 | 16 |
import org.eclipse.core.runtime.IStatus; |
| 18 | 17 |
import org.eclipse.core.runtime.Status; |
| ... | ... | |
| 33 | 32 |
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; |
| 34 | 33 |
|
| 35 | 34 |
/** |
| 36 |
* <p>NaturalLanguageDetailElement class.</p> |
|
| 37 |
* |
|
| 38 | 35 |
* @author n.hoffmann |
| 39 | 36 |
* @created Sep 16, 2010 |
| 40 | 37 |
*/ |
| 41 | 38 |
public class NaturalLanguageDetailElement extends AbstractCdmDetailElement<TaxonDescription> {
|
| 42 | 39 |
|
| 43 |
private static final Logger logger = LogManager.getLogger(NaturalLanguageDetailElement.class);
|
|
| 40 |
private static final Logger logger = LogManager.getLogger(); |
|
| 44 | 41 |
|
| 45 | 42 |
private LabelElement label; |
| 46 | 43 |
|
| ... | ... | |
| 69 | 66 |
} |
| 70 | 67 |
} |
| 71 | 68 |
|
| 72 |
/* (non-Javadoc) |
|
| 73 |
* @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java.lang.Object) |
|
| 74 |
*/ |
|
| 75 |
/** {@inheritDoc} */
|
|
| 76 | 69 |
@Override |
| 77 | 70 |
public void handleEvent(Object eventSource) {
|
| 78 | 71 |
// nothing gets edited, nothing gets updated |
| ... | ... | |
| 95 | 88 |
String text = ""; |
| 96 | 89 |
|
| 97 | 90 |
if(featureTree != null){
|
| 98 |
CdmStore.createConversation(); |
|
| 99 | 91 |
try{
|
| 100 | 92 |
List<TextData> naturalLanguageDescription = generator.generateNaturalLanguageDescription(featureTree, entity, CdmStore.getDefaultLanguage()); |
| 101 | 93 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterNodeDetailElement.java | ||
|---|---|---|
| 72 | 72 |
// supportsCategoricalData = formFactory.createCheckbox(formElement, "Supports Categorical Data", entity.getTerm().isSupportsCategoricalData(), style); |
| 73 | 73 |
// |
| 74 | 74 |
// if (supportsCategoricalData.getSelection()) {
|
| 75 |
// sectionStateVocabularies = formFactory.createStateVocabulariesSection(getConversationHolder(),
|
|
| 75 |
// sectionStateVocabularies = formFactory.createStateVocabulariesSection( |
|
| 76 | 76 |
// parentFormElement, StoreUtil.getSectionStyle(StateVocabularyCollectionSection.class, entity.getClass().getCanonicalName(), true)); |
| 77 | 77 |
// sectionStateVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 78 | 78 |
// sectionStateVocabularies.setEntity(entity.getTerm()); |
| 79 | 79 |
// } |
| 80 | 80 |
// if (supportsQuantitativeData.getSelection()) {
|
| 81 |
// sectionMeasurementUnits = formFactory.createMeasurementUnitCollectionSection(getConversationHolder(),
|
|
| 81 |
// sectionMeasurementUnits = formFactory.createMeasurementUnitCollectionSection( |
|
| 82 | 82 |
// parentFormElement, StoreUtil.getSectionStyle(MeasurementUnitCollectionSection.class, entity.getClass().getCanonicalName(), true)); |
| 83 | 83 |
// sectionMeasurementUnits.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 84 | 84 |
// sectionMeasurementUnits.setEntity(entity.getTerm()); |
| 85 | 85 |
// |
| 86 |
// sectionStatisticalMeasures = formFactory.createStatisticalMeasureCollectionSection(getConversationHolder(),
|
|
| 86 |
// sectionStatisticalMeasures = formFactory.createStatisticalMeasureCollectionSection( |
|
| 87 | 87 |
// parentFormElement, StoreUtil.getSectionStyle(StatisticalMeasureCollectionSection.class, entity.getClass().getCanonicalName(), true)); |
| 88 | 88 |
// sectionStatisticalMeasures.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 89 | 89 |
// sectionStatisticalMeasures.setEntity(entity.getTerm()); |
| 90 | 90 |
// } |
| 91 | 91 |
// if (supportsCategoricalData.getSelection() || supportsQuantitativeData.getSelection()) {
|
| 92 | 92 |
// sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection( |
| 93 |
// getConversationHolder(), parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, entity.getClass().getCanonicalName(), true));
|
|
| 93 |
// parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, entity.getClass().getCanonicalName(), true)); |
|
| 94 | 94 |
// sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 95 | 95 |
// sectionModifierVocabularies.setEntity(entity.getTerm()); |
| 96 | 96 |
// } |
| ... | ... | |
| 184 | 184 |
// |
| 185 | 185 |
// //statistical measures |
| 186 | 186 |
// sectionStatisticalMeasures = formFactory.createStatisticalMeasureCollectionSection( |
| 187 |
// getConversationHolder(), parentFormElement, StoreUtil.getSectionStyle(StatisticalMeasureCollectionSection.class, getEntity().getClass().getCanonicalName(), true));
|
|
| 187 |
// parentFormElement, StoreUtil.getSectionStyle(StatisticalMeasureCollectionSection.class, getEntity().getClass().getCanonicalName(), true)); |
|
| 188 | 188 |
// sectionStatisticalMeasures.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 189 | 189 |
// sectionStatisticalMeasures.setEntity(getEntity().getTerm()); |
| 190 | 190 |
// |
| 191 | 191 |
// //modifiers |
| 192 | 192 |
// sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection( |
| 193 |
// getConversationHolder(), parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, getEntity().getClass().getCanonicalName(), true));
|
|
| 193 |
// parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, getEntity().getClass().getCanonicalName(), true)); |
|
| 194 | 194 |
// sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 195 | 195 |
// sectionModifierVocabularies.setEntity(getEntity().getTerm()); |
| 196 | 196 |
// } |
| ... | ... | |
| 217 | 217 |
// |
| 218 | 218 |
// //modifiers |
| 219 | 219 |
// sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection( |
| 220 |
// getConversationHolder(), parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, getEntity().getClass().getCanonicalName(), true));
|
|
| 220 |
// parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, getEntity().getClass().getCanonicalName(), true)); |
|
| 221 | 221 |
// sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 222 | 222 |
// sectionModifierVocabularies.setEntity(getEntity().getTerm()); |
| 223 | 223 |
// } |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterNodeDtoDetailElement.java | ||
|---|---|---|
| 138 | 138 |
// removeCategoricalWidgets(); |
| 139 | 139 |
// |
| 140 | 140 |
// //measurement units |
| 141 |
// sectionMeasurementUnits = formFactory.createMeasurementUnitCollectionSection(getConversationHolder(),
|
|
| 141 |
// sectionMeasurementUnits = formFactory.createMeasurementUnitCollectionSection( |
|
| 142 | 142 |
// parentFormElement, StoreUtil.getSectionStyle(MeasurementUnitCollectionSection.class, getEntity().getClass().getCanonicalName(), true)); |
| 143 | 143 |
// sectionMeasurementUnits.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 144 | 144 |
// sectionMeasurementUnits.setEntity(getEntity().getTerm()); |
| 145 | 145 |
// |
| 146 | 146 |
// //statistical measures |
| 147 | 147 |
// sectionStatisticalMeasures = formFactory.createStatisticalMeasureCollectionSection( |
| 148 |
// getConversationHolder(), parentFormElement, StoreUtil.getSectionStyle(StatisticalMeasureCollectionSection.class, getEntity().getClass().getCanonicalName(), true));
|
|
| 148 |
// parentFormElement, StoreUtil.getSectionStyle(StatisticalMeasureCollectionSection.class, getEntity().getClass().getCanonicalName(), true)); |
|
| 149 | 149 |
// sectionStatisticalMeasures.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 150 | 150 |
// sectionStatisticalMeasures.setEntity(getEntity().getTerm()); |
| 151 | 151 |
// |
| 152 | 152 |
// //modifiers |
| 153 | 153 |
// sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection( |
| 154 |
// getConversationHolder(), parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, getEntity().getClass().getCanonicalName(), true));
|
|
| 154 |
// parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, getEntity().getClass().getCanonicalName(), true)); |
|
| 155 | 155 |
// sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 156 | 156 |
// sectionModifierVocabularies.setEntity(getEntity().getTerm()); |
| 157 | 157 |
// } |
| ... | ... | |
| 171 | 171 |
// removeQuantitativeWidgets(); |
| 172 | 172 |
// |
| 173 | 173 |
// //states |
| 174 |
// sectionStateVocabularies = formFactory.createStateVocabulariesSection(getConversationHolder(),
|
|
| 174 |
// sectionStateVocabularies = formFactory.createStateVocabulariesSection( |
|
| 175 | 175 |
// parentFormElement, StoreUtil.getSectionStyle(StateVocabularyCollectionSection.class, getEntity().getClass().getCanonicalName(), true)); |
| 176 | 176 |
// sectionStateVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 177 | 177 |
// sectionStateVocabularies.setEntity(getEntity().getTerm()); |
| 178 | 178 |
// |
| 179 | 179 |
// //modifiers |
| 180 | 180 |
// sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection( |
| 181 |
// getConversationHolder(), parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, getEntity().getClass().getCanonicalName(), true));
|
|
| 181 |
// parentFormElement, StoreUtil.getSectionStyle(RecommendedModifierVocabulariesCollectionSection.class, getEntity().getClass().getCanonicalName(), true)); |
|
| 182 | 182 |
// sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); |
| 183 | 183 |
// sectionModifierVocabularies.setEntity(getEntity().getTerm()); |
| 184 | 184 |
// } |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java | ||
|---|---|---|
| 76 | 76 |
addControl(externalLinks); |
| 77 | 77 |
addElement(externalLinks); |
| 78 | 78 |
|
| 79 |
// advancedSection = formFactory.createOriginalSourceAdvancedSection(getConversationHolder(), formElement, null, StoreUtil.getSectionStyle(OriginalSourceAdvancedSection.class, INomenclaturalReference.class.getCanonicalName()));
|
|
| 79 |
// advancedSection = formFactory.createOriginalSourceAdvancedSection(formElement, null, StoreUtil.getSectionStyle(OriginalSourceAdvancedSection.class, INomenclaturalReference.class.getCanonicalName())); |
|
| 80 | 80 |
// TableWrapData layoutData = LayoutConstants.FILL_HORIZONTALLY(2, 1); |
| 81 | 81 |
// |
| 82 | 82 |
// advancedSection.setLayoutData(layoutData); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditorInput.java | ||
|---|---|---|
| 13 | 13 |
import org.apache.logging.log4j.LogManager; |
| 14 | 14 |
import org.apache.logging.log4j.Logger; |
| 15 | 15 |
|
| 16 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
|
| 17 | 16 |
import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery; |
| 18 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
|
| 19 | 17 |
|
| 20 | 18 |
/** |
| 21 | 19 |
* Input for {@link DataImportEditor}. This class queries a data source for
|
| ... | ... | |
| 26 | 24 |
*/ |
| 27 | 25 |
public abstract class DataImportEditorInput<T> {
|
| 28 | 26 |
|
| 29 |
protected static Logger logger = LogManager.getLogger(DataImportEditorInput.class);
|
|
| 27 |
protected static Logger logger = LogManager.getLogger(); |
|
| 30 | 28 |
|
| 31 | 29 |
private Collection<T> results; |
| 32 | 30 |
|
| 33 |
private final ConversationHolder conversationHolder; |
|
| 34 | 31 |
|
| 35 | 32 |
protected OccurenceQuery query; |
| 36 | 33 |
|
| 37 |
public DataImportEditorInput() {
|
|
| 38 |
this.conversationHolder = CdmStore.createConversation(); |
|
| 39 |
} |
|
| 40 |
|
|
| 41 | 34 |
public Collection<T> getResults() {
|
| 42 | 35 |
return results; |
| 43 | 36 |
} |
| ... | ... | |
| 46 | 39 |
this.results = results; |
| 47 | 40 |
} |
| 48 | 41 |
|
| 49 |
public ConversationHolder getConversationHolder() {
|
|
| 50 |
return conversationHolder; |
|
| 51 |
} |
|
| 52 |
|
|
| 53 | 42 |
@Override |
| 54 | 43 |
public abstract int hashCode(); |
| 55 | 44 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java | ||
|---|---|---|
| 523 | 523 |
} |
| 524 | 524 |
} |
| 525 | 525 |
//TODO: test code for secundum source section |
| 526 |
// SecundumSourceSection sourceSection = formFactory.createSecundumDetailSection(getConversationHolder(), parent, this, StoreUtil.getSectionStyle(SecundumSourceSection.class, getInput().getClass().getCanonicalName(), true)); |
|
| 527 | 526 |
// formFactory.createHorizontalSeparator(parent, SWT.BORDER); |
| 528 | 527 |
// addPart(sourceSection); |
| 529 | 528 |
// if (taxonBase.getSecSource() == null){
|
Also available in: Unified diff
ref #10186 further remove ConversationHolder from TaxEditor code and some cleanup