Revision: 20971
          http://sourceforge.net/p/jmol/code/20971
Author:   hansonr
Date:     2016-03-03 03:41:27 +0000 (Thu, 03 Mar 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.4.3_2016.03.03"

bug fix: after SET echo ALL, background echo ... changes text color, not 
background color  

Modified Paths:
--------------
    branches/v14_4/Jmol/src/org/jmol/modelset/Object2d.java
    branches/v14_4/Jmol/src/org/jmol/shape/Echo.java
    branches/v14_4/Jmol/src/org/jmol/shape/Object2dShape.java
    branches/v14_4/Jmol/src/org/jmol/shape/TextShape.java
    branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/jmol/modelset/Object2d.java
    trunk/Jmol/src/org/jmol/shape/Echo.java
    trunk/Jmol/src/org/jmol/shape/Object2dShape.java
    trunk/Jmol/src/org/jmol/shape/TextShape.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v14_4/Jmol/src/org/jmol/modelset/Object2d.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/modelset/Object2d.java     2016-03-02 
15:52:17 UTC (rev 20970)
+++ branches/v14_4/Jmol/src/org/jmol/modelset/Object2d.java     2016-03-03 
03:41:27 UTC (rev 20971)
@@ -75,13 +75,13 @@
     }
   }
 
-  private void setMovableX(int x) {
+  public void setMovableX(int x) {
     valign = (valign == JC.ECHO_XYZ ? JC.ECHO_XYZ : JC.ECHO_XY);
     movableX = x;
     movableXPercent = Integer.MAX_VALUE;
   }
 
-  private void setMovableY(int y) {
+  public void setMovableY(int y) {
     valign = (valign == JC.ECHO_XYZ ? JC.ECHO_XYZ : JC.ECHO_XY);
     movableY = y;
     movableYPercent = Integer.MAX_VALUE;
@@ -188,67 +188,4 @@
         + boxHeight);
   }
 
-  public static boolean setProperty(String propertyName, Object value,
-                                    Object2d currentObject) {
-
-    if ("script" == propertyName) {
-      if (currentObject != null)
-        currentObject.setScript((String) value);
-      return true;
-    }
-
-    if ("xpos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableX(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("ypos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableY(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("%xpos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableXPercent(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("%ypos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableYPercent(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("%zpos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableZPercent(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("xypos" == propertyName) {
-      if (currentObject == null)
-        return true;
-      P3 pt = (P3) value;
-      currentObject.setXYZ(null, true);
-      if (pt.z == Float.MAX_VALUE) {
-        currentObject.setMovableX((int) pt.x);
-        currentObject.setMovableY((int) pt.y);
-      } else {
-        currentObject.setMovableXPercent((int) pt.x);
-        currentObject.setMovableYPercent((int) pt.y);
-      }
-      return true;
-    }
-
-    if ("xyz" == propertyName) {
-      if (currentObject != null) {
-        currentObject.setXYZ((P3) value, true);
-      }
-      return true;
-    }
-    return false;
-  }
-
 }

Modified: branches/v14_4/Jmol/src/org/jmol/shape/Echo.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shape/Echo.java    2016-03-02 15:52:17 UTC 
(rev 20970)
+++ branches/v14_4/Jmol/src/org/jmol/shape/Echo.java    2016-03-03 03:41:27 UTC 
(rev 20971)
@@ -24,14 +24,13 @@
 
 package org.jmol.shape;
 
+import javajs.util.P3;
+import javajs.util.PT;
+
 import org.jmol.java.BS;
-import org.jmol.modelset.Object2d;
 import org.jmol.modelset.Text;
 import org.jmol.script.T;
 import org.jmol.util.C;
-import javajs.util.P3;
-import javajs.util.PT;
-
 import org.jmol.viewer.JC;
 
 public class Echo extends TextShape {
@@ -67,11 +66,12 @@
     }
 
     if ("point" == propertyName) {
-      if (currentObject == null)
-        return;
-      Text t = (Text) currentObject;
-      t.pointerPt = (value == null ? null : (P3) value); // could be an atom.
-      t.pointer = (value == null ? JC.LABEL_POINTER_NONE : 
JC.LABEL_POINTER_ON);
+      if (currentObject != null) {
+        Text t = (Text) currentObject;
+        t.pointerPt = (value == null ? null : (P3) value); // could be an atom.
+        t.pointer = (value == null ? JC.LABEL_POINTER_NONE
+            : JC.LABEL_POINTER_ON);
+      }
       return;
     }
     if ("xyz" == propertyName) {
@@ -82,23 +82,21 @@
     }
 
     if ("scale" == propertyName) {
-      if (currentObject == null) {
-        if (isAll)
-          for (Text t : objects.values())
-            t.setScale(((Float) value).floatValue());
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).setScale(((Float) value).floatValue());
+      } else if (isAll) {
+        for (Text t : objects.values())
+          t.setScale(((Float) value).floatValue());
       }
-      ((Text) currentObject).setScale(((Float) value).floatValue());
       return;
     }
     if ("image" == propertyName) {
-      if (currentObject == null) {
-        if (isAll)
-          for (Text t : objects.values())
-            t.setImage(value);
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).setImage(value);
+      } else if (isAll) {
+        for (Text t : objects.values())
+          t.setImage(value);
       }
-      ((Text) currentObject).setImage(value);
       return;
     }
     if ("thisID" == propertyName) {
@@ -111,28 +109,78 @@
 
     if ("hidden" == propertyName) {
       boolean isHidden = ((Boolean) value).booleanValue();
-      if (currentObject == null) {
-        if (isAll || thisID != null)
-          for (Text t : objects.values())
-            if (isAll
-                || PT.isMatch(t.target.toUpperCase(), thisID, true,
-                    true))
-              t.hidden = isHidden;
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).hidden = isHidden;
+      } else if (isAll || thisID != null) {
+        for (Text t : objects.values())
+          if (isAll || PT.isMatch(t.target.toUpperCase(), thisID, true, true))
+            t.hidden = isHidden;
       }
-      ((Text) currentObject).hidden = isHidden;
       return;
     }
 
-    if (Object2d.setProperty(propertyName, value, currentObject))
+    if ("script" == propertyName) {
+      if (currentObject != null)
+        currentObject.setScript((String) value);
       return;
+    }
 
+    if ("xpos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableX(((Integer) value).intValue());
+      return;
+    }
+
+    if ("ypos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableY(((Integer) value).intValue());
+      return;
+    }
+
+    if ("%xpos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableXPercent(((Integer) value).intValue());
+      return;
+    }
+
+    if ("%ypos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableYPercent(((Integer) value).intValue());
+      return;
+    }
+
+    if ("%zpos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableZPercent(((Integer) value).intValue());
+      return;
+    }
+
+    if ("xypos" == propertyName) {
+      if (currentObject != null) {
+        P3 pt = (P3) value;
+        currentObject.setXYZ(null, true);
+        if (pt.z == Float.MAX_VALUE) {
+          currentObject.setMovableX((int) pt.x);
+          currentObject.setMovableY((int) pt.y);
+        } else {
+          currentObject.setMovableXPercent((int) pt.x);
+          currentObject.setMovableYPercent((int) pt.y);
+        }
+      }
+      return;
+    }
+
+    if ("xyz" == propertyName) {
+      if (currentObject != null) {
+        currentObject.setXYZ((P3) value, true);
+      }
+      return;
+    }
+
     if ("target" == propertyName) {
       thisID = null;
       String target = ((String) value).intern().toLowerCase();
-      if (target == "none" || target == "all") {
-        // process in Object2dShape
-      } else {
+      if (target != "none" && target != "all") {
         isAll = false;
         Text text = objects.get(target);
         if (text == null) {
@@ -149,8 +197,8 @@
           } else if ("error" == target) {
             valign = JC.ECHO_TOP;
           }
-          text = Text.newEcho(vwr, vwr.gdata.getFont3DFS(FONTFACE,
-              FONTSIZE), target, COLOR, valign, halign, 0);
+          text = Text.newEcho(vwr, vwr.gdata.getFont3DFS(FONTFACE, FONTSIZE),
+              target, COLOR, valign, halign, 0);
           text.adjustForWindow = true;
           objects.put(target, text);
           if (currentFont != null)
@@ -168,6 +216,7 @@
         return;
       }
     }
+    
     setPropTS(propertyName, value, null);
   }
 
@@ -189,7 +238,7 @@
       }
       return false;
     }
-    return false;
+    return getPropShape(property, data);
   }
 
   @Override

Modified: branches/v14_4/Jmol/src/org/jmol/shape/Object2dShape.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shape/Object2dShape.java   2016-03-02 
15:52:17 UTC (rev 20970)
+++ branches/v14_4/Jmol/src/org/jmol/shape/Object2dShape.java   2016-03-03 
03:41:27 UTC (rev 20971)
@@ -47,8 +47,7 @@
           while (e.hasNext()) {
             Text text = e.next();
             if (isAll
-                || PT.isMatch(text.target.toUpperCase(), thisID, true,
-                    true)) {
+                || PT.isMatch(text.target.toUpperCase(), thisID, true, true)) {
               e.remove();
             }
           }
@@ -102,16 +101,14 @@
 
     if ("bgcolor" == propertyName) {
       currentBgColor = value;
-      if (currentObject == null) {
-        if (isAll) {
-          Iterator<Text> e = objects.values().iterator();
-          while (e.hasNext()) {
-            e.next().colix = C.getColixO(value);
-          }
+      if (currentObject != null) {
+        currentObject.bgcolix = C.getColixO(value);
+      } else if (isAll) {
+        Iterator<Text> e = objects.values().iterator();
+        while (e.hasNext()) {
+          e.next().bgcolix = C.getColixO(value);
         }
-        return;
       }
-      currentObject.bgcolix = C.getColixO(value);
       return;
     }
 
@@ -123,8 +120,7 @@
           while (e.hasNext()) {
             Text text = e.next();
             if (isAll
-                || PT.isMatch(text.target.toUpperCase(), thisID, true,
-                    true)) {
+                || PT.isMatch(text.target.toUpperCase(), thisID, true, true)) {
               text.colix = C.getColixO(value);
             }
           }

Modified: branches/v14_4/Jmol/src/org/jmol/shape/TextShape.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shape/TextShape.java       2016-03-02 
15:52:17 UTC (rev 20970)
+++ branches/v14_4/Jmol/src/org/jmol/shape/TextShape.java       2016-03-03 
03:41:27 UTC (rev 20971)
@@ -41,26 +41,24 @@
   protected void setPropTS(String propertyName, Object value, BS bsSelected) {
     if ("text" == propertyName) {
       String text = (String) value;
-      if (currentObject == null) {
-        if (isAll)
-          for (Text t : objects.values())
-            t.setText(text);
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).setText(text);
+      } else if (isAll) {
+        for (Text t : objects.values())
+          t.setText(text);
       }
-      ((Text) currentObject).setText(text);
       return;
     }
 
     if ("font" == propertyName) {
       currentFont = (Font) value;
-      if (currentObject == null) {
-        if (isAll)
-          for (Text t : objects.values())
-            t.setFont(currentFont, true);
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).setFont(currentFont, true);
+        ((Text) currentObject).setFontScale(0);
+      } else if (isAll) {
+        for (Text t : objects.values())
+          t.setFont(currentFont, true);
       }
-      ((Text) currentObject).setFont(currentFont, true);
-      ((Text) currentObject).setFontScale(0);
       return;
     }
 

Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties     2016-03-02 
15:52:17 UTC (rev 20970)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties     2016-03-03 
03:41:27 UTC (rev 20971)
@@ -8,7 +8,11 @@
 # see also http://chemapps.stolaf.edu/jmol/zip for daily updates
        
 
-Jmol.___JmolVersion="14.4.3_2016.03.02"
+Jmol.___JmolVersion="14.4.3_2016.03.03"
+
+bug fix: after SET echo ALL, background echo ... changes text color, not 
background color  
+
+JmolVersion="14.4.3_2016.03.02"
 released
 
 bug fix: JavaScript reference to j2s for working gif does not recognize 
Info.j2sPath

Modified: trunk/Jmol/src/org/jmol/modelset/Object2d.java
===================================================================
--- trunk/Jmol/src/org/jmol/modelset/Object2d.java      2016-03-02 15:52:17 UTC 
(rev 20970)
+++ trunk/Jmol/src/org/jmol/modelset/Object2d.java      2016-03-03 03:41:27 UTC 
(rev 20971)
@@ -75,13 +75,13 @@
     }
   }
 
-  private void setMovableX(int x) {
+  public void setMovableX(int x) {
     valign = (valign == JC.ECHO_XYZ ? JC.ECHO_XYZ : JC.ECHO_XY);
     movableX = x;
     movableXPercent = Integer.MAX_VALUE;
   }
 
-  private void setMovableY(int y) {
+  public void setMovableY(int y) {
     valign = (valign == JC.ECHO_XYZ ? JC.ECHO_XYZ : JC.ECHO_XY);
     movableY = y;
     movableYPercent = Integer.MAX_VALUE;
@@ -188,67 +188,4 @@
         + boxHeight);
   }
 
-  public static boolean setProperty(String propertyName, Object value,
-                                    Object2d currentObject) {
-
-    if ("script" == propertyName) {
-      if (currentObject != null)
-        currentObject.setScript((String) value);
-      return true;
-    }
-
-    if ("xpos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableX(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("ypos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableY(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("%xpos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableXPercent(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("%ypos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableYPercent(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("%zpos" == propertyName) {
-      if (currentObject != null)
-        currentObject.setMovableZPercent(((Integer) value).intValue());
-      return true;
-    }
-
-    if ("xypos" == propertyName) {
-      if (currentObject == null)
-        return true;
-      P3 pt = (P3) value;
-      currentObject.setXYZ(null, true);
-      if (pt.z == Float.MAX_VALUE) {
-        currentObject.setMovableX((int) pt.x);
-        currentObject.setMovableY((int) pt.y);
-      } else {
-        currentObject.setMovableXPercent((int) pt.x);
-        currentObject.setMovableYPercent((int) pt.y);
-      }
-      return true;
-    }
-
-    if ("xyz" == propertyName) {
-      if (currentObject != null) {
-        currentObject.setXYZ((P3) value, true);
-      }
-      return true;
-    }
-    return false;
-  }
-
 }

Modified: trunk/Jmol/src/org/jmol/shape/Echo.java
===================================================================
--- trunk/Jmol/src/org/jmol/shape/Echo.java     2016-03-02 15:52:17 UTC (rev 
20970)
+++ trunk/Jmol/src/org/jmol/shape/Echo.java     2016-03-03 03:41:27 UTC (rev 
20971)
@@ -24,14 +24,13 @@
 
 package org.jmol.shape;
 
+import javajs.util.P3;
+import javajs.util.PT;
+
 import org.jmol.java.BS;
-import org.jmol.modelset.Object2d;
 import org.jmol.modelset.Text;
 import org.jmol.script.T;
 import org.jmol.util.C;
-import javajs.util.P3;
-import javajs.util.PT;
-
 import org.jmol.viewer.JC;
 
 public class Echo extends TextShape {
@@ -67,11 +66,12 @@
     }
 
     if ("point" == propertyName) {
-      if (currentObject == null)
-        return;
-      Text t = (Text) currentObject;
-      t.pointerPt = (value == null ? null : (P3) value); // could be an atom.
-      t.pointer = (value == null ? JC.LABEL_POINTER_NONE : 
JC.LABEL_POINTER_ON);
+      if (currentObject != null) {
+        Text t = (Text) currentObject;
+        t.pointerPt = (value == null ? null : (P3) value); // could be an atom.
+        t.pointer = (value == null ? JC.LABEL_POINTER_NONE
+            : JC.LABEL_POINTER_ON);
+      }
       return;
     }
     if ("xyz" == propertyName) {
@@ -82,23 +82,21 @@
     }
 
     if ("scale" == propertyName) {
-      if (currentObject == null) {
-        if (isAll)
-          for (Text t : objects.values())
-            t.setScale(((Float) value).floatValue());
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).setScale(((Float) value).floatValue());
+      } else if (isAll) {
+        for (Text t : objects.values())
+          t.setScale(((Float) value).floatValue());
       }
-      ((Text) currentObject).setScale(((Float) value).floatValue());
       return;
     }
     if ("image" == propertyName) {
-      if (currentObject == null) {
-        if (isAll)
-          for (Text t : objects.values())
-            t.setImage(value);
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).setImage(value);
+      } else if (isAll) {
+        for (Text t : objects.values())
+          t.setImage(value);
       }
-      ((Text) currentObject).setImage(value);
       return;
     }
     if ("thisID" == propertyName) {
@@ -111,28 +109,78 @@
 
     if ("hidden" == propertyName) {
       boolean isHidden = ((Boolean) value).booleanValue();
-      if (currentObject == null) {
-        if (isAll || thisID != null)
-          for (Text t : objects.values())
-            if (isAll
-                || PT.isMatch(t.target.toUpperCase(), thisID, true,
-                    true))
-              t.hidden = isHidden;
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).hidden = isHidden;
+      } else if (isAll || thisID != null) {
+        for (Text t : objects.values())
+          if (isAll || PT.isMatch(t.target.toUpperCase(), thisID, true, true))
+            t.hidden = isHidden;
       }
-      ((Text) currentObject).hidden = isHidden;
       return;
     }
 
-    if (Object2d.setProperty(propertyName, value, currentObject))
+    if ("script" == propertyName) {
+      if (currentObject != null)
+        currentObject.setScript((String) value);
       return;
+    }
 
+    if ("xpos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableX(((Integer) value).intValue());
+      return;
+    }
+
+    if ("ypos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableY(((Integer) value).intValue());
+      return;
+    }
+
+    if ("%xpos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableXPercent(((Integer) value).intValue());
+      return;
+    }
+
+    if ("%ypos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableYPercent(((Integer) value).intValue());
+      return;
+    }
+
+    if ("%zpos" == propertyName) {
+      if (currentObject != null)
+        currentObject.setMovableZPercent(((Integer) value).intValue());
+      return;
+    }
+
+    if ("xypos" == propertyName) {
+      if (currentObject != null) {
+        P3 pt = (P3) value;
+        currentObject.setXYZ(null, true);
+        if (pt.z == Float.MAX_VALUE) {
+          currentObject.setMovableX((int) pt.x);
+          currentObject.setMovableY((int) pt.y);
+        } else {
+          currentObject.setMovableXPercent((int) pt.x);
+          currentObject.setMovableYPercent((int) pt.y);
+        }
+      }
+      return;
+    }
+
+    if ("xyz" == propertyName) {
+      if (currentObject != null) {
+        currentObject.setXYZ((P3) value, true);
+      }
+      return;
+    }
+
     if ("target" == propertyName) {
       thisID = null;
       String target = ((String) value).intern().toLowerCase();
-      if (target == "none" || target == "all") {
-        // process in Object2dShape
-      } else {
+      if (target != "none" && target != "all") {
         isAll = false;
         Text text = objects.get(target);
         if (text == null) {
@@ -149,8 +197,8 @@
           } else if ("error" == target) {
             valign = JC.ECHO_TOP;
           }
-          text = Text.newEcho(vwr, vwr.gdata.getFont3DFS(FONTFACE,
-              FONTSIZE), target, COLOR, valign, halign, 0);
+          text = Text.newEcho(vwr, vwr.gdata.getFont3DFS(FONTFACE, FONTSIZE),
+              target, COLOR, valign, halign, 0);
           text.adjustForWindow = true;
           objects.put(target, text);
           if (currentFont != null)
@@ -168,6 +216,7 @@
         return;
       }
     }
+    
     setPropTS(propertyName, value, null);
   }
 

Modified: trunk/Jmol/src/org/jmol/shape/Object2dShape.java
===================================================================
--- trunk/Jmol/src/org/jmol/shape/Object2dShape.java    2016-03-02 15:52:17 UTC 
(rev 20970)
+++ trunk/Jmol/src/org/jmol/shape/Object2dShape.java    2016-03-03 03:41:27 UTC 
(rev 20971)
@@ -47,8 +47,7 @@
           while (e.hasNext()) {
             Text text = e.next();
             if (isAll
-                || PT.isMatch(text.target.toUpperCase(), thisID, true,
-                    true)) {
+                || PT.isMatch(text.target.toUpperCase(), thisID, true, true)) {
               e.remove();
             }
           }
@@ -102,16 +101,14 @@
 
     if ("bgcolor" == propertyName) {
       currentBgColor = value;
-      if (currentObject == null) {
-        if (isAll) {
-          Iterator<Text> e = objects.values().iterator();
-          while (e.hasNext()) {
-            e.next().colix = C.getColixO(value);
-          }
+      if (currentObject != null) {
+        currentObject.bgcolix = C.getColixO(value);
+      } else if (isAll) {
+        Iterator<Text> e = objects.values().iterator();
+        while (e.hasNext()) {
+          e.next().bgcolix = C.getColixO(value);
         }
-        return;
       }
-      currentObject.bgcolix = C.getColixO(value);
       return;
     }
 
@@ -123,8 +120,7 @@
           while (e.hasNext()) {
             Text text = e.next();
             if (isAll
-                || PT.isMatch(text.target.toUpperCase(), thisID, true,
-                    true)) {
+                || PT.isMatch(text.target.toUpperCase(), thisID, true, true)) {
               text.colix = C.getColixO(value);
             }
           }

Modified: trunk/Jmol/src/org/jmol/shape/TextShape.java
===================================================================
--- trunk/Jmol/src/org/jmol/shape/TextShape.java        2016-03-02 15:52:17 UTC 
(rev 20970)
+++ trunk/Jmol/src/org/jmol/shape/TextShape.java        2016-03-03 03:41:27 UTC 
(rev 20971)
@@ -41,26 +41,24 @@
   protected void setPropTS(String propertyName, Object value, BS bsSelected) {
     if ("text" == propertyName) {
       String text = (String) value;
-      if (currentObject == null) {
-        if (isAll)
-          for (Text t : objects.values())
-            t.setText(text);
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).setText(text);
+      } else if (isAll) {
+        for (Text t : objects.values())
+          t.setText(text);
       }
-      ((Text) currentObject).setText(text);
       return;
     }
 
     if ("font" == propertyName) {
       currentFont = (Font) value;
-      if (currentObject == null) {
-        if (isAll)
-          for (Text t : objects.values())
-            t.setFont(currentFont, true);
-        return;
+      if (currentObject != null) {
+        ((Text) currentObject).setFont(currentFont, true);
+        ((Text) currentObject).setFontScale(0);
+      } else if (isAll) {
+        for (Text t : objects.values())
+          t.setFont(currentFont, true);
       }
-      ((Text) currentObject).setFont(currentFont, true);
-      ((Text) currentObject).setFontScale(0);
       return;
     }
 

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2016-03-02 15:52:17 UTC 
(rev 20970)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2016-03-03 03:41:27 UTC 
(rev 20971)
@@ -65,8 +65,12 @@
 TODO: isosurface molecular has an issue with 2gb1
 TODO: slab SET will not be rendered correctly when exported because 
tm.transformPoint
 
-Jmol.___JmolVersion="14.5.3_2016.03.02"
+Jmol.___JmolVersion="14.5.3_2016.03.03"
 
+bug fix: after SET echo ALL, background echo ... changes text color, not 
background color  
+
+JmolVersion="14.5.3_2016.03.02"
+
 bug fix: JavaScript reference to j2s for working gif does not recognize 
Info.j2sPath
 
 JmolVersion="14.5.3_2016.02.28"

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to