From: <die...@us...> - 2011-04-01 10:45:23
|
Revision: 3397 http://openutils.svn.sourceforge.net/openutils/?rev=3397&view=rev Author: diego_schivo Date: 2011-04-01 10:45:17 +0000 (Fri, 01 Apr 2011) Log Message: ----------- TAGCLOUD-13 extract method Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-03-23 13:57:26 UTC (rev 3396) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 10:45:17 UTC (rev 3397) @@ -117,6 +117,43 @@ log.error("RepositoryException: {}", e); } + TagCloud tagCloud = buildTagCloud(); + if (tagCloud == null) + { + parameters.put("configuredTagList", new String[]{}); + return; + } + + Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(tagCloud.getTags().size()); + for (String key : tagCloud.getTags().keySet()) + { + Map<String, Object> values = new HashMap<String, Object>(2); + values.put("selected", tagList.contains(key)); + values.put("count", tagCloud.getTags().get(key)); + tags.put(key, values); + } + + parameters.put("configuredTagList", tags); + + // load the script once: if there are multiple instances + String jQueryAttributeName = "info.magnolia.cms.gui.dialog.jquery.loaded"; + boolean includejquery = getRequest().getAttribute(jQueryAttributeName) == null; + parameters.put("includejquery", includejquery); + if (includejquery) + { + getRequest().setAttribute(jQueryAttributeName, "true"); + } + + parameters.put("debugEnabled", Boolean.valueOf(this.getConfigValue("debugEnabled"))); + + parameters.put("width", StringUtils.isNotEmpty(this.getConfigValue("width")) + ? this.getConfigValue("width") + : ""); + + } + + protected TagCloud buildTagCloud() + { // Get configured node TagCloud tagCloud = null; if (StringUtils.isNotBlank(this.getConfigValue("tagCloudName"))) @@ -125,8 +162,7 @@ if (tagCloudOriginal == null) { log.error("No tag cloud configured with name : {}", this.getConfigValue("tagCloudName")); - parameters.put("configuredTagList", new String[]{}); - return; + return null; } try { @@ -173,32 +209,6 @@ } tagCloud.setCount(10000); TagCloudManager.getInstance().calculateTagCloud(tagCloud); - - Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(tagCloud.getTags().size()); - for (String key : tagCloud.getTags().keySet()) - { - Map<String, Object> values = new HashMap<String, Object>(2); - values.put("selected", tagList.contains(key)); - values.put("count", tagCloud.getTags().get(key)); - tags.put(key, values); - } - - parameters.put("configuredTagList", tags); - - // load the script once: if there are multiple instances - String jQueryAttributeName = "info.magnolia.cms.gui.dialog.jquery.loaded"; - boolean includejquery = getRequest().getAttribute(jQueryAttributeName) == null; - parameters.put("includejquery", includejquery); - if (includejquery) - { - getRequest().setAttribute(jQueryAttributeName, "true"); - } - - parameters.put("debugEnabled", Boolean.valueOf(this.getConfigValue("debugEnabled"))); - - parameters.put("width", StringUtils.isNotEmpty(this.getConfigValue("width")) - ? this.getConfigValue("width") - : ""); - + return tagCloud; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-04-01 12:26:09
|
Revision: 3398 http://openutils.svn.sourceforge.net/openutils/?rev=3398&view=rev Author: diego_schivo Date: 2011-04-01 12:26:03 +0000 (Fri, 01 Apr 2011) Log Message: ----------- TAGCLOUD-13 customizable tags provider Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-04-01 10:45:17 UTC (rev 3397) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:26:03 UTC (rev 3398) @@ -26,6 +26,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -56,6 +57,8 @@ */ private Logger log = LoggerFactory.getLogger(ConfiguredDialog.class); + private TagsProvider tagsProvider; + /** * {@inheritDoc} */ @@ -76,6 +79,32 @@ this.setConfig( "saveHandler", "net.sourceforge.openutils.mgnltagcloud.dialog.TagCloudDialogSafeMultivalueSaveHandler"); + + if (!StringUtils.isEmpty(getConfigValue("tagsProvider"))) + { + try + { + tagsProvider = (TagsProvider) Class.forName(getConfigValue("tagsProvider")).newInstance(); + } + catch (Exception e) + { + log.error("Failed to instantiate custom tags provider due to {}", e.getMessage()); + } + } + if (tagsProvider == null) + { + tagsProvider = new TagsProvider() + { + + /** + * {@inheritDoc} + */ + public Collection<String> provideTags(TagCloud tagCloud) + { + return tagCloud != null ? tagCloud.getTags().keySet() : Collections.<String> emptyList(); + } + }; + } } /** @@ -118,14 +147,9 @@ } TagCloud tagCloud = buildTagCloud(); - if (tagCloud == null) - { - parameters.put("configuredTagList", new String[]{}); - return; - } - Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(tagCloud.getTags().size()); - for (String key : tagCloud.getTags().keySet()) + Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(); + for (String key : tagsProvider.provideTags(tagCloud)) { Map<String, Object> values = new HashMap<String, Object>(2); values.put("selected", tagList.contains(key)); @@ -152,6 +176,12 @@ } + public interface TagsProvider + { + + Collection<String> provideTags(TagCloud tagCloud); + } + protected TagCloud buildTagCloud() { // Get configured node This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-04-01 12:36:51
|
Revision: 3399 http://openutils.svn.sourceforge.net/openutils/?rev=3399&view=rev Author: diego_schivo Date: 2011-04-01 12:36:44 +0000 (Fri, 01 Apr 2011) Log Message: ----------- TAGCLOUD-13 handling missing value Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-04-01 12:26:03 UTC (rev 3398) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 12:36:44 UTC (rev 3399) @@ -153,7 +153,8 @@ { Map<String, Object> values = new HashMap<String, Object>(2); values.put("selected", tagList.contains(key)); - values.put("count", tagCloud.getTags().get(key)); + Integer count = tagCloud.getTags().get(key); + values.put("count", count != null ? count : 0); tags.put(key, values); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-04-01 13:41:02
|
Revision: 3404 http://openutils.svn.sourceforge.net/openutils/?rev=3404&view=rev Author: diego_schivo Date: 2011-04-01 13:40:56 +0000 (Fri, 01 Apr 2011) Log Message: ----------- TAGCLOUD-14 tagCloudName Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-04-01 12:57:17 UTC (rev 3403) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 13:40:56 UTC (rev 3404) @@ -20,6 +20,7 @@ package net.sourceforge.openutils.mgnltagcloud.dialog; import info.magnolia.cms.core.Content; +import info.magnolia.cms.i18n.I18nContentSupportFactory; import info.magnolia.cms.security.AccessDeniedException; import info.magnolia.module.admininterface.dialogs.ConfiguredDialog; @@ -28,6 +29,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import javax.jcr.RepositoryException; @@ -40,6 +42,7 @@ import net.sourceforge.openutils.mgnltagcloud.manager.TagCloudManager; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang.LocaleUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -187,12 +190,28 @@ { // Get configured node TagCloud tagCloud = null; - if (StringUtils.isNotBlank(this.getConfigValue("tagCloudName"))) + String tagCloudName = this.getConfigValue("tagCloudName"); + if (StringUtils.isBlank(tagCloudName)) { - TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(this.getConfigValue("tagCloudName")); + tagCloudName = this.getName(); + } + else if (I18nContentSupportFactory.getI18nSupport().isEnabled() && "true".equals(this.getConfigValue("i18n"))) + { + Locale locale = LocaleUtils.toLocale(this.getTopParent().getConfigValue("locale", null)); + boolean isFallbackLanguage = locale == null + || I18nContentSupportFactory.getI18nSupport().getFallbackLocale().equals(locale); + if (!isFallbackLanguage) + { + tagCloudName += "_" + locale; + } + } + + if (StringUtils.isNotBlank(tagCloudName)) + { + TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(tagCloudName); if (tagCloudOriginal == null) { - log.error("No tag cloud configured with name : {}", this.getConfigValue("tagCloudName")); + log.error("No tag cloud configured with name : {}", tagCloudName); return null; } try This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-04-01 13:45:57
|
Revision: 3405 http://openutils.svn.sourceforge.net/openutils/?rev=3405&view=rev Author: diego_schivo Date: 2011-04-01 13:45:51 +0000 (Fri, 01 Apr 2011) Log Message: ----------- TAGCLOUD-14 tagcloud building logic Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-04-01 13:40:56 UTC (rev 3404) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 13:45:51 UTC (rev 3405) @@ -205,60 +205,63 @@ tagCloudName += "_" + locale; } } - + if (StringUtils.isNotBlank(tagCloudName)) { TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(tagCloudName); - if (tagCloudOriginal == null) + if (tagCloudOriginal != null) { - log.error("No tag cloud configured with name : {}", tagCloudName); - return null; + try + { + tagCloud = (TagCloud) BeanUtils.cloneBean(tagCloudOriginal); + tagCloud.setTags(new HashMap<String, Integer>()); + } + catch (IllegalAccessException e) + { + // should never happen + } + catch (InstantiationException e) + { + // should never happen + } + catch (InvocationTargetException e) + { + // should never happen + } + catch (NoSuchMethodException e) + { + // should never happen + } } - try + else if (StringUtils.isNotBlank(this.getConfigValue("tagCloudName"))) { - tagCloud = (TagCloud) BeanUtils.cloneBean(tagCloudOriginal); + log.warn("No tag cloud configured with name : {}", tagCloudName); } - catch (IllegalAccessException e) + + if (tagCloud == null) { - // should never happen + tagCloud = new TagCloud(); + if (StringUtils.isNotBlank(this.getConfigValue("tagCloudRepository"))) + { + tagCloud.setRepository(this.getConfigValue("tagCloudRepository")); + } + if (StringUtils.isNotBlank(this.getConfigValue("tagCloudPath"))) + { + tagCloud.setPath(this.getConfigValue("tagCloudPath")); + } + if (StringUtils.isNotBlank(this.getConfigValue("tagCloudProperty"))) + { + tagCloud.setPropertyName(this.getConfigValue("tagCloudProperty")); + } + else + { + // Set the actual node name, it's useful in some cases + tagCloud.setPropertyName(this.getName()); + } } - catch (InstantiationException e) - { - // should never happen - } - catch (InvocationTargetException e) - { - // should never happen - } - catch (NoSuchMethodException e) - { - // should never happen - } - tagCloud.setTags(new HashMap<String, Integer>()); + tagCloud.setCount(10000); + TagCloudManager.getInstance().calculateTagCloud(tagCloud); } - else - { - tagCloud = new TagCloud(); - if (StringUtils.isNotBlank(this.getConfigValue("tagCloudRepository"))) - { - tagCloud.setRepository(this.getConfigValue("tagCloudRepository")); - } - if (StringUtils.isNotBlank(this.getConfigValue("tagCloudPath"))) - { - tagCloud.setPath(this.getConfigValue("tagCloudPath")); - } - if (StringUtils.isNotBlank(this.getConfigValue("tagCloudProperty"))) - { - tagCloud.setPropertyName(this.getConfigValue("tagCloudProperty")); - } - else - { - // Set the actual node name, it's useful in some cases - tagCloud.setPropertyName(this.getName()); - } - } - tagCloud.setCount(10000); - TagCloudManager.getInstance().calculateTagCloud(tagCloud); return tagCloud; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-04-01 13:49:28
|
Revision: 3406 http://openutils.svn.sourceforge.net/openutils/?rev=3406&view=rev Author: diego_schivo Date: 2011-04-01 13:49:22 +0000 (Fri, 01 Apr 2011) Log Message: ----------- TAGCLOUD-14 tagcloud building logic Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-04-01 13:45:51 UTC (rev 3405) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 13:49:22 UTC (rev 3406) @@ -240,6 +240,7 @@ if (tagCloud == null) { + tagCloud = new TagCloud(); if (StringUtils.isNotBlank(this.getConfigValue("tagCloudRepository"))) { @@ -256,9 +257,10 @@ else { // Set the actual node name, it's useful in some cases - tagCloud.setPropertyName(this.getName()); + tagCloud.setPropertyName(tagCloudName); } } + tagCloud.setCount(10000); TagCloudManager.getInstance().calculateTagCloud(tagCloud); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-04-01 13:52:01
|
Revision: 3407 http://openutils.svn.sourceforge.net/openutils/?rev=3407&view=rev Author: diego_schivo Date: 2011-04-01 13:51:55 +0000 (Fri, 01 Apr 2011) Log Message: ----------- TAGCLOUD-14 tagcloud building logic Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-04-01 13:49:22 UTC (rev 3406) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-01 13:51:55 UTC (rev 3407) @@ -190,6 +190,7 @@ { // Get configured node TagCloud tagCloud = null; + String tagCloudName = this.getConfigValue("tagCloudName"); if (StringUtils.isBlank(tagCloudName)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-04-08 07:57:35
|
Revision: 3409 http://openutils.svn.sourceforge.net/openutils/?rev=3409&view=rev Author: diego_schivo Date: 2011-04-08 07:57:29 +0000 (Fri, 08 Apr 2011) Log Message: ----------- TAGCLOUD-13 storageNode Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-04-07 08:08:55 UTC (rev 3408) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-08 07:57:29 UTC (rev 3409) @@ -102,7 +102,8 @@ /** * {@inheritDoc} */ - public Collection<String> provideTags(TagCloud tagCloud) + @Override + public Collection<String> provideTags(TagCloud tagCloud, Content storageNode) { return tagCloud != null ? tagCloud.getTags().keySet() : Collections.<String> emptyList(); } @@ -152,7 +153,7 @@ TagCloud tagCloud = buildTagCloud(); Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(); - for (String key : tagsProvider.provideTags(tagCloud)) + for (String key : tagsProvider.provideTags(tagCloud, getStorageNode())) { Map<String, Object> values = new HashMap<String, Object>(2); values.put("selected", tagList.contains(key)); @@ -183,7 +184,7 @@ public interface TagsProvider { - Collection<String> provideTags(TagCloud tagCloud); + Collection<String> provideTags(TagCloud tagCloud, Content storageNode); } protected TagCloud buildTagCloud() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2011-04-10 07:22:56
|
Revision: 3412 http://openutils.svn.sourceforge.net/openutils/?rev=3412&view=rev Author: fgiust Date: 2011-04-10 07:22:49 +0000 (Sun, 10 Apr 2011) Log Message: ----------- remove annotation (1.5 source compatibility) Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-04-10 07:13:53 UTC (rev 3411) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-04-10 07:22:49 UTC (rev 3412) @@ -102,7 +102,6 @@ /** * {@inheritDoc} */ - @Override public Collection<String> provideTags(TagCloud tagCloud, Content storageNode) { return tagCloud != null ? tagCloud.getTags().keySet() : Collections.<String> emptyList(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-06-23 10:24:27
|
Revision: 3550 http://openutils.svn.sourceforge.net/openutils/?rev=3550&view=rev Author: diego_schivo Date: 2011-06-23 10:24:21 +0000 (Thu, 23 Jun 2011) Log Message: ----------- TAGCLOUD-16 Selected tag not shown in tagcloud control if it contains a trailing space Modified Paths: -------------- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 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 2011-06-23 10:22:57 UTC (rev 3549) +++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2011-06-23 10:24:21 UTC (rev 3550) @@ -136,7 +136,7 @@ { for (Value value : getStorageNode().getNodeData(this.getName()).getValues()) { - tagList.add(value.getString()); + tagList.add(StringUtils.trim(value.getString())); } } } @@ -154,6 +154,7 @@ Map<String, Map<String, Object>> tags = new HashMap<String, Map<String, Object>>(); for (String key : tagsProvider.provideTags(tagCloud, getStorageNode())) { + key = StringUtils.trim(key); Map<String, Object> values = new HashMap<String, Object>(2); values.put("selected", tagList.contains(key)); Integer count = tagCloud.getTags().get(key); @@ -268,3 +269,4 @@ return tagCloud; } } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |