[Jmol-commits] CVS: Jmol applet.classes,1.20,1.21 build.xml,1.44,1.45

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol
In directory sc8-pr-cvs1:/tmp/cvs-serv3245

Modified Files:
	applet.classes build.xml 
Log Message:
completed separation of measures from UI


Index: applet.classes
===================================================================
RCS file: /cvsroot/jmol/Jmol/applet.classes,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** applet.classes	4 Feb 2003 22:50:10 -0000	1.20
--- applet.classes	5 Feb 2003 15:58:15 -0000	1.21
***************
*** 30,33 ****
--- 30,34 ----
  org/openscience/jmol/CrystalBox.java
  org/openscience/jmol/FortranFormat.java
+ freeware/PrintfFormat.java
  org/openscience/jmol/AtomTypeSet.java
  org/openscience/jmol/StatusDisplay.java
***************
*** 36,42 ****
  org/openscience/jmol/NMRShielding.java
  org/openscience/jmol/AtomicSymbol.java
! org/openscience/jmol/Measurement.java
! org/openscience/jmol/app/MeasurementList.java
! org/openscience/jmol/app/MeasurementListEvent.java
  org/openscience/jmol/UseJavaSort.java
  org/openscience/jmol/JmolAtomIterator.java
--- 37,43 ----
  org/openscience/jmol/NMRShielding.java
  org/openscience/jmol/AtomicSymbol.java
! org/openscience/jmol/MeasurementManager.java
! org/openscience/jmol/MeasurementWatcher.java
! org/openscience/jmol/MeasurementInterface.java
  org/openscience/jmol/UseJavaSort.java
  org/openscience/jmol/JmolAtomIterator.java
***************
*** 73,77 ****
  org/openscience/jmol/render/ArrowLine.java
  org/openscience/jmol/render/ChemFrameRenderer.java
- org/openscience/jmol/render/MeasureRenderer.java
  org/openscience/jmol/render/Shape.java
  org/openscience/jmol/render/AtomShape.java
--- 74,77 ----
***************
*** 85,88 ****
--- 85,92 ----
  org/openscience/jmol/render/ShadedSphereRenderer.java
  org/openscience/jmol/render/SphereG2D.java
+ org/openscience/jmol/render/Distance.java
+ org/openscience/jmol/render/Angle.java
+ org/openscience/jmol/render/Dihedral.java
+ org/openscience/jmol/render/MeasureRenderer.java
  org/openscience/jmol/script/Eval.java
  org/openscience/jmol/script/Token.java

Index: build.xml
===================================================================
RCS file: /cvsroot/jmol/Jmol/build.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** build.xml	3 Feb 2003 15:20:31 -0000	1.44
--- build.xml	5 Feb 2003 15:58:16 -0000	1.45
***************
*** 278,283 ****
      <jar jarfile="${lib.dir}/JmolApplet.jar" >
        <fileset dir="${applet.classes.dir}" >
!         <exclude name="**/.*" />
!         <include name="**/jmol/**" />
        </fileset>
        <fileset dir="${appletjars.dir}" includes="**/*"/>
--- 278,282 ----
      <jar jarfile="${lib.dir}/JmolApplet.jar" >
        <fileset dir="${applet.classes.dir}" >
!         <include name="**/*" />
        </fileset>
        <fileset dir="${appletjars.dir}" includes="**/*"/>