Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2590] trunk/openutils-mgnltagcloud
|
From: <fg...@us...> - 2010-05-30 16:50:40
|
Revision: 2590
http://openutils.svn.sourceforge.net/openutils/?rev=2590&view=rev
Author: fgiust
Date: 2010-05-30 16:50:28 +0000 (Sun, 30 May 2010)
Log Message:
-----------
cleaning up before the final release
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/pom.xml
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
Property Changed:
----------------
trunk/openutils-mgnltagcloud/
Property changes on: trunk/openutils-mgnltagcloud
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.checkstyle
.classpath
.project
+ target
.settings
.checkstyle
.classpath
.project
pom.xml.releaseBackup
release.properties
Modified: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/pom.xml 2010-05-30 16:50:28 UTC (rev 2590)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -110,7 +111,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.0.6</version>
+ <version>4.0.7</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -25,6 +25,7 @@
import java.util.Map;
import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
/**
@@ -188,19 +189,6 @@
}
/**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object obj)
- {
- if (obj == null || !(obj instanceof TagCloud))
- {
- return false;
- }
- return EqualsBuilder.reflectionEquals(this, obj, new String[]{"tags", "enabled", "name" });
- }
-
- /**
* Returns the cacheAndObserve.
* @return the cacheAndObserve
*/
@@ -218,4 +206,42 @@
this.cacheAndObserve = cacheAndObserve;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(Object object)
+ {
+ if (!(object instanceof TagCloud))
+ {
+ return false;
+ }
+ TagCloud rhs = (TagCloud) object;
+ return new EqualsBuilder() //
+ .append(this.propertyName, rhs.propertyName)
+ .append(this.count, rhs.count)
+ .append(this.repository, rhs.repository)
+ .append(this.name, rhs.name)
+ .append(this.path, rhs.path)
+ .append(this.cacheAndObserve, rhs.cacheAndObserve)
+ .isEquals();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ return new HashCodeBuilder(609434781, 862593375)
+ .append(this.propertyName)
+ .append(this.enabled)
+ .append(this.count)
+ .append(this.repository)
+ .append(this.name)
+ .append(this.path)
+ .append(this.cacheAndObserve)
+ .toHashCode();
+ }
+
}
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -87,9 +87,11 @@
return null;
}
- @SuppressWarnings("unchecked")
+ /**
+ * {@inheritDoc}
+ */
@Override
- protected void addToParameters(Map parameters)
+ protected void addToParameters(Map<String, Object> parameters)
{
super.addToParameters(parameters);
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -45,6 +45,9 @@
public class TagCloudDialogSafeMultivalueSaveHandler extends SaveHandlerImpl implements FieldSaveHandler
{
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void processMultiple(Content node, String name, int type, String[] values) throws RepositoryException,
PathNotFoundException, AccessDeniedException
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-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -28,10 +28,7 @@
import net.sourceforge.openutils.mgnltagcloud.bean.TagCloud;
import net.sourceforge.openutils.mgnltagcloud.manager.TagCloudManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* El functions on tagClouds
* @author molaschi
@@ -47,11 +44,6 @@
private static final String PROP_COUNT = "count";
/**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(TagCloudElFunctions.class);
-
- /**
* Get tagCloud by name
* @param name of the tagCloud
* @return map of tags
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -41,29 +41,32 @@
/**
* Build wrapped Bobo index reader instance
- * @param reader jackrabbit index reader
+ * @param indexReader jackrabbit index reader
* @param facetHandlers facet handlers
- * @return wrapped Bobo index reader instance
- * @throws IOException i/o exception reading indicies
+ * @param workArea work area
+ * @throws IOException i/o exception reading indexes
*/
- public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers)
- throws IOException
+ protected HierarchyBoboIndexReader(
+ IndexReader indexReader,
+ Collection<FacetHandler> facetHandlers,
+ WorkArea workArea) throws IOException
{
- return HierarchyBoboIndexReader.getInstance(reader, facetHandlers, new WorkArea());
+ super(indexReader, facetHandlers, workArea);
+ resolver = (HierarchyResolver) indexReader;
}
/**
* Build wrapped Bobo index reader instance
* @param reader jackrabbit index reader
* @param facetHandlers facet handlers
- * @param workArea work area
* @return wrapped Bobo index reader instance
- * @throws IOException i/o exception reading indicies
+ * @throws IOException i/o exception reading indexes
*/
- public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers,
- WorkArea workArea) throws IOException
+ public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers)
+ throws IOException
{
- HierarchyBoboIndexReader boboReader = new HierarchyBoboIndexReader(reader, facetHandlers, workArea);
+
+ HierarchyBoboIndexReader boboReader = new HierarchyBoboIndexReader(reader, facetHandlers, new WorkArea());
boboReader.facetInit();
return boboReader;
}
@@ -76,20 +79,4 @@
return resolver.getParents(n, docNumbers);
}
- /**
- * Build wrapped Bobo index reader instance
- * @param indexReader jackrabbit index reader
- * @param facetHandlers facet handlers
- * @param workArea work area
- * @throws IOException i/o exception reading indicies
- */
- protected HierarchyBoboIndexReader(
- IndexReader indexReader,
- Collection<FacetHandler> facetHandlers,
- WorkArea workArea) throws IOException
- {
- super(indexReader, facetHandlers, workArea);
- resolver = (HierarchyResolver) indexReader;
- }
-
}
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -29,7 +29,6 @@
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -104,11 +103,11 @@
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
protected void onRegister(Content node)
{
- for (Content tagCloudNode : (Collection<Content>) ContentUtil.collectAllChildren(node))
+ List<Content> allChildren = ContentUtil.collectAllChildren(node);
+ for (Content tagCloudNode : allChildren)
{
try
{
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java 2010-05-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -19,8 +19,6 @@
package net.sourceforge.openutils.mgnltagcloud.manager;
-import info.magnolia.context.MgnlContext;
-
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
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-28 17:34:35 UTC (rev 2589)
+++ trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-05-30 16:50:28 UTC (rev 2590)
@@ -26,6 +26,7 @@
import info.magnolia.cms.core.Path;
import info.magnolia.cms.util.ClasspathResourcesUtil;
import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.test.RepositoryTestCase;
@@ -122,11 +123,7 @@
{
log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.getCachedTagCloud");
long time = System.currentTimeMillis();
- Map<String, Integer> tags = TagCloudElFunctions.cached(
- ContentRepository.WEBSITE,
- pathList[1],
- "tags",
- 2);
+ Map<String, Integer> tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 2);
log.info("Time: " + (System.currentTimeMillis() - time));
log.info("tagCloud freq: {}", tags);
assertEquals(nodesNumber, tags.get("tag2"));
@@ -159,11 +156,7 @@
public void testSortByCount()
{
log.info("\n----------------------------------------\nTEST: TagCloudElFunctions.sortByCount");
- Map<String, Integer> tags = TagCloudElFunctions.cached(
- ContentRepository.WEBSITE,
- "/site",
- "tags",
- 10);
+ Map<String, Integer> tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, "/site", "tags", 10);
log.info("Tags: {}", tags);
Map<String, Integer> countedTags = TagCloudElFunctions.sortbycount(tags, false);
log.info("Tags: {}", countedTags);
@@ -240,6 +233,7 @@
hm.getContent("/"),
Path.getValidatedLabel("site"),
ItemType.CONTENT);
+
contentRoot.createNodeData("tags", new Value[]{ValueFactoryImpl.getInstance().createValue("tag32") });
for (String path : pathList)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
