From 45af764729a95e690ce84716f07e6e7a7663b7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 18 Apr 2011 17:02:23 +0200
Subject: [PATCH] [Bug #992] Fix bug

Revert "[Bug #952] Show list of resources in 'Resource load view' in
order". The left part is always ordered by alphabetic order, but the
right part remained in the original order.

This reverts commit 7bb18e5ea471bde0490f86b97e10acb98f28fb08.

FEA: ItEr74S04BugFixing
---
 .../data/resourceload/LoadTimeLine.java       | 13 ++-------
 .../resourceload/ResourcesLoadPanel.java      | 27 -------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java
index c1b917a11..8227ae8d5 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java
@@ -30,7 +30,7 @@ import org.apache.commons.lang.Validate;
 import org.joda.time.LocalDate;
 import org.zkoss.ganttz.util.Interval;
 
-public class LoadTimeLine implements Comparable<LoadTimeLine>{
+public class LoadTimeLine {
 
     private final String conceptName;
     private final List<LoadPeriod> loadPeriods;
@@ -196,13 +196,4 @@ public class LoadTimeLine implements Comparable<LoadTimeLine>{
         return result;
     }
 
-    public String toString() {
-        return conceptName;
-    }
-
-    @Override
-    public int compareTo(LoadTimeLine o) {
-        return conceptName.compareTo(o.getConceptName());
-    }
-
-}
\ No newline at end of file
+}
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
index a4d91ec02..655b14069 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
@@ -23,10 +23,7 @@ package org.zkoss.ganttz.resourceload;
 
 import static org.zkoss.ganttz.i18n.I18nHelper._;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
 
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.LocalDate;
@@ -297,33 +294,9 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
             result.addToRoot(loadTimeLine);
             result = addNodes(result, loadTimeLine);
         }
-        return sortModelTree(result);
-    }
-
-    private MutableTreeModel<LoadTimeLine> sortModelTree(MutableTreeModel<LoadTimeLine> modelForTree) {
-        LoadTimeLine root = modelForTree.getRoot();
-        MutableTreeModel<LoadTimeLine> result = MutableTreeModel.create(LoadTimeLine.class, root);
-        sortModelTree(result, modelForTree, root);
         return result;
     }
 
-    private void sortModelTree(MutableTreeModel<LoadTimeLine> result,
-            MutableTreeModel<LoadTimeLine> source, LoadTimeLine parent) {
-        List<LoadTimeLine> children = getChildrenInOrderFor(source, parent);
-        result.add(parent, children);
-        for (LoadTimeLine each: children) {
-            sortModelTree(result, source, each);
-        }
-    }
-
-    private List<LoadTimeLine> getChildrenInOrderFor(
-            MutableTreeModel<LoadTimeLine> modelForTree, LoadTimeLine parent) {
-        SortedSet<LoadTimeLine> result = new TreeSet<LoadTimeLine>();
-        for (int i = 0; i < modelForTree.getChildCount(parent); i++) {
-            result.add(modelForTree.getChild(parent, i));
-        }
-        return new ArrayList<LoadTimeLine>(result);
-    }
 
     private MutableTreeModel<LoadTimeLine> addNodes(
             MutableTreeModel<LoadTimeLine> tree, LoadTimeLine parent) {