[jboss-svn-commits] JBL Code SVN: r5277 - in labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme: . gwt/client services
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 25 11:24:30 EDT 2006
Author: szimano
Date: 2006-07-25 11:24:28 -0400 (Tue, 25 Jul 2006)
New Revision: 5277
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/SearchListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
Log:
testing, removed npes, removed junk from sys out
http://jira.jboss.com/jira/browse/JBLAB-727
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-07-25 15:23:38 UTC (rev 5276)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-07-25 15:24:28 UTC (rev 5277)
@@ -76,7 +76,7 @@
TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
.newInstance();
- log.info("tags: " + tags + "\nspliter: "
+ log.debug("tags: " + tags + "\nspliter: "
+ TagMeClickListener.TAG_SEP);
String[] tagsTable = tags.split(TagMeClickListener.TAG_SEP);
String[] descTable = descriptions.split(TagMeClickListener.TAG_SEP);
@@ -195,6 +195,14 @@
PrimatesService pServ = LabsServices.getPrimatesService();
if (pServ.getPrimate(nickname, "default") != null) {
String bio = pServ.getPrimate(nickname, "default").getBio();
+
+ if (pServ.getUser(nickname).getGivenName() != null
+ && pServ.getUser(nickname).getFamilyName() != null) {
+ bio = "<div class=\"tagme-username\">"
+ + pServ.getUser(nickname).getGivenName() + " "
+ + pServ.getUser(nickname).getFamilyName()
+ + "</div> " + bio;
+ }
return bio;
} else
return NO_INFO;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/SearchListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/SearchListener.java 2006-07-25 15:23:38 UTC (rev 5276)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/SearchListener.java 2006-07-25 15:24:28 UTC (rev 5277)
@@ -6,6 +6,7 @@
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.rpc.ServiceDefTarget;
+import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -28,6 +29,8 @@
private TextBox keyword;
private HTML bio;
+
+ private Button button;
public SearchListener(VerticalPanel results, TextBox tags, TextBox author,
TextBox keyword, String clas, HTML bio) {
@@ -41,6 +44,11 @@
public void onClick(Widget sender) {
results.clear();
+ bio.setHTML(" ");
+
+ button = ((Button)sender);
+
+ button.setEnabled(false);
TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
.create(TaggingService.class);
@@ -56,13 +64,13 @@
boolean oneAuthor = true;
for (int i = 0; i < res.size(); i += 5) {
-
- String tag = (String)res.get(i);
- String author = (String)res.get(i + 1);
- String desc = (String)res.get(i + 2);
- String feed = (String)res.get(i + 3);
- String allResFeed = (String)res.get(i + 4);
+ String tag = (String) res.get(i);
+ String author = (String) res.get(i + 1);
+ String desc = (String) res.get(i + 2);
+ String feed = (String) res.get(i + 3);
+ String allResFeed = (String) res.get(i + 4);
+
if (oneAuthor && last.equals("")) {
last = author.toString();
} else if (oneAuthor) {
@@ -71,22 +79,31 @@
}
}
- results.add(TagMeShowPopupListener.getLink(desc, feed, allResFeed, tag, author));
-
+ results.add(TagMeShowPopupListener.getLink(desc, feed,
+ allResFeed, tag, author));
+
// results.add(new HTML("<a href=\""
// + res.get(i + 1).toString() + "\">"
// + res.get(i).toString() + "</a>"));
}
- if (oneAuthor) {
+ if (res.size() == 0) {
+ results.add(new HTML("<i>No results available</i>"));
+ }
+
+ if (oneAuthor && res.size() > 0) {
getBio(last);
}
+
+ button.setEnabled(true);
}
public void onFailure(Throwable caught) {
Window.alert("Error ! " + caught.getMessage() + " Throwable: "
+ caught);
+
+ button.setEnabled(true);
}
};
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java 2006-07-25 15:23:38 UTC (rev 5276)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java 2006-07-25 15:24:28 UTC (rev 5277)
@@ -44,7 +44,7 @@
private String user;
private Vector textBoxes;
-
+
private Vector descBoxes;
private String clas;
@@ -54,13 +54,15 @@
private Button button;
private TagMeShowPopupListener parent;
-
+
private Vector suggestionCheckboxes;
-
+
private boolean website;
public TagMeClickListener(String path, String user, String clas,
- Vector textBoxes, Vector descBoxes, Label info, Vector suggestionCheckboxes, TagMeShowPopupListener parent, boolean website) {
+ Vector textBoxes, Vector descBoxes, Label info,
+ Vector suggestionCheckboxes, TagMeShowPopupListener parent,
+ boolean website) {
this.path = path;
this.user = user;
this.textBoxes = textBoxes;
@@ -73,7 +75,6 @@
}
public void onClick(Widget sender) {
-
TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
.create(TaggingService.class);
@@ -88,10 +89,15 @@
public void onSuccess(Object result) {
parent.stopProgressAnim("Tags added");
parent.refreshTags();
+
+ for (int i = 0; i < textBoxes.size(); i++) {
+ ((TextBox) textBoxes.get(i)).setText("");
+ ((TextBox) descBoxes.get(i)).setText("");
+ }
}
public void onFailure(Throwable caught) {
- Window.alert("Error ! " + caught.getMessage());
+ Window.alert("Please fill in at least one tag or check at least one suggestion (if available)");
parent.stopProgressAnim("Error while adding tags");
}
};
@@ -103,22 +109,27 @@
for (int i = 0; i < textBoxes.size(); i++) {
String tag = ((TextBox) textBoxes.get(i)).getText();
- String desc = ((TextBox)descBoxes.get(i)).getText();
+ String desc = ((TextBox) descBoxes.get(i)).getText();
+
+ if (desc == null || desc.length() == 0) {
+ desc = tag;
+ }
+
if (tag != null && tag.length() > 0) {
if (tags.length() == 0) {
tags = tag;
descs = desc;
} else {
tags += TAG_SEP + tag;
- descs += TAG_SEP + ((desc != null && desc.length() > 0) ? desc : tag);
+ descs += TAG_SEP
+ + ((desc != null && desc.length() > 0) ? desc : tag);
}
}
}
-
- //TODO desc in suggestions
+
for (int i = 0; i < suggestionCheckboxes.size(); i++) {
- CheckBox chBox = (CheckBox)suggestionCheckboxes.get(i);
-
+ CheckBox chBox = (CheckBox) suggestionCheckboxes.get(i);
+
if (chBox.isChecked()) {
if (tags.length() == 0) {
tags = chBox.getText();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-07-25 15:23:38 UTC (rev 5276)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-07-25 15:24:28 UTC (rev 5277)
@@ -387,7 +387,7 @@
searchPanel.add(bio);
- searchPanel.add(new Label("Search results"));
+ searchPanel.add(new HTML("<div class=\"tagme-search-results\">Search results</div>"));
VerticalPanel results = new VerticalPanel();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-07-25 15:23:38 UTC (rev 5276)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-07-25 15:24:28 UTC (rev 5277)
@@ -42,8 +42,6 @@
public class ShotokuTaggingService implements TagMeTagger {
- private static final String SHOTOKU_TAG = "tag";
-
private static final Logger log = Logger
.getLogger(ShotokuTaggingService.class);
@@ -85,7 +83,7 @@
}
public Vector getTags(String path) {
- log.info("Getting tags for: " + path);
+ log.debug("Getting tags for: " + path);
Vector<String> tags = new Vector<String>();
@@ -143,7 +141,7 @@
public void addTag(String user, String path, String tag, String desc,
boolean website) {
- log.info("Adding tag: " + tag + " for node: " + path);
+ log.debug("Adding tag: " + tag + " for node: " + path);
try {
if (website) {
service
@@ -161,7 +159,7 @@
}
public boolean deleteTag(String user, String path, String tag) {
- log.info("Deleting tag " + tag + " " + path + "...");
+ log.debug("Deleting tag " + tag + " " + path + "...");
try {
List<Tag> tags = service.getTags(path);
@@ -172,7 +170,7 @@
service.deleteTag(tagObj);
}
}
-
+
return true;
} catch (TagGetException e) {
throw new RuntimeException(e);
@@ -198,42 +196,45 @@
}
public Vector search(String tags, String author, String keyword) {
- log.info("Search started");
+ log.debug("Search started");
+ Vector result = new Vector();
+
List<Tag> allTags = service.searchTags(tags, author, keyword);
- Collections.sort(allTags, new Comparator<Tag>() {
+ if (allTags.size() > 0) {
+ Collections.sort(allTags, new Comparator<Tag>() {
- public int compare(Tag o1, Tag o2) {
- if (o2.getFeedVisits().compareTo(o1.getFeedVisits()) == 0) {
- return o2.getName().compareTo(o1.getName());
- } else {
- return o2.getFeedVisits().compareTo(o1.getFeedVisits());
+ public int compare(Tag o1, Tag o2) {
+ if (o2.getFeedVisits().compareTo(o1.getFeedVisits()) == 0) {
+ return o2.getName().compareTo(o1.getName());
+ } else {
+ return o2.getFeedVisits().compareTo(o1.getFeedVisits());
+ }
}
- }
- });
+ });
- Vector result = new Vector();
+ String lastTag = "";
+ for (Tag tag : allTags) {
- String lastTag = "";
- for (Tag tag : allTags) {
+ // check if there are no duplicates
+ if (!tag.getName().equals(lastTag)) {
+ List<String> tagData = new ArrayList<String>();
+ tagData.add(tag.getName());
+ tagData.add(tag.getAuthor());
- // check if there are no duplicates
- if (!tag.getName().equals(lastTag)) {
- List<String> tagData = new ArrayList<String>();
- tagData.add(tag.getName());
- tagData.add(tag.getAuthor());
+ result.add(tag.getName());
+ result.add(tag.getAuthor());
+ result.add(tag.getData());
+ result.add(service.getFeedLink(FeedType.AUTHOR_TAG,
+ tagData, "rss2"));
+ result.add(service.getFeedLink(FeedType.TAGS,
+ tag.getName(), "rss2"));
- result.add(tag.getName());
- result.add(tag.getAuthor());
- result.add(tag.getData());
- result.add(service.getFeedLink(FeedType.AUTHOR_TAG, tagData,
- "rss2"));
- result.add(service.getFeedLink(FeedType.TAGS, tag.getName(),
- "rss2"));
+ lastTag = tag.getName();
+ }
+ }
- lastTag = tag.getName();
- }
}
return result;
More information about the jboss-svn-commits
mailing list