[jboss-svn-commits] JBL Code SVN: r5053 - in labs/jbosslabs/trunk/portal-extensions: forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/services jbosswiki/forge-wiki/src/java/org/jboss/wiki jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess jbosswiki/wiki-common/src/java/org/jboss/wiki jbosswiki/wiki-management/src/java/org/jboss/wiki/management jbosswiki/wiki-test/src/java/org/jboss/wiki/test
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 12 17:30:55 EDT 2006
Author: szimano
Date: 2006-07-12 17:30:48 -0400 (Wed, 12 Jul 2006)
New Revision: 5053
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/services/ShotokuTaggingService.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java
Log:
wiki bugs
tagme description show
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-12 21:17:29 UTC (rev 5052)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-07-12 21:30:48 UTC (rev 5053)
@@ -129,8 +129,8 @@
AsyncCallback callback = new AsyncCallback() {
public void onSuccess(Object result) {
- Vector res = (Vector)result;
-
+ Vector res = (Vector) result;
+
for (int i = 0; i < res.size(); i++) {
listBox.addItem(res.get(i).toString());
}
@@ -176,6 +176,7 @@
String fullName = to[2];
String feed = to[3];
String authorFeed = to[4];
+ String desc = to[5];
if (!rows.keySet().contains(user)) {
rows.put(user, new Integer(rowsNum));
@@ -193,7 +194,9 @@
HorizontalPanel hpanel = new HorizontalPanel();
hpanel.add(new HTML("<a href='" + feed
- + "' target='_blank' >" + tag + "</a>"));
+ + "' target='_blank' title='"
+ + ((desc == null) ? "" : desc) + "' >" + tag
+ + "</a>"));
hpanel.add(im);
im.addClickListener(new DeleteTagClickListener(
@@ -204,7 +207,8 @@
} else {
// just show tag
table.setHTML(curRow, table.getCellCount(curRow),
- "<a href='" + feed + "' target='_blank' >"
+ "<a href='" + feed + "' target='_blank' title='"
+ + ((desc == null) ? "" : desc) + "' >"
+ tag + "</a>");
}
}
@@ -221,8 +225,8 @@
// refresh tags also
refreshSugestions();
-
- //refresh all tags list
+
+ // refresh all tags list
refreshAllTags();
}
@@ -243,8 +247,9 @@
HorizontalPanel customs = new HorizontalPanel();
VerticalPanel boxes = new VerticalPanel();
VerticalPanel descriptions = new VerticalPanel();
-
- customs.add(boxes); customs.add(descriptions);
+
+ customs.add(boxes);
+ customs.add(descriptions);
input.add(customs);
VerticalPanel suggestions = new VerticalPanel();
@@ -261,17 +266,17 @@
Vector textBoxes = new Vector();
Vector descBoxes = new Vector();
-
+
for (int i = 0; i < 3; i++) {
TextBox box = new TextBox();
TextBox desc = new TextBox();
-
+
textBoxes.add(box);
descBoxes.add(desc);
-
+
boxes.add(new Label("Name"));
boxes.add(box);
-
+
descriptions.add(new Label("Description"));
descriptions.add(desc);
}
@@ -284,7 +289,8 @@
HorizontalPanel btnPanel = new HorizontalPanel();
this.saveBtn = new Button("Save", new TagMeClickListener(path,
- currentUser, clas, textBoxes, descBoxes, info, suggestionCheckboxes, this));
+ currentUser, clas, textBoxes, descBoxes, info,
+ suggestionCheckboxes, this));
btnPanel.add(saveBtn);
btnPanel.add(new Button("Close", new ClickListener() {
@@ -328,17 +334,18 @@
searchPanel.add(keyword);
searchPanel.add(new Label("Search results"));
-
+
VerticalPanel results = new VerticalPanel();
-
+
searchPanel.add(results);
-
+
HorizontalPanel buttons = new HorizontalPanel();
-
- buttons.add(new Button("Search", new SearchListener(results, tags, author, keyword, clas)));
-
+
+ buttons.add(new Button("Search", new SearchListener(results, tags,
+ author, keyword, clas)));
+
searchPanel.add(buttons);
-
+
buttons.add(new Button("Close", new ClickListener() {
public void onClick(Widget sender) {
@@ -346,7 +353,7 @@
}
}));
-
+
searchPanel.add(buttons);
tabs.add(searchPanel, "Tag Search");
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-12 21:17:29 UTC (rev 5052)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-07-12 21:30:48 UTC (rev 5053)
@@ -101,7 +101,8 @@
"rss2")
+ TagMeClickListener.TAG_SEP
+ service.getFeedLink(FeedType.AUTHOR, tag.getAuthor(),
- "rss2"));
+ "rss2") + TagMeClickListener.TAG_SEP
+ + tag.getData());
}
} catch (TagGetException e) {
@@ -221,10 +222,10 @@
Collections.sort(allTags, new Comparator<Tag>() {
public int compare(Tag o1, Tag o2) {
- if (o1.getFeedCounter().compareTo(o2.getFeedCounter()) == 0) {
- return o1.getName().compareTo(o2.getName());
+ if (o2.getFeedCounter().compareTo(o1.getFeedCounter()) == 0) {
+ return o2.getName().compareTo(o1.getName());
} else {
- return o1.getFeedCounter().compareTo(o2.getFeedCounter());
+ return o2.getFeedCounter().compareTo(o1.getFeedCounter());
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2006-07-12 21:17:29 UTC (rev 5052)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2006-07-12 21:30:48 UTC (rev 5053)
@@ -46,7 +46,7 @@
import org.jboss.wiki.exceptions.EditingNotAllowedException;
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
import org.jboss.wiki.exceptions.WikiSaveException;
-import org.jboss.wiki.management.WikiServiceMenagement;
+import org.jboss.wiki.management.WikiServiceManagement;
/**
* The WikiPortlet.
@@ -75,7 +75,7 @@
WikiCommon wikiCommon = new WikiCommon();
try {
- WikiServiceMenagement wikiServiceMenagement = wikiCommon
+ WikiServiceManagement wikiServiceMenagement = wikiCommon
.getWikiManagement();
wikiEngine = wikiServiceMenagement.getWikiEngine();
} catch (WikiManagementNotFoundException e1) {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2006-07-12 21:17:29 UTC (rev 5052)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2006-07-12 21:30:48 UTC (rev 5053)
@@ -53,7 +53,7 @@
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
-import org.jboss.wiki.management.WikiServiceMenagement;
+import org.jboss.wiki.management.WikiServiceManagement;
/**
@@ -89,10 +89,8 @@
log = Logger.getLogger(WikiFileAccessFilter.class);
- WikiCommon wikiCommon = new WikiCommon();
-
try {
- WikiServiceMenagement wikiServiceMenagement = wikiCommon
+ WikiServiceManagement wikiServiceMenagement = WikiCommon
.getWikiManagement();
wikiEngine = wikiServiceMenagement.getWikiEngine();
} catch (WikiManagementNotFoundException e1) {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2006-07-12 21:17:29 UTC (rev 5052)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2006-07-12 21:30:48 UTC (rev 5053)
@@ -22,7 +22,6 @@
package org.jboss.wiki;
import java.io.File;
-import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2006-07-12 21:17:29 UTC (rev 5052)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2006-07-12 21:30:48 UTC (rev 5053)
@@ -39,7 +39,7 @@
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
import org.jboss.wiki.management.EMailNotifier;
import org.jboss.wiki.management.NotificationMsg;
-import org.jboss.wiki.management.WikiServiceMenagement;
+import org.jboss.wiki.management.WikiServiceManagement;
import org.jboss.wiki.plugins.DifferenceEngine;
import org.jboss.wiki.plugins.WatchListPlugin;
@@ -57,14 +57,14 @@
private static Logger log = Logger.getLogger(WikiCommon.class);
- private static WikiServiceMenagement wikiServiceMenagement;
+ private static WikiServiceManagement wikiServiceMenagement;
- public static WikiServiceMenagement getWikiManagement()
+ public static WikiServiceManagement getWikiManagement()
throws WikiManagementNotFoundException {
try {
if (wikiServiceMenagement == null)
- wikiServiceMenagement = (WikiServiceMenagement) MBeanProxyExt
- .create(WikiServiceMenagement.class, WIKI_SERVICE_NAME,
+ wikiServiceMenagement = (WikiServiceManagement) MBeanProxyExt
+ .create(WikiServiceManagement.class, WIKI_SERVICE_NAME,
MBeanServerLocator.locate());
return wikiServiceMenagement;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java 2006-07-12 21:17:29 UTC (rev 5052)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java 2006-07-12 21:30:48 UTC (rev 5053)
@@ -29,14 +29,14 @@
import org.jboss.logging.Logger;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiEngine;
-import org.jboss.wiki.management.WikiServiceMenagement;
+import org.jboss.wiki.management.WikiServiceManagement;
@Service(objectName = WikiCommon.WIKI_SERVICE_NAME)
@Local(WikiServiceLocal.class)
@Remote(WikiServiceRemote.class)
- at Management(WikiServiceMenagement.class)
+ at Management(WikiServiceManagement.class)
public class WikiService implements WikiServiceLocal, WikiServiceRemote,
- WikiServiceMenagement {
+ WikiServiceManagement {
private WikiEngine wikiEngine;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java 2006-07-12 21:17:29 UTC (rev 5052)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java 2006-07-12 21:30:48 UTC (rev 5053)
@@ -42,7 +42,7 @@
import org.jboss.wiki.exceptions.PageRenamingException;
import org.jboss.wiki.exceptions.WikiException;
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
-import org.jboss.wiki.management.WikiServiceMenagement;
+import org.jboss.wiki.management.WikiServiceManagement;
public class WikiTest extends TestCase {
protected WikiEngine wikiEngine;
@@ -90,7 +90,7 @@
WikiCommon wikiCommon = new WikiCommon();
try {
- WikiServiceMenagement wikiServiceMenagement = wikiCommon
+ WikiServiceManagement wikiServiceMenagement = wikiCommon
.getWikiManagement();
wikiEngine = wikiServiceMenagement.getWikiEngine();
} catch (WikiManagementNotFoundException e1) {
More information about the jboss-svn-commits
mailing list