Refactoring

 - created "search" package for search UI classes

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index de003d5ecd63a4143656ad60c9479e786e35dab7..d50b764b7ab3178e32bb4644dd14545620718fc6 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -72,8 +72,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateContentProvider;
-import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
+import eu.etaxonomy.taxeditor.view.search.derivative.DerivateContentProvider;
+import eu.etaxonomy.taxeditor.view.search.derivative.DerivateLabelProvider;
 import eu.etaxonomy.taxeditor.workbench.part.ICollapsableExpandable;
 import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
index d03d680626d7e6a99fbd0db9a7f3d136b5fa07d0..65ecb3bfcbbf0b90679ec43553033ed7a7aee5cd 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
@@ -34,7 +34,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.SearchManager;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;
 import eu.etaxonomy.taxeditor.ui.mvc.combo.EnumTermComboController;
-import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
+import eu.etaxonomy.taxeditor.view.search.derivative.DerivateLabelProvider;
 
 /**
  * Controller class for the {@link DerivateSearchComposite}.<br>

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/AlignmentEditorE4.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/AlignmentEditorE4.java
index 80f61f3d6f12da2d7cbce73f8eb63b93022c1d4c..97b32907916076144e09cf63ddb9be65f8d9f267 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/AlignmentEditorE4.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/AlignmentEditorE4.java
@@ -55,7 +55,7 @@ import eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ToggleInsertOverwriteH
 import eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ToggleLeftRightInsertionHandlerE4;
 import eu.etaxonomy.taxeditor.molecular.l10n.Messages;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
+import eu.etaxonomy.taxeditor.view.search.derivative.DerivateLabelProvider;
 import info.bioinfweb.commons.swt.SWTUtils;
 import info.bioinfweb.libralign.alignmentarea.AlignmentArea;
 import info.bioinfweb.libralign.alignmentarea.selection.SelectionModel;

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 2c64b661c2fa4415e1e52bb2e342d249ebf63a47..9cb1a878ff8aa9b928d8dce1d2fcaaafa4540725 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -64,12 +64,12 @@ Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.view,
  eu.etaxonomy.taxeditor.view.datasource,
  eu.etaxonomy.taxeditor.view.datasource.handler,
- eu.etaxonomy.taxeditor.view.derivateSearch,
  eu.etaxonomy.taxeditor.view.detail,
  eu.etaxonomy.taxeditor.view.e4,
  eu.etaxonomy.taxeditor.view.e4.details,
  eu.etaxonomy.taxeditor.view.e4.supplementaldata,
- eu.etaxonomy.taxeditor.view.specimenSearch,
+ eu.etaxonomy.taxeditor.view.search.derivative,
+ eu.etaxonomy.taxeditor.view.search.specimen,
  org.eclipse.wb.swt
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AbstractSampleDesignationDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AbstractSampleDesignationDetailSection.java
index 36bd524a438ea995a422d6ab3eb72f7acbc9a290..ec9030b62b9342b631c2e94f193f302e96695a2f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AbstractSampleDesignationDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AbstractSampleDesignationDetailSection.java
@@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.model.common.Identifier;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
-import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
+import eu.etaxonomy.taxeditor.view.search.derivative.DerivateLabelProvider;
 
 /**
  *

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/CurrentSampleDesignationDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/CurrentSampleDesignationDetailSection.java
index 3f4b04e62b25bc4adf8742e2e182859cd6a0b8f5..ed847e71b8612828a37de28d7a5161acd01a4b8d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/CurrentSampleDesignationDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/CurrentSampleDesignationDetailSection.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.common.Identifier;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.DefaultCdmBaseComparator;
-import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
+import eu.etaxonomy.taxeditor.view.search.derivative.DerivateLabelProvider;
 
 /**
  *

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationHistoryDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationHistoryDetailSection.java
index bdc31e1bda908558e8639db21e2b7eae15bb18ac..5cbdc1e375e7776c9b8c35041872daa9e498a170 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationHistoryDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationHistoryDetailSection.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.common.Identifier;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.DefaultCdmBaseComparator;
-import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
+import eu.etaxonomy.taxeditor.view.search.derivative.DerivateLabelProvider;
 
 /**
  * @author n.hoffmann

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java
index 731cf0e601baf9a71757d31c46b8ac3b20e08fa7..cdb720b8c550826d56a794bfd1f47d78f62912d2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java
@@ -18,7 +18,7 @@ import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.ext.common.ServiceWrapperBase;
 import eu.etaxonomy.cdm.ext.occurrence.bioCase.BioCaseQueryServiceWrapper;
-import eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenProviderSelectionController;
+import eu.etaxonomy.taxeditor.view.search.specimen.SpecimenProviderSelectionController;
 
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizardPage.java
index 9cdc9b123ca2ed640ff36335019965a61949dbf8..6207f1dfa39e07288c36e8bbdf0cb4eebc905fa8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizardPage.java
@@ -14,7 +14,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
-import eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchController;
+import eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchController;
 
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenProviderSelectionWizardPageE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenProviderSelectionWizardPageE4.java
index 22d57246f4d379f55138ec8c823505868b1e9a90..531834883dcba752cc06bf30f4f0acba73b3fdd0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenProviderSelectionWizardPageE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenProviderSelectionWizardPageE4.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite;
 import eu.etaxonomy.cdm.ext.common.ServiceWrapperBase;
 import eu.etaxonomy.cdm.ext.occurrence.bioCase.BioCaseQueryServiceWrapper;
 import eu.etaxonomy.taxeditor.view.dataimport.QueryType;
-import eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenProviderSelectionController;
+import eu.etaxonomy.taxeditor.view.search.specimen.SpecimenProviderSelectionController;
 
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardPageE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardPageE4.java
index c6728e4ef4f1c6b7061d6eae7a0fb4591edce7dc..76e01ceb8b52773da997111f9185d54921ab35a5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardPageE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardPageE4.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
-import eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchController;
+import eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchController;
 
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateContentProvider.java
similarity index 99%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateContentProvider.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateContentProvider.java
index 0aedc17a04bd45d27d0c09673bfbf2b72d9aff0d..9244c93d06026afa03ec44de4965081a26839ffd 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateContentProvider.java
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.view.derivateSearch;
+package eu.etaxonomy.taxeditor.view.search.derivative;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
similarity index 99%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
index 0e25d05e8b575f1ebc8ce9e3fdeef04d415b9f56..b3c8c1fb152758dfa30d10e5edc28377af2cf0cd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.view.derivateSearch;
+package eu.etaxonomy.taxeditor.view.search.derivative;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenProviderSelectionComposite.java
similarity index 98%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenProviderSelectionComposite.java
index b324ca0d4615941e7eaf69852d6c447d087c1835..dd09377e33b6214cdb4106ebf07aefd570fe0dd0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenProviderSelectionComposite.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.view.specimenSearch;
+package eu.etaxonomy.taxeditor.view.search.specimen;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenProviderSelectionController.java
similarity index 98%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionController.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenProviderSelectionController.java
index 916402d84050d44aa2fd185756c6b13948cc1bb8..51f12af7ea9c914d3e43c97d74f6a653cef7d191 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenProviderSelectionController.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.view.specimenSearch;
+package eu.etaxonomy.taxeditor.view.search.specimen;
 
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.swt.SWT;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenSearchComposite.java
similarity index 99%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenSearchComposite.java
index 76b11620ccd7ab1478022d1cdce125b59f6aa1fb..2e49fda49b33deab0e71e5fbdb303f7184d591fd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenSearchComposite.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.view.specimenSearch;
+package eu.etaxonomy.taxeditor.view.search.specimen;
 
 import java.util.List;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenSearchController.java
similarity index 88%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchController.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenSearchController.java
index 6fa3559055e62e2713a8af25908614979b7edeea..f897a5c96a3e02f117d2d76280ce27de31335be3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/specimen/SpecimenSearchController.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.view.specimenSearch;
+package eu.etaxonomy.taxeditor.view.search.specimen;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -106,7 +106,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the taxon name entered in the search view
      * @return the taxon name as a {@link String}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextTaxonName()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getTextTaxonName()
      */
     public String getTaxonName() {
         return specimenSearchComposite.getTextTaxonName().getText();
@@ -115,7 +115,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the collector entered in the search view
      * @return the collector as a {@link String}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextCollector()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getTextCollector()
      */
     public String getCollector() {
         return specimenSearchComposite.getTextCollector().getText();
@@ -124,7 +124,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the collecting number entered in the search view
      * @return the collecting as a {@link String}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextCollectorNumber()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getTextCollectorNumber()
      */
     public String getCollectorNumber() {
         return specimenSearchComposite.getTextCollectorNumber().getText();
@@ -133,7 +133,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the accession number entered in the search view
      * @return the accession number as a {@link String}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextAccessionNumber()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getTextAccessionNumber()
      */
     public String getAccessionNumber() {
         return specimenSearchComposite.getTextAccessionNumber().getText();
@@ -142,7 +142,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the herbarium entered in the search view
      * @return the herbarium as a {@link String}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getComboHerbarium()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getComboHerbarium()
      */
     public String getHerbarium() {
         return specimenSearchComposite.getTextHerbarium().getText();
@@ -151,7 +151,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the country entered in the search view
      * @return the country as a {@link String}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getComboCountry()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getComboCountry()
      */
     public String getCountry(boolean biocase) {
 
@@ -169,7 +169,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the locality entered in the search view
      * @return the locality as a {@link String}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextLocality()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getTextLocality()
      */
     public String getLocality() {
         return specimenSearchComposite.getTextLocality().getText();
@@ -178,7 +178,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the start date entered in the search view.
      * @return the date as an instance of {@link Calendar}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getDateFrom()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getDateFrom()
      */
     public Calendar getDateFrom() {
         if(specimenSearchComposite.getBtnShowDate().getSelection()){
@@ -193,7 +193,7 @@ public class SpecimenSearchController implements Listener{
     /**
      * Returns the end date entered in the search view.
      * @return the date as an instance of {@link Calendar}
-     * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getDateTo()
+     * @see eu.etaxonomy.taxeditor.view.search.specimen.SpecimenSearchComposite#getDateTo()
      */
     public Calendar getDateTo() {
         if(specimenSearchComposite.getBtnShowDate().getSelection()){