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{ +public class LoadTimeLine { private final String conceptName; private final List loadPeriods; @@ -196,13 +196,4 @@ public class LoadTimeLine implements Comparable{ 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 sortModelTree(MutableTreeModel modelForTree) { - LoadTimeLine root = modelForTree.getRoot(); - MutableTreeModel result = MutableTreeModel.create(LoadTimeLine.class, root); - sortModelTree(result, modelForTree, root); return result; } - private void sortModelTree(MutableTreeModel result, - MutableTreeModel source, LoadTimeLine parent) { - List children = getChildrenInOrderFor(source, parent); - result.add(parent, children); - for (LoadTimeLine each: children) { - sortModelTree(result, source, each); - } - } - - private List getChildrenInOrderFor( - MutableTreeModel modelForTree, LoadTimeLine parent) { - SortedSet result = new TreeSet(); - for (int i = 0; i < modelForTree.getChildCount(parent); i++) { - result.add(modelForTree.getChild(parent, i)); - } - return new ArrayList(result); - } private MutableTreeModel addNodes( MutableTreeModel tree, LoadTimeLine parent) {