smaller changes for specimen import and others

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DeleteResultMessagingUtils.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DeleteResultMessagingUtils.java
index 55854c6bf00fafdd3f4592ed4b73239e3c3e81db..66874f128c32cfaffb6dd8d63d2d5beafd580556 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DeleteResultMessagingUtils.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DeleteResultMessagingUtils.java
@@ -14,6 +14,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;
 import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.MultiStatus;

 import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.api.service.DeleteResult;
 import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.api.service.DeleteResult;


@@ -80,4 +81,35 @@ public class DeleteResultMessagingUtils extends MessagingUtils {
 
 
     }
 
 
     }

+    
+    public static void messageDialogWithDetails(IStatus result, String message, String pluginId) {
+       
+        List<String> details = new ArrayList<String>();
+        String title= "";
+        Throwable e = null;
+        if (result.isMultiStatus()){
+            for (IStatus childStatus:result.getChildren()){
+                details.add(childStatus.getMessage());
+            }
+            e = result.getChildren()[0].getException();
+            if (result.equals(Status.OK_STATUS)|| result.equals(Status.WARNING)){
+                title = "Delete was successfull.";
+            } else {
+                title = "Delete was aborted.";
+            }
+        }
+        StringBuffer relatedObjectsString = new StringBuffer();
+        Object[] relatedObjects = new ArrayList<Object>().toArray(); 
+      
+       
+    
+        String stackTraceWithContext = getContextInfo(details);
+        CdmDeleteErrorDialog ced = new CdmDeleteErrorDialog(AbstractUtility.getShell(), title, message,new Status(IStatus.INFO, pluginId, null, e), stackTraceWithContext, relatedObjects);
+
+        ced.open();
+
+
+
+    }
+    

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
index b807510bc5b0296ade0eddcc936382bbd39dad48..d319dfd537c39e32f3aed777c36ec7754a72beda 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
@@ -47,7 +47,7 @@ public class ChecklistEditorGeneralPreference extends PreferencePage implements
         composite.setLayout(new GridLayout());
         isEditorActivated = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
         final Button activateCheckButton = new Button(composite, SWT.CHECK);
         composite.setLayout(new GridLayout());
         isEditorActivated = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
         final Button activateCheckButton = new Button(composite, SWT.CHECK);

-        activateCheckButton.setText("Enable Checklist Editor");
+        activateCheckButton.setText("Enable Distribution Editor");

         activateCheckButton.setSelection(isEditorActivated);
         activateCheckButton.addSelectionListener(new SelectionAdapter(){
             @Override
         activateCheckButton.setSelection(isEditorActivated);
         activateCheckButton.addSelectionListener(new SelectionAdapter(){
             @Override


@@ -69,7 +69,7 @@ public class ChecklistEditorGeneralPreference extends PreferencePage implements
         child.setLayout(new GridLayout());
         child.setVisible(isEditorActivated);
         final CLabel label = new CLabel(child, SWT.NULL);
         child.setLayout(new GridLayout());
         child.setVisible(isEditorActivated);
         final CLabel label = new CLabel(child, SWT.NULL);

-        label.setText("Please open the wizard below, in order to \n" + "choose the areas for the Checklist Editor");
+        label.setText("Please open the wizard below, in order to \n" + "choose the areas for the Distribution Editor");

         final CommandHandlerButton button_openFeatureTree = new CommandHandlerButton(child, SWT.PUSH,
                 "eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardHandler");
 
         final CommandHandlerButton button_openFeatureTree = new CommandHandlerButton(child, SWT.PUSH,
                 "eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardHandler");
 


@@ -88,7 +88,7 @@ public class ChecklistEditorGeneralPreference extends PreferencePage implements
         PreferencesUtil.recursiveSetEnabled(button_openFeatureTree, CdmStore.isActive());
         boolean isShowRank = PreferencesUtil.isShowRankInChecklistEditor();
         final Button activateRankButton = new Button(child, SWT.CHECK);
         PreferencesUtil.recursiveSetEnabled(button_openFeatureTree, CdmStore.isActive());
         boolean isShowRank = PreferencesUtil.isShowRankInChecklistEditor();
         final Button activateRankButton = new Button(child, SWT.CHECK);

-        activateRankButton.setText("Show Rank in Checklist Editor");
+        activateRankButton.setText("Show Rank in Distribution Editor");

         activateRankButton.setSelection(isShowRank);
         activateRankButton.addSelectionListener(new SelectionAdapter(){
             @Override
         activateRankButton.setSelection(isShowRank);
         activateRankButton.addSelectionListener(new SelectionAdapter(){
             @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteTaxonBaseConfiguratorComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteTaxonBaseConfiguratorComposite.java
index c2efefbb14b18314f1dffb9cb4e66f29a4cf6a24..675ed5a004fc672d277ceba74e2c7ee05b8aa997 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteTaxonBaseConfiguratorComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteTaxonBaseConfiguratorComposite.java
@@ -83,7 +83,7 @@ public class DeleteTaxonBaseConfiguratorComposite extends Composite implements S
         setBackground(getBackground());
 
         btnDeleteTaxonName = new Button(this, SWT.CHECK);
         setBackground(getBackground());
 
         btnDeleteTaxonName = new Button(this, SWT.CHECK);

-        btnDeleteTaxonName.setText("Delete taxon name if possible");
+        btnDeleteTaxonName.setText("Delete name if possible");

         btnDeleteTaxonName.setSelection(true);
         btnDeleteTaxonName.addListener(SWT.Selection, new Listener() {
                @Override
         btnDeleteTaxonName.setSelection(true);
         btnDeleteTaxonName.addListener(SWT.Selection, new Listener() {
                @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
index 706ceb4bcf76cf61b70674f352e7e86f992acd17..ddeb878aa9c76c716354579663c786e835c92159 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
@@ -3,6 +3,8 @@
  */
 package eu.etaxonomy.taxeditor.ui.section.media;
 
  */
 package eu.etaxonomy.taxeditor.ui.section.media;
 

+import java.util.Map;
+

 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;


@@ -15,6 +17,7 @@ import org.eclipse.swt.widgets.Listener;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.AgentBase;

+import eu.etaxonomy.cdm.model.common.Language;

 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;


@@ -89,6 +92,12 @@ public class MediaMetaElement extends AbstractEntityCollectionElement<Media> imp
 
         text_description.setLanguageString(element.getDescription(CdmStore
                 .getDefaultLanguage()));
 
         text_description.setLanguageString(element.getDescription(CdmStore
                 .getDefaultLanguage()));

+        if (text_description.getText().isEmpty()){
+               Map<Language, LanguageString> allDescriptions = element.getAllDescriptions();
+               if (!allDescriptions.isEmpty()){
+                       text_description.setLanguageString(allDescriptions.get(Language.ENGLISH()));
+               }
+        }

 
         LanguageString title = element.getTitle(CdmStore.getDefaultLanguage());
 
 
         LanguageString title = element.getTitle(CdmStore.getDefaultLanguage());
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index 84a1ae49eab28540008315bfe5e37a004f15136e..b4e733ed7065c0fef47b2907946944096cb19d0b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -179,7 +179,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
        }
 
        private void createInfragenerericEpithetControls(ICdmFormElement element, NonViralName nonViralName, int style){
        }
 
        private void createInfragenerericEpithetControls(ICdmFormElement element, NonViralName nonViralName, int style){

-               if (nonViralName.getNomenclaturalCode().equals(NomenclaturalCode.ICZN)){
+               if (nonViralName.getNomenclaturalCode() == null || nonViralName.getNomenclaturalCode().equals(NomenclaturalCode.ICZN)){

                        if(nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS()) ){
                                text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
                        }
                        if(nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS()) ){
                                text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
                        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportView.java
index e7746b639730904a2ff1520552018a01acda352f..5c7a5d71b131a16b9180c94556aa6655ec51f0ae 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportView.java
@@ -18,23 +18,33 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;

 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;

 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;

+import org.eclipse.swt.widgets.Text;

 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.part.ViewPart;

+import org.eclipse.wb.swt.ResourceManager;

 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;

+import eu.etaxonomy.cdm.model.taxon.Classification;

 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.IContextListener;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.IContextListener;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
 import eu.etaxonomy.taxeditor.store.CdmStore;

+import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;

 
 /**
  * View which shows a list of "data" that can be imported into the CDM
 
 /**
  * View which shows a list of "data" that can be imported into the CDM


@@ -45,7 +55,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 
 public abstract class DataImportView<T> extends ViewPart implements IPartContentHasFactualData,
  */
 
 public abstract class DataImportView<T> extends ViewPart implements IPartContentHasFactualData,

-IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IContextListener{
+IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IContextListener, Listener{

 
     protected final Logger logger = Logger.getLogger(DataImportView.class);
 
 
     protected final Logger logger = Logger.getLogger(DataImportView.class);
 


@@ -56,6 +66,24 @@ IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, I
     private static ConversationHolder conversationHolder;
 
     private SaveImportedSpecimenAction saveImportedSpecimenAction;
     private static ConversationHolder conversationHolder;
 
     private SaveImportedSpecimenAction saveImportedSpecimenAction;

+    
+    private Text textClassification;
+    private Classification classification;
+    /**
+        * @return the classification
+        */
+       public Classification getClassification() {
+               return classification;
+       }
+
+       /**
+        * @param classification the classification to set
+        */
+       public void setClassification(Classification classification) {
+               this.classification = classification;
+       }
+       private Button btnBrowseClassification;
+    private Button btnClear;

 
     private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
 
 
     private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
 


@@ -77,11 +105,29 @@ IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, I
      */
     @Override
     public void createPartControl(Composite parent) {
      */
     @Override
     public void createPartControl(Composite parent) {

+       final Composite composite = new Composite(parent, SWT.NULL);
+
+               GridLayout gridLayout = new GridLayout();
+               gridLayout.numColumns = 4;
+               composite.setLayout(gridLayout);
+       Label label = new Label(composite, SWT.NONE);
+               label.setText("Classification");
+               textClassification = new Text(composite, SWT.NONE);
+               textClassification.setEnabled(false);
+               textClassification.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+               btnBrowseClassification = new Button(composite, SWT.NONE);
+               btnBrowseClassification.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/open.gif"));
+               btnBrowseClassification.addListener(SWT.Selection, this);
+               btnClear = new Button(composite, SWT.NONE);
+               btnClear.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/trash.gif"));
+               btnClear.addListener(SWT.Selection, this);

 
         CheckboxTableViewer checkboxTableViewer = CheckboxTableViewer.newCheckList(parent, SWT.BORDER | SWT.FULL_SELECTION);
         table = checkboxTableViewer.getTable();
         toolkit.paintBordersFor(table);
 
 
         CheckboxTableViewer checkboxTableViewer = CheckboxTableViewer.newCheckList(parent, SWT.BORDER | SWT.FULL_SELECTION);
         table = checkboxTableViewer.getTable();
         toolkit.paintBordersFor(table);
 

+        
+        

         createActions();
         initializeToolBar();
         initializeMenu();
         createActions();
         initializeToolBar();
         initializeMenu();


@@ -145,7 +191,7 @@ IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, I
     }
 
     protected void refresh(){
     }
 
     protected void refresh(){

-        getTable().removeAll();
+       // getTable().removeAll();

         for(T item:results){
             TableItem tableItem = new TableItem(getTable(), SWT.NONE);
             tableItem.setText(getTextForTableItem(item));
         for(T item:results){
             TableItem tableItem = new TableItem(getTable(), SWT.NONE);
             tableItem.setText(getTextForTableItem(item));


@@ -234,5 +280,17 @@ IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, I
         }
         return conversationHolder;
     }
         }
         return conversationHolder;
     }

-
+    @Override
+       public void handleEvent(Event event) {
+           if(event.widget==btnBrowseClassification){
+               classification = SelectionDialogFactory.getSelectionFromDialog(Classification.class, getSite().getShell(), null, null);
+               if(classification!=null){
+                   textClassification.setText(classification.getTitleCache());
+               }
+           }
+           else if(event.widget==btnClear){
+               classification = null;
+               textClassification.setText("");
+           }
+       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java
index b3ca3f46028546d993cc841f357f47cab19b58a0..7e01d6b00b3bf9e49d02a0bbaa46c672af12c9cb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java
@@ -9,12 +9,14 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+import java.util.UUID;

 
 import org.apache.http.client.ClientProtocolException;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.text.source.Annotation;
 
 import org.apache.http.client.ClientProtocolException;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.text.source.Annotation;

+import org.eclipse.swt.widgets.Event;

 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.IWorkbenchPart;


@@ -22,6 +24,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import org.eclipse.ui.PlatformUI;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;

+import eu.etaxonomy.cdm.api.service.IClassificationService;

 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;


@@ -35,7 +38,9 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;

+import eu.etaxonomy.cdm.model.taxon.Classification;

 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.CdmStore;

+import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;

 
 public class SaveImportedSpecimenAction extends Action {
 
 
 public class SaveImportedSpecimenAction extends Action {
 


@@ -110,6 +115,10 @@ public class SaveImportedSpecimenAction extends Action {
                                unitIdsBioCase = new HashSet<String[]>();
                                bioCaseOccurrenceQuery = new OccurenceQuery(unitIdsBioCase);
                                configuratorAbcd.setOccurenceQuery(bioCaseOccurrenceQuery);
                                unitIdsBioCase = new HashSet<String[]>();
                                bioCaseOccurrenceQuery = new OccurenceQuery(unitIdsBioCase);
                                configuratorAbcd.setOccurenceQuery(bioCaseOccurrenceQuery);

+                               if (dataImportView.getClassification() != null){
+                                       configuratorAbcd.setClassificationUuid(dataImportView.getClassification().getUuid());
+                               }
+                               

                        }
                        tripleId = response.getTripleID();
                        unitIdsBioCase.add(tripleId);
                        }
                        tripleId = response.getTripleID();
                        unitIdsBioCase.add(tripleId);


@@ -134,7 +143,7 @@ public class SaveImportedSpecimenAction extends Action {
             }
         }
  
             }
         }
  

-
+    

     private void persistTerm(DefinedTermBase<?> term, ITermService termService, ConversationHolder conversation){
         if(term!=null){
             //if the term does not exist in the DB save it
     private void persistTerm(DefinedTermBase<?> term, ITermService termService, ConversationHolder conversation){
         if(term!=null){
             //if the term does not exist in the DB save it

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java
index eb01cbb79d91c326f8b7519e2c5a118dcc8f2c84..11674fd2429f717d266ac05617cbbbdf5eb4f052 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java
@@ -71,6 +71,8 @@ public class SpecimenImportView extends DataImportView<SpecimenOrObservationBase
 //                    new TransientCdmRepository(CdmStore.getCurrentApplicationConfiguration());
             //configurator.setCdmAppController(repo);
             configurator.setAddMediaAsMediaSpecimen(true);
 //                    new TransientCdmRepository(CdmStore.getCurrentApplicationConfiguration());
             //configurator.setCdmAppController(repo);
             configurator.setAddMediaAsMediaSpecimen(true);

+            configurator.setAllowReuseOtherClassifications(true);
+            

             Job job = CdmStore.getImportManager().createIOServiceJob(configurator, resultStream, SOURCE_TYPE.INPUTSTREAM);
             CdmStore.getImportManager().run(job);
             
             Job job = CdmStore.getImportManager().createIOServiceJob(configurator, resultStream, SOURCE_TYPE.INPUTSTREAM);
             CdmStore.getImportManager().run(job);
             

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java
index a33c03d9a169d735278a1ee78804ce9f12984bf3..62522a010a1a03b620113953fb3095183059fb7b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java
@@ -80,6 +80,7 @@ public class SpecimenSearchWizard extends Wizard implements IImportWizard {
         configurator.setSourceUri(providerSelectionPage.getEndPoint());
         configurator.setAddMediaAsMediaSpecimen(true);
         configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
         configurator.setSourceUri(providerSelectionPage.getEndPoint());
         configurator.setAddMediaAsMediaSpecimen(true);
         configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);

+        configurator.setIgnoreAuthorship(true);

       
         //Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM);
         //CdmStore.getImportManager().run(job);
       
         //Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM);
         //CdmStore.getImportManager().run(job);