From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: More code cleanup: Refactored Entity Proxy Subscription to handle
 generics better Rewrote RemoteMap to use TreeMap instead of the internal
 array for order. It now sorts its keys by number if they parse, else as
 strings. Removed a no-longer-in-progress outcome form class

---
 source/com/c2kernel/gui/EntityTabManager.java | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'source/com/c2kernel/gui/EntityTabManager.java')

diff --git a/source/com/c2kernel/gui/EntityTabManager.java b/source/com/c2kernel/gui/EntityTabManager.java
index 1e01ad0..b465570 100644
--- a/source/com/c2kernel/gui/EntityTabManager.java
+++ b/source/com/c2kernel/gui/EntityTabManager.java
@@ -2,7 +2,6 @@ package com.c2kernel.gui;
 import java.awt.GridLayout;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -21,7 +20,7 @@ import com.c2kernel.utils.Logger;
 public class EntityTabManager extends JPanel
 {
     private MainFrame mMainframe;
-    
+
     protected HashMap<Integer, EntityDetails> openItems = new HashMap<Integer, EntityDetails>();
     protected JTabbedPaneWithCloseIcons tabbedPane = new JTabbedPaneWithCloseIcons();
 	//JTabbedPane tabbedPane = new JTabbedPane();
@@ -50,11 +49,11 @@ public class EntityTabManager extends JPanel
 
             // get currently selected item to set location
             tabbedPane.addTab(thisEntity.getName(), thisEntity.getIcon(), requestedDetails, Integer.toString(thisEntity.getSysKey()));
-            
-			
+
+
         }
         else { //opened window but different nodeitem
-            requestedDetails = (EntityDetails)openItems.get(new Integer(thisEntity.getSysKey()));
+            requestedDetails = openItems.get(new Integer(thisEntity.getSysKey()));
         }
         tabbedPane.setSelectedComponent(requestedDetails);
         return requestedDetails;
@@ -64,24 +63,23 @@ public class EntityTabManager extends JPanel
         this.myMenuBuilder = myMenuBuilder;
     }
 
-    public void remove(int sysKey) {
+    @Override
+	public void remove(int sysKey) {
         Integer sysKeyObj = new Integer(sysKey);
         if (!openItems.containsKey(sysKeyObj)) return;
-        EntityDetails tabToClose = (EntityDetails)openItems.get(sysKeyObj);
+        EntityDetails tabToClose = openItems.get(sysKeyObj);
         tabbedPane.remove(tabToClose);
         tabToClose.discardTabs();
         openItems.remove(sysKeyObj);
     }
-    
+
     public void closeAll(boolean keepOpen) {
     	ArrayList<Integer> toRemove = new ArrayList<Integer>();
-    	for (Iterator iter = openItems.keySet().iterator(); iter.hasNext();) {
-			Integer element = (Integer) iter.next();
+    	for (Integer element : openItems.keySet()) {
 			if (keepOpen && openItems.get(element).equals(tabbedPane.getSelectedComponent())) continue;
 			toRemove.add(element);
 		}
-    	for (Iterator iter = toRemove.iterator(); iter.hasNext();) {
-			Integer element = (Integer) iter.next();
+    	for (Integer element : toRemove) {
 			remove(element.intValue());
 		}
     }
-- 
cgit v1.2.3