[jboss-svn-commits] JBL Code SVN: r5241 - 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
Fri Jul 21 20:15:17 EDT 2006
Author: szimano
Date: 2006-07-21 20:15:14 -0400 (Fri, 21 Jul 2006)
New Revision: 5241
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/DeleteTagClickListener.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/gwt/client/TaggingService.java
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/TagMeTagger.java
Log:
modified refresh bug in tagme JBLAB-724
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-21 23:44:29 UTC (rev 5240)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-07-22 00:15:14 UTC (rev 5241)
@@ -40,7 +40,7 @@
TaggingService {
private final static Logger log = Logger.getLogger(TagMeServlet.class);
-
+
private static final String NO_INFO = "<i>No info available</i>";
/**
@@ -70,7 +70,7 @@
return vect;
}
- public boolean addTag(String user, String path, String clas, String tags,
+ public String addTag(String user, String path, String clas, String tags,
String descriptions, boolean website) {
try {
TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
@@ -85,31 +85,29 @@
tagger.addTag(user, path, tagsTable[i], descTable[i], website);
}
- return true;
+ return String.valueOf(true);
} catch (InstantiationException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- return false;
+ return String.valueOf(false);
} catch (IllegalAccessException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- return false;
+ return String.valueOf(false);
} catch (ClassNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- return false;
+ return String.valueOf(false);
}
}
- public boolean deleteTag(String user, String path, String clas, String tag) {
+ public String deleteTag(String user, String path, String clas, String tag) {
try {
TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
.newInstance();
- tagger.deleteTag(user, path, tag);
-
- return true;
+ return String.valueOf(tagger.deleteTag(user, path, tag));
} catch (InstantiationException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -121,7 +119,7 @@
e.printStackTrace();
}
- return false;
+ return String.valueOf(false);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/DeleteTagClickListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/DeleteTagClickListener.java 2006-07-21 23:44:29 UTC (rev 5240)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/DeleteTagClickListener.java 2006-07-22 00:15:14 UTC (rev 5241)
@@ -60,8 +60,8 @@
AsyncCallback callback = new AsyncCallback() {
public void onSuccess(Object result) {
+ parent.stopProgressAnim("Tag deleted");
parent.refreshTags();
- parent.stopProgressAnim("Tag deleted");
}
public void onFailure(Throwable caught) {
@@ -71,8 +71,8 @@
};
+ parent.startProgressAnim("Deleting tag");
tagging.deleteTag(user, path, clas, tag, callback);
- parent.startProgressAnim("Deleting tag");
}
}
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-21 23:44:29 UTC (rev 5240)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-07-22 00:15:14 UTC (rev 5241)
@@ -92,7 +92,7 @@
suggestionCheckboxes = new Vector();
while (suggTable.getRowCount() > 0) {
- table.removeRow(0);
+ suggTable.removeRow(0);
}
TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
@@ -106,17 +106,17 @@
Vector vect = (Vector) result;
if (vect.size() > 0) {
- int rowLen = (int) Math.sqrt(vect.size());
+ int rowLen = (int) Math.sqrt(vect.size());
- for (int i = 0; i < vect.size(); i++) {
- CheckBox chBox = new CheckBox((String) vect.get(i));
- suggTable.setWidget(i / rowLen, i % rowLen, chBox);
- suggestionCheckboxes.add(chBox);
+ for (int i = 0; i < vect.size(); i++) {
+ CheckBox chBox = new CheckBox((String) vect.get(i));
+ suggTable.setWidget(i / rowLen, i % rowLen, chBox);
+ suggestionCheckboxes.add(chBox);
+ }
+ } else {
+ suggTable.setHTML(0, 0,
+ "<i>There are no suggestions available</i>");
}
- }
- else {
- suggTable.setHTML(0, 0, "<i>There are no suggestions available</i>");
- }
}
public void onFailure(Throwable caught) {
@@ -159,14 +159,6 @@
public void refreshTags() {
- while (table.getRowCount() > 0) {
- 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);
@@ -177,12 +169,15 @@
public void onSuccess(Object result) {
Vector vect = (Vector) result;
+ table.setHTML(0, 1, "# Subscribers");
+ table.setHTML(0, 2, "Author");
+ table.setHTML(0, 3, "Tags");
+
HashMap rows = new HashMap();
int rowsNum = 0;
for (int i = 0; i < vect.size(); i++) {
-
String[] to = ((String) vect.get(i))
.split(TagMeClickListener.TAG_SEP);
@@ -199,8 +194,14 @@
if (!rows.keySet().contains(user)) {
rows.put(user, new Integer(rowsNum + 1));
table.setHTML(rowsNum + 1, 1, String.valueOf(subsc));
- table
- .setWidget(++rowsNum, 2, getAuthorLink(fullName, user, authorFeed, authorUniqueFeed));
+ table.setWidget(++rowsNum, 2, getAuthorLink(fullName,
+ user, authorFeed, authorUniqueFeed));
+
+ //delete all cells (if they are any from last refreshing)
+ while (table.getCellCount(rowsNum) > 3) {
+ table.removeCell(rowsNum, table.getCellCount(rowsNum) - 1);
+ }
+
}
int curRow = ((Integer) rows.get(user)).intValue();
@@ -209,11 +210,11 @@
// current user - add delete button
Image im = new Image("/tagme-servlet/images/delete.gif");
im.setStyleName("tagme_btn");
-
+
HorizontalPanel hpanel = new HorizontalPanel();
-
+
hpanel.add(getLink(desc, feed, allResFeed, tag, user));
-
+
hpanel.add(im);
im.addClickListener(new DeleteTagClickListener(
@@ -227,6 +228,14 @@
getLink(desc, feed, allResFeed, tag, user));
}
}
+
+ if ((rowsNum + 1)< table.getRowCount()) {
+ for (int i = rowsNum + 1; i < table.getRowCount(); i++) {
+ for (int j = 0; j < table.getCellCount(i); j++) {
+ table.setWidget(i, j, new Label(""));
+ }
+ }
+ }
}
public void onFailure(Throwable caught) {
@@ -234,7 +243,7 @@
+ caught);
}
};
-
+
// call AJAX methos, after that callback is going to be executed
tagging.getTags(path, clas, callback);
@@ -245,27 +254,31 @@
refreshAllTags();
}
- public static HTML getLink(String desc, String feed, String allResFeed, String tag, String user) {
- HTML link = new HTML("<a href='" + /*feed*/ ""
- + "' target='_blank' title='"
- + ((desc == null) ? "" : desc) + "' onclick='return false' >" + tag
- + "</a>");
-
- link.addClickListener(new ShowFeedsListener(feed, allResFeed, tag, user));
-
+ public static HTML getLink(String desc, String feed, String allResFeed,
+ String tag, String user) {
+ HTML link = new HTML("<a href='" + /* feed */""
+ + "' target='_blank' title='" + ((desc == null) ? "" : desc)
+ + "' onclick='return false' >" + tag + "</a>");
+
+ link
+ .addClickListener(new ShowFeedsListener(feed, allResFeed, tag,
+ user));
+
return link;
}
-
- public static HTML getAuthorLink(String fullName, String author, String allFeed, String uniqueFeed) {
- HTML link = new HTML("<b><a href='" + /*feed*/ ""
+
+ public static HTML getAuthorLink(String fullName, String author,
+ String allFeed, String uniqueFeed) {
+ HTML link = new HTML("<b><a href='" + /* feed */""
+ "' target='_blank' onclick='return false' >" + fullName
+ "</a></b>");
-
- link.addClickListener(new ShowAuthorFeedsListener(author, allFeed, uniqueFeed));
-
+
+ link.addClickListener(new ShowAuthorFeedsListener(author, allFeed,
+ uniqueFeed));
+
return link;
}
-
+
public void onClick(Widget sender) {
VerticalPanel panel = new VerticalPanel();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-07-21 23:44:29 UTC (rev 5240)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-07-22 00:15:14 UTC (rev 5241)
@@ -41,9 +41,9 @@
*/
public Vector getTags(String path, String clas);
- public boolean addTag(String user, String path, String clas, String tags, String descriptions, boolean website);
+ public String addTag(String user, String path, String clas, String tags, String descriptions, boolean website);
- public boolean deleteTag(String user, String path, String clas, String tag);
+ public String deleteTag(String user, String path, String clas, String tag);
public Vector getSugestions(String path, String clas);
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-21 23:44:29 UTC (rev 5240)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-07-22 00:15:14 UTC (rev 5241)
@@ -160,7 +160,7 @@
}
- public void deleteTag(String user, String path, String tag) {
+ public boolean deleteTag(String user, String path, String tag) {
log.info("Deleting tag " + tag + " " + path + "...");
try {
@@ -172,33 +172,13 @@
service.deleteTag(tagObj);
}
}
+
+ return true;
} catch (TagGetException e) {
throw new RuntimeException(e);
} catch (TagDeleteException e) {
throw new RuntimeException(e);
}
-
- /*
- * try {
- *
- *
- * Node node = ContentManager.getContentManager().getNode(path);
- *
- * Iterator it = node.getProperties().keySet().iterator(); boolean found =
- * false; String key = null;
- *
- * while (!found && it.hasNext()) { key = (String) it.next(); if
- * (node.getProperties().get(key).equals(tag)) { found = true; } }
- *
- * if (found) { node.deleteProperty(key); try { node.save("Removing tag: " +
- * tag + " by user: " + user);
- *
- * log.info("tag deleted ! (key: " + key + " )"); } catch (SaveException
- * e) { e.printStackTrace(); } } } catch (RepositoryException e) { //
- * TODO Auto-generated catch block e.printStackTrace(); } catch
- * (ResourceDoesNotExist e) { // TODO Auto-generated catch block
- * e.printStackTrace(); }
- */
}
public Vector getAllTags() {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-07-21 23:44:29 UTC (rev 5240)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-07-22 00:15:14 UTC (rev 5241)
@@ -28,7 +28,7 @@
public void addTag(String user, String path, String tag, String desc, boolean website);
- public void deleteTag(String user, String path, String tag);
+ public boolean deleteTag(String user, String path, String tag);
public Vector getSuggestions(String path);
More information about the jboss-svn-commits
mailing list