Menu
▾
▴
[Jmol-commits] SF.net SVN: jmol:[18861] trunk/Jmol/src/org/openscience
|
From: <ha...@us...> - 2013-10-29 18:43:23
|
Revision: 18861
http://sourceforge.net/p/jmol/code/18861
Author: hansonr
Date: 2013-10-29 18:43:18 +0000 (Tue, 29 Oct 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/openscience/jmol/app/JmolApp.java
trunk/Jmol/src/org/openscience/jmol/app/JmolData.java
trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java
trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/console/AppConsole.java
trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java
trunk/Jmol/src/org/openscience/jvxl/Jvxl.java
Modified: trunk/Jmol/src/org/openscience/jmol/app/JmolApp.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/JmolApp.java 2013-10-29 18:43:02 UTC (rev 18860)
+++ trunk/Jmol/src/org/openscience/jmol/app/JmolApp.java 2013-10-29 18:43:18 UTC (rev 18861)
@@ -289,7 +289,7 @@
// port for JSON mode communication
if (line.hasOption("P"))
- port = javajs.util.ParserJS.parseInt(line.getOptionValue("P"));
+ port = javajs.util.Parser.parseInt(line.getOptionValue("P"));
if (port > 0)
info.put("port", Integer.valueOf(port));
@@ -402,10 +402,10 @@
String geometry = line.getOptionValue("g");
int indexX = geometry.indexOf('x');
if (indexX > 0) {
- width = javajs.util.ParserJS.parseInt(geometry.substring(0, indexX));
- height = javajs.util.ParserJS.parseInt(geometry.substring(indexX + 1));
+ width = javajs.util.Parser.parseInt(geometry.substring(0, indexX));
+ height = javajs.util.Parser.parseInt(geometry.substring(indexX + 1));
} else {
- width = height = javajs.util.ParserJS.parseInt(geometry);
+ width = height = javajs.util.Parser.parseInt(geometry);
}
startupWidth = -1;
}
@@ -424,7 +424,7 @@
if (line.hasOption("w")) {
int quality = -1;
if (line.hasOption("q"))
- quality = javajs.util.ParserJS.parseInt(line.getOptionValue("q"));
+ quality = javajs.util.Parser.parseInt(line.getOptionValue("q"));
String type_name = line.getOptionValue("w");
if (type_name != null) {
if (type_name.length() == 0)
@@ -435,7 +435,7 @@
String type = type_name.substring(0, i).toUpperCase();
type_name = type_name.substring(i + 1).trim();
if (type.indexOf(" ") >= 0) {
- quality = javajs.util.ParserJS.parseInt(type.substring(type.indexOf(" ")).trim());
+ quality = javajs.util.Parser.parseInt(type.substring(type.indexOf(" ")).trim());
type.substring(0, type.indexOf(" "));
}
if (GraphicsEnvironment.isHeadless()) {
@@ -452,7 +452,7 @@
}
}
if (GraphicsEnvironment.isHeadless())
- info.put("headlistMaxTimeMs", Integer.valueOf(1000 * (line.hasOption("T") ? javajs.util.ParserJS.parseInt(line.getOptionValue("T")) : 60)));
+ info.put("headlistMaxTimeMs", Integer.valueOf(1000 * (line.hasOption("T") ? javajs.util.Parser.parseInt(line.getOptionValue("T")) : 60)));
// the next three are coupled -- if the -n command line option is
// given, but -I is not, then the -x is added, but not vice-versa.
Modified: trunk/Jmol/src/org/openscience/jmol/app/JmolData.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/JmolData.java 2013-10-29 18:43:02 UTC (rev 18860)
+++ trunk/Jmol/src/org/openscience/jmol/app/JmolData.java 2013-10-29 18:43:18 UTC (rev 18861)
@@ -23,7 +23,7 @@
*/
package org.openscience.jmol.app;
-import javajs.util.ParserJS;
+import javajs.util.Parser;
import org.jmol.api.JmolViewer;
import org.jmol.util.Escape;
@@ -52,7 +52,7 @@
jmolApp.isDataOnly = true;
//jmolApp.info.put("exit", Boolean.TRUE);
- String[] args = ParserJS.split(commandOptions, " "); // doesn't allow for double-quoted
+ String[] args = Parser.split(commandOptions, " "); // doesn't allow for double-quoted
jmolApp.parseCommandLine(args);
return new JmolData(jmolApp);
}
Modified: trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java 2013-10-29 18:43:02 UTC (rev 18860)
+++ trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java 2013-10-29 18:43:18 UTC (rev 18861)
@@ -50,7 +50,7 @@
import java.io.BufferedInputStream;
import java.io.FileOutputStream;
-import javajs.util.ParserJS;
+import javajs.util.Parser;
import javax.swing.JRadioButton;
import javax.swing.BoxLayout;
@@ -636,9 +636,9 @@
clearHistory = Boolean.getBoolean("clearHistory");
minBondDistance =
- ParserJS.fVal(currentProperties.getProperty("minBondDistance"));
+ Parser.fVal(currentProperties.getProperty("minBondDistance"));
bondTolerance =
- ParserJS.fVal(currentProperties.getProperty("bondTolerance"));
+ Parser.fVal(currentProperties.getProperty("bondTolerance"));
marBond = Short.parseShort(currentProperties.getProperty("marBond"));
percentVdwAtom =
Integer.parseInt(currentProperties.getProperty("percentVdwAtom"));
Modified: trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/console/AppConsole.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/console/AppConsole.java 2013-10-29 18:43:02 UTC (rev 18860)
+++ trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/console/AppConsole.java 2013-10-29 18:43:18 UTC (rev 18861)
@@ -35,7 +35,7 @@
import java.util.List;
-import javajs.util.ParserJS;
+import javajs.util.Parser;
import javax.swing.JButton;
import javax.swing.JDialog;
@@ -180,7 +180,7 @@
if (enabledButtons == null)
enabledButtons = ALL_BUTTONS;
JScrollPane consolePane = new JScrollPane(console);
- String[] tokens = ParserJS.getTokens(enabledButtons);
+ String[] tokens = Parser.getTokens(enabledButtons);
for (int i = 0; i < tokens.length; i++)
enableButton(tokens[i]);
setEnabled(undoButton, false);
Modified: trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2013-10-29 18:43:02 UTC (rev 18860)
+++ trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2013-10-29 18:43:18 UTC (rev 18861)
@@ -76,9 +76,9 @@
localAppletPath = historyFile.getProperty("webMakerLocalAppletPath", "..");
pageAuthorName = historyFile.getProperty("webMakerPageAuthorName",
GT._("Jmol Web Page Maker"));
- popInWidth=javajs.util.ParserJS.parseInt(historyFile.getProperty("webMakerPopInWidth", "300"));
- popInHeight=javajs.util.ParserJS.parseInt(historyFile.getProperty("webMakerPopInHeight", "300"));
- scriptButtonPercent = javajs.util.ParserJS.parseInt(historyFile.getProperty(
+ popInWidth=javajs.util.Parser.parseInt(historyFile.getProperty("webMakerPopInWidth", "300"));
+ popInHeight=javajs.util.Parser.parseInt(historyFile.getProperty("webMakerPopInHeight", "300"));
+ scriptButtonPercent = javajs.util.Parser.parseInt(historyFile.getProperty(
"webMakerScriptButtonPercent", "60"));
//Define the tabbed pane
Modified: trunk/Jmol/src/org/openscience/jvxl/Jvxl.java
===================================================================
--- trunk/Jmol/src/org/openscience/jvxl/Jvxl.java 2013-10-29 18:43:02 UTC (rev 18860)
+++ trunk/Jmol/src/org/openscience/jvxl/Jvxl.java 2013-10-29 18:43:18 UTC (rev 18861)
@@ -46,7 +46,7 @@
import org.jmol.jvxl.readers.SurfaceGenerator;
import org.jmol.util.Logger;
import javajs.util.P4;
-import javajs.util.ParserJS;
+import javajs.util.Parser;
public class Jvxl {
@@ -184,7 +184,7 @@
blockData = (line.hasOption("B"));
if (line.hasOption("i")) {
- fileIndex = javajs.util.ParserJS.parseInt(line.getOptionValue("i"));
+ fileIndex = javajs.util.Parser.parseInt(line.getOptionValue("i"));
}
if (line.hasOption("f")) {
@@ -238,21 +238,21 @@
isPositiveOnly = true;
s = s.substring(1);
}
- cutoff = ParserJS.parseFloat(s);
+ cutoff = Parser.parseFloat(s);
}
if (line.hasOption("n")) {
if (bicolor)
Logger.warn("--min option ignored; incompatible with --bicolor");
else
- min = ParserJS.parseFloat(line.getOptionValue("n"));
+ min = Parser.parseFloat(line.getOptionValue("n"));
}
if (line.hasOption("x")) {
if (bicolor)
Logger.warn("--max option ignored; incompatible with --bicolor");
else
- max = ParserJS.parseFloat(line.getOptionValue("x"));
+ max = Parser.parseFloat(line.getOptionValue("x"));
}
// if (line.hasOption("P")) {
@@ -357,19 +357,19 @@
if (str.equalsIgnoreCase("yz"))
return P4.new4(1, 0, 0, 0);
if (str.indexOf("x=") == 0) {
- return P4.new4(1, 0, 0, -ParserJS.parseFloat(str.substring(2)));
+ return P4.new4(1, 0, 0, -Parser.parseFloat(str.substring(2)));
}
if (str.indexOf("y=") == 0) {
- return P4.new4(0, 1, 0, -ParserJS.parseFloat(str.substring(2)));
+ return P4.new4(0, 1, 0, -Parser.parseFloat(str.substring(2)));
}
if (str.indexOf("z=") == 0) {
- return P4.new4(0, 0, 1, -ParserJS.parseFloat(str.substring(2)));
+ return P4.new4(0, 0, 1, -Parser.parseFloat(str.substring(2)));
}
if (str.indexOf("{") == 0) {
str = str.replace(',', ' ');
int[] next = new int[1];
- return P4.new4(ParserJS.parseFloatNext(str, next), ParserJS.parseFloatNext(str,
- next), ParserJS.parseFloatNext(str, next), ParserJS.parseFloatNext(str, next));
+ return P4.new4(Parser.parseFloatNext(str, next), Parser.parseFloatNext(str,
+ next), Parser.parseFloatNext(str, next), Parser.parseFloatNext(str, next));
}
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|