Thread: [Openutils-svn] SF.net SVN: openutils:[2420] trunk/openutils-mgnltagcloud/src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2420
          http://openutils.svn.sourceforge.net/openutils/?rev=2420&view=rev
Author:   cstrap
Date:     2010-05-12 15:32:12 +0000 (Wed, 12 May 2010)

Log Message:
-----------
TAGCLOUD-7 Change Elfunction methods name: allow compatibility with freemarker template 

Modified Paths:
--------------
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
    trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
    trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java

Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
===================================================================

--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java	2010-05-12 15:14:11 UTC (rev 2419)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java	2010-05-12 15:32:12 UTC (rev 2420)
@@ -56,7 +56,7 @@
      * @param name of the tagCloud
      * @return map of tags
      */
-    public static Map<String, Integer> getNamedTagCloud(String name)
+    public static Map<String, Integer> named(String name)
     {
         TagCloud tagCloud = TagCloudManager.getInstance().getTagCloud(name);
         return tagCloud != null ? tagCloud.getTags() : new HashMap<String, Integer>();
@@ -70,7 +70,7 @@
      * @param count how many tags
      * @return map of tags
      */
-    public static Map<String, Integer> getTagCloud(String repository, String path, String propertyName, int count)
+    public static Map<String, Integer> notcached(String repository, String path, String propertyName, int count)
     {
         return internalGetTagCloud(repository, path, propertyName, count, false);
     }
@@ -83,7 +83,7 @@
      * @param count how many tags
      * @return map of tags
      */
-    public static Map<String, Integer> getCachedTagCloud(String repository, String path, String propertyName, int count)
+    public static Map<String, Integer> cached(String repository, String path, String propertyName, int count)
     {
         return internalGetTagCloud(repository, path, propertyName, count, true);
     }
@@ -117,7 +117,7 @@
             TagCloudManager.getInstance().calculateTagCloud(tagCloud);
         }
 
-        return tagCloud != null ? sortByName(tagCloud.getTags(), true) : new HashMap<String, Integer>();
+        return tagCloud != null ? sortbyname(tagCloud.getTags(), true) : new HashMap<String, Integer>();
     }
 
     /**
@@ -126,7 +126,7 @@
      * @param ascending sort direction
      * @return sorted tag cloud
      */
-    public static Map<String, Integer> sortByName(Map<String, Integer> tags, boolean ascending)
+    public static Map<String, Integer> sortbyname(Map<String, Integer> tags, boolean ascending)
     {
         return sort(tags, new ValueComparer<String, Integer>(tags, true, ascending));
     }
@@ -137,7 +137,7 @@
      * @param ascending sort direction
      * @return sorted tag cloud
      */
-    public static Map<String, Integer> sortByCount(Map<String, Integer> tags, boolean ascending)
+    public static Map<String, Integer> sortbycount(Map<String, Integer> tags, boolean ascending)
     {
         return sort(tags, new ValueComparer<String, Integer>(tags, false, ascending));
     }
@@ -160,9 +160,9 @@
      * @param tagCloud tagCloud
      * @return tag cloud properties
      */
-    public static Map<String, Integer> getTagCloudProperties(Map<String, Integer> tagCloud)
+    public static Map<String, Integer> props(Map<String, Integer> tagCloud)
     {
-        Map<String, Integer> sorted = sortByCount(tagCloud, true);
+        Map<String, Integer> sorted = sortbycount(tagCloud, true);
         Integer[] values = sorted.values().toArray(new Integer[sorted.size()]);
 
         Map<String, Integer> properties = new HashMap<String, Integer>(3);

Modified: trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld	2010-05-12 15:14:11 UTC (rev 2419)
+++ trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld	2010-05-12 15:32:12 UTC (rev 2420)
@@ -175,7 +175,7 @@
     <name>named</name>
     <description>Get a tag cloud configured in adminCentral (which caches values and updates on repository operations)</description>
     <function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
-    <function-signature>info.util.Map getNamedTagCloud(java.lang.String)</function-signature>
+    <function-signature>info.util.Map named(java.lang.String)</function-signature>
     <example>
       <![CDATA[
       <c:set var="tagCloud" value="${tagcloud:named('articles')}" />
@@ -189,7 +189,7 @@
     <name>cached</name>
     <description>Create a tag cloud, cache it, and link it to repository events for updates</description>
     <function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
-    <function-signature>info.util.Map getCachedTagCloud(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
+    <function-signature>info.util.Map cached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
     <example>
       <![CDATA[
       <c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -203,7 +203,7 @@
     <name>notcached</name>
     <description>Calculate tag cloud, without caching it. Each call to notcached will calculate tags from lucene indicies</description>
     <function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
-    <function-signature>info.util.Map getTagCloud(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
+    <function-signature>info.util.Map notcached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
     <example>
       <![CDATA[
       <c:set var="tagCloud" value="${tagcloud:notcached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -217,7 +217,7 @@
     <name>props</name>
     <description>Get a map with some properties of passed tag cloud: min which holds the number of hits for the less used tag, max which holds the number of hits for the most used tag. Could be useful for normalization work.</description>
     <function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
-    <function-signature>info.util.Map getTagCloudProperties(java.util.Map)</function-signature>
+    <function-signature>info.util.Map props(java.util.Map)</function-signature>
     <example>
       <![CDATA[
       <c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -231,7 +231,7 @@
     <name>sortbyname</name>
     <description>Sort a tag cloud by tag names. If the second parameter is true, the sort order is ascending otherwise descending. </description>
     <function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
-    <function-signature>info.util.Map sortByName(java.util.Map, boolean)</function-signature>
+    <function-signature>info.util.Map sortbyname(java.util.Map, boolean)</function-signature>
     <example>
       <![CDATA[
       <c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -243,7 +243,7 @@
     <name>sortbycount</name>
     <description>Sort a tag cloud by tag count. If the second parameter is true, the sort order is ascending otherwise descending. </description>
     <function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
-    <function-signature>info.util.Map sortByCount(java.util.Map, boolean)</function-signature>
+    <function-signature>info.util.Map sortbycount(java.util.Map, boolean)</function-signature>
     <example>
       <![CDATA[
       <c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />

Modified: trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2010-05-12 15:14:11 UTC (rev 2419)
+++ trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2010-05-12 15:32:12 UTC (rev 2420)
@@ -91,11 +91,11 @@
     {
         log.info("\n----------------------------------------\nTEST: performance");
         long time = System.currentTimeMillis();
-        Map<String, Integer> tags = TagCloudElFunctions.getTagCloud(ContentRepository.WEBSITE, "/", "tags", 10);
+        Map<String, Integer> tags = TagCloudElFunctions.notcached(ContentRepository.WEBSITE, "/", "tags", 10);
         log.info("Time: " + (System.currentTimeMillis() - time));
         log.info("Map: {}", tags);
         time = System.currentTimeMillis();
-        tags = TagCloudElFunctions.getTagCloud(ContentRepository.WEBSITE, "/", "tags", 12);
+        tags = TagCloudElFunctions.notcached(ContentRepository.WEBSITE, "/", "tags", 12);
         log.info("Time: " + (System.currentTimeMillis() - time));
         log.info("Map: {}", tags);
     }
@@ -108,7 +108,7 @@
     {
         log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.getTagCloud by path");
         long time = System.currentTimeMillis();
-        Map<String, Integer> tags = TagCloudElFunctions.getTagCloud(ContentRepository.WEBSITE, pathList[0], "tags", 2);
+        Map<String, Integer> tags = TagCloudElFunctions.notcached(ContentRepository.WEBSITE, pathList[0], "tags", 2);
         log.info("Time: " + (System.currentTimeMillis() - time));
         log.info("PathMap freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag1 tag4"));
@@ -122,7 +122,7 @@
     {
         log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.getCachedTagCloud");
         long time = System.currentTimeMillis();
-        Map<String, Integer> tags = TagCloudElFunctions.getCachedTagCloud(
+        Map<String, Integer> tags = TagCloudElFunctions.cached(
             ContentRepository.WEBSITE,
             pathList[1],
             "tags",
@@ -131,7 +131,7 @@
         log.info("tagCloud freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag2"));
         time = System.currentTimeMillis();
-        tags = TagCloudElFunctions.getCachedTagCloud(ContentRepository.WEBSITE, pathList[1], "tags", 1);
+        tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 1);
         log.info("Time: " + (System.currentTimeMillis() - time));
         log.info("tagCloud freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag1 tag4"));
@@ -144,8 +144,8 @@
     public void testSortByName()
     {
         log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.sortByName");
-        Map<String, Integer> tags = TagCloudElFunctions.getCachedTagCloud(ContentRepository.WEBSITE, "/", "tags", 2);
-        Map<String, Integer> orderedTags = TagCloudElFunctions.sortByName(tags, false);
+        Map<String, Integer> tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, "/", "tags", 2);
+        Map<String, Integer> orderedTags = TagCloudElFunctions.sortbyname(tags, false);
         log.info("Tags: {}", tags);
         log.info("Ordered Tags: {}", orderedTags);
 
@@ -159,13 +159,13 @@
     public void testSortByCount()
     {
         log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.sortByCount");
-        Map<String, Integer> tags = TagCloudElFunctions.getCachedTagCloud(
+        Map<String, Integer> tags = TagCloudElFunctions.cached(
             ContentRepository.WEBSITE,
             "/site",
             "tags",
             10);
         log.info("Tags: {}", tags);
-        Map<String, Integer> countedTags = TagCloudElFunctions.sortByCount(tags, false);
+        Map<String, Integer> countedTags = TagCloudElFunctions.sortbycount(tags, false);
         log.info("Tags: {}", countedTags);
 
         assertNotSame(tags, countedTags);
@@ -180,7 +180,7 @@
     public void testNamed()
     {
         log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.getNamedTagCloud");
-        Map<String, Integer> tags = TagCloudElFunctions.getNamedTagCloud("cloud1");
+        Map<String, Integer> tags = TagCloudElFunctions.named("cloud1");
         log.info("Tags: {}", tags);
 
         try
@@ -204,7 +204,7 @@
             fail(e.getMessage());
         }
 
-        tags = TagCloudElFunctions.getNamedTagCloud("cloud1");
+        tags = TagCloudElFunctions.named("cloud1");
         log.info("Tags: {}", tags);
 
         assertEquals(true, tags.containsKey("prova"));
@@ -217,10 +217,10 @@
     public void testGetTagCloudProperties()
     {
         log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.getTagCloudProperties");
-        Map<String, Integer> tags = TagCloudElFunctions.getTagCloud(ContentRepository.WEBSITE, "/", "tags", 10);
+        Map<String, Integer> tags = TagCloudElFunctions.notcached(ContentRepository.WEBSITE, "/", "tags", 10);
         log.info("Tags: {}", tags);
 
-        Map<String, Integer> mapProperties = TagCloudElFunctions.getTagCloudProperties(tags);
+        Map<String, Integer> mapProperties = TagCloudElFunctions.props(tags);
 
         log.info("Properties {}", mapProperties);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Openutils-svn] SF.net SVN: openutils:[2420] trunk/openutils-mgnltagcloud/src

openutils-svn