formatting

[jalview.git] / src / jalview / gui / ViewSelectionMenu.java

diff --git a/src/jalview/gui/ViewSelectionMenu.java b/src/jalview/gui/ViewSelectionMenu.java
index 26c52c9..a220ae7 100644 (file)
--- a/src/jalview/gui/ViewSelectionMenu.java
+++ b/src/jalview/gui/ViewSelectionMenu.java
@@ -121,12 +121,17 @@ public class ViewSelectionMenu extends JMenu
    * menu selection event occurred.
    */
   private boolean append = false;
+
   /**
-   * flag indicating if the itemStateChanged listener for view associated menu items is currently enabled 
+   * flag indicating if the itemStateChanged listener for view associated menu
+   * items is currently enabled
    */
   private boolean enabled = true;
+
   private JMenuItem selectAll, invertSel;
-  private JCheckBoxMenuItem toggleview=null;
+
+  private JCheckBoxMenuItem toggleview = null;
+
   private void rebuild()
   {
     removeAll();
@@ -139,10 +144,12 @@ public class ViewSelectionMenu extends JMenu
     if (allviews.length >= 2)
     {
       // ensure we update menu state to reflect external selection list state
-      append = append || _selectedviews.size()>1;
-      toggleview = new JCheckBoxMenuItem("Select many views",append);
-      toggleview.setToolTipText("When enabled, allows many views to be selected.");
-      toggleview.addItemListener(new ItemListener() {
+      append = append || _selectedviews.size() > 1;
+      toggleview = new JCheckBoxMenuItem("Select many views", append);
+      toggleview
+              .setToolTipText("When enabled, allows many views to be selected.");
+      toggleview.addItemListener(new ItemListener()
+      {
 
         @Override
         public void itemStateChanged(ItemEvent arg0)
@@ -153,12 +160,12 @@ public class ViewSelectionMenu extends JMenu
             selectAll.setEnabled(append);
             invertSel.setEnabled(append);
           }
-          
+
         }
-        
+
       });
       add(toggleview);
-      add(selectAll= new JMenuItem("Select all views"));
+      add(selectAll = new JMenuItem("Select all views"));
       selectAll.addActionListener(new ActionListener()
       {
 
@@ -167,16 +174,16 @@ public class ViewSelectionMenu extends JMenu
         {
           for (Component c : getMenuComponents())
           {
-            boolean t=append;
-            append=true;
+            boolean t = append;
+            append = true;
             if (c instanceof JCheckBoxMenuItem)
             {
-              if (toggleview!=c && !((JCheckBoxMenuItem) c).isSelected())
+              if (toggleview != c && !((JCheckBoxMenuItem) c).isSelected())
               {
                 ((JCheckBoxMenuItem) c).doClick();
               }
             }
-            append=t;
+            append = t;
           }
         }
       });
@@ -187,16 +194,16 @@ public class ViewSelectionMenu extends JMenu
         @Override
         public void actionPerformed(ActionEvent e)
         {
-          boolean t=append;
-          append=true;
+          boolean t = append;
+          append = true;
           for (Component c : getMenuComponents())
           {
-            if (toggleview!=c && c instanceof JCheckBoxMenuItem)
+            if (toggleview != c && c instanceof JCheckBoxMenuItem)
             {
               ((JCheckBoxMenuItem) c).doClick();
             }
           }
-          append=t;
+          append = t;
         }
       });
       invertSel.setEnabled(append);
@@ -217,40 +224,40 @@ public class ViewSelectionMenu extends JMenu
         {
           if (enabled)
           {
-          if (append)
-          {
-            enabled=false;
-            // toggle the inclusion state
-            if (_selectedviews.indexOf(p)==-1)
+            if (append)
             {
-              _selectedviews.add(p);
-              a.setSelected(true);
+              enabled = false;
+              // toggle the inclusion state
+              if (_selectedviews.indexOf(p) == -1)
+              {
+                _selectedviews.add(p);
+                a.setSelected(true);
+              }
+              else
+              {
+                _selectedviews.remove(p);
+                a.setSelected(false);
+              }
+              enabled = true;
+              _handler.itemStateChanged(e);
             }
             else
             {
-              _selectedviews.remove(p);
-              a.setSelected(false);
-            }
-            enabled=true;
-            _handler.itemStateChanged(e);
-          }
-          else
-          {
-            // Deselect everything and select this item only
-            _selectedviews.clear();
-            _selectedviews.add(p);
-            enabled=false;
-            for (Component c : getMenuComponents())
-            {
-              if (c instanceof JCheckBoxMenuItem)
+              // Deselect everything and select this item only
+              _selectedviews.clear();
+              _selectedviews.add(p);
+              enabled = false;
+              for (Component c : getMenuComponents())
               {
-                ((JCheckBoxMenuItem) c).setSelected(a == c);
+                if (c instanceof JCheckBoxMenuItem)
+                {
+                  ((JCheckBoxMenuItem) c).setSelected(a == c);
+                }
               }
+              enabled = true;
+              // only fire event if we weren't selected before
+              _handler.itemStateChanged(e);
             }
-            enabled=true;
-            // only fire event if we weren't selected before
-            _handler.itemStateChanged(e);
-          }
           }
         }
       });