From f434ba6e5ddf558c7590b6423c18dae9c5be857d Mon Sep 17 00:00:00 2001
From: AWIPS User <mjames@unidata.ucar.edu>
Date: Sat, 18 Apr 2015 22:04:08 -0600
Subject: [PATCH] toggle 4 and 0 sideViews with 0 as default

Former-commit-id: 6d074bdb74ae9f1f565071b491c7d292c68e9a49 [formerly ef72d436ac4db3e9995995b10fdee898c553f772]
Former-commit-id: 0b0e907bed37e09e49f9fcd715f7d5a4b45cff69
---
 cave/com.raytheon.uf.viz.d2d.ui/icons/square.png  | Bin 0 -> 312 bytes
 cave/com.raytheon.uf.viz.d2d.ui/plugin.xml        |   8 ++++----
 .../uf/viz/d2d/ui/perspectives/D2D5Pane.java      |   7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 cave/com.raytheon.uf.viz.d2d.ui/icons/square.png

diff --git a/cave/com.raytheon.uf.viz.d2d.ui/icons/square.png b/cave/com.raytheon.uf.viz.d2d.ui/icons/square.png
new file mode 100644
index 0000000000000000000000000000000000000000..6da37b7ba2586b3d7d788be5d96dea73df3cfb13
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`|2<tCLn`JZB`g3*G5r6Z)N)CO
zhlht1h`#~x8kR3LX$c84&L23ip|`QIkrAw@X`v=i?!V`O{}K`sdw^I1qPc0IzKYa`
z`HhW<rp!P9F|bMMfbW*&f(_H*+LM%)bV03KbOWRlXfH{OCdm)edG_v?L|80YFoTDg
z&(OfY0AgH|Vk8?|TP@I)^%5NF5A}H_>^Xesz<~o$%OoKFU}kXsq?2WPC`1n=?&<31
Jvd$@?2><{*Xf^-<

literal 0
HcmV?d00001

diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index 9d7e93e06e..4bf17f3704 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -528,8 +528,8 @@
             </separator>
             <command
                   commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout"
-                  icon="icons/5-pane.gif"
-                  label="Default Pane Layout">
+                  icon="icons/square.png"
+                  label="Full Layout">
                <parameter
                      name="sideViews"
                      value="4">
@@ -542,8 +542,8 @@
             </command>
             <command
                   commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout"
-                  icon="icons/3-pane.gif"
-                  label="Full Layout">
+                  icon="icons/5-pane.gif"
+                  label="Default Pane Layout">
                <parameter
                      name="sideViews"
                      value="0">
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
index d715fb2878..c546147b86 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
@@ -93,8 +93,8 @@ public class D2D5Pane implements IPerspectiveFactory {
             }
         }
 
-        int numViews = ChangeD2DLayoutAction.getViewCount() == 0 ? 0
-                : baseViewsToAdd.size();
+        int numViews = ChangeD2DLayoutAction.getViewCount() > 0 ? 0
+                : 4;
 
         String lastAdded = null;
 
@@ -109,8 +109,7 @@ public class D2D5Pane implements IPerspectiveFactory {
 	                            baseView,
 	                            false,
 	                            IPageLayout.LEFT,
-	                            ChangeD2DLayoutAction.getViewCount() == 0 ? ZERO_PANE_WIDTH
-	                                    : FIVE_PANE_WIDTH, editorArea);
+	                            FIVE_PANE_WIDTH, editorArea);
 	                } else {
 	                    layout.addStandaloneView(baseView, false,
 	                            IPageLayout.BOTTOM, (i >= numViews) ? 1.0f