Author: lucaa Date: 2008-01-24 13:49:16 +0100 (Thu, 24 Jan 2008) New Revision: 7070
Modified: xwiki-products/xwiki-watch/trunk/pom.xml xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/Config.java xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/NewArticlesMonitoring.java xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java Log: XWATCH-94: changed dependencies in pom file, fixed bugs caused by the different types returned by custom query. Modified: xwiki-products/xwiki-watch/trunk/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/pom.xml 2008-01-24 12:16:33 UTC (rev 7069) +++ xwiki-products/xwiki-watch/trunk/pom.xml 2008-01-24 12:49:16 UTC (rev 7070) @@ -27,7 +27,7 @@ <parent> <groupId>com.xpn.xwiki.platform</groupId> <artifactId>xwiki</artifactId> - <version>7</version> + <version>9-SNAPSHOT</version> <relativePath>../xwiki-platform-pom</relativePath> </parent> <groupId>com.xpn.xwiki.products</groupId> @@ -44,9 +44,9 @@ <properties> <!-- Versions of XWiki dependencies used in Watch modules --> <platform.tools.version>1.8-SNAPSHOT</platform.tools.version> - <platform.core.version>1.1-SNAPSHOT</platform.core.version> - <platform.web.version>1.1-SNAPSHOT</platform.web.version> - <product.enterprise.version>1.1-SNAPSHOT</product.enterprise.version> + <platform.core.version>1.3-SNAPSHOT</platform.core.version> + <platform.web.version>1.3-SNAPSHOT</platform.web.version> + <product.enterprise.version>1.3-SNAPSHOT</product.enterprise.version> </properties> <modules> <module>web</module> @@ -54,6 +54,14 @@ <module>database</module> <module>distribution</module> </modules> + <profiles> + <profile> + <id>mysql</id> + <properties> + <xwiki.db.connection.url>jdbc:mysql://localhost/xwiki?useServerPrepStmts=false&amp;amp;sessionVariables=sql_mode=''</xwiki.db.connection.url> + </properties> + </profile> + </profiles> <build> <extensions> <extension> Modified: xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/Config.java =================================================================== --- xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/Config.java 2008-01-24 12:16:33 UTC (rev 7069) +++ xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/Config.java 2008-01-24 12:49:16 UTC (rev 7070) @@ -205,8 +205,12 @@ if (list!=null) { for (int i=0;i<list.size();i++) { List result = (List) list.get(i); - String feedname = (String) result.get(0); - Integer count = (Integer)result.get(1); + //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) + String feedname = (String) result.get(0).toString(); + Integer count = new Integer(result.get(1).toString()); Feed feed = (Feed) feedsList.get(feedname); if (feed!=null) { feed.setNb(count); Modified: xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/NewArticlesMonitoring.java =================================================================== --- xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/NewArticlesMonitoring.java 2008-01-24 12:16:33 UTC (rev 7069) +++ xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/NewArticlesMonitoring.java 2008-01-24 12:49:16 UTC (rev 7070) @@ -74,7 +74,8 @@ queryActive = false; if (object!=null) { List nblist= (List) ((List) object).get(0); - Integer nb = (nblist==null) ? null : (Integer) nblist.get(0); + Integer nb = (nblist==null) ? null + : new Integer(nblist.get(0).toString()); if (nb!=null) { int newNbArticles = nb.intValue(); if (currentNbArticles==-1) Modified: xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java =================================================================== --- xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java 2008-01-24 12:16:33 UTC (rev 7069) +++ xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java 2008-01-24 12:49:16 UTC (rev 7070) @@ -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 = ((Integer)result.get(1)).intValue(); + int count = (new Integer(result.get(1).toString())).intValue(); Hyperlink link = new Hyperlink(name, ""); int pixels = 9 + count; if (pixels>15) _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications