[jboss-svn-commits] JBL Code SVN: r5012 - labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2006-07-11 15:43:33 -0400 (Tue, 11 Jul 2006)
New Revision: 5012

Modified:
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/ShotokuTag.java
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/Tag.java
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagSearch.java
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/WebsiteTag.java
Log:
tag feed counter


Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/ShotokuTag.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/ShotokuTag.java	2006-07-11 19:06:41 UTC (rev 5011)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/ShotokuTag.java	2006-07-11 19:43:33 UTC (rev 5012)
@@ -16,4 +16,9 @@
     public String getType() {
         return Constants.SHOTOKU_TAG;
     }
+
+	public Integer getFeedCounter() {
+		// TODO Auto-generated method stub - dummy method
+		return 1;
+	}
 }

Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/Tag.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/Tag.java	2006-07-11 19:06:41 UTC (rev 5011)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/Tag.java	2006-07-11 19:43:33 UTC (rev 5012)
@@ -14,4 +14,5 @@
     public String getData();
     public String getType();
     public Date getDateCreated();
+    public Integer getFeedCounter();
 }

Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagSearch.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagSearch.java	2006-07-11 19:06:41 UTC (rev 5011)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagSearch.java	2006-07-11 19:43:33 UTC (rev 5012)
@@ -23,31 +23,48 @@
 	Vector<String> keywordRequiredTokens;
 
 	/**
-	 * Construtor for search. Use nulls or zero length strings if you don't want some of the rules to
-	 * be checked.
+	 * Construtor for search. Use nulls or zero length strings if you don't want
+	 * some of the rules to be checked.
 	 * 
 	 * @param tagString
 	 * @param authorString
 	 * @param keywordString
 	 */
 	public TagSearch(String tagString, String authorString, String keywordString) {
-		tokenizeString(tagString, tagRequiredTokens, tagForbiddenTokens,
-				tagRequestTokens);
+		if (checkQuery(tagString)) {
+			tagRequiredTokens = new Vector<String>();
+			tagForbiddenTokens = new Vector<String>();
+			tagRequestTokens = new Vector<String>();
+			tokenizeString(tagString.trim(), tagRequiredTokens,
+					tagForbiddenTokens, tagRequestTokens);
+		}
 
-		tokenizeString(authorString, authorRequiredTokens,
-				authorForbiddenTokens, authorRequestTokens);
+		if (checkQuery(authorString)) {
+			authorRequiredTokens = new Vector<String>();
+			authorForbiddenTokens = new Vector<String>();
+			authorRequestTokens = new Vector<String>();
+			tokenizeString(authorString.trim(), authorRequiredTokens,
+					authorForbiddenTokens, authorRequestTokens);
+		}
 
-		tokenizeString(keywordString, keywordRequiredTokens,
-				keywordForbiddenTokens, keywordRequestTokens);
+		if (checkQuery(keywordString)) {
+			keywordRequiredTokens = new Vector<String>();
+			keywordForbiddenTokens = new Vector<String>();
+			keywordRequestTokens = new Vector<String>();
+			tokenizeString(keywordString.trim(), keywordRequiredTokens,
+					keywordForbiddenTokens, keywordRequestTokens);
+		}
 	}
 
-	public void tokenizeString(String query, Vector<String> requiredTokens,
+	private boolean checkQuery(String query) {
+		return query != null && query.trim().length() > 0;
+	}
+
+	private void tokenizeString(String query, Vector<String> requiredTokens,
 			Vector<String> forbiddenTokens, Vector<String> requestTokens) {
 
 		if (query != null && query.length() > 0) {
-			requiredTokens = new Vector<String>();
-			forbiddenTokens = new Vector<String>();
-			requestTokens = new Vector<String>();
+
 		} else {
 			return;
 		}

Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/WebsiteTag.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/WebsiteTag.java	2006-07-11 19:06:41 UTC (rev 5011)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/WebsiteTag.java	2006-07-11 19:43:33 UTC (rev 5012)
@@ -16,4 +16,9 @@
     public String getType() {
         return Constants.WEBSITE_TAG;
     }
+
+	public Integer getFeedCounter() {
+		// TODO Auto-generated method stub - dummy method
+		return 1;
+	}
 }