From: Michael T H. <mic...@us...> - 2003-01-12 23:58:10
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/script In directory sc8-pr-cvs1:/tmp/cvs-serv21247/src/org/openscience/jmol/script Modified Files: Compiler.java Log Message: changed Vector method calls to run on jvm 1.1 platform Index: Compiler.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/script/Compiler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Compiler.java 11 Jan 2003 12:52:45 -0000 1.5 --- Compiler.java 12 Jan 2003 23:58:07 -0000 1.6 *************** *** 309,313 **** if (! compileCommand(ltoken)) return false; ! lltoken.add(atokenCommand); int iCommand = lltoken.size(); if (iCommand == lnLength) { --- 309,313 ---- if (! compileCommand(ltoken)) return false; ! lltoken.addElement(atokenCommand); int iCommand = lltoken.size(); if (iCommand == lnLength) { *************** *** 334,347 **** if (tokCommand != Token.nada) { if (lookingAtString()) { ! ltoken.add(new Token(Token.string, ! script.substring(ichToken + 1, ! ichToken + cchToken - 1))); continue; } if ((tokCommand & Token.specialstring) != 0 && lookingAtSpecialString()) { ! ltoken.add(new Token(Token.string, ! script.substring(ichToken, ! ichToken + cchToken))); continue; } --- 334,345 ---- if (tokCommand != Token.nada) { if (lookingAtString()) { ! String str = script.substring(ichToken+1, ichToken+cchToken-1); ! ltoken.addElement(new Token(Token.string, str)); continue; } if ((tokCommand & Token.specialstring) != 0 && lookingAtSpecialString()) { ! String str = script.substring(ichToken, ichToken + cchToken); ! ltoken.addElement(new Token(Token.string, str)); continue; } *************** *** 349,353 **** double value = Float.parseFloat(script.substring(ichToken, ichToken + cchToken)); ! ltoken.add(new Token(Token.decimal, new Double(value))); continue; } --- 347,351 ---- double value = Float.parseFloat(script.substring(ichToken, ichToken + cchToken)); ! ltoken.addElement(new Token(Token.decimal, new Double(value))); continue; } *************** *** 357,361 **** int val = Integer.parseInt(script.substring(ichToken, ichToken + cchToken)); ! ltoken.add(new Token(Token.integer, val, null)); continue; } --- 355,359 ---- int val = Integer.parseInt(script.substring(ichToken, ichToken + cchToken)); ! ltoken.addElement(new Token(Token.integer, val, null)); continue; } *************** *** 380,384 **** tokenCommand = token; tokCommand = token.tok; ! ltoken.clear(); break; } --- 378,382 ---- tokenCommand = token; tokCommand = token.tok; ! ltoken.removeAllElements(); break; } *************** *** 412,416 **** break; } ! ltoken.add(token); continue; } --- 410,414 ---- break; } ! ltoken.addElement(token); continue; } *************** *** 474,487 **** private boolean compileCommand(Vector ltoken) { ! Token tokenCommand = (Token)ltoken.get(0); int tokCommand = tokenCommand.tok; if ((tokenCommand.intValue & Token.onDefault1) != 0 && ltoken.size() == 1) ! ltoken.add(Token.tokenOn); if (tokCommand == Token.set) { int size = ltoken.size(); if (size < 2) return badArgumentCount(); ! if (size == 2 && (((Token)ltoken.get(1)).tok & Token.setDefaultOn) != 0) ! ltoken.add(Token.tokenOn); } atokenCommand = new Token[ltoken.size()]; --- 472,486 ---- private boolean compileCommand(Vector ltoken) { ! Token tokenCommand = (Token)ltoken.firstElement(); int tokCommand = tokenCommand.tok; if ((tokenCommand.intValue & Token.onDefault1) != 0 && ltoken.size() == 1) ! ltoken.addElement(Token.tokenOn); if (tokCommand == Token.set) { int size = ltoken.size(); if (size < 2) return badArgumentCount(); ! if (size == 2 && ! (((Token)ltoken.elementAt(1)).tok & Token.setDefaultOn) != 0) ! ltoken.addElement(Token.tokenOn); } atokenCommand = new Token[ltoken.size()]; *************** *** 533,537 **** ltokenPostfix = new Vector(); for (int i = 0; i < itoken; ++i) ! ltokenPostfix.add(atokenCommand[i]); atokenInfix = atokenCommand; itokenInfix = itoken; --- 532,536 ---- ltokenPostfix = new Vector(); for (int i = 0; i < itoken; ++i) ! ltokenPostfix.addElement(atokenCommand[i]); atokenInfix = atokenCommand; itokenInfix = itoken; *************** *** 564,568 **** if (! clauseAnd()) return false; ! ltokenPostfix.add(tokenOr); } return true; --- 563,567 ---- if (! clauseAnd()) return false; ! ltokenPostfix.addElement(tokenOr); } return true; *************** *** 576,580 **** if (! clauseNot()) return false; ! ltokenPostfix.add(tokenAnd); } return true; --- 575,579 ---- if (! clauseNot()) return false; ! ltokenPostfix.addElement(tokenAnd); } return true; *************** *** 586,590 **** if (! clauseNot()) return false; ! ltokenPostfix.add(tokenNot); return true; } --- 585,589 ---- if (! clauseNot()) return false; ! ltokenPostfix.addElement(tokenNot); return true; } *************** *** 611,615 **** case Token.none: case Token.identifier: ! ltokenPostfix.add(tokenNext()); return true; case Token.leftparen: --- 610,614 ---- case Token.none: case Token.identifier: ! ltokenPostfix.addElement(tokenNext()); return true; case Token.leftparen: *************** *** 629,633 **** Token tokenInt1 = tokenNext(); if (tokPeek() != Token.hyphen) { ! ltokenPostfix.add(tokenInt1); return true; } --- 628,632 ---- Token tokenInt1 = tokenNext(); if (tokPeek() != Token.hyphen) { ! ltokenPostfix.addElement(tokenInt1); return true; } *************** *** 641,645 **** int intT = max; max = min; min = intT; } ! ltokenPostfix.add(new Token(Token.hyphen, min, new Integer(max))); return true; } --- 640,644 ---- int intT = max; max = min; min = intT; } ! ltokenPostfix.addElement(new Token(Token.hyphen, min, new Integer(max))); return true; } *************** *** 658,664 **** // the value against which you are comparing is stored as an Integer // in the object value ! ltokenPostfix.add(new Token(tokenComparator.tok, ! tokenAtomProperty.tok, ! new Integer(val))); return true; } --- 657,663 ---- // the value against which you are comparing is stored as an Integer // in the object value ! ltokenPostfix.addElement(new Token(tokenComparator.tok, ! tokenAtomProperty.tok, ! new Integer(val))); return true; } |