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

---
 .../tabs/outcome/form/field/DecimalEditField.java  | 45 +++++++++++++---------
 1 file changed, 26 insertions(+), 19 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java

(limited to 'source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java')

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java
old mode 100755
new mode 100644
index d77dff3..fabaed8
--- a/source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java
@@ -26,44 +26,50 @@ public class DecimalEditField extends StringEditField {
         field.setToolTipText("This field must contains a decimal number e.g. 3.14159265");
     }
 
-    public String getText() {
+    @Override
+	public String getText() {
         return field.getText();
     }
 
-    public void setText(String text) {
+    @Override
+	public void setText(String text) {
         field.setText(text);
     }
-    
-    public String getDefaultValue() {
+
+    @Override
+	public String getDefaultValue() {
         return "0.0";
-    }    
-    
-    public JTextComponent makeTextField() {
+    }
+
+    @Override
+	public JTextComponent makeTextField() {
         return new DecimalTextField();
     }
-    
+
     private class DecimalTextField extends JTextField {
 
         public DecimalTextField() {
             super();
             setHorizontalAlignment(RIGHT);
         }
-        protected Document createDefaultModel() {
+        @Override
+		protected Document createDefaultModel() {
             return new Decimal();
         }
     }
-    
+
     private class Decimal extends PlainDocument {
 
         BigDecimal currentVal = new BigDecimal(0.0);
 
 
-        public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+        @Override
+		public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
 
             if (str == null || str.equals("")) {
                 return;
             }
-            
+
             String proposedResult = null;
 
             if (getLength() == 0) {
@@ -73,23 +79,24 @@ public class DecimalEditField extends StringEditField {
                 currentBuffer.insert(offs, str);
                 proposedResult = currentBuffer.toString();
             }
-     
+
             try {
                 currentVal = parse(proposedResult);
                 super.insertString(offs, str, a);
             } catch (Exception e) {
                 Toolkit.getDefaultToolkit().beep();
             }
-      
+
         }
 
-        public void remove(int offs, int len) throws BadLocationException {
+        @Override
+		public void remove(int offs, int len) throws BadLocationException {
 
             String currentText = this.getText(0, getLength());
             String beforeOffset = currentText.substring(0, offs);
             String afterOffset = currentText.substring(len + offs, currentText.length());
             String proposedResult = beforeOffset + afterOffset;
-            
+
             if (proposedResult.length() == 0) { // empty is ok
                 super.remove(offs, len);
                 return;
@@ -97,17 +104,17 @@ public class DecimalEditField extends StringEditField {
             try {
                 currentVal = parse(proposedResult);
                 super.remove(offs, len);
-            } catch (Exception e) { 
+            } catch (Exception e) {
                 Toolkit.getDefaultToolkit().beep();
             }
 
-        }           
+        }
 
         public BigDecimal parse(String proposedResult) throws NumberFormatException {
 
             BigDecimal value = new BigDecimal(0);
             if ( proposedResult.length() != 0) {
-                value =  new BigDecimal(proposedResult);      
+                value =  new BigDecimal(proposedResult);
             }
             return value;
         }
-- 
cgit v1.2.3