Revision: 5123
Author: hansonr
Date: 2006-05-14 22:37:46 -0700 (Sun, 14 May 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5123&view=rev
Log Message:
-----------
bob200603 reconfigures auxiliaryinfo as stand-alone information
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
branches/bob200603/Jmol/src/org/jmol/viewer/PropertyManager.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
2006-05-15 05:14:15 UTC (rev 5122)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
2006-05-15 05:37:46 UTC (rev 5123)
@@ -908,19 +908,14 @@
Hashtable info = new Hashtable();
if (frame == null)
return info;
- Hashtable auxInfo = getModelSetAuxiliaryInfo();
- if (auxInfo != null)
- info.put("modelSetAuxiliaryInfo",auxInfo);
+ info = getModelSetAuxiliaryInfo();
+ if (info == null)
+ return info;
Vector models = new Vector();
int modelCount = viewer.getModelCount();
for (int i = 0; i < modelCount; ++i) {
- Hashtable model = new Hashtable();
- model.put("_ipt",new Integer(i));
- model.put("num",new Integer(viewer.getModelNumber(i)));
- auxInfo = getModelAuxiliaryInfo(i);
- if (auxInfo != null)
- model.put("modelAuxiliaryInfo",auxInfo);
- models.add(model);
+ Hashtable modelinfo = getModelAuxiliaryInfo(i);
+ models.add(modelinfo);
}
info.put("models",models);
return info;
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/PropertyManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/PropertyManager.java
2006-05-15 05:14:15 UTC (rev 5122)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/PropertyManager.java
2006-05-15 05:37:46 UTC (rev 5123)
@@ -56,7 +56,7 @@
"animationInfo" , "", "",
"modelInfo" , "", "",
- "vibrationInfo" , "", "",
+ "X -vibrationInfo", "", "", //not implemented -- see auxiliaryInfo
"shapeInfo" , "", "",
"measurementInfo" , "", "",
@@ -89,7 +89,7 @@
final static int PROP_ANIMATION_INFO = 5;
final static int PROP_MODEL_INFO = 6;
- final static int PROP_VIBRATION_INFO = 7;
+ final static int PROP_VIBRATION_INFO = 7; //not implemented -- see
auxiliaryInfo
final static int PROP_SHAPE_INFO = 8;
final static int PROP_MEASUREMENT_INFO = 9;
@@ -228,12 +228,14 @@
for (int i = 0; i < PROP_COUNT; i++) {
String paramType = getParamType(i);
String paramDefault = getDefaultParam(i);
- info += "\n getProperty(\""
- + getPropertyName(i)
- + "\""
- + (paramType != "" ? ",\"" + paramType
- + (paramDefault != "" ? "[" + paramDefault + "]" : "") + "\""
- : "") + ")";
+ String name = getPropertyName(i);
+ if (name.charAt(0) != 'X')
+ info += "\n getProperty(\""
+ + name
+ + "\""
+ + (paramType != "" ? ",\"" + paramType
+ + (paramDefault != "" ? "[" + paramDefault + "]" : "") + "\""
+ : "") + ")";
}
return info;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits
