[jboss-svn-commits] JBL Code SVN: r5189 - 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
Wed Jul 19 18:03:41 EDT 2006
Author: szimano
Date: 2006-07-19 18:03:40 -0400 (Wed, 19 Jul 2006)
New Revision: 5189
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/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
Log:
JBLAB-704
modified way of showing tags
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-19 21:41:09 UTC (rev 5188)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/SearchListener.java 2006-07-19 22:03:40 UTC (rev 5189)
@@ -27,10 +27,10 @@
private TextBox keyword;
- private TextArea bio;
+ private HTML bio;
public SearchListener(VerticalPanel results, TextBox tags,
- TextBox author, TextBox keyword, String clas, TextArea bio) {
+ TextBox author, TextBox keyword, String clas, HTML bio) {
this.results = results;
this.clas = clas;
this.tags = tags;
@@ -93,7 +93,7 @@
}
private void getBio(String nickname) {
- bio.setText("");
+ bio.setHTML("");
TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
.create(TaggingService.class);
@@ -103,7 +103,7 @@
AsyncCallback callback = new AsyncCallback() {
public void onSuccess(Object result) {
- bio.setText(result.toString());
+ bio.setHTML(result.toString());
}
public void onFailure(Throwable caught) {
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-19 21:41:09 UTC (rev 5188)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-07-19 22:03:40 UTC (rev 5189)
@@ -65,7 +65,7 @@
private FlexTable suggTable;
- private TextArea bio;
+ private HTML bio;
private Vector suggestionCheckboxes;
@@ -158,6 +158,10 @@
table.removeRow(0);
}
+ table.setHTML(0, 1, "# Subscribers");
+ table.setHTML(0, 2, "Author");
+ table.setHTML(0, 3, "Tags");
+
TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
.create(TaggingService.class);
@@ -183,21 +187,24 @@
String feed = to[3];
String authorFeed = to[4];
String desc = to[5];
+ int subsc = Integer.parseInt(to[6]);
if (!rows.keySet().contains(user)) {
- rows.put(user, new Integer(rowsNum));
+ rows.put(user, new Integer(rowsNum + 1));
+ table.setHTML(rowsNum + 1, 1, String.valueOf(subsc));
table
- .setHTML(rowsNum++, 0, "<b><a href='"
+ .setHTML(++rowsNum, 2, "<b><a href='"
+ authorFeed + "' target='_blank' >"
+ fullName + "</a></b>");
}
int curRow = ((Integer) rows.get(user)).intValue();
- if (table.getText(curRow, 0).equals(currentUser)) {
+ if (table.getText(curRow, 2).equals(currentUser)) {
// current user - add delete button
Image im = new Image("/tagme-servlet/images/delete.gif");
-
+ im.setStyleName("tagme_btn");
+
HorizontalPanel hpanel = new HorizontalPanel();
hpanel.add(new HTML("<a href='" + feed
+ "' target='_blank' title='"
@@ -340,11 +347,11 @@
TextBox keyword = new TextBox();
keyword.setText("");
searchPanel.add(keyword);
-
- bio = new TextArea();
+ bio = new HTML();
+
searchPanel.add(bio);
-
+
searchPanel.add(new Label("Search results"));
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-19 21:41:09 UTC (rev 5188)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-07-19 22:03:40 UTC (rev 5189)
@@ -21,6 +21,7 @@
*/
package org.jboss.labs.tagme.services;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -92,18 +93,24 @@
List<Tag> allTags = service.getTags(path);
for (Tag tag : allTags) {
+ List<String> feedData = new ArrayList<String>();
+ feedData.add(tag.getName());
+ feedData.add(tag.getAuthor());
+
tags.add(tag.getName()
+ TagMeClickListener.TAG_SEP
+ tag.getAuthor()
+ TagMeClickListener.TAG_SEP
+ tag.getAuthor()
+ TagMeClickListener.TAG_SEP
- + service.getFeedLink(FeedType.TAGS, tag.getName(),
+ + service.getFeedLink(FeedType.AUTHOR_TAG, feedData,
"rss2")
+ TagMeClickListener.TAG_SEP
- + service.getFeedLink(FeedType.AUTHOR_ALL, tag.getAuthor(),
- "rss2") + TagMeClickListener.TAG_SEP
- + tag.getData());
+ + service.getFeedLink(FeedType.AUTHOR_ALL, tag
+ .getAuthor(), "rss2")
+ + TagMeClickListener.TAG_SEP + tag.getData()
+ + TagMeClickListener.TAG_SEP
+ + service.getAllSubscribers(tag.getAuthor()));
}
} catch (TagGetException e) {
@@ -111,6 +118,21 @@
e.printStackTrace();
}
+ Collections.sort(tags, new Comparator<String>() {
+
+ public int compare(String o1, String o2) {
+ String[] o1Splited = o1.split(TagMeClickListener.TAG_SEP);
+ String[] o2Splited = o2.split(TagMeClickListener.TAG_SEP);
+
+ return 0 - ((Integer.valueOf(o1Splited[6]).compareTo(
+ Integer.valueOf(o2Splited[6])) == 0) ? (0 - o1Splited[2]
+ .compareTo(o2Splited[2])) : Integer
+ .valueOf(o1Splited[6]).compareTo(
+ Integer.valueOf(o2Splited[6])));
+ }
+
+ });
+
return tags;
}
@@ -120,8 +142,8 @@
try {
if (website) {
service
- .addTag(new WebsiteTag(tag, user, path, desc,
- new Date()));
+ .addTag(new WebsiteTag(tag, user, path, desc,
+ new Date()));
} else {
service
.addTag(new ShotokuTag(tag, user, path, desc,
More information about the jboss-svn-commits
mailing list