Merge branch 'release' into integration/master

zanata · Sep 11, 2012 · b0df4d0 · b0df4d0
2 parents d520746 + 2dfccb5
commit b0df4d0
Showing 1 changed file with 7 additions and 20 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
@@ -146,7 +146,7 @@ public List<Object[]> getSearchResult(TransMemoryQuery query, LocaleId locale, f
       // 'Lucene' in the editor
       case RAW:
          queryText = query.getQueries().get(0);
-         if (StringUtils.isEmpty(queryText))
+         if (StringUtils.isBlank(queryText))
          {
             return new ArrayList<Object[]>();
          }
@@ -155,7 +155,7 @@ public List<Object[]> getSearchResult(TransMemoryQuery query, LocaleId locale, f
       // 'Fuzzy' in the editor
       case FUZZY:
          queryText = QueryParser.escape(query.getQueries().get(0));
-         if (StringUtils.isEmpty(queryText))
+         if (StringUtils.isBlank(queryText))
          {
             return new ArrayList<Object[]>();
          }
@@ -164,7 +164,7 @@ public List<Object[]> getSearchResult(TransMemoryQuery query, LocaleId locale, f
       // 'Phrase' in the editor
       case EXACT:
          queryText = "\"" + QueryParser.escape(query.getQueries().get(0)) + "\"";
-         if (StringUtils.isEmpty(queryText))
+         if (StringUtils.isBlank(queryText))
          {
             return new ArrayList<Object[]>();
          }
@@ -176,11 +176,10 @@ public List<Object[]> getSearchResult(TransMemoryQuery query, LocaleId locale, f
          for (int i = 0; i < query.getQueries().size(); i++)
          {
             multiQueryText[i] = QueryParser.escape(query.getQueries().get(i));
-         }
-
-         if (containEmptyString(multiQueryText))
-         {
-            return new ArrayList<Object[]>();
+            if (StringUtils.isBlank(multiQueryText[i]))
+            {
+               return new ArrayList<Object[]>();
+            }
          }
          break;
       default:
@@ -217,18 +216,6 @@ public List<Object[]> getSearchResult(TransMemoryQuery query, LocaleId locale, f
       return matches;
    }
 
-   private boolean containEmptyString(String[] queries)
-   {
-      for (int i = 0; i < queries.length; i++)
-      {
-         if (StringUtils.isEmpty(queries[i]))
-         {
-            return true;
-         }
-      }
-      return false;
-   }
-
    public int getTotalWords()
    {
       Query q = getSession().createQuery("select sum(tf.wordCount) from HTextFlow tf where tf.obsolete=0");