From: <ni...@us...> - 2008-08-27 19:31:51
|
Revision: 9782 http://jmol.svn.sourceforge.net/jmol/?rev=9782&view=rev Author: nicove Date: 2008-08-27 19:31:47 +0000 (Wed, 27 Aug 2008) Log Message: ----------- Code optimisation Modified Paths: -------------- trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java Modified: trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java =================================================================== --- trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java 2008-08-27 19:17:03 UTC (rev 9781) +++ trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java 2008-08-27 19:31:47 UTC (rev 9782) @@ -45,7 +45,7 @@ Hashtable htEllipsoids = new Hashtable(); boolean haveEllipsoids; - class Ellipsoid { + static class Ellipsoid { String id; Vector3f[] axes; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2010-07-31 22:47:14
|
Revision: 13808 http://jmol.svn.sourceforge.net/jmol/?rev=13808&view=rev Author: nicove Date: 2010-07-31 22:47:08 +0000 (Sat, 31 Jul 2010) Log Message: ----------- Java 1.5 : Generics Modified Paths: -------------- trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java Modified: trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java =================================================================== --- trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java 2010-07-31 22:40:30 UTC (rev 13807) +++ trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java 2010-07-31 22:47:08 UTC (rev 13808) @@ -41,7 +41,7 @@ public class Ellipsoids extends AtomShape { // most differences are in renderer - Hashtable htEllipsoids = new Hashtable(); + Hashtable<String, Ellipsoid> htEllipsoids = new Hashtable<String, Ellipsoid>(); boolean haveEllipsoids; static class Ellipsoid { @@ -67,7 +67,7 @@ @Override public int getIndexFromName(String thisID) { - return ((ellipsoid = (Ellipsoid) htEllipsoids.get(thisID)) + return ((ellipsoid = htEllipsoids.get(thisID)) == null ? -1 : 1); } @@ -93,8 +93,7 @@ @Override public void setProperty(String propertyName, Object value, BitSet bs) { if (propertyName == "thisID") { - ellipsoid = (value == null ? null : (Ellipsoid) htEllipsoids - .get((String) value)); + ellipsoid = (value == null ? null : (Ellipsoid) htEllipsoids.get(value)); if (value == null) return; if (ellipsoid == null) { @@ -106,10 +105,10 @@ } if (propertyName == "deleteModelAtoms") { int modelIndex = ((int[]) ((Object[]) value)[2])[0]; - Enumeration e = htEllipsoids.keys(); + Enumeration<String> e = htEllipsoids.keys(); while (e.hasMoreElements()) { - String id = (String) e.nextElement(); - Ellipsoid ellipsoid = (Ellipsoid) htEllipsoids.get(id); + String id = e.nextElement(); + Ellipsoid ellipsoid = htEllipsoids.get(id); if (ellipsoid.modelIndex > modelIndex) ellipsoid.modelIndex--; else if (ellipsoid.modelIndex == modelIndex) @@ -217,11 +216,11 @@ @Override public String getShapeState() { - Enumeration e = htEllipsoids.elements(); + Enumeration<Ellipsoid> e = htEllipsoids.elements(); StringBuffer sb = new StringBuffer(); Vector3f v1 = new Vector3f(); while (e.hasMoreElements()) { - Ellipsoid ellipsoid = (Ellipsoid) e.nextElement(); + Ellipsoid ellipsoid = e.nextElement(); if (ellipsoid.axes == null || ellipsoid.lengths == null) continue; sb.append(" Ellipsoid ID ").append(ellipsoid.id).append(" modelIndex ") @@ -260,9 +259,9 @@ * set all fixed objects visible; others based on model being displayed * */ - Enumeration e = htEllipsoids.elements(); + Enumeration<Ellipsoid> e = htEllipsoids.elements(); while (e.hasMoreElements()) { - Ellipsoid ellipsoid = (Ellipsoid) e.nextElement(); + Ellipsoid ellipsoid = e.nextElement(); ellipsoid.visible = ellipsoid.isOn && (ellipsoid.modelIndex < 0 || bs.get(ellipsoid.modelIndex)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-08-07 16:53:30
|
Revision: 13907 http://jmol.svn.sourceforge.net/jmol/?rev=13907&view=rev Author: hansonr Date: 2010-08-07 16:53:24 +0000 (Sat, 07 Aug 2010) Log Message: ----------- Ellipsoid e.remove() Modified Paths: -------------- trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java Modified: trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java =================================================================== --- trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java 2010-08-07 16:37:50 UTC (rev 13906) +++ trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java 2010-08-07 16:53:24 UTC (rev 13907) @@ -106,13 +106,13 @@ } if (propertyName == "deleteModelAtoms") { int modelIndex = ((int[]) ((Object[]) value)[2])[0]; - for (Map.Entry<String, Ellipsoid> entry : htEllipsoids.entrySet()) { - String id = entry.getKey(); - Ellipsoid ellipsoid = entry.getValue(); + Iterator<Ellipsoid> e = htEllipsoids.values().iterator(); + while (e.hasNext()) { + Ellipsoid ellipsoid = e.next(); if (ellipsoid.modelIndex > modelIndex) ellipsoid.modelIndex--; else if (ellipsoid.modelIndex == modelIndex) - htEllipsoids.remove(id); + e.remove(); } ellipsoid = null; return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-07-02 10:40:46
|
Revision: 18404 http://sourceforge.net/p/jmol/code/18404 Author: hansonr Date: 2013-07-02 10:40:41 +0000 (Tue, 02 Jul 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java Modified: trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java =================================================================== --- trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java 2013-07-02 10:11:41 UTC (rev 18403) +++ trunk/Jmol/src/org/jmol/shapespecial/Ellipsoids.java 2013-07-02 10:40:41 UTC (rev 18404) @@ -261,12 +261,13 @@ } private boolean initEllipsoids(Object value) { - ellipsoidSelected = (value == null ? null : (Ellipsoid) simpleEllipsoids.get(value)); - if (value != null) { + boolean haveID = (value != null); + ellipsoidSelected = (haveID ? (Ellipsoid) simpleEllipsoids.get(value) : null); + if (haveID) { typeSelected = null; } selectedAtoms = null; - return false; + return haveID; } // private void setPoints(P3[] points, BS bs) { @@ -390,7 +391,7 @@ Ellipsoid ellipsoid = e.next(); ellipsoid.visible = ellipsoid.isValid && ellipsoid.isOn && (ellipsoid.modelIndex < 0 || bs.get(ellipsoid.modelIndex)); - if (atoms != null) + if (ellipsoid.tensor.atomIndex1 >= 0) atoms[ellipsoid.tensor.atomIndex1].setShapeVisibility(myVisibilityFlag, true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |