From 7ec846a567ac663d8b3c2205d460a5b615c9b2c1 Mon Sep 17 00:00:00 2001
From: Siena <siena.biales@uconn.edu>
Date: Sun, 25 Oct 2015 22:58:27 -0400
Subject: [PATCH] made Expand image made isExpandAll getter setter in Model
 TreeView.ActionExpandAll class populate toolbar expand button added

---
 images/genj/tree/images/Expand.png | Bin 0 -> 2867 bytes
 src/core/genj/tree/Images.java     |   4 +++-
 src/core/genj/tree/Model.java      |  25 +++++++++++++++++++++++++
 src/core/genj/tree/TreeView.java   |  25 +++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 images/genj/tree/images/Expand.png

diff --git a/images/genj/tree/images/Expand.png b/images/genj/tree/images/Expand.png
new file mode 100644
index 0000000000000000000000000000000000000000..67191a60adf18a08d8bc38421f00ffb878d4264f
GIT binary patch
literal 2867
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
RR1g3F002ovPDHLkV1iOJPiX)E

literal 0
HcmV?d00001

diff --git a/src/core/genj/tree/Images.java b/src/core/genj/tree/Images.java
index fad38aa..82cbc23 100644
--- a/src/core/genj/tree/Images.java
+++ b/src/core/genj/tree/Images.java
@@ -35,7 +35,8 @@ final class Images {
     imgVert,
     imgDoFams,
     imgDontFams,
-    imgFoldSymbols;
+    imgFoldSymbols,
+    imgExpand;
     
   /**
    * Constructor which pre-loads all images
@@ -53,6 +54,7 @@ final class Images {
     imgDontFams    = new ImageIcon(this,"images/DontFams"   ); 
 
     imgFoldSymbols = new ImageIcon(this,"images/FoldUnfold"    );
+    imgExpand      = new ImageIcon(this, "images/Expand");
   }
   
 } //Images
diff --git a/src/core/genj/tree/Model.java b/src/core/genj/tree/Model.java
index deff3f3..b10b570 100644
--- a/src/core/genj/tree/Model.java
+++ b/src/core/genj/tree/Model.java
@@ -85,6 +85,11 @@ import java.util.concurrent.CopyOnWriteArrayList;
   /** whether we show toggles for un/folding */
   private boolean isFoldSymbols = true;
   
+  
+  //OUR CODE/////////////////////////////////////////////////////////////////////////////////////////////////
+  private boolean isExpandAll = false;
+  
+  
   /** individuals whose ancestors we're not interested in */
   private Set<String> hideAncestors = new HashSet<String>();
 
@@ -146,6 +151,26 @@ import java.util.concurrent.CopyOnWriteArrayList;
     return root;
   }
     
+  /** 
+   * Accessor - expand all
+   **/
+  public void setExpandAll(boolean set) {
+    if (isExpandAll==set) return;
+    isExpandAll = set;
+    if (set)
+    {
+      clearHiddenIDs();
+    }
+    update();
+  }
+  
+  /**
+   * Accessor - get isExpandAll
+   */
+  public boolean isExpandAll() {
+    return isExpandAll;
+  }
+  
   /**
    * Accessor - wether we're vertical
    */
diff --git a/src/core/genj/tree/TreeView.java b/src/core/genj/tree/TreeView.java
index 19b3969..b2330fc 100644
--- a/src/core/genj/tree/TreeView.java
+++ b/src/core/genj/tree/TreeView.java
@@ -466,6 +466,9 @@ public class TreeView extends View implements ContextProvider, ActionProvider {
     // gap
     toolbar.addSeparator();
     
+    // expand all
+    toolbar.add(bh.create(new ActionExpandAll(), Images.imgExpand, model.isExpandAll()));
+    
     // vertical/horizontal
     toolbar.add(bh.create(new ActionOrientation(), Images.imgVert, model.isVertical()));
     
@@ -1039,6 +1042,28 @@ public class TreeView extends View implements ContextProvider, ActionProvider {
     }
 
   }
+
+  /**
+   * Action ExpandAll on/off
+   */
+  private class ActionExpandAll extends Action2 {
+    /**
+     * Constructor
+     */
+    private ActionExpandAll() {
+      super.setImage(Images.imgExpand);
+      //super.setTip(RESOURCES, "expandall.tip");
+    }
+    /**
+     * @see genj.util.swing.Action2#execute()
+     */
+    public void actionPerformed(ActionEvent event) {
+      model.setExpandAll(!model.isExpandAll());
+      scrollToCurrent();
+    }
+  }//ActionExpanding
+  
+  
   
   /**
    * Action - bookmark something