Index: src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java
===================================================================
--- src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java	(revision 9340)
+++ src/main/java/com/xpn/xwiki/watch/client/ui/menu/TagCloudWidget.java	(working copy)
@@ -1,4 +1,4 @@
-/**
+/*
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  * <p/>
@@ -19,28 +19,41 @@
  */
 package com.xpn.xwiki.watch.client.ui.menu;
 
-import com.google.gwt.user.client.ui.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Widget;
+import com.xpn.xwiki.gwt.api.client.app.XWikiAsyncCallback;
 import com.xpn.xwiki.watch.client.Watch;
 import com.xpn.xwiki.watch.client.ui.WatchWidget;
-import com.xpn.xwiki.gwt.api.client.app.XWikiAsyncCallback;
 
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-
-public class TagCloudWidget extends WatchWidget {
+/**
+ * Menu Widget that displays a Tag cloud based on watch tagged articles.
+ * 
+ * @version $Id: $
+ */
+public class TagCloudWidget extends WatchWidget
+{
     private Map tagsLink = new HashMap();
 
-    public TagCloudWidget() {
+    public TagCloudWidget()
+    {
         super();
     }
 
-    public String getName() {
+    public String getName()
+    {
         return "tagcloud";
     }
-    
-    public TagCloudWidget(Watch watch) {
+
+    public TagCloudWidget(Watch watch)
+    {
         super(watch);
         panel = new FlowPanel();
         panel.add(getTitlePanel());
@@ -48,7 +61,8 @@
         init();
     }
 
-    private Widget getTitlePanel() {
+    private Widget getTitlePanel()
+    {
         FlowPanel p = new FlowPanel();
         p.setStyleName(watch.getStyleName("filter", "tagcloud-title"));
         HTML titleHTML = new HTML(watch.getTranslation("filter.tagcloud.title"));
@@ -57,54 +71,65 @@
         return p;
     }
 
-
-    public void refreshData() {
+    public void refreshData()
+    {
         // Load the tags list
-        watch.getDataManager().getTagsList(new XWikiAsyncCallback(watch) {
-            public void onSuccess(Object result) {
+        watch.getDataManager().getTagsList(new XWikiAsyncCallback(watch)
+        {
+            public void onSuccess(Object result)
+            {
                 super.onSuccess(result);
                 updateTagsList((List) result);
             }
         });
     }
 
-    public void resetSelections() {
+    public void resetSelections()
+    {
         setActiveTags((Object[]) watch.getFilterStatus().getTags().toArray());
     }
 
-    public void updateTagsList(List list) {
+    public void updateTagsList(List list)
+    {
         panel.clear();
         panel.add(getTitlePanel());
         tagsLink.clear();
-        if (list!=null) {
-            for (int i=0;i<list.size();i++) {
+        int minimalTagCount = watch.getParamAsInt("min_tag_count", 1);
+        if (list != null) {
+            for (int i = 0; i < list.size(); i++) {
                 List result = (List) list.get(i);
                 final String name = (String) result.get(0);
-                int count = ((Number)result.get(1)).intValue();
-                Label label = new Label(name);
-                int pixels = 9 + count;
-                if (pixels
-                    >15)
-                 pixels = 15;
-                label.addStyleName(watch.getStyleName("tagscloud", "link"));
-                label.addStyleName(watch.getStyleName("tagscloud", "" + pixels));
-                tagsLink.put(name, label);
-                label.addClickListener(new ClickListener() {
-                    public void onClick(Widget widget) {
+                int count = ((Number) result.get(1)).intValue();
+                // display only tags which count is superior or equals to the minimal tag count
+                // parameter.
+                if (count >= minimalTagCount) {
+                    Label label = new Label(name);
+                    int pixels = 9 + count;
+                    if (pixels > 15)
+                        pixels = 15;
+                    label.addStyleName(watch.getStyleName("tagscloud", "link"));
+                    label.addStyleName(watch.getStyleName("tagscloud", "" + pixels));
+                    tagsLink.put(name, label);
+                    label.addClickListener(new ClickListener()
+                    {
+                        public void onClick(Widget widget)
+                        {
                             watch.refreshOnTagActivated(name);
                         }
                     });
-                panel.add(label);
+                    panel.add(label);
+                }
             }
         }
     }
 
-    public void setActiveTags(Object[] tags) {
+    public void setActiveTags(Object[] tags)
+    {
         Iterator it = tagsLink.values().iterator();
         while (it.hasNext()) {
-            ((Widget)it.next()).removeStyleName(watch.getStyleName("tagscloud", "active"));
+            ((Widget) it.next()).removeStyleName(watch.getStyleName("tagscloud", "active"));
         }
-        for (int i=0;i<tags.length;i++) {
+        for (int i = 0; i < tags.length; i++) {
             Widget tag = (Widget) tagsLink.get(tags[i]);
             if (tag != null) {
                 tag.addStyleName(watch.getStyleName("tagscloud", "active"));
