Revision: 20235
http://sourceforge.net/p/jmol/code/20235
Author: hansonr
Date: 2015-01-22 23:46:15 +0000 (Thu, 22 Jan 2015)
Log Message:
-----------
simplification of TestSort into TextString
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/g3d/Graphics3D.java
trunk/Jmol/src/org/jmol/g3d/TextString.java
Removed Paths:
-------------
trunk/Jmol/src/org/jmol/g3d/TextSorter.java
Modified: trunk/Jmol/src/org/jmol/g3d/Graphics3D.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/Graphics3D.java 2015-01-22 23:21:48 UTC (rev
20234)
+++ trunk/Jmol/src/org/jmol/g3d/Graphics3D.java 2015-01-22 23:46:15 UTC (rev
20235)
@@ -1061,7 +1061,7 @@
return;
if (stringCount >= 2) {
if (sort == null)
- sort = new TextSorter();
+ sort = new TextString();
Arrays.sort(strings, sort);
}
for (int i = 0; i < stringCount; i++) {
Deleted: trunk/Jmol/src/org/jmol/g3d/TextSorter.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/TextSorter.java 2015-01-22 23:21:48 UTC (rev
20234)
+++ trunk/Jmol/src/org/jmol/g3d/TextSorter.java 2015-01-22 23:46:15 UTC (rev
20235)
@@ -1,12 +0,0 @@
-package org.jmol.g3d;
-
-import java.util.Comparator;
-
-class TextSorter implements Comparator<TextString> {
-
- @Override
- public int compare(TextString a, TextString b) {
- return (a == null || b == null ? 0 : a.z > b.z ? -1 : a.z < b.z ? 1 : 0);
- }
-
-}
Modified: trunk/Jmol/src/org/jmol/g3d/TextString.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/TextString.java 2015-01-22 23:21:48 UTC (rev
20234)
+++ trunk/Jmol/src/org/jmol/g3d/TextString.java 2015-01-22 23:46:15 UTC (rev
20235)
@@ -1,10 +1,12 @@
package org.jmol.g3d;
+import java.util.Comparator;
+
import javajs.awt.Font;
import javajs.util.P3i;
-class TextString extends P3i {
+class TextString extends P3i implements Comparator<TextString> {
String text;
Font font;
@@ -21,6 +23,11 @@
}
@Override
+ public int compare(TextString a, TextString b) {
+ return (a == null || b == null ? 0 : a.z > b.z ? -1 : a.z < b.z ? 1 : 0);
+ }
+
+ @Override
public String toString() {
return super.toString() + " " + text;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
