merge from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / parser / ParseHandler.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
index 0ca07983aaf269d2acd64d8edb7b03239c6943d6..9616b0ff6225a672da3fdf892527cc88b7e7e09b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
@@ -162,7 +162,7 @@ public class ParseHandler{
                
                MatchMatrix matchMatrix = findMatches(parsedName);
                
-               resolveDuplicates(parsedName, matchMatrix);
+//             resolveDuplicates(parsedName, matchMatrix);
                
                return parsedName;
        }
@@ -329,13 +329,13 @@ public class ParseHandler{
         * @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;
        }
 }