import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.ui.texteditor.IDocumentProvider;
--import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
import eu.etaxonomy.cdm.api.service.IReferenceService;
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.reference.Reference;
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;
import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
LineAnnotation annotation = (LineAnnotation) model.getAnnotation(object);
try {
-- CdmApplicationController controller;
-- controller = (CdmApplicationController) CdmStore.getCurrentApplicationConfiguration();
++ ICdmApplicationConfiguration controller;
++ controller = (ICdmApplicationConfiguration) CdmStore.getCurrentApplicationConfiguration();
//persistenceService.delete(object);
if (object instanceof SpecimenOrObservationBase){
lib/yjp-controller-api-redist-9.0.8.jar,
lib/google-api-translate-java-0.92.jar,
lib/odfdom-0.8.jar,
- lib/h2mig_pagestore_addon.jar
+ lib/h2mig_pagestore_addon.jar,
+ lib/spring-security-remoting-3.1.3.RELEASE.jar
++Import-Package: eu.etaxonomy.cdm.api.application
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.jface.dialogs.MessageDialog;
+ import org.eclipse.ui.handlers.HandlerUtil;
--import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
import eu.etaxonomy.taxeditor.store.CdmStore;
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
-
+
//parent.removeChild(node);
-- CdmApplicationController controller;
++ ICdmApplicationConfiguration controller;
-- controller = (CdmApplicationController) CdmStore.getCurrentApplicationConfiguration();
++ controller = (ICdmApplicationConfiguration) CdmStore.getCurrentApplicationConfiguration();
IPolytomousKeyNodeService service = controller.getPolytomousKeyNodeService();
-
- service.delete(node, true);
-
+ if (node.getChildren().size()>0){
+ if(! MessageDialog.openQuestion(null, "Confirm deletion of children", "The selected node has children, do you want to delete them, too?")) {
+ service.delete(node, false);
+ }
+ } else{
+ service.delete(node, true);
+ }
return postExecute(null);
}
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
--import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
import eu.etaxonomy.cdm.model.taxon.Taxon;
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
import eu.etaxonomy.taxeditor.store.CdmStore;
// Remove synonym from taxon
-- CdmApplicationController controller;
++ ICdmApplicationConfiguration controller;
-- controller = (CdmApplicationController) CdmStore.getCurrentApplicationConfiguration();
++ controller = (ICdmApplicationConfiguration) CdmStore.getCurrentApplicationConfiguration();
ITaxonService service = controller.getTaxonService();
if (synonym.getId() == 0){
import org.eclipse.ui.PartInitException;\r
import org.eclipse.ui.handlers.HandlerUtil;\r
\r
--import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;\r
import eu.etaxonomy.cdm.api.service.ITaxonService;\r
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;\r
import eu.etaxonomy.cdm.model.taxon.Synonym;\r
import eu.etaxonomy.cdm.model.taxon.Taxon;\r
import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;\r
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
bind();\r
\r
\r
-- CdmApplicationController controller;\r
++ ICdmApplicationConfiguration controller;\r
\r
-- controller = (CdmApplicationController) CdmStore.getCurrentApplicationConfiguration();\r
++ controller = (ICdmApplicationConfiguration) CdmStore.getCurrentApplicationConfiguration();\r
\r
ITaxonService service = controller.getTaxonService();\r
try {\r
AbstractUtility.error(NavigationUtil.class, "Error opening the editor", e);
} catch (Exception e) {
AbstractUtility.warningDialog("Could not create Taxon", NavigationUtil.class, e.getMessage());
++ e.printStackTrace();
}
}
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.ui.handlers.HandlerUtil;
--import eu.etaxonomy.cdm.api.application.CdmApplicationController;
--import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
++import eu.etaxonomy.cdm.api.application.CdmApplicationController;
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
import eu.etaxonomy.taxeditor.store.CdmStore;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ui.progress.IProgressConstants;
--import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.io.common.IIoConfigurator;
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
/**
* <p>
*
* @param applicationController
* a
-- * {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
++ * {@link eu.etaxonomy.cdm.remote.api.application.CdmApplicationController}
* object.
* @param <CONFIGURATOR>
* a CONFIGURATOR object.
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchPart;
--import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.io.common.CdmDefaultExport;
import eu.etaxonomy.cdm.io.common.IExportConfigurator;
import eu.etaxonomy.cdm.io.common.IIoConfigurator;
import eu.etaxonomy.cdm.io.jaxb.JaxbExportConfigurator;
import eu.etaxonomy.cdm.io.sdd.out.SDDExportConfigurator;
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
import eu.etaxonomy.taxeditor.store.StoreUtil;
*
* @param applicationConfiguration
* a
-- * {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
++ * {@link eu.etaxonomy.cdm.remote.api.application.CdmApplicationController}
* object.
* @return a {@link eu.etaxonomy.taxeditor.io.ExportManager} object.
*/
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.widgets.Display;
--import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator;
import eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator;
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.StoreUtil;
*
* @param applicationConfiguration
* a
-- * {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
++ * {@link eu.etaxonomy.cdm.remote.api.application.CdmApplicationController}
* object.
* @return a {@link eu.etaxonomy.taxeditor.io.ImportManager} object.
*/
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
--import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.ext.ipni.IIpniService;
import eu.etaxonomy.cdm.ext.ipni.IpniService;
import eu.etaxonomy.cdm.model.reference.Reference;
++import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
MatchMatrix matchMatrix = findMatches(parsedName);
-- resolveDuplicates(parsedName, matchMatrix);
++// resolveDuplicates(parsedName, matchMatrix);
return parsedName;
}
* @return A <code>List</code> of possibly matching TaxonNameBase's.
*/
private List<TaxonNameBase> findMatchingLatinNames(TaxonNameBase taxonNameBase) {
--
-- try {
-- return CdmStore.getService(ICommonService.class).findMatching(taxonNameBase, MatchStrategyConfigurator.NonViralNameMatchStrategy());
--
-- } catch (MatchException e) {
-- StoreUtil.error(this.getClass(), "Error finding matching names", e);
-- }
++//
++// try {
++// return CdmStore.getService(ICommonService.class).findMatching(taxonNameBase, MatchStrategyConfigurator.NonViralNameMatchStrategy());
++//
++// } catch (MatchException e) {
++// StoreUtil.error(this.getClass(), "Error finding matching names", e);
++// }
return null;
}
}
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">\r
\r
- <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>\r
- <!-- <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->\r
- <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">\r
+ <!-- <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/> -->\r
+ <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/>\r
+ \r
+ <!-- <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">\r
<property name="omit" value="false" />\r
- </bean>\r
+ </bean> -->\r
+ \r
+ <!-- <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"> \r
+ </bean> -->\r
\r
++ \r
++\r
++ \r
<import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>\r
<import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>\r
\r