Author: jvelociter
Date: 2007-11-20 17:08:06 +0100 (Tue, 20 Nov 2007)
New Revision: 6036

Modified:
   
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/KeywordsWidget.java
Log:
XWATCH-81 current keyword highlight does not differentiate on the group of the 
keyword
Patch submited by Anca Paula Luca



Modified: 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/KeywordsWidget.java
===================================================================
--- 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/KeywordsWidget.java
   2007-11-20 16:05:07 UTC (rev 6035)
+++ 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/KeywordsWidget.java
   2007-11-20 16:08:06 UTC (rev 6036)
@@ -62,11 +62,13 @@
     public void resetSelections() {
         Iterator it = keywordsLink.keySet().iterator();
         String keywordactive = watch.getFilterStatus().getKeyword();
+        String groupactive = watch.getFilterStatus().getGroup();
         while (it.hasNext()) {
             Keyword keyword  = (Keyword) it.next();
             Hyperlink link = (Hyperlink) keywordsLink.get(keyword);
             if (link!=null) {
-                if (keyword.getName().equals(keywordactive)) {
+                if (keyword.getName().equals(keywordactive) 
+                    && keyword.getGroup().equals(groupactive)) {
                     link.addStyleName(watch.getStyleName("keyword", 
"link-active"));
                 } else {
                     link.removeStyleName(watch.getStyleName("keyword", 
"link-active"));

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to