cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
index d6da373a0bd8b4f92c6a28bd11ae8a29ded42773..8d532da19e90ea7266d662c4bb15b9c8d5ca4560 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
@@ -6,7 +6,6 @@
 * 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.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IAgentService;
@@ -17,7 +16,6 @@ import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionWizardPage;
 /**
  * @author n.hoffmann
  * @created Dec 15, 2010
- * @version 1.0
  */
 public class NewInstitutionWizard extends AbstractNewEntityWizard<Institution> {
 
@@ -40,5 +38,4 @@ public class NewInstitutionWizard extends AbstractNewEntityWizard<Institution> {
        protected String getEntityName() {
                return "Institution";
        }
-
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java
index eadc7dd0d10f856c4642b089a275e43474e6df1b..31731bd695d1ac3570ed163a1b4efc4917b73758 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java
@@ -6,7 +6,6 @@
 * 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.ui.dialog.selection;
 
 import java.util.UUID;
@@ -23,39 +22,26 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author n.hoffmann
  * @created Dec 15, 2010
- * @version 1.0
  */
 public class InstitutionSelectionDialog extends
                AbstractFilteredCdmResourceSelectionDialog<Institution> {
 
-       public static Institution select(Shell shell,// ConversationHolder conversation,
+       public static Institution select(Shell shell,
                Institution institution){
                InstitutionSelectionDialog dialog = new InstitutionSelectionDialog(shell, //conversation,
                                "Choose Institution", false, TeamSelectionDialog.class.getCanonicalName(), institution);
                return getSelectionFromDialog(dialog);
        }
 
-       /**
-        * @param shell
-        * @param conversation
-        * @param title
-        * @param multi
-        * @param settings
-        * @param cdmObject
-        */
-       protected InstitutionSelectionDialog(Shell shell,//ConversationHolder conversation,
+       protected InstitutionSelectionDialog(Shell shell,
                String title, boolean multi,
                        String settings, Institution cdmObject) {
-               super(shell, //conversation,
-                       title, multi, settings, cdmObject);
+               super(shell, title, multi, settings, cdmObject);
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)
-        */
        @Override
        protected Institution getPersistentObject(UUID uuid) {
-               AgentBase agentBase = CdmStore.getService(IAgentService.class).load(uuid);
+               AgentBase<?> agentBase = CdmStore.getService(IAgentService.class).load(uuid);
 
                if(agentBase instanceof Institution){
                        return (Institution) agentBase;
@@ -63,31 +49,19 @@ public class InstitutionSelectionDialog extends
                return null;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#search
-        */
        @Override
        protected void callService(String pattern) {
-
-              model = CdmStore.getService(IAgentService.class).getUuidAndTitleCache(Institution.class, limitOfInitialElements,pattern);
-
-
+              model = CdmStore.getService(IAgentService.class)
+                      .getUuidAndTitleCache(Institution.class, limitOfInitialElements, pattern);
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getNewWizardLinkText()
-        */
        @Override
        protected String[] getNewWizardText() {
                return new String[]{"New Institution"};
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getNewEntityWizard(java.lang.String)
-        */
        @Override
-       protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
+       protected AbstractNewEntityWizard<Institution> getNewEntityWizard(String parameter) {
                return new NewInstitutionWizard();
        }
-
-}
+}
\ No newline at end of file