Changeset 1093

Timestamp:

01/25/11 16:35:35 (13 years ago)

Author:

patdui

Message:

• fixed tests

Location:

vlo/trunk/vlo_webapp/src

Files:

• main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java (modified) (5 diffs)
• test/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanelTest.java (modified) (1 diff)

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java

@@ -29 +29 @@
     private FacetHeaderPanel facetHeaderPanel;
     private FacetModel facetModel;
+    private int maxNrOfFacetValues;
 
     public FacetBoxPanel(String id, IModel<FacetField> model) {
         super(id, model);
         setOutputMarkupId(true);
+        setMaxNrOfFacetValues(MAX_NR_OF_FACET_VALUES);
     }
-
+    
     @SuppressWarnings("serial")
     public FacetBoxPanel create(final SearchPageQuery query) {
@@ -48 +50 @@
             add(new WebMarkupContainer("facetHeaderPanel"));
         }
-        final boolean showMore = facetField.getValueCount() > MAX_NR_OF_FACET_VALUES + 1;
+        final boolean showMore = facetField.getValueCount() > maxNrOfFacetValues + 1;
         List<Count> values = getFacetListForBox(facetField, showMore);
         ListView<Count> facetList = new ListView<Count>("facetList", values) {
@@ -78 +80 @@
         List<Count> values = new ArrayList<Count>();
         if (showMore) {
-            if (facetField.getValueCount() == MAX_NR_OF_FACET_VALUES || facetField.getValueCount() == MAX_NR_OF_FACET_VALUES + 1) { //Show all values, the "more" link can be used as the extra facet
+            if (facetField.getValueCount() == maxNrOfFacetValues || facetField.getValueCount() == maxNrOfFacetValues + 1) { //Show all values, the "more" link can be used as the extra facet
                 values = allValues;
             } else {// make a sublist
                 //IGNORABLE_VALUES (like "unknown") are move to the back of the list and should only be shown when you click "more...", unless the list is too small then whe can just show them.
                 List<Count> ignorables = new ArrayList<Count>();
-                for (int i = 0; values.size() < MAX_NR_OF_FACET_VALUES && i < allValues.size(); i++) {
+                for (int i = 0; values.size() < maxNrOfFacetValues && i < allValues.size(); i++) {
                     Count count = allValues.get(i);
                     if (!IGNORABLE_VALUES.contains(count.getName().toLowerCase())) {
@@ -91 +93 @@
                     }
                 }
-                int stillToAdd = MAX_NR_OF_FACET_VALUES - values.size();
+                int stillToAdd = maxNrOfFacetValues - values.size();
                 for (int i = 0; i < stillToAdd && i < ignorables.size(); i++) {
                     values.add(ignorables.get(i));
@@ -113 +115 @@
     }
 
+    void setMaxNrOfFacetValues(int maxNrOfFacetValues) {
+        this.maxNrOfFacetValues = maxNrOfFacetValues;
+    }
+
 }

vlo/trunk/vlo_webapp/src/test/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanelTest.java

@@ -23 +23 @@
     public void testCalculateFacetBoxPanel() throws Exception {
         FacetBoxPanel panel = new FacetBoxPanel("test", null);
+        panel.setMaxNrOfFacetValues(5);
         FacetField facetField = new FacetField("test");
         facetField.add("name5", 5);