Changeset 176 for trunk/src/org/expeditee/simple

Timestamp:

07/30/08 14:53:21 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/simple/ExpediteeJEP.java (modified) (5 diffs)

trunk/src/org/expeditee/simple/ExpediteeJEP.java

@@ -14 +14 @@
 public class ExpediteeJEP extends JEP {
         Observer observer = null;
-        
+
         public ExpediteeJEP() {
                 super();
@@ -24 +24 @@
                 resetObserver();
         }
-        
+
         public void resetObserver() {
                 observer = new Observer() {
@@ -30 +30 @@
 
                         public void update(Observable ob, Object o) {
+                                assert(o instanceof Variable);
                                 _attribute = ((Variable) o).getName();
                         }
@@ -44 +45 @@
         public String getResult() {
                 Double result = getValue();
-                if(result.isNaN()){
+                if (result.isNaN()) {
                         return null;
-                }               
+                }
                 NumberFormat nf = NumberFormat.getInstance();
+                // TODO see if the parser can handle commas if a flag is switched
+                nf.setGroupingUsed(false);
                 nf.setMinimumFractionDigits(0);
                 nf.setMaximumFractionDigits(15);
-                return observer.toString()+ ": " + nf.format(result);
+                String varName = observer.toString();
+                if (varName.length() > 0)
+                        return varName + ": " + nf.format(result);
+
+                return nf.format(result);
         }
 
         public void addVariables(Frame frame) {
-                if(frame == null)
+                if (frame == null)
                         return;
                 // Check for variables
@@ -60 +67 @@
                         AttributeValuePair avp = AttributeUtils.getPair(t.getText());
                         if (avp != null) {
-                                addVariable(avp.getAttribute(), avp
-                                                .getDoubleValue());
+                                addVariable(avp.getAttribute(), avp.getDoubleValue());
                         }
                 }