summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java6
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java11
2 files changed, 14 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java
index 45602a04..7ead4112 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java
@@ -27,8 +27,12 @@ import org.openslx.dozmod.util.FormatHelper;
/**
* Credits to 'SomethingSomething': http://stackoverflow.com/a/21851201
+ *
* With minor changes:
- * TODO
+ * - setCheckedState(): helper to set the selection within the tree
+ * - fully expand first level nodes after setting the model
+ * - removed partial highlight in updatePredecessorsWithCheckMode()
+ * - hacked cellRenderer to properly use Location names (uses FormatHelper.locName())
*/
public class JCheckBoxTree extends JTree {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
index 65e4f5e7..ea73ceff 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
@@ -240,6 +240,13 @@ public class LocationSelector extends JPanel {
locationTree.collapseFullySelectedNodes();
}
+ /**
+ * Minimize the given set of TreePath: if all children of an inner node are
+ * selected, remove all child from the result list and just keep the inner node
+ *
+ * @param Array of TreePath to minimize
+ * @return Resulting minimal list of TreePaths
+ */
private List<TreePath> minify(final TreePath[] paths) {
// transform the array of paths to a list of leaf nodes
List<TreePath> leavesPathsList = new ArrayList<TreePath>();
@@ -297,8 +304,8 @@ public class LocationSelector extends JPanel {
/**
* Helper to get the TreePath of the given TreeNode
*
- * @param treeNode
- * @return
+ * @param treeNode to get the TreePath of
+ * @return TreePath of the given TreeNode if it can be determined, null otherwise
*/
public static TreePath getPath(TreeNode treeNode) {
List<Object> nodes = new ArrayList<Object>();