dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16837
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-09-28 20:43:30 +0200
message:
  Event charts, using natural sorting of dimension items if all / no explicit selection of items.
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/ObjectStringValueComparator.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java	2014-09-28 17:12:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java	2014-09-28 18:43:30 +0000
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,7 @@
 
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang.StringUtils;
+import org.hisp.dhis.common.comparator.ObjectStringValueComparator;
 
 /**
  * @author Lars Helge Overland
@@ -302,6 +304,8 @@
         
         List<Object> values = new ArrayList<>( grid.getUniqueValues( dim.getDimension() ) );
         
+        Collections.sort( values, ObjectStringValueComparator.INSTANCE );
+        
         // Use order of items in filter if specified
         
         List<?> itemList = filterItems != null ? ListUtils.retainAll( filterItems, values ) : values;

=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/ObjectStringValueComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/ObjectStringValueComparator.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/ObjectStringValueComparator.java	2014-09-28 18:43:30 +0000
@@ -0,0 +1,51 @@
+package org.hisp.dhis.common.comparator;
+
+/*
+ * Copyright (c) 2004-2014, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.Comparator;
+
+import org.apache.commons.lang.ObjectUtils;
+
+/**
+ * Converts the given objects based on their string value. Null objects are
+ * interpreted as empty strings.
+ * 
+ * @author Lars Helge Overland
+ */
+public class ObjectStringValueComparator
+    implements Comparator<Object>
+{
+    public static final ObjectStringValueComparator INSTANCE = new ObjectStringValueComparator();
+    
+    @Override
+    public int compare( Object o1, Object o2 )
+    {
+        return ObjectUtils.toString( o1 ).compareTo( ObjectUtils.toString( o2 ) );
+    }
+}