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

---
 .../collection/gui/view/SelectedMemberPanel.java   | 44 ++++++++++++++--------
 1 file changed, 29 insertions(+), 15 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java

(limited to 'source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java')

diff --git a/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java b/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java
old mode 100755
new mode 100644
index 5e66c1e..5b59b35
--- a/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java
+++ b/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java
@@ -4,7 +4,14 @@ import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.JToggleButton;
 
 import com.c2kernel.collection.AggregationMember;
 import com.c2kernel.collection.MembershipException;
@@ -39,22 +46,23 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
 
     SelectedMemberPanel me;
     AggregationMember selectedMember = null;
-	
+
 	public SelectedMemberPanel() {
         me=this;
 		setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-        
+
         JPanel attrs = new JPanel(new GridLayout(3,2));
         attrs.add(new JLabel(Language.translate("Slot Number:")));
         attrs.add(slotNumber);
         attrs.add(new JLabel(Language.translate("Assigned Member:")));
         attrs.add(memberKey);
         memberKey.setEditable(false);
-        
+
         add(attrs);
         add(Box.createVerticalStrut(10));
 
 		findButton.addActionListener(new ActionListener() {
+			@Override
 			public void actionPerformed(ActionEvent ae) {
 				String code = memberKey.getText();
 				if (code == null || code.length() == 0)
@@ -62,9 +70,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
 				MainFrame.itemFinder.pushNewKey(code);
 			}
 		});
-		
+
         changeButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent ae) {
+            @Override
+			public void actionPerformed(ActionEvent ae) {
                 if (changeButton.getModel().isSelected()) {
                     MainFrame.status.setText(Language.translate("Please scan or type your barcode to assign in the top field"));
                     MainFrame.itemFinder.setConsumer(me, "Assign");
@@ -77,9 +86,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
                 }
             }
         });
-        
+
         removeButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent ae) {
+            @Override
+			public void actionPerformed(ActionEvent ae) {
                 selectedMember.clearEntity();
                 selectedMember.getProperties().remove("Name");
                 select(selectedMember);
@@ -92,11 +102,12 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
     		buttonBox.add(changeButton);
 	   	    buttonBox.add(removeButton);
         }
-        
+
         setButtons(false);
 		add(buttonBox);
 	}
 
+	@Override
 	public void select(Vertex vert) {
         selectedMember = (AggregationMember)vert;
 		slotNumber.setText(String.valueOf(vert.getID()));
@@ -108,10 +119,11 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
         } catch (Exception e) { }
         memberKey.setText(name);
         setButtons(true);
-        
+
 		revalidate();
 	}
-	
+
+	@Override
 	public void clear() {
 		slotNumber.setText("");
         memberKey.setText("");
@@ -123,13 +135,14 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
         findButton.setEnabled(state);
         changeButton.getModel().setSelected(false);
         changeButton.setEnabled(state);
-        removeButton.setEnabled(state);   
-        MainFrame.itemFinder.clearConsumer(me);     
+        removeButton.setEnabled(state);
+        MainFrame.itemFinder.clearConsumer(me);
     }
     /**
      *
      */
-    public void push(DomainPath key) {
+    @Override
+	public void push(DomainPath key) {
         MainFrame.status.setText("Assigning entity "+key.getSysKey()+" to slot "+selectedMember.getID());
         try {
             selectedMember.assignEntity(key.getSysKey());
@@ -142,7 +155,8 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe
     /**
      *
      */
-    public void push(String name) {
+    @Override
+	public void push(String name) {
         JOptionPane.showMessageDialog(null, "Product is not known in this centre", "Error", JOptionPane.ERROR_MESSAGE);
     }
 
-- 
cgit v1.2.3