Merged refactoring from development branch.

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

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
index b57c67e3bc28e38d25bfc0f960a75df2d576beae..0ca07983aaf269d2acd64d8edb7b03239c6943d6 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
@@ -6,12 +6,11 @@ package eu.etaxonomy.taxeditor.parser;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.swt.widgets.Control;
-
 import eu.etaxonomy.cdm.api.service.ICommonService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -89,9 +88,9 @@ public class ParseHandler{
         * @param unparsedNameString a {@link java.lang.String} object.
         * @return a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
         */
-       public static TaxonNameBase quickParse(String unparsedNameString){
+       public static TaxonNameBase parseReferencedName(String unparsedNameString, Rank rank){
                TaxonNameBase name = nonViralNameParser.parseReferencedName(unparsedNameString,
-                               PreferencesUtil.getPreferredNomenclaturalCode(), null);
+                               PreferencesUtil.getPreferredNomenclaturalCode(), rank);
 
 //             if (name.hasProblem()) {
 //                     name.setFullTitleCache(unparsedNameString);
@@ -100,6 +99,13 @@ public class ParseHandler{
                return name;
        }
        
+       public static TaxonNameBase parseName(String unparsedNameString, Rank rank){
+               TaxonNameBase name = nonViralNameParser.parseFullName(unparsedNameString,
+                               PreferencesUtil.getPreferredNomenclaturalCode(), rank);
+               
+               return name;
+       }
+       
        /**
         * Creates an empty <code>TaxonNameBase</code> instance with the nomenclatural code
         * currently set in preferences.