Author: lucaa
Date: 2008-02-08 12:09:11 +0100 (Fri, 08 Feb 2008)
New Revision: 7386

Modified:
   
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/Config.java
   
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/NewArticlesMonitoring.java
   
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/ui/dialog/AnalysisDialog.java
   
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java
Log:
Minor code changes: replaced ugly hacks with better code.



Modified: 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/Config.java
===================================================================
--- 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/Config.java
   2008-02-08 11:08:45 UTC (rev 7385)
+++ 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/Config.java
   2008-02-08 11:09:11 UTC (rev 7386)
@@ -204,13 +204,9 @@
     public void updateArticleNumbers(List list) {
         if (list!=null) {
             for (int i=0;i<list.size();i++) {
-                List result = (List) list.get(i);
-                //get the values from Strings rather than rely on a specific 
-                //type returned (direct object cast causes problems in 
-                //1.3 snaphshot due to the long value returned for the 
-                //count on position 1) 
+                List result = (List) list.get(i); 
                 String feedname = (String) result.get(0).toString();
-                Integer count = new Integer(result.get(1).toString());
+                Integer count = new 
Integer(((Number)result.get(1)).intValue());
                 Feed feed = (Feed) feedsList.get(feedname);
                 if (feed!=null) {
                    feed.setNb(count);

Modified: 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/NewArticlesMonitoring.java
===================================================================
--- 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/NewArticlesMonitoring.java
    2008-02-08 11:08:45 UTC (rev 7385)
+++ 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/NewArticlesMonitoring.java
    2008-02-08 11:09:11 UTC (rev 7386)
@@ -75,7 +75,7 @@
                     if (object!=null) {
                         List nblist= (List) ((List) object).get(0);
                         Integer nb = (nblist==null) ? null 
-                                     : new Integer(nblist.get(0).toString());
+                                     : new 
Integer(((Number)nblist.get(0)).intValue());
                         if (nb!=null) {
                             int newNbArticles = nb.intValue();
                             if (currentNbArticles==-1)

Modified: 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/ui/dialog/AnalysisDialog.java
===================================================================
--- 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/ui/dialog/AnalysisDialog.java
 2008-02-08 11:08:45 UTC (rev 7385)
+++ 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/ui/dialog/AnalysisDialog.java
 2008-02-08 11:09:11 UTC (rev 7386)
@@ -70,8 +70,7 @@
                     {
                         if (DOM.eventGetType(event) == Event.ONCLICK) {
                             Element eventTarget = DOM.eventGetTarget(event);
-                            //the ugly way of testing if the eventTarget is an 
anchor
-                            if 
(eventTarget.toString().toLowerCase().startsWith("<a ")) {
+                            if (DOM.getAttribute(eventTarget, 
"tagName").trim().equalsIgnoreCase("a")) {
                                 //close the dialog
                                 AnalysisDialog.this.cancelDialog();
                                 //search

Modified: 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java
===================================================================
--- 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java
   2008-02-08 11:08:45 UTC (rev 7385)
+++ 
xwiki-products/xwiki-watch/trunk/gwt/src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java
   2008-02-08 11:09:11 UTC (rev 7386)
@@ -80,7 +80,7 @@
             for (int i=0;i<list.size();i++) {
                 List result = (List) list.get(i);
                 final String name = (String) result.get(0);
-                int count = (new Integer(result.get(1).toString())).intValue();
+                int count = ((Number)result.get(1)).intValue();
                 Hyperlink link = new Hyperlink(name, "");
                 int pixels = 9 + count;
                 if (pixels>15)

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

Reply via email to