diff -r generated/20130314a/ddl/schema_table_majic_h2.sql generated/20130314c/ddl/schema_table_majic_h2.sql 525,526c525,526 < create alias if not exists indexOf_4 for "com.goldencode.p2j.persist.pl.Functions.indexOf(java.lang.String, java.lang.String, java.lang.Integer)"; < create alias if not exists indexOf_5 for "com.goldencode.p2j.persist.pl.Functions.indexOf(java.lang.String, java.lang.String, java.math.BigDecimal)"; --- > create alias if not exists indexOf_4 for "com.goldencode.p2j.persist.pl.Functions.indexOf(java.lang.String, java.lang.String, java.math.BigDecimal)"; > create alias if not exists indexOf_5 for "com.goldencode.p2j.persist.pl.Functions.indexOf(java.lang.String, java.lang.String, java.lang.Integer)"; 537,538c537,538 < create alias if not exists begins_1 for "com.goldencode.p2j.persist.pl.Functions.begins(java.lang.String, java.lang.String, boolean)"; < create alias if not exists begins_2 for "com.goldencode.p2j.persist.pl.Functions.begins(java.lang.String, java.lang.String)"; --- > create alias if not exists begins_1 for "com.goldencode.p2j.persist.pl.Functions.begins(java.lang.String, java.lang.String)"; > create alias if not exists begins_2 for "com.goldencode.p2j.persist.pl.Functions.begins(java.lang.String, java.lang.String, boolean)"; 539a540 > create alias if not exists getDay_1 for "com.goldencode.p2j.persist.pl.Functions.getDay(java.sql.Date)"; 541,544c542,545 < create alias if not exists toInt_1 for "com.goldencode.p2j.persist.pl.Functions.toInt(java.math.BigDecimal)"; < create alias if not exists toInt_2 for "com.goldencode.p2j.persist.pl.Functions.toInt(java.lang.String)"; < create alias if not exists toInt_3 for "com.goldencode.p2j.persist.pl.Functions.toInt(java.sql.Date)"; < create alias if not exists toInt_4 for "com.goldencode.p2j.persist.pl.Functions.toInt(java.lang.Boolean)"; --- > create alias if not exists toInt_1 for "com.goldencode.p2j.persist.pl.Functions.toInt(java.lang.Boolean)"; > create alias if not exists toInt_2 for "com.goldencode.p2j.persist.pl.Functions.toInt(java.sql.Date)"; > create alias if not exists toInt_3 for "com.goldencode.p2j.persist.pl.Functions.toInt(java.lang.String)"; > create alias if not exists toInt_4 for "com.goldencode.p2j.persist.pl.Functions.toInt(java.math.BigDecimal)"; 546,555c547,552 < create alias if not exists getDay_1 for "com.goldencode.p2j.persist.pl.Functions.getDay(java.sql.Date)"; < create alias if not exists substringOf_1 for "com.goldencode.p2j.persist.pl.Functions.substringOf(java.lang.String, java.lang.Integer)"; < create alias if not exists substringOf_2 for "com.goldencode.p2j.persist.pl.Functions.substringOf(java.lang.String, java.lang.Integer, java.lang.Integer)"; < create alias if not exists substringOf_3 for "com.goldencode.p2j.persist.pl.Functions.substringOf(java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.String)"; < create alias if not exists toDec_1 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.lang.Boolean)"; < create alias if not exists toDec_2 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.sql.Date)"; < create alias if not exists toDec_3 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.lang.String)"; < create alias if not exists toDec_4 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.math.BigDecimal, java.lang.Integer)"; < create alias if not exists toDec_5 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.math.BigDecimal)"; < create alias if not exists toDec_6 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.lang.Integer)"; --- > create alias if not exists toDec_1 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.lang.Integer)"; > create alias if not exists toDec_2 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.math.BigDecimal)"; > create alias if not exists toDec_3 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.lang.Boolean)"; > create alias if not exists toDec_4 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.sql.Date)"; > create alias if not exists toDec_5 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.lang.String)"; > create alias if not exists toDec_6 for "com.goldencode.p2j.persist.pl.Functions.toDec(java.math.BigDecimal, java.lang.Integer)"; 559,576c556,564 < create alias if not exists lt_1 for "com.goldencode.p2j.persist.pl.Operators.lt(java.lang.String, java.lang.String)"; < create alias if not exists lt_2 for "com.goldencode.p2j.persist.pl.Operators.lt(java.lang.Boolean, java.lang.Boolean)"; < create alias if not exists lt_3 for "com.goldencode.p2j.persist.pl.Operators.lt(java.lang.Integer, java.math.BigDecimal)"; < create alias if not exists lt_4 for "com.goldencode.p2j.persist.pl.Operators.lt(java.lang.Integer, java.lang.Integer)"; < create alias if not exists lt_5 for "com.goldencode.p2j.persist.pl.Operators.lt(java.math.BigDecimal, java.math.BigDecimal)"; < create alias if not exists lt_6 for "com.goldencode.p2j.persist.pl.Operators.lt(java.math.BigDecimal, java.lang.Integer)"; < create alias if not exists eq_1 for "com.goldencode.p2j.persist.pl.Operators.eq(java.lang.Integer, java.math.BigDecimal)"; < create alias if not exists eq_2 for "com.goldencode.p2j.persist.pl.Operators.eq(java.lang.Boolean, java.lang.Boolean)"; < create alias if not exists eq_3 for "com.goldencode.p2j.persist.pl.Operators.eq(java.lang.String, java.lang.String)"; < create alias if not exists eq_4 for "com.goldencode.p2j.persist.pl.Operators.eq(java.lang.Integer, java.lang.Integer)"; < create alias if not exists eq_5 for "com.goldencode.p2j.persist.pl.Operators.eq(java.math.BigDecimal, java.math.BigDecimal)"; < create alias if not exists eq_6 for "com.goldencode.p2j.persist.pl.Operators.eq(java.math.BigDecimal, java.lang.Integer)"; < create alias if not exists ne_1 for "com.goldencode.p2j.persist.pl.Operators.ne(java.lang.String, java.lang.String)"; < create alias if not exists ne_2 for "com.goldencode.p2j.persist.pl.Operators.ne(java.lang.Integer, java.math.BigDecimal)"; < create alias if not exists ne_3 for "com.goldencode.p2j.persist.pl.Operators.ne(java.lang.Integer, java.lang.Integer)"; < create alias if not exists ne_4 for "com.goldencode.p2j.persist.pl.Operators.ne(java.math.BigDecimal, java.math.BigDecimal)"; < create alias if not exists ne_5 for "com.goldencode.p2j.persist.pl.Operators.ne(java.lang.Boolean, java.lang.Boolean)"; < create alias if not exists ne_6 for "com.goldencode.p2j.persist.pl.Operators.ne(java.math.BigDecimal, java.lang.Integer)"; --- > create alias if not exists substringOf_1 for "com.goldencode.p2j.persist.pl.Functions.substringOf(java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.String)"; > create alias if not exists substringOf_2 for "com.goldencode.p2j.persist.pl.Functions.substringOf(java.lang.String, java.lang.Integer)"; > create alias if not exists substringOf_3 for "com.goldencode.p2j.persist.pl.Functions.substringOf(java.lang.String, java.lang.Integer, java.lang.Integer)"; > create alias if not exists lt_1 for "com.goldencode.p2j.persist.pl.Operators.lt(java.lang.Integer, java.lang.Integer)"; > create alias if not exists lt_2 for "com.goldencode.p2j.persist.pl.Operators.lt(java.math.BigDecimal, java.math.BigDecimal)"; > create alias if not exists lt_3 for "com.goldencode.p2j.persist.pl.Operators.lt(java.math.BigDecimal, java.lang.Integer)"; > create alias if not exists lt_4 for "com.goldencode.p2j.persist.pl.Operators.lt(java.lang.String, java.lang.String)"; > create alias if not exists lt_5 for "com.goldencode.p2j.persist.pl.Operators.lt(java.lang.Boolean, java.lang.Boolean)"; > create alias if not exists lt_6 for "com.goldencode.p2j.persist.pl.Operators.lt(java.lang.Integer, java.math.BigDecimal)"; 578,586c566,586 < create alias if not exists plus_2 for "com.goldencode.p2j.persist.pl.Operators.plus(java.math.BigDecimal, java.lang.Integer)"; < create alias if not exists plus_3 for "com.goldencode.p2j.persist.pl.Operators.plus(java.lang.Integer, java.math.BigDecimal)"; < create alias if not exists plus_4 for "com.goldencode.p2j.persist.pl.Operators.plus(java.sql.Date, java.lang.Integer)"; < create alias if not exists plus_5 for "com.goldencode.p2j.persist.pl.Operators.plus(java.math.BigDecimal, java.math.BigDecimal)"; < create alias if not exists plus_6 for "com.goldencode.p2j.persist.pl.Operators.plus(java.lang.Integer, java.lang.Integer)"; < create alias if not exists plus_7 for "com.goldencode.p2j.persist.pl.Operators.plus(java.math.BigDecimal, java.sql.Date)"; < create alias if not exists plus_8 for "com.goldencode.p2j.persist.pl.Operators.plus(java.lang.Integer, java.sql.Date)"; < create alias if not exists gt_1 for "com.goldencode.p2j.persist.pl.Operators.gt(java.lang.Integer, java.lang.Integer)"; < create alias if not exists gt_2 for "com.goldencode.p2j.persist.pl.Operators.gt(java.math.BigDecimal, java.math.BigDecimal)"; --- > create alias if not exists plus_2 for "com.goldencode.p2j.persist.pl.Operators.plus(java.lang.Integer, java.sql.Date)"; > create alias if not exists plus_3 for "com.goldencode.p2j.persist.pl.Operators.plus(java.math.BigDecimal, java.sql.Date)"; > create alias if not exists plus_4 for "com.goldencode.p2j.persist.pl.Operators.plus(java.lang.Integer, java.lang.Integer)"; > create alias if not exists plus_5 for "com.goldencode.p2j.persist.pl.Operators.plus(java.sql.Date, java.lang.Integer)"; > create alias if not exists plus_6 for "com.goldencode.p2j.persist.pl.Operators.plus(java.lang.Integer, java.math.BigDecimal)"; > create alias if not exists plus_7 for "com.goldencode.p2j.persist.pl.Operators.plus(java.math.BigDecimal, java.lang.Integer)"; > create alias if not exists plus_8 for "com.goldencode.p2j.persist.pl.Operators.plus(java.math.BigDecimal, java.math.BigDecimal)"; > create alias if not exists eq_1 for "com.goldencode.p2j.persist.pl.Operators.eq(java.lang.String, java.lang.String)"; > create alias if not exists eq_2 for "com.goldencode.p2j.persist.pl.Operators.eq(java.lang.Integer, java.lang.Integer)"; > create alias if not exists eq_3 for "com.goldencode.p2j.persist.pl.Operators.eq(java.math.BigDecimal, java.math.BigDecimal)"; > create alias if not exists eq_4 for "com.goldencode.p2j.persist.pl.Operators.eq(java.lang.Integer, java.math.BigDecimal)"; > create alias if not exists eq_5 for "com.goldencode.p2j.persist.pl.Operators.eq(java.math.BigDecimal, java.lang.Integer)"; > create alias if not exists eq_6 for "com.goldencode.p2j.persist.pl.Operators.eq(java.lang.Boolean, java.lang.Boolean)"; > create alias if not exists ne_1 for "com.goldencode.p2j.persist.pl.Operators.ne(java.math.BigDecimal, java.lang.Integer)"; > create alias if not exists ne_2 for "com.goldencode.p2j.persist.pl.Operators.ne(java.lang.Boolean, java.lang.Boolean)"; > create alias if not exists ne_3 for "com.goldencode.p2j.persist.pl.Operators.ne(java.lang.String, java.lang.String)"; > create alias if not exists ne_4 for "com.goldencode.p2j.persist.pl.Operators.ne(java.lang.Integer, java.lang.Integer)"; > create alias if not exists ne_5 for "com.goldencode.p2j.persist.pl.Operators.ne(java.lang.Integer, java.math.BigDecimal)"; > create alias if not exists ne_6 for "com.goldencode.p2j.persist.pl.Operators.ne(java.math.BigDecimal, java.math.BigDecimal)"; > create alias if not exists gt_1 for "com.goldencode.p2j.persist.pl.Operators.gt(java.lang.Integer, java.math.BigDecimal)"; > create alias if not exists gt_2 for "com.goldencode.p2j.persist.pl.Operators.gt(java.math.BigDecimal, java.lang.Integer)"; 588,591c588,591 < create alias if not exists gt_4 for "com.goldencode.p2j.persist.pl.Operators.gt(java.lang.Boolean, java.lang.Boolean)"; < create alias if not exists gt_5 for "com.goldencode.p2j.persist.pl.Operators.gt(java.lang.Integer, java.math.BigDecimal)"; < create alias if not exists gt_6 for "com.goldencode.p2j.persist.pl.Operators.gt(java.math.BigDecimal, java.lang.Integer)"; < create alias if not exists modulo_1 for "com.goldencode.p2j.persist.pl.Operators.modulo(java.lang.Integer, java.lang.Integer)"; --- > create alias if not exists gt_4 for "com.goldencode.p2j.persist.pl.Operators.gt(java.math.BigDecimal, java.math.BigDecimal)"; > create alias if not exists gt_5 for "com.goldencode.p2j.persist.pl.Operators.gt(java.lang.Boolean, java.lang.Boolean)"; > create alias if not exists gt_6 for "com.goldencode.p2j.persist.pl.Operators.gt(java.lang.Integer, java.lang.Integer)"; > create alias if not exists modulo_1 for "com.goldencode.p2j.persist.pl.Operators.modulo(java.math.BigDecimal, java.lang.Integer)"; 593c593 < create alias if not exists modulo_3 for "com.goldencode.p2j.persist.pl.Operators.modulo(java.math.BigDecimal, java.lang.Integer)"; --- > create alias if not exists modulo_3 for "com.goldencode.p2j.persist.pl.Operators.modulo(java.lang.Integer, java.lang.Integer)"; diff -r generated/20130314a/src/aero/timco/majic/adp/Adpout0.java generated/20130314c/src/aero/timco/majic/adp/Adpout0.java 1200c1200 < public integer to10from36(final character _myvalue) --- > public integer to10from36(final character _myvalue_2) 1204c1204 < character myvalue = new character(_myvalue); --- > character myvalue_2 = new character(_myvalue_2); 1218c1218 < vl.assign(length(myvalue)); --- > vl.assign(length(myvalue_2)); 1224c1224 < vthisdigit.assign(substring(myvalue, vp, 1)); --- > vthisdigit.assign(substring(myvalue_2, vp, 1)); 1261c1261 < public character encrypt(final character _mystring, final character _mykey) --- > public character encrypt(final character _mystring_2, final character _mykey) 1265c1265 < character mystring = new character(_mystring); --- > character mystring_2 = new character(_mystring_2); 1269c1269 < integer i = new integer(0); --- > integer i_2 = new integer(0); 1271c1271 < integer j = new integer(0); --- > integer j_2 = new integer(0); 1285c1285 < myraw.setLength(plus(length(mystring), 1)); --- > myraw.setLength(plus(length(mystring_2), 1)); 1288,1289c1288,1289 < stringlength.assign(byteLength(mystring)); < mycrc.assign(substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw")); --- > stringlength.assign(byteLength(mystring_2)); > mycrc.assign(substring(SecurityOps.encode(concat(mystring_2, "foobar")), 1, 2, "raw")); 1291c1291 < myraw.setString(mystring, 1); --- > myraw.setString(mystring_2, 1); 1294c1294 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_2.assign(0); _isLessThanOrEqual(i_2, minus(stringlength, 1)); i_2.assign(plus(i_2, 5))) 1297c1297 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_2.assign(1); _isLessThanOrEqual(j_2, integer.minimum(keylength, minus(stringlength, i_2))); j_2.increment()) 1299c1299 < myraw.setByte(modulo(plus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256), plus(i, j)); --- > myraw.setByte(modulo(plus(myraw.getByte(plus(i_2, j_2)), asc(substring(mykey, j_2, 1, "raw"))), 256), plus(i_2, j_2)); 1304c1304 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength); i_2.increment()) 1306c1306 < myraw.setByte(modulo(plus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256), i); --- > myraw.setByte(modulo(plus(myraw.getByte(i_2), asc(substring(myhash, plus(modulo(i_2, 16), 1), 1, "raw"))), 256), i_2); 1309c1309 < mystring.assign(""); --- > mystring_2.assign(""); 1311c1311 < ToClause toClause0 = new ToClause(i, 1, stringlength); --- > ToClause toClause0 = new ToClause(i_2, 1, stringlength); 1317c1317 < mystring.assign(concat(mystring, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); --- > mystring_2.assign(concat(mystring_2, zeroPad(toBase36(myraw.getByte(i_2)), new integer(2)))); 1322c1322 < returnNormal(concat(mycrc, mystring)); --- > returnNormal(concat(mycrc, mystring_2)); 1327c1327 < public character decrypt(final character _mystring, final character _mykey) --- > public character decrypt(final character _mystring_3, final character _mykey_2) 1331c1331 < character mystring = new character(_mystring); --- > character mystring_3 = new character(_mystring_3); 1333c1333 < character mykey = new character(_mykey); --- > character mykey_2 = new character(_mykey_2); 1335c1335 < integer i = new integer(0); --- > integer i_3 = new integer(0); 1337c1337 < integer j = new integer(0); --- > integer j_3 = new integer(0); 1339c1339 < integer keylength = new integer(0); --- > integer keylength_2 = new integer(0); 1341c1341 < integer stringlength = new integer(0); --- > integer stringlength_2 = new integer(0); 1343c1343 < character mycrc = new character(""); --- > character mycrc_2 = new character(""); 1345c1345 < character myhash = new character(""); --- > character myhash_2 = new character(""); 1347c1347 < memptr myraw = new memptr(); --- > memptr myraw_2 = new memptr(); 1351,1357c1351,1357 < mycrc.assign(substring(mystring, 1, 2)); < mystring.assign(substring(mystring, 3, -1, "raw")); < myraw.setLength((length(mystring))); < mykey.assign(substring(SecurityOps.encode(concat(mykey, "foobar")), 1, 16)); < myhash.assign(SecurityOps.encode(concat(mycrc, "foobar", mykey))); < keylength.assign(byteLength(mykey)); < stringlength.assign(byteLength(mystring)); --- > mycrc_2.assign(substring(mystring_3, 1, 2)); > mystring_3.assign(substring(mystring_3, 3, -1, "raw")); > myraw_2.setLength((length(mystring_3))); > mykey_2.assign(substring(SecurityOps.encode(concat(mykey_2, "foobar")), 1, 16)); > myhash_2.assign(SecurityOps.encode(concat(mycrc_2, "foobar", mykey_2))); > keylength_2.assign(byteLength(mykey_2)); > stringlength_2.assign(byteLength(mystring_3)); 1359c1359 < ToClause toClause1 = new ToClause(i, 1, stringlength, 2); --- > ToClause toClause1 = new ToClause(i_3, 1, stringlength_2, 2); 1365,1366c1365,1366 < j.assign(plus(j, 1)); < myraw.setByte(to10from36(new character(substring(mystring, i, 2, "raw"))), j); --- > j_3.assign(plus(j_3, 1)); > myraw_2.setByte(to10from36(new character(substring(mystring_3, i_3, 2, "raw"))), j_3); 1370c1370 < stringlength.assign(new integer(divide(stringlength, 2))); --- > stringlength_2.assign(new integer(divide(stringlength_2, 2))); 1373c1373 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_3.assign(1); _isLessThanOrEqual(i_3, stringlength_2); i_3.increment()) 1375c1375 < myraw.setByte(abs(modulo(minus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256)), i); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(i_3), asc(substring(myhash_2, plus(modulo(i_3, 16), 1), 1, "raw"))), 256)), i_3); 1379c1379 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_3.assign(0); _isLessThanOrEqual(i_3, minus(stringlength_2, 1)); i_3.assign(plus(i_3, 5))) 1382c1382 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_3.assign(1); _isLessThanOrEqual(j_3, integer.minimum(keylength_2, minus(stringlength_2, i_3))); j_3.increment()) 1384c1384 < myraw.setByte(abs(modulo(minus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256)), plus(i, j)); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(plus(i_3, j_3)), asc(substring(mykey_2, j_3, 1, "raw"))), 256)), plus(i_3, j_3)); 1388c1388 < mystring.assign(""); --- > mystring_3.assign(""); 1391c1391 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_3.assign(1); _isLessThanOrEqual(i_3, stringlength_2); i_3.increment()) 1393c1393 < mystring.assign(concat(mystring, chr(myraw.getByte(i)))); --- > mystring_3.assign(concat(mystring_3, chr(myraw_2.getByte(i_3)))); 1396,1397c1396,1397 < myraw.setLength(0); < if (_isEqual(mycrc, substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw"))) --- > myraw_2.setLength(0); > if (_isEqual(mycrc_2, substring(SecurityOps.encode(concat(mystring_3, "foobar")), 1, 2, "raw"))) 1399c1399 < returnNormal(mystring); --- > returnNormal(mystring_3); diff -r generated/20130314a/src/aero/timco/majic/adp/UltiProOut01.java generated/20130314c/src/aero/timco/majic/adp/UltiProOut01.java 938c938 < public integer to10from36(final character _myvalue) --- > public integer to10from36(final character _myvalue_2) 942c942 < character myvalue = new character(_myvalue); --- > character myvalue_2 = new character(_myvalue_2); 956c956 < vl.assign(length(myvalue)); --- > vl.assign(length(myvalue_2)); 962c962 < vthisdigit.assign(substring(myvalue, vp, 1)); --- > vthisdigit.assign(substring(myvalue_2, vp, 1)); 999c999 < public character encrypt(final character _mystring, final character _mykey) --- > public character encrypt(final character _mystring_2, final character _mykey) 1003c1003 < character mystring = new character(_mystring); --- > character mystring_2 = new character(_mystring_2); 1007c1007 < integer i = new integer(0); --- > integer i_2 = new integer(0); 1009c1009 < integer j = new integer(0); --- > integer j_2 = new integer(0); 1023c1023 < myraw.setLength(plus(length(mystring), 1)); --- > myraw.setLength(plus(length(mystring_2), 1)); 1026,1027c1026,1027 < stringlength.assign(byteLength(mystring)); < mycrc.assign(substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw")); --- > stringlength.assign(byteLength(mystring_2)); > mycrc.assign(substring(SecurityOps.encode(concat(mystring_2, "foobar")), 1, 2, "raw")); 1029c1029 < myraw.setString(mystring, 1); --- > myraw.setString(mystring_2, 1); 1032c1032 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_2.assign(0); _isLessThanOrEqual(i_2, minus(stringlength, 1)); i_2.assign(plus(i_2, 5))) 1035c1035 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_2.assign(1); _isLessThanOrEqual(j_2, integer.minimum(keylength, minus(stringlength, i_2))); j_2.increment()) 1037c1037 < myraw.setByte(modulo(plus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256), plus(i, j)); --- > myraw.setByte(modulo(plus(myraw.getByte(plus(i_2, j_2)), asc(substring(mykey, j_2, 1, "raw"))), 256), plus(i_2, j_2)); 1042c1042 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength); i_2.increment()) 1044c1044 < myraw.setByte(modulo(plus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256), i); --- > myraw.setByte(modulo(plus(myraw.getByte(i_2), asc(substring(myhash, plus(modulo(i_2, 16), 1), 1, "raw"))), 256), i_2); 1047c1047 < mystring.assign(""); --- > mystring_2.assign(""); 1049c1049 < ToClause toClause0 = new ToClause(i, 1, stringlength); --- > ToClause toClause0 = new ToClause(i_2, 1, stringlength); 1055c1055 < mystring.assign(concat(mystring, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); --- > mystring_2.assign(concat(mystring_2, zeroPad(toBase36(myraw.getByte(i_2)), new integer(2)))); 1060c1060 < returnNormal(concat(mycrc, mystring)); --- > returnNormal(concat(mycrc, mystring_2)); 1065c1065 < public character decrypt(final character _mystring, final character _mykey) --- > public character decrypt(final character _mystring_3, final character _mykey_2) 1069c1069 < character mystring = new character(_mystring); --- > character mystring_3 = new character(_mystring_3); 1071c1071 < character mykey = new character(_mykey); --- > character mykey_2 = new character(_mykey_2); 1073c1073 < integer i = new integer(0); --- > integer i_3 = new integer(0); 1075c1075 < integer j = new integer(0); --- > integer j_3 = new integer(0); 1077c1077 < integer keylength = new integer(0); --- > integer keylength_2 = new integer(0); 1079c1079 < integer stringlength = new integer(0); --- > integer stringlength_2 = new integer(0); 1081c1081 < character mycrc = new character(""); --- > character mycrc_2 = new character(""); 1083c1083 < character myhash = new character(""); --- > character myhash_2 = new character(""); 1085c1085 < memptr myraw = new memptr(); --- > memptr myraw_2 = new memptr(); 1089,1095c1089,1095 < mycrc.assign(substring(mystring, 1, 2)); < mystring.assign(substring(mystring, 3, -1, "raw")); < myraw.setLength((length(mystring))); < mykey.assign(substring(SecurityOps.encode(concat(mykey, "foobar")), 1, 16)); < myhash.assign(SecurityOps.encode(concat(mycrc, "foobar", mykey))); < keylength.assign(byteLength(mykey)); < stringlength.assign(byteLength(mystring)); --- > mycrc_2.assign(substring(mystring_3, 1, 2)); > mystring_3.assign(substring(mystring_3, 3, -1, "raw")); > myraw_2.setLength((length(mystring_3))); > mykey_2.assign(substring(SecurityOps.encode(concat(mykey_2, "foobar")), 1, 16)); > myhash_2.assign(SecurityOps.encode(concat(mycrc_2, "foobar", mykey_2))); > keylength_2.assign(byteLength(mykey_2)); > stringlength_2.assign(byteLength(mystring_3)); 1097c1097 < ToClause toClause1 = new ToClause(i, 1, stringlength, 2); --- > ToClause toClause1 = new ToClause(i_3, 1, stringlength_2, 2); 1103,1104c1103,1104 < j.assign(plus(j, 1)); < myraw.setByte(to10from36(new character(substring(mystring, i, 2, "raw"))), j); --- > j_3.assign(plus(j_3, 1)); > myraw_2.setByte(to10from36(new character(substring(mystring_3, i_3, 2, "raw"))), j_3); 1108c1108 < stringlength.assign(new integer(divide(stringlength, 2))); --- > stringlength_2.assign(new integer(divide(stringlength_2, 2))); 1111c1111 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_3.assign(1); _isLessThanOrEqual(i_3, stringlength_2); i_3.increment()) 1113c1113 < myraw.setByte(abs(modulo(minus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256)), i); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(i_3), asc(substring(myhash_2, plus(modulo(i_3, 16), 1), 1, "raw"))), 256)), i_3); 1117c1117 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_3.assign(0); _isLessThanOrEqual(i_3, minus(stringlength_2, 1)); i_3.assign(plus(i_3, 5))) 1120c1120 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_3.assign(1); _isLessThanOrEqual(j_3, integer.minimum(keylength_2, minus(stringlength_2, i_3))); j_3.increment()) 1122c1122 < myraw.setByte(abs(modulo(minus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256)), plus(i, j)); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(plus(i_3, j_3)), asc(substring(mykey_2, j_3, 1, "raw"))), 256)), plus(i_3, j_3)); 1126c1126 < mystring.assign(""); --- > mystring_3.assign(""); 1129c1129 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_3.assign(1); _isLessThanOrEqual(i_3, stringlength_2); i_3.increment()) 1131c1131 < mystring.assign(concat(mystring, chr(myraw.getByte(i)))); --- > mystring_3.assign(concat(mystring_3, chr(myraw_2.getByte(i_3)))); 1134,1135c1134,1135 < myraw.setLength(0); < if (_isEqual(mycrc, substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw"))) --- > myraw_2.setLength(0); > if (_isEqual(mycrc_2, substring(SecurityOps.encode(concat(mystring_3, "foobar")), 1, 2, "raw"))) 1137c1137 < returnNormal(mystring); --- > returnNormal(mystring_3); diff -r generated/20130314a/src/aero/timco/majic/ap/Ap02R.java generated/20130314c/src/aero/timco/majic/ap/Ap02R.java 1701c1701 < public logical fxAccumAgeAmt(final date _idate) --- > public logical fxAccumAgeAmt(final date _idate_2) 1705c1705 < date idate = new date(_idate); --- > date idate_2 = new date(_idate_2); 1709c1709 < if (_isGreaterThanOrEqual(idate, date.minusDays(sDate, subscript(tDay, 1)))) --- > if (_isGreaterThanOrEqual(idate_2, date.minusDays(sDate, subscript(tDay, 1)))) 1716c1716 < if (_isGreaterThanOrEqual(idate, date.minusDays(sDate, subscript(tDay, 2)))) --- > if (_isGreaterThanOrEqual(idate_2, date.minusDays(sDate, subscript(tDay, 2)))) 1723c1723 < if (_isGreaterThanOrEqual(idate, date.minusDays(sDate, subscript(tDay, 3)))) --- > if (_isGreaterThanOrEqual(idate_2, date.minusDays(sDate, subscript(tDay, 3)))) 1730c1730 < if (_isGreaterThanOrEqual(idate, date.minusDays(sDate, subscript(tDay, 4)))) --- > if (_isGreaterThanOrEqual(idate_2, date.minusDays(sDate, subscript(tDay, 4)))) diff -r generated/20130314a/src/aero/timco/majic/ap/Ap13R.java generated/20130314c/src/aero/timco/majic/ap/Ap13R.java 856c856 < public character putMapValue(final handle _codeMap, final character _k, final character _v) --- > public character putMapValue(final handle _codeMap_2, final character _k, final character _v) 860c860 < handle codeMap = new handle(_codeMap); --- > handle codeMap_2 = new handle(_codeMap_2); 873c873 < public character getMapValueChar(final handle _codeMap, final character _k) --- > public character getMapValueChar(final handle _codeMap_3, final character _k_2) 877c877 < handle codeMap = new handle(_codeMap); --- > handle codeMap_3 = new handle(_codeMap_3); 879c879 < character k = new character(_k); --- > character k_2 = new character(_k_2); diff -r generated/20130314a/src/aero/timco/majic/ap/Wb01R.java generated/20130314c/src/aero/timco/majic/ap/Wb01R.java 573c573 < character tExport = new character(""); --- > character tExport_2 = new character(""); 577c577 < TransactionManager.registerUndo(tExport); --- > TransactionManager.registerUndo(tExport_2); 582,583c582,583 < tExport.assign(concat("/home/Acct/WF", valueOf(tDate, "999999"), site.getSite(), valueOf(site.getSiteNumber(), "99"), ".csv")); < returnNormal(tExport); --- > tExport_2.assign(concat("/home/Acct/WF", valueOf(tDate, "999999"), site.getSite(), valueOf(site.getSiteNumber(), "99"), ".csv")); > returnNormal(tExport_2); diff -r generated/20130314a/src/aero/timco/majic/codes/EmpHistGso.java generated/20130314c/src/aero/timco/majic/codes/EmpHistGso.java 227c227 < public integer to10from36(final character _myvalue) --- > public integer to10from36(final character _myvalue_2) 231c231 < character myvalue = new character(_myvalue); --- > character myvalue_2 = new character(_myvalue_2); 245c245 < vl.assign(length(myvalue)); --- > vl.assign(length(myvalue_2)); 251c251 < vthisdigit.assign(substring(myvalue, vp, 1)); --- > vthisdigit.assign(substring(myvalue_2, vp, 1)); 288c288 < public character encrypt(final character _mystring, final character _mykey) --- > public character encrypt(final character _mystring_2, final character _mykey) 292c292 < character mystring = new character(_mystring); --- > character mystring_2 = new character(_mystring_2); 312c312 < myraw.setLength(plus(length(mystring), 1)); --- > myraw.setLength(plus(length(mystring_2), 1)); 315,316c315,316 < stringlength.assign(byteLength(mystring)); < mycrc.assign(substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw")); --- > stringlength.assign(byteLength(mystring_2)); > mycrc.assign(substring(SecurityOps.encode(concat(mystring_2, "foobar")), 1, 2, "raw")); 318c318 < myraw.setString(mystring, 1); --- > myraw.setString(mystring_2, 1); 336c336 < mystring.assign(""); --- > mystring_2.assign(""); 344c344 < mystring.assign(concat(mystring, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); --- > mystring_2.assign(concat(mystring_2, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); 349c349 < returnNormal(concat(mycrc, mystring)); --- > returnNormal(concat(mycrc, mystring_2)); 354c354 < public character decrypt(final character _mystring, final character _mykey) --- > public character decrypt(final character _mystring_3, final character _mykey_2) 358c358 < character mystring = new character(_mystring); --- > character mystring_3 = new character(_mystring_3); 360c360 < character mykey = new character(_mykey); --- > character mykey_2 = new character(_mykey_2); 362c362 < integer i = new integer(0); --- > integer i_2 = new integer(0); 364c364 < integer j = new integer(0); --- > integer j_2 = new integer(0); 366c366 < integer keylength = new integer(0); --- > integer keylength_2 = new integer(0); 368c368 < integer stringlength = new integer(0); --- > integer stringlength_2 = new integer(0); 370c370 < character mycrc = new character(""); --- > character mycrc_2 = new character(""); 372c372 < character myhash = new character(""); --- > character myhash_2 = new character(""); 374c374 < memptr myraw = new memptr(); --- > memptr myraw_2 = new memptr(); 378,384c378,384 < mycrc.assign(substring(mystring, 1, 2)); < mystring.assign(substring(mystring, 3, -1, "raw")); < myraw.setLength((length(mystring))); < mykey.assign(substring(SecurityOps.encode(concat(mykey, "foobar")), 1, 16)); < myhash.assign(SecurityOps.encode(concat(mycrc, "foobar", mykey))); < keylength.assign(byteLength(mykey)); < stringlength.assign(byteLength(mystring)); --- > mycrc_2.assign(substring(mystring_3, 1, 2)); > mystring_3.assign(substring(mystring_3, 3, -1, "raw")); > myraw_2.setLength((length(mystring_3))); > mykey_2.assign(substring(SecurityOps.encode(concat(mykey_2, "foobar")), 1, 16)); > myhash_2.assign(SecurityOps.encode(concat(mycrc_2, "foobar", mykey_2))); > keylength_2.assign(byteLength(mykey_2)); > stringlength_2.assign(byteLength(mystring_3)); 386c386 < ToClause toClause1 = new ToClause(i, 1, stringlength, 2); --- > ToClause toClause1 = new ToClause(i_2, 1, stringlength_2, 2); 392,393c392,393 < j.assign(plus(j, 1)); < myraw.setByte(to10from36(new character(substring(mystring, i, 2, "raw"))), j); --- > j_2.assign(plus(j_2, 1)); > myraw_2.setByte(to10from36(new character(substring(mystring_3, i_2, 2, "raw"))), j_2); 397c397 < stringlength.assign(new integer(divide(stringlength, 2))); --- > stringlength_2.assign(new integer(divide(stringlength_2, 2))); 400c400 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 402c402 < myraw.setByte(abs(modulo(minus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256)), i); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(i_2), asc(substring(myhash_2, plus(modulo(i_2, 16), 1), 1, "raw"))), 256)), i_2); 406c406 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_2.assign(0); _isLessThanOrEqual(i_2, minus(stringlength_2, 1)); i_2.assign(plus(i_2, 5))) 409c409 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_2.assign(1); _isLessThanOrEqual(j_2, integer.minimum(keylength_2, minus(stringlength_2, i_2))); j_2.increment()) 411c411 < myraw.setByte(abs(modulo(minus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256)), plus(i, j)); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(plus(i_2, j_2)), asc(substring(mykey_2, j_2, 1, "raw"))), 256)), plus(i_2, j_2)); 415c415 < mystring.assign(""); --- > mystring_3.assign(""); 418c418 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 420c420 < mystring.assign(concat(mystring, chr(myraw.getByte(i)))); --- > mystring_3.assign(concat(mystring_3, chr(myraw_2.getByte(i_2)))); 423,424c423,424 < myraw.setLength(0); < if (_isEqual(mycrc, substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw"))) --- > myraw_2.setLength(0); > if (_isEqual(mycrc_2, substring(SecurityOps.encode(concat(mystring_3, "foobar")), 1, 2, "raw"))) 426c426 < returnNormal(mystring); --- > returnNormal(mystring_3); diff -r generated/20130314a/src/aero/timco/majic/codes/EmpHist.java generated/20130314c/src/aero/timco/majic/codes/EmpHist.java 152c152 < integer i = new integer(0); --- > integer i_3 = new integer(0); 156c156 < TransactionManager.register(tSsn, tName, tEmpNum, tAppend, rptName, tRptHdr, tSerial, infile, outfile, startString, endString, ifappend, ifpaged, tPrintFile, version, tConErr, tLbin, tWhereUsed, tIp, tSocket, tSite, tSysName, curWSys, startRecid, tRefresh, i); --- > TransactionManager.register(tSsn, tName, tEmpNum, tAppend, rptName, tRptHdr, tSerial, infile, outfile, startString, endString, ifappend, ifpaged, tPrintFile, version, tConErr, tLbin, tWhereUsed, tIp, tSocket, tSite, tSysName, curWSys, startRecid, tRefresh, i_3); 426c426 < i.assign(plus(i, 1)); --- > i_3.assign(plus(i_3, 1)); 432c432 < new Element(i, frame0.widgeti()) --- > new Element(i_3, frame0.widgetI_3()) 553c553 < public integer to10from36(final character _myvalue) --- > public integer to10from36(final character _myvalue_2) 557c557 < character myvalue = new character(_myvalue); --- > character myvalue_2 = new character(_myvalue_2); 571c571 < vl.assign(length(myvalue)); --- > vl.assign(length(myvalue_2)); 577c577 < vthisdigit.assign(substring(myvalue, vp, 1)); --- > vthisdigit.assign(substring(myvalue_2, vp, 1)); 614c614 < public character encrypt(final character _mystring, final character _mykey) --- > public character encrypt(final character _mystring_2, final character _mykey) 618c618 < character mystring = new character(_mystring); --- > character mystring_2 = new character(_mystring_2); 638c638 < myraw.setLength(plus(length(mystring), 1)); --- > myraw.setLength(plus(length(mystring_2), 1)); 641,642c641,642 < stringlength.assign(byteLength(mystring)); < mycrc.assign(substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw")); --- > stringlength.assign(byteLength(mystring_2)); > mycrc.assign(substring(SecurityOps.encode(concat(mystring_2, "foobar")), 1, 2, "raw")); 644c644 < myraw.setString(mystring, 1); --- > myraw.setString(mystring_2, 1); 662c662 < mystring.assign(""); --- > mystring_2.assign(""); 670c670 < mystring.assign(concat(mystring, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); --- > mystring_2.assign(concat(mystring_2, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); 675c675 < returnNormal(concat(mycrc, mystring)); --- > returnNormal(concat(mycrc, mystring_2)); 680c680 < public character decrypt(final character _mystring, final character _mykey) --- > public character decrypt(final character _mystring_3, final character _mykey_2) 684c684 < character mystring = new character(_mystring); --- > character mystring_3 = new character(_mystring_3); 686c686 < character mykey = new character(_mykey); --- > character mykey_2 = new character(_mykey_2); 688c688 < integer i = new integer(0); --- > integer i_2 = new integer(0); 690c690 < integer j = new integer(0); --- > integer j_2 = new integer(0); 692c692 < integer keylength = new integer(0); --- > integer keylength_2 = new integer(0); 694c694 < integer stringlength = new integer(0); --- > integer stringlength_2 = new integer(0); 696c696 < character mycrc = new character(""); --- > character mycrc_2 = new character(""); 698c698 < character myhash = new character(""); --- > character myhash_2 = new character(""); 700c700 < memptr myraw = new memptr(); --- > memptr myraw_2 = new memptr(); 704,710c704,710 < mycrc.assign(substring(mystring, 1, 2)); < mystring.assign(substring(mystring, 3, -1, "raw")); < myraw.setLength((length(mystring))); < mykey.assign(substring(SecurityOps.encode(concat(mykey, "foobar")), 1, 16)); < myhash.assign(SecurityOps.encode(concat(mycrc, "foobar", mykey))); < keylength.assign(byteLength(mykey)); < stringlength.assign(byteLength(mystring)); --- > mycrc_2.assign(substring(mystring_3, 1, 2)); > mystring_3.assign(substring(mystring_3, 3, -1, "raw")); > myraw_2.setLength((length(mystring_3))); > mykey_2.assign(substring(SecurityOps.encode(concat(mykey_2, "foobar")), 1, 16)); > myhash_2.assign(SecurityOps.encode(concat(mycrc_2, "foobar", mykey_2))); > keylength_2.assign(byteLength(mykey_2)); > stringlength_2.assign(byteLength(mystring_3)); 712c712 < ToClause toClause1 = new ToClause(i, 1, stringlength, 2); --- > ToClause toClause1 = new ToClause(i_2, 1, stringlength_2, 2); 718,719c718,719 < j.assign(plus(j, 1)); < myraw.setByte(to10from36(new character(substring(mystring, i, 2, "raw"))), j); --- > j_2.assign(plus(j_2, 1)); > myraw_2.setByte(to10from36(new character(substring(mystring_3, i_2, 2, "raw"))), j_2); 723c723 < stringlength.assign(new integer(divide(stringlength, 2))); --- > stringlength_2.assign(new integer(divide(stringlength_2, 2))); 726c726 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 728c728 < myraw.setByte(abs(modulo(minus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256)), i); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(i_2), asc(substring(myhash_2, plus(modulo(i_2, 16), 1), 1, "raw"))), 256)), i_2); 732c732 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_2.assign(0); _isLessThanOrEqual(i_2, minus(stringlength_2, 1)); i_2.assign(plus(i_2, 5))) 735c735 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_2.assign(1); _isLessThanOrEqual(j_2, integer.minimum(keylength_2, minus(stringlength_2, i_2))); j_2.increment()) 737c737 < myraw.setByte(abs(modulo(minus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256)), plus(i, j)); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(plus(i_2, j_2)), asc(substring(mykey_2, j_2, 1, "raw"))), 256)), plus(i_2, j_2)); 741c741 < mystring.assign(""); --- > mystring_3.assign(""); 744c744 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 746c746 < mystring.assign(concat(mystring, chr(myraw.getByte(i)))); --- > mystring_3.assign(concat(mystring_3, chr(myraw_2.getByte(i_2)))); 749,750c749,750 < myraw.setLength(0); < if (_isEqual(mycrc, substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw"))) --- > myraw_2.setLength(0); > if (_isEqual(mycrc_2, substring(SecurityOps.encode(concat(mystring_3, "foobar")), 1, 2, "raw"))) 752c752 < returnNormal(mystring); --- > returnNormal(mystring_3); 768c768 < integer ii = new integer(0); --- > integer ii_2 = new integer(0); 777c777 < for (ii.assign(1); _isLessThanOrEqual(ii, length(myTest)); ii.increment()) --- > for (ii_2.assign(1); _isLessThanOrEqual(ii_2, length(myTest)); ii_2.increment()) 779c779 < xx.assign(substring(myTest, ii, 1)); --- > xx.assign(substring(myTest, ii_2, 1)); 799c799 < integer ii = new integer(0); --- > integer ii_3 = new integer(0); 801c801 < character xx = new character(""); --- > character xx_2 = new character(""); 831c831 < for (ii.assign(1); _isLessThanOrEqual(ii, lenStr); ii.increment()) --- > for (ii_3.assign(1); _isLessThanOrEqual(ii_3, lenStr); ii_3.increment()) 833,834c833,834 < xx.assign(substring(testString, ii, 1)); < if (_isNotEqual(xx, "-")) --- > xx_2.assign(substring(testString, ii_3, 1)); > if (_isNotEqual(xx_2, "-")) 836c836 < noDash.assign(concat(noDash, xx)); --- > noDash.assign(concat(noDash, xx_2)); diff -r generated/20130314a/src/aero/timco/majic/codes/ShiftTime.java generated/20130314c/src/aero/timco/majic/codes/ShiftTime.java 76c76 < public integer fnSecstoIntHm(final integer _ipinSeconds) --- > public integer fnSecstoIntHm(final integer _ipinSeconds_2) 80c80 < integer ipinSeconds = new integer(_ipinSeconds); --- > integer ipinSeconds_2 = new integer(_ipinSeconds_2); 92,93c92,93 < linHour.assign(truncate(divide(ipinSeconds, 86400), 0)); < linTmpSecs.assign(minus(ipinSeconds, multiply(linHour, 3600))); --- > linHour.assign(truncate(divide(ipinSeconds_2, 86400), 0)); > linTmpSecs.assign(minus(ipinSeconds_2, multiply(linHour, 3600))); 101c101 < public integer fnIntHmtoSecs(final integer _ipinIntHm) --- > public integer fnIntHmtoSecs(final integer _ipinIntHm_3) 105c105 < integer ipinIntHm = new integer(_ipinIntHm); --- > integer ipinIntHm_3 = new integer(_ipinIntHm_3); 107c107 < integer linHour = new integer(0); --- > integer linHour_2 = new integer(0); 109c109 < integer linMinutes = new integer(0); --- > integer linMinutes_2 = new integer(0); 115,117c115,117 < linHour.assign(truncate(divide(ipinIntHm, 100), 0)); < linMinutes.assign(modulo(ipinIntHm, 100)); < linSeconds.assign(plus(multiply(linHour, 3600), multiply(linMinutes, 60))); --- > linHour_2.assign(truncate(divide(ipinIntHm_3, 100), 0)); > linMinutes_2.assign(modulo(ipinIntHm_3, 100)); > linSeconds.assign(plus(multiply(linHour_2, 3600), multiply(linMinutes_2, 60))); 123c123 < public character fnIntHmtoString(final integer _ipinIntHm) --- > public character fnIntHmtoString(final integer _ipinIntHm_4) 127c127 < integer ipinIntHm = new integer(_ipinIntHm); --- > integer ipinIntHm_4 = new integer(_ipinIntHm_4); 129c129 < integer linSeconds = new integer(0); --- > integer linSeconds_2 = new integer(0); 135,136c135,136 < linSeconds.assign(fnIntHmtoSecs(ipinIntHm)); < lchString.assign(valueOf(linSeconds, "HH:MM")); --- > linSeconds_2.assign(fnIntHmtoSecs(ipinIntHm_4)); > lchString.assign(valueOf(linSeconds_2, "HH:MM")); diff -r generated/20130314a/src/aero/timco/majic/dan/DanR2.java generated/20130314c/src/aero/timco/majic/dan/DanR2.java 74c74 < integer inDan; --- > integer inDan_3; 76c76 < integer inDec; --- > integer inDec_2; 281c281 < public logical fxLineChk(final integer _inDan, final integer _inDec) --- > public logical fxLineChk(final integer _inDan_3, final integer _inDec_2) 285c285 < integer inDan = new integer(_inDan); --- > integer inDan_3 = new integer(_inDan_3); 287c287 < integer inDec = new integer(_inDec); --- > integer inDec_2 = new integer(_inDec_2); 291,292c291,292 < DanR2.this.inDan = inDan; < DanR2.this.inDec = inDec; --- > DanR2.this.inDan_3 = inDan_3; > DanR2.this.inDec_2 = inDec_2; 299,300c299,300 < inDan, < inDec --- > inDan_3, > inDec_2 diff -r generated/20130314a/src/aero/timco/majic/dan/DanR.java generated/20130314c/src/aero/timco/majic/dan/DanR.java 54c54 < integer inParm; --- > integer inParm_2; 212c212 < public logical fxIsEmployee(final integer _inParm) --- > public logical fxIsEmployee(final integer _inParm_2) 216c216 < integer inParm = new integer(_inParm); --- > integer inParm_2 = new integer(_inParm_2); 220c220 < DanR.this.inParm = inParm; --- > DanR.this.inParm_2 = inParm_2; 225c225 < if (_isEqual(inParm, 0)) --- > if (_isEqual(inParm_2, 0)) 231c231 < inParm --- > inParm_2 diff -r generated/20130314a/src/aero/timco/majic/dan/Tckt.java generated/20130314c/src/aero/timco/majic/dan/Tckt.java 48c48 < integer inParm; --- > integer inParm_3; 50c50 < integer inParmRef2; --- > integer inParm_4; 52c52 < integer inParm1; --- > integer inParm1_2; 54c54 < integer inParm2; --- > integer inParm2_2; 377c377 < logical lgResponse = new logical(false); --- > logical lgResponse_2 = new logical(false); 396,397c396,397 < }, false, new AccessorWrapper(lgResponse), ALERT_MESSAGE, BTN_YES_NO, "CHANGE STATUS?"); < if ((lgResponse).booleanValue()) --- > }, false, new AccessorWrapper(lgResponse_2), ALERT_MESSAGE, BTN_YES_NO, "CHANGE STATUS?"); > if ((lgResponse_2).booleanValue()) 552c552 < public logical fxIsEmployee(final integer _inParm) --- > public logical fxIsEmployee(final integer _inParm_3) 556c556 < integer inParm = new integer(_inParm); --- > integer inParm_3 = new integer(_inParm_3); 560c560 < Tckt.this.inParm = inParm; --- > Tckt.this.inParm_3 = inParm_3; 567c567 < inParm --- > inParm_3 580c580 < public logical fxIsSo(final integer _inParmRef2) --- > public logical fxIsSo(final integer _inParm_4) 584c584 < integer inParmRef2 = new integer(_inParmRef2); --- > integer inParm_4 = new integer(_inParm_4); 588c588 < Tckt.this.inParmRef2 = inParmRef2; --- > Tckt.this.inParm_4 = inParm_4; 595c595 < inParmRef2 --- > inParm_4 608c608 < public logical fxIsSoOper(final integer _inParm1, final integer _inParm2) --- > public logical fxIsSoOper(final integer _inParm1_2, final integer _inParm2_2) 612c612 < integer inParm1 = new integer(_inParm1); --- > integer inParm1_2 = new integer(_inParm1_2); 614c614 < integer inParm2 = new integer(_inParm2); --- > integer inParm2_2 = new integer(_inParm2_2); 618,619c618,619 < Tckt.this.inParm1 = inParm1; < Tckt.this.inParm2 = inParm2; --- > Tckt.this.inParm1_2 = inParm1_2; > Tckt.this.inParm2_2 = inParm2_2; 626,627c626,627 < inParm1, < inParm2 --- > inParm1_2, > inParm2_2 diff -r generated/20130314a/src/aero/timco/majic/dan/TrendR.java generated/20130314c/src/aero/timco/majic/dan/TrendR.java 802c802 < public void outputCosum(final integer _tot) --- > public void outputCosum(final integer _tot_2) 806c806 < integer tot = new integer(_tot); --- > integer tot_2 = new integer(_tot_2); 813c813 < new Element(tot, fcosumFrame.widgetTot()), --- > new Element(tot_2, fcosumFrame.widgetTot_2()), 817c817 < new Element((_isEqual(tot, 0) ? new decimal(0) : multiply(divide(tot, ttParent.getCntCard()), 100)), fcosumFrame.widgetExpr73()) --- > new Element((_isEqual(tot_2, 0) ? new decimal(0) : multiply(divide(tot_2, ttParent.getCntCard()), 100)), fcosumFrame.widgetExpr73()) diff -r generated/20130314a/src/aero/timco/majic/dc/BlJcsv.java generated/20130314c/src/aero/timco/majic/dc/BlJcsv.java 54c54 < integer ipinBatchIdRef2; --- > integer ipinBatchId_6; 56c56 < integer ipinJobtimeId; --- > integer ipinJobtimeId_6; 58c58 < integer ipinJobtimeIdRef2; --- > integer ipinJobtimeId_7; 78c78 < integer ipinBatchIdRef3; --- > integer ipinBatchId_7; 80c80 < integer ipinBatchIdRef4; --- > integer ipinBatchId_8; 82c82 < integer ipinEmpNumRef2; --- > integer ipinEmpNum_2; 84c84 < date ipdtTransDateRef2; --- > date ipdtTransDate_2; 86c86 < integer ipinEmpNumRef3; --- > integer ipinEmpNum_3; 186c186 < public character getTypeDesc(final character _ipchType) --- > public character getTypeDesc(final character _ipchType_2) 190c190 < character ipchType = new character(_ipchType); --- > character ipchType_2 = new character(_ipchType_2); 192c192 < integer linListPos = new integer(0); --- > integer linListPos_2 = new integer(0); 198,199c198,199 < linListPos.assign(lookup(ipchType, gchTypeList)); < if (_and(isGreaterThan(linListPos, 0), isLessThanOrEqual(linListPos, numEntries(gchTypeDesc)))) --- > linListPos_2.assign(lookup(ipchType_2, gchTypeList)); > if (_and(isGreaterThan(linListPos_2, 0), isLessThanOrEqual(linListPos_2, numEntries(gchTypeDesc)))) 201c201 < lchTypeDesc.assign(entry(linListPos, gchTypeDesc)); --- > lchTypeDesc.assign(entry(linListPos_2, gchTypeDesc)); 250c250 < public void ipSetBatchAsNew(final integer _ipinBatchId) --- > public void ipSetBatchAsNew(final integer _ipinBatchId_2) 254c254 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_2 = new integer(_ipinBatchId_2); 258c258 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("New"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_2, new character("New"), new date(), new character("")); 263c263 < public void ipSetBatchAsLoaded(final integer _ipinBatchId) --- > public void ipSetBatchAsLoaded(final integer _ipinBatchId_3) 267c267 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_3 = new integer(_ipinBatchId_3); 271c271 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Loaded"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_3, new character("Loaded"), new date(), new character("")); 276c276 < public void ipSetBatchAsProcessed(final integer _ipinBatchId, final character _ipchResult) --- > public void ipSetBatchAsProcessed(final integer _ipinBatchId_4, final character _ipchResult) 280c280 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_4 = new integer(_ipinBatchId_4); 286c286 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Processed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_4, new character("Processed"), new date(), ipchResult); 291c291 < public void ipSetBatchAsCompleted(final integer _ipinBatchId, final character _ipchResult) --- > public void ipSetBatchAsCompleted(final integer _ipinBatchId_5, final character _ipchResult_2) 295c295 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_5 = new integer(_ipinBatchId_5); 297c297 < character ipchResult = new character(_ipchResult); --- > character ipchResult_2 = new character(_ipchResult_2); 301c301 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Completed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_5, new character("Completed"), new date(), ipchResult_2); 306c306 < public void ipSetBatchStatus(final integer _ipinBatchIdRef2, final character _ipchStatus, final date _ipdtDate, final character _ipchResult) --- > public void ipSetBatchStatus(final integer _ipinBatchId_6, final character _ipchStatus, final date _ipdtDate, final character _ipchResult_3) 310c310 < integer ipinBatchIdRef2 = new integer(_ipinBatchIdRef2); --- > integer ipinBatchId_6 = new integer(_ipinBatchId_6); 316c316 < character ipchResult = new character(_ipchResult); --- > character ipchResult_3 = new character(_ipchResult_3); 320c320 < BlJcsv.this.ipinBatchIdRef2 = ipinBatchIdRef2; --- > BlJcsv.this.ipinBatchId_6 = ipinBatchId_6; 334c334 < ipinBatchIdRef2 --- > ipinBatchId_6 342c342 < bBlBatchBuf2.setBatchResult(ipchResult); --- > bBlBatchBuf2.setBatchResult(ipchResult_3); 364c364 < public void ipSetJobtimeAsLoaded(final integer _ipinJobtimeId) --- > public void ipSetJobtimeAsLoaded(final integer _ipinJobtimeId_2) 368c368 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_2 = new integer(_ipinJobtimeId_2); 372c372 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Loaded"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_2, new character("Loaded"), new date(), new character("")); 377c377 < public void ipSetJobtimeAsProcessed(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsProcessed(final integer _ipinJobtimeId_3, final character _ipchResult_4) 381c381 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_3 = new integer(_ipinJobtimeId_3); 383c383 < character ipchResult = new character(_ipchResult); --- > character ipchResult_4 = new character(_ipchResult_4); 387c387 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Processed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_3, new character("Processed"), new date(), ipchResult_4); 392c392 < public void ipSetJobtimeAsError(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsError(final integer _ipinJobtimeId_4, final character _ipchResult_5) 396c396 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_4 = new integer(_ipinJobtimeId_4); 398c398 < character ipchResult = new character(_ipchResult); --- > character ipchResult_5 = new character(_ipchResult_5); 402c402 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Error"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_4, new character("Error"), new date(), ipchResult_5); 407c407 < public void ipSetJobtimeAsCompleted(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsCompleted(final integer _ipinJobtimeId_5, final character _ipchResult_6) 411c411 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_5 = new integer(_ipinJobtimeId_5); 413c413 < character ipchResult = new character(_ipchResult); --- > character ipchResult_6 = new character(_ipchResult_6); 417c417 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Completed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_5, new character("Completed"), new date(), ipchResult_6); 422c422 < public void ipGetJobtimeStatus(final integer _ipinJobtimeId, final character opchStatus) --- > public void ipGetJobtimeStatus(final integer _ipinJobtimeId_6, final character opchStatus_2) 426c426 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_6 = new integer(_ipinJobtimeId_6); 430,431c430,431 < BlJcsv.this.ipinJobtimeId = ipinJobtimeId; < opchStatus.assign(new character("")); --- > BlJcsv.this.ipinJobtimeId_6 = ipinJobtimeId_6; > opchStatus_2.assign(new character("")); 434c434 < opchStatus --- > opchStatus_2 444c444 < ipinJobtimeId --- > ipinJobtimeId_6 449c449 < opchStatus.assign(bBlJobtime.getJobTimeStatus()); --- > opchStatus_2.assign(bBlJobtime.getJobTimeStatus()); 453c453 < opchStatus.assign("Unknown"); --- > opchStatus_2.assign("Unknown"); 460c460 < public void ipSetJobtimeStatus(final integer _ipinJobtimeIdRef2, final character _ipchStatus, final date _ipdtDate, final character _ipchResult) --- > public void ipSetJobtimeStatus(final integer _ipinJobtimeId_7, final character _ipchStatus_2, final date _ipdtDate_2, final character _ipchResult_7) 464c464 < integer ipinJobtimeIdRef2 = new integer(_ipinJobtimeIdRef2); --- > integer ipinJobtimeId_7 = new integer(_ipinJobtimeId_7); 466c466 < character ipchStatus = new character(_ipchStatus); --- > character ipchStatus_2 = new character(_ipchStatus_2); 468c468 < date ipdtDate = new date(_ipdtDate); --- > date ipdtDate_2 = new date(_ipdtDate_2); 470c470 < character ipchResult = new character(_ipchResult); --- > character ipchResult_7 = new character(_ipchResult_7); 474c474 < BlJcsv.this.ipinJobtimeIdRef2 = ipinJobtimeIdRef2; --- > BlJcsv.this.ipinJobtimeId_7 = ipinJobtimeId_7; 488c488 < ipinJobtimeIdRef2 --- > ipinJobtimeId_7 494,496c494,496 < bBlJobtimeBuf2.setJobTimeStatus(ipchStatus); < bBlJobtimeBuf2.setJobTimeDate(ipdtDate); < bBlJobtimeBuf2.setJobTimeResult(ipchResult); --- > bBlJobtimeBuf2.setJobTimeStatus(ipchStatus_2); > bBlJobtimeBuf2.setJobTimeDate(ipdtDate_2); > bBlJobtimeBuf2.setJobTimeResult(ipchResult_7); 610c610 < public integer getUserNum(final character _ipchSymUser) --- > public integer getUserNum(final character _ipchSymUser_2) 614c614 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 620c620 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 634c634 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_3) 638c638 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 644c644 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_3); 717c717 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 721c721 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 723c723 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 727c727 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 732c732 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 736c736 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 738c738 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 742c742 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 747c747 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 751c751 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 753c753 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 757c757 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 762c762 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 766c766 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 768c768 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 772c772 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 777c777 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 781c781 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 783c783 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 787c787 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 792c792 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 796c796 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 798c798 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 802c802 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 885c885 < public void ipCreateBatch(final character _ipchBatchType, final character _ipchDataFile, final integer opinBatchId) --- > public void ipCreateBatch(final character _ipchBatchType_2, final character _ipchDataFile_2, final integer opinBatchId) 889c889 < character ipchBatchType = new character(_ipchBatchType); --- > character ipchBatchType_2 = new character(_ipchBatchType_2); 891c891 < character ipchDataFile = new character(_ipchDataFile); --- > character ipchDataFile_2 = new character(_ipchDataFile_2); 918,919c918,919 < blanketBatch.setBatcType(ipchBatchType); < blanketBatch.setDataSource(ipchDataFile); --- > blanketBatch.setBatcType(ipchBatchType_2); > blanketBatch.setDataSource(ipchDataFile_2); 927c927 < public void ipLoadData(final integer _ipinBatchIdRef3) --- > public void ipLoadData(final integer _ipinBatchId_7) 931c931 < integer ipinBatchIdRef3 = new integer(_ipinBatchIdRef3); --- > integer ipinBatchId_7 = new integer(_ipinBatchId_7); 965c965 < BlJcsv.this.ipinBatchIdRef3 = ipinBatchIdRef3; --- > BlJcsv.this.ipinBatchId_7 = ipinBatchId_7; 974c974 < ipinBatchIdRef3 --- > ipinBatchId_7 1021c1021 < blanketJobTime.setBatchId(ipinBatchIdRef3); --- > blanketJobTime.setBatchId(ipinBatchId_7); 1042c1042 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchIdRef3))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchId_7))); 1049c1049 < public void ipProcessData(final integer _ipinBatchIdRef4) --- > public void ipProcessData(final integer _ipinBatchId_8) 1053c1053 < integer ipinBatchIdRef4 = new integer(_ipinBatchIdRef4); --- > integer ipinBatchId_8 = new integer(_ipinBatchId_8); 1065c1065 < BlJcsv.this.ipinBatchIdRef4 = ipinBatchIdRef4; --- > BlJcsv.this.ipinBatchId_8 = ipinBatchId_8; 1077c1077 < ipinBatchIdRef4 --- > ipinBatchId_8 1124c1124 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchIdRef4))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchId_8))); 1183c1183 < public void ipGetShiftStart(final integer _ipinEmpNumRef2, final date _ipdtTransDateRef2, final integer opinShiftStart) --- > public void ipGetShiftStart(final integer _ipinEmpNum_2, final date _ipdtTransDate_2, final integer opinShiftStart) 1187c1187 < integer ipinEmpNumRef2 = new integer(_ipinEmpNumRef2); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 1189c1189 < date ipdtTransDateRef2 = new date(_ipdtTransDateRef2); --- > date ipdtTransDate_2 = new date(_ipdtTransDate_2); 1193,1194c1193,1194 < BlJcsv.this.ipinEmpNumRef2 = ipinEmpNumRef2; < BlJcsv.this.ipdtTransDateRef2 = ipdtTransDateRef2; --- > BlJcsv.this.ipinEmpNum_2 = ipinEmpNum_2; > BlJcsv.this.ipdtTransDate_2 = ipdtTransDate_2; 1208,1209c1208,1209 < ipinEmpNumRef2, < ipdtTransDateRef2 --- > ipinEmpNum_2, > ipdtTransDate_2 1218c1218 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No shift found for employee: ", valueOf(ipinEmpNumRef2))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No shift found for employee: ", valueOf(ipinEmpNum_2))); 1225c1225 < public void ipGetEmpCrew(final integer _ipinEmpNumRef3, final date _ipdtCheckDate, final character opchCrewCode) --- > public void ipGetEmpCrew(final integer _ipinEmpNum_3, final date _ipdtCheckDate, final character opchCrewCode) 1229c1229 < integer ipinEmpNumRef3 = new integer(_ipinEmpNumRef3); --- > integer ipinEmpNum_3 = new integer(_ipinEmpNum_3); 1235c1235 < BlJcsv.this.ipinEmpNumRef3 = ipinEmpNumRef3; --- > BlJcsv.this.ipinEmpNum_3 = ipinEmpNum_3; 1251c1251 < ipinEmpNumRef3, --- > ipinEmpNum_3, 1262c1262 < ipinEmpNumRef3, --- > ipinEmpNum_3, 1276c1276 < ipinEmpNumRef3 --- > ipinEmpNum_3 diff -r generated/20130314a/src/aero/timco/majic/dc/BlJtc.java generated/20130314c/src/aero/timco/majic/dc/BlJtc.java 136c136 < integer ipinBatchIdRef2; --- > integer ipinBatchId_6; 138c138 < integer ipinJobtimeId; --- > integer ipinJobtimeId_6; 140c140 < integer ipinJobtimeIdRef2; --- > integer ipinJobtimeId_7; 154c154 < integer ipinEmpNumRef2; --- > integer ipinEmpNum_2; 156c156 < date ipdtTransDateRef2; --- > date ipdtTransDate_2; 158c158 < integer ipinEmpNumRef3; --- > integer ipinEmpNum_3; 160c160 < integer ipinEmpNumRef4; --- > integer ipinEmpNum_4; 162c162 < date ipdtTransDateRef3; --- > date ipdtTransDate_3; 166c166 < integer ipinCoNumRef2; --- > integer ipinCoNum_2; 174c174 < integer linJobtimeIdRef2 = new integer(0); --- > integer linJobtimeId_2 = new integer(0); 176c176 < integer linJobtimeIdRef3 = new integer(0); --- > integer linJobtimeId_3 = new integer(0); 180c180 < integer linJobtimeIdRef4 = new integer(0); --- > integer linJobtimeId_4 = new integer(0); 186c186 < integer linMoveToIdRef2 = new integer(0); --- > integer linMoveToId_2 = new integer(0); 188c188 < integer linNewIdRef2 = new integer(0); --- > integer linNewId_2 = new integer(0); 190c190 < integer linJobtimeIdRef5 = new integer(0); --- > integer linJobtimeId_5 = new integer(0); 192c192 < integer ipinEmpNumRef5; --- > integer ipinEmpNum_5; 198c198 < integer ipinEmpNumRef6; --- > integer ipinEmpNum_6; 200c200 < integer ipinEmpNumRef7; --- > integer ipinEmpNum_8; 202c202 < date ipdtTransDateRef4; --- > date ipdtTransDate_5; 204c204 < integer ipinEmpNumRef8; --- > integer ipinEmpNum_9; 206c206 < integer ipinCoNumRef3; --- > integer ipinCoNum_3; 208c208 < integer ipinCoNumRef4; --- > integer ipinCoNum_4; 210c210 < integer ipinTimcoOperRef2; --- > integer ipinTimcoOper_2; 212c212 < character ipchSkillCodeRef2; --- > character ipchSkillCode_2; 361c361 < public void ipSetBatchAsNew(final integer _ipinBatchId) --- > public void ipSetBatchAsNew(final integer _ipinBatchId_2) 365c365 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_2 = new integer(_ipinBatchId_2); 369c369 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("New"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_2, new character("New"), new date(), new character("")); 374c374 < public void ipSetBatchAsLoaded(final integer _ipinBatchId) --- > public void ipSetBatchAsLoaded(final integer _ipinBatchId_3) 378c378 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_3 = new integer(_ipinBatchId_3); 382c382 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Loaded"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_3, new character("Loaded"), new date(), new character("")); 387c387 < public void ipSetBatchAsProcessed(final integer _ipinBatchId, final character _ipchResult) --- > public void ipSetBatchAsProcessed(final integer _ipinBatchId_4, final character _ipchResult) 391c391 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_4 = new integer(_ipinBatchId_4); 397c397 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Processed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_4, new character("Processed"), new date(), ipchResult); 402c402 < public void ipSetBatchAsCompleted(final integer _ipinBatchId, final character _ipchResult) --- > public void ipSetBatchAsCompleted(final integer _ipinBatchId_5, final character _ipchResult_2) 406c406 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_5 = new integer(_ipinBatchId_5); 408c408 < character ipchResult = new character(_ipchResult); --- > character ipchResult_2 = new character(_ipchResult_2); 412c412 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Completed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_5, new character("Completed"), new date(), ipchResult_2); 417c417 < public void ipSetBatchStatus(final integer _ipinBatchIdRef2, final character _ipchStatus, final date _ipdtDate, final character _ipchResult) --- > public void ipSetBatchStatus(final integer _ipinBatchId_6, final character _ipchStatus, final date _ipdtDate, final character _ipchResult_3) 421c421 < integer ipinBatchIdRef2 = new integer(_ipinBatchIdRef2); --- > integer ipinBatchId_6 = new integer(_ipinBatchId_6); 427c427 < character ipchResult = new character(_ipchResult); --- > character ipchResult_3 = new character(_ipchResult_3); 431c431 < BlJtc.this.ipinBatchIdRef2 = ipinBatchIdRef2; --- > BlJtc.this.ipinBatchId_6 = ipinBatchId_6; 445c445 < ipinBatchIdRef2 --- > ipinBatchId_6 453c453 < bBlBatchBuf2.setBatchResult(ipchResult); --- > bBlBatchBuf2.setBatchResult(ipchResult_3); 475c475 < public void ipSetJobtimeAsLoaded(final integer _ipinJobtimeId) --- > public void ipSetJobtimeAsLoaded(final integer _ipinJobtimeId_2) 479c479 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_2 = new integer(_ipinJobtimeId_2); 483c483 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Loaded"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_2, new character("Loaded"), new date(), new character("")); 488c488 < public void ipSetJobtimeAsProcessed(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsProcessed(final integer _ipinJobtimeId_3, final character _ipchResult_4) 492c492 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_3 = new integer(_ipinJobtimeId_3); 494c494 < character ipchResult = new character(_ipchResult); --- > character ipchResult_4 = new character(_ipchResult_4); 498c498 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Processed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_3, new character("Processed"), new date(), ipchResult_4); 503c503 < public void ipSetJobtimeAsError(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsError(final integer _ipinJobtimeId_4, final character _ipchResult_5) 507c507 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_4 = new integer(_ipinJobtimeId_4); 509c509 < character ipchResult = new character(_ipchResult); --- > character ipchResult_5 = new character(_ipchResult_5); 513c513 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Error"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_4, new character("Error"), new date(), ipchResult_5); 518c518 < public void ipSetJobtimeAsCompleted(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsCompleted(final integer _ipinJobtimeId_5, final character _ipchResult_6) 522c522 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_5 = new integer(_ipinJobtimeId_5); 524c524 < character ipchResult = new character(_ipchResult); --- > character ipchResult_6 = new character(_ipchResult_6); 528c528 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Completed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_5, new character("Completed"), new date(), ipchResult_6); 533c533 < public void ipGetJobtimeStatus(final integer _ipinJobtimeId, final character opchStatus) --- > public void ipGetJobtimeStatus(final integer _ipinJobtimeId_6, final character opchStatus_2) 537c537 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_6 = new integer(_ipinJobtimeId_6); 541,542c541,542 < BlJtc.this.ipinJobtimeId = ipinJobtimeId; < opchStatus.assign(new character("")); --- > BlJtc.this.ipinJobtimeId_6 = ipinJobtimeId_6; > opchStatus_2.assign(new character("")); 545c545 < opchStatus --- > opchStatus_2 555c555 < ipinJobtimeId --- > ipinJobtimeId_6 560c560 < opchStatus.assign(bBlJobtime.getJobTimeStatus()); --- > opchStatus_2.assign(bBlJobtime.getJobTimeStatus()); 564c564 < opchStatus.assign("Unknown"); --- > opchStatus_2.assign("Unknown"); 571c571 < public void ipSetJobtimeStatus(final integer _ipinJobtimeIdRef2, final character _ipchStatus, final date _ipdtDate, final character _ipchResult) --- > public void ipSetJobtimeStatus(final integer _ipinJobtimeId_7, final character _ipchStatus_2, final date _ipdtDate_2, final character _ipchResult_7) 575c575 < integer ipinJobtimeIdRef2 = new integer(_ipinJobtimeIdRef2); --- > integer ipinJobtimeId_7 = new integer(_ipinJobtimeId_7); 577c577 < character ipchStatus = new character(_ipchStatus); --- > character ipchStatus_2 = new character(_ipchStatus_2); 579c579 < date ipdtDate = new date(_ipdtDate); --- > date ipdtDate_2 = new date(_ipdtDate_2); 581c581 < character ipchResult = new character(_ipchResult); --- > character ipchResult_7 = new character(_ipchResult_7); 585c585 < BlJtc.this.ipinJobtimeIdRef2 = ipinJobtimeIdRef2; --- > BlJtc.this.ipinJobtimeId_7 = ipinJobtimeId_7; 599c599 < ipinJobtimeIdRef2 --- > ipinJobtimeId_7 605,607c605,607 < bBlJobtimeBuf2.setJobTimeStatus(ipchStatus); < bBlJobtimeBuf2.setJobTimeDate(ipdtDate); < bBlJobtimeBuf2.setJobTimeResult(ipchResult); --- > bBlJobtimeBuf2.setJobTimeStatus(ipchStatus_2); > bBlJobtimeBuf2.setJobTimeDate(ipdtDate_2); > bBlJobtimeBuf2.setJobTimeResult(ipchResult_7); 723c723 < public void ipGetDefaultRecord(final integer _ipinEmpNumRef2, final date _ipdtTransDateRef2, final integer opinDefaultId) --- > public void ipGetDefaultRecord(final integer _ipinEmpNum_2, final date _ipdtTransDate_2, final integer opinDefaultId) 727c727 < integer ipinEmpNumRef2 = new integer(_ipinEmpNumRef2); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 729c729 < date ipdtTransDateRef2 = new date(_ipdtTransDateRef2); --- > date ipdtTransDate_2 = new date(_ipdtTransDate_2); 733,734c733,734 < BlJtc.this.ipinEmpNumRef2 = ipinEmpNumRef2; < BlJtc.this.ipdtTransDateRef2 = ipdtTransDateRef2; --- > BlJtc.this.ipinEmpNum_2 = ipinEmpNum_2; > BlJtc.this.ipdtTransDate_2 = ipdtTransDate_2; 745c745 < if (_isNotEqual(ipinEmpNumRef2, 0)) --- > if (_isNotEqual(ipinEmpNum_2, 0)) 750,751c750,751 < ipinEmpNumRef2, < ipdtTransDateRef2 --- > ipinEmpNum_2, > ipdtTransDate_2 955c955 < public void ipGetEmpName(final integer _ipinEmpNumRef3, final character opchEmpName) --- > public void ipGetEmpName(final integer _ipinEmpNum_3, final character opchEmpName) 959c959 < integer ipinEmpNumRef3 = new integer(_ipinEmpNumRef3); --- > integer ipinEmpNum_3 = new integer(_ipinEmpNum_3); 963c963 < BlJtc.this.ipinEmpNumRef3 = ipinEmpNumRef3; --- > BlJtc.this.ipinEmpNum_3 = ipinEmpNum_3; 977c977 < ipinEmpNumRef3 --- > ipinEmpNum_3 993c993 < public void ipGetTotalHours(final integer _ipinEmpNumRef4, final date _ipdtTransDateRef3, final decimal opdeTotalHours) --- > public void ipGetTotalHours(final integer _ipinEmpNum_4, final date _ipdtTransDate_3, final decimal opdeTotalHours) 997c997 < integer ipinEmpNumRef4 = new integer(_ipinEmpNumRef4); --- > integer ipinEmpNum_4 = new integer(_ipinEmpNum_4); 999c999 < date ipdtTransDateRef3 = new date(_ipdtTransDateRef3); --- > date ipdtTransDate_3 = new date(_ipdtTransDate_3); 1005,1006c1005,1006 < BlJtc.this.ipinEmpNumRef4 = ipinEmpNumRef4; < BlJtc.this.ipdtTransDateRef3 = ipdtTransDateRef3; --- > BlJtc.this.ipinEmpNum_4 = ipinEmpNum_4; > BlJtc.this.ipdtTransDate_3 = ipdtTransDate_3; 1025,1026c1025,1026 < ipinEmpNumRef4, < ipdtTransDateRef3 --- > ipinEmpNum_4, > ipdtTransDate_3 1086c1086 < public void ipGetOperData(final integer _ipinCoNumRef2, final integer _ipinTimcoOper, final character opchWorkBreakdown, final character opchCardNum, final character opchOperDescript, final character opchOperStatus) --- > public void ipGetOperData(final integer _ipinCoNum_2, final integer _ipinTimcoOper, final character opchWorkBreakdown, final character opchCardNum, final character opchOperDescript, final character opchOperStatus) 1090c1090 < integer ipinCoNumRef2 = new integer(_ipinCoNumRef2); --- > integer ipinCoNum_2 = new integer(_ipinCoNum_2); 1094c1094 < character lchStatusDesc = new character(""); --- > character lchStatusDesc_2 = new character(""); 1098c1098 < BlJtc.this.ipinCoNumRef2 = ipinCoNumRef2; --- > BlJtc.this.ipinCoNum_2 = ipinCoNum_2; 1116c1116 < if (_and(isNotEqual(ipinCoNumRef2, 0), isNotEqual(ipinTimcoOper, 0))) --- > if (_and(isNotEqual(ipinCoNum_2, 0), isNotEqual(ipinTimcoOper, 0))) 1121c1121 < ipinCoNumRef2, --- > ipinCoNum_2, 1136,1137c1136,1137 < ControlFlowOps.invokeWithMode("util/opgetdsc.p", "IO", job.getStatus(), lchStatusDesc); < opchOperStatus.assign(concat(job.getStatus(), " ", lchStatusDesc)); --- > ControlFlowOps.invokeWithMode("util/opgetdsc.p", "IO", job.getStatus(), lchStatusDesc_2); > opchOperStatus.assign(concat(job.getStatus(), " ", lchStatusDesc_2)); 1303c1303 < linJobtimeIdRef2.assign(blanketJobTime.getJobTimeId()); --- > linJobtimeId_2.assign(blanketJobTime.getJobTimeId()); 1314c1314 < linJobtimeIdRef2 --- > linJobtimeId_2 1347c1347 < linJobtimeIdRef3.assign(blanketJobTime.getJobTimeId()); --- > linJobtimeId_3.assign(blanketJobTime.getJobTimeId()); 1461c1461 < linJobtimeIdRef3.assign(linNewId); --- > linJobtimeId_3.assign(linNewId); 1497c1497 < linJobtimeIdRef3 --- > linJobtimeId_3 1515c1515 < logical llgValidSo = new logical(false); --- > logical llgValidSo_2 = new logical(false); 1517c1517 < character lchSomessage = new character(""); --- > character lchSomessage_2 = new character(""); 1519c1519 < logical llgValidOper = new logical(false); --- > logical llgValidOper_2 = new logical(false); 1521c1521 < character lchOperMessage = new character(""); --- > character lchOperMessage_2 = new character(""); 1523c1523 < logical llgValidSkill = new logical(false); --- > logical llgValidSkill_2 = new logical(false); 1525c1525 < character lchSkillMessage = new character(""); --- > character lchSkillMessage_2 = new character(""); 1548c1548 < linJobtimeIdRef4.assign(blanketJobTime.getJobTimeId()); --- > linJobtimeId_4.assign(blanketJobTime.getJobTimeId()); 1560,1561c1560,1561 < ControlFlowOps.invokeWithMode("ip_ValActiveSO", "IOO", ginConum, llgValidSo, lchSomessage); < if ((llgValidSo).booleanValue()) --- > ControlFlowOps.invokeWithMode("ip_ValActiveSO", "IOO", ginConum, llgValidSo_2, lchSomessage_2); > if ((llgValidSo_2).booleanValue()) 1593c1593 < messageBox(lchSomessage, ALERT_ERROR, BTN_OK, null); --- > messageBox(lchSomessage_2, ALERT_ERROR, BTN_OK, null); 1608,1609c1608,1609 < ControlFlowOps.invokeWithMode("ip_ValActiveOper", "IIOO", ginConum, ginTimcoOper, llgValidOper, lchOperMessage); < if ((llgValidOper).booleanValue()) --- > ControlFlowOps.invokeWithMode("ip_ValActiveOper", "IIOO", ginConum, ginTimcoOper, llgValidOper_2, lchOperMessage_2); > if ((llgValidOper_2).booleanValue()) 1625c1625 < messageBox(lchOperMessage, ALERT_ERROR, BTN_OK, null); --- > messageBox(lchOperMessage_2, ALERT_ERROR, BTN_OK, null); 1640,1641c1640,1641 < ControlFlowOps.invokeWithMode("ip_ValSkillCode", "IOO", gchSkillCode, llgValidSkill, lchSkillMessage); < if ((llgValidSkill).booleanValue()) --- > ControlFlowOps.invokeWithMode("ip_ValSkillCode", "IOO", gchSkillCode, llgValidSkill_2, lchSkillMessage_2); > if ((llgValidSkill_2).booleanValue()) 1654c1654 < messageBox(lchOperMessage, ALERT_ERROR, BTN_OK, null); --- > messageBox(lchOperMessage_2, ALERT_ERROR, BTN_OK, null); 1700c1700 < linJobtimeIdRef4 --- > linJobtimeId_4 1738c1738 < integer linEmpNum = new integer(0); --- > integer linEmpNum_2 = new integer(0); 1740c1740 < date ldtTransDate = date.instantiateUnknownDate(); --- > date ldtTransDate_2 = date.instantiateUnknownDate(); 1760,1761c1760,1761 < linEmpNum.assign(blanketJobTime.getEmployeeNumber()); < ldtTransDate.assign(blanketJobTime.getTransactionDate()); --- > linEmpNum_2.assign(blanketJobTime.getEmployeeNumber()); > ldtTransDate_2.assign(blanketJobTime.getTransactionDate()); 1779c1779 < ControlFlowOps.invokeWithMode("ip_GetDefaultRecord", "IIO", linEmpNum, ldtTransDate, linMoveToId); --- > ControlFlowOps.invokeWithMode("ip_GetDefaultRecord", "IIO", linEmpNum_2, ldtTransDate_2, linMoveToId); 1832c1832 < integer linCurrentId = new integer(0); --- > integer linCurrentId_2 = new integer(0); 1840c1840 < logical llgValidSo = new logical(false); --- > logical llgValidSo_3 = new logical(false); 1842c1842 < character lchSomessage = new character(""); --- > character lchSomessage_3 = new character(""); 1844c1844 < logical llgValidOper = new logical(false); --- > logical llgValidOper_3 = new logical(false); 1846c1846 < character lchOperMessage = new character(""); --- > character lchOperMessage_3 = new character(""); 1852c1852 < linCurrentId.assign(blanketJobTime.getJobTimeId()); --- > linCurrentId_2.assign(blanketJobTime.getJobTimeId()); 1856c1856 < linCurrentId.assign(0); --- > linCurrentId_2.assign(0); 1968,1969c1968,1969 < ControlFlowOps.invokeWithMode("ip_ValActiveSO", "IOO", ginConum, llgValidSo, lchSomessage); < if ((llgValidSo).booleanValue()) --- > ControlFlowOps.invokeWithMode("ip_ValActiveSO", "IOO", ginConum, llgValidSo_3, lchSomessage_3); > if ((llgValidSo_3).booleanValue()) 2001c2001 < messageBox(lchSomessage, ALERT_ERROR, BTN_OK, null); --- > messageBox(lchSomessage_3, ALERT_ERROR, BTN_OK, null); 2012,2013c2012,2013 < ControlFlowOps.invokeWithMode("ip_ValActiveOper", "IIOO", ginConum, ginTimcoOper, llgValidOper, lchOperMessage); < if ((llgValidOper).booleanValue()) --- > ControlFlowOps.invokeWithMode("ip_ValActiveOper", "IIOO", ginConum, ginTimcoOper, llgValidOper_3, lchOperMessage_3); > if ((llgValidOper_3).booleanValue()) 2029c2029 < messageBox(lchOperMessage, ALERT_ERROR, BTN_OK, null); --- > messageBox(lchOperMessage_3, ALERT_ERROR, BTN_OK, null); 2065c2065 < ControlFlowOps.invokeWithMode("ip_CreateNewLine", "IIIO", ginEmpNum, gdtTransDate, gchCrewCode, linNewIdRef2); --- > ControlFlowOps.invokeWithMode("ip_CreateNewLine", "IIIO", ginEmpNum, gdtTransDate, gchCrewCode, linNewId_2); 2069c2069 < linNewIdRef2 --- > linNewId_2 2080c2080 < linMoveToIdRef2.assign(linNewIdRef2); --- > linMoveToId_2.assign(linNewId_2); 2085c2085 < linMoveToIdRef2.assign(linCurrentId); --- > linMoveToId_2.assign(linCurrentId_2); 2093c2093 < linMoveToIdRef2.assign(linCurrentId); --- > linMoveToId_2.assign(linCurrentId_2); 2099c2099 < linMoveToIdRef2.assign(linCurrentId); --- > linMoveToId_2.assign(linCurrentId_2); 2104c2104 < linMoveToIdRef2 --- > linMoveToId_2 2120c2120 < linJobtimeIdRef5.assign(blanketJobTime.getJobTimeId()); --- > linJobtimeId_5.assign(blanketJobTime.getJobTimeId()); 2176c2176 < linJobtimeIdRef5 --- > linJobtimeId_5 2197c2197 < public void ipGetEmpCrew(final integer _ipinEmpNumRef5, final date _ipdtCheckDate, final character opchCrewCode) --- > public void ipGetEmpCrew(final integer _ipinEmpNum_5, final date _ipdtCheckDate, final character opchCrewCode) 2201c2201 < integer ipinEmpNumRef5 = new integer(_ipinEmpNumRef5); --- > integer ipinEmpNum_5 = new integer(_ipinEmpNum_5); 2207c2207 < BlJtc.this.ipinEmpNumRef5 = ipinEmpNumRef5; --- > BlJtc.this.ipinEmpNum_5 = ipinEmpNum_5; 2223c2223 < ipinEmpNumRef5, --- > ipinEmpNum_5, 2234c2234 < ipinEmpNumRef5, --- > ipinEmpNum_5, 2248c2248 < ipinEmpNumRef5 --- > ipinEmpNum_5 2265c2265 < public void ipGetEmpSkill(final integer _ipinEmpNumRef6, final character opchSkillCode) --- > public void ipGetEmpSkill(final integer _ipinEmpNum_6, final character opchSkillCode) 2269c2269 < integer ipinEmpNumRef6 = new integer(_ipinEmpNumRef6); --- > integer ipinEmpNum_6 = new integer(_ipinEmpNum_6); 2273c2273 < BlJtc.this.ipinEmpNumRef6 = ipinEmpNumRef6; --- > BlJtc.this.ipinEmpNum_6 = ipinEmpNum_6; 2287c2287 < ipinEmpNumRef6 --- > ipinEmpNum_6 2303c2303 < public void ipCreateNewLine(final integer _ipinEmpNum, final date _ipdtTransDate, final character _ipchCrewCode, final integer opinJobtimeId) --- > public void ipCreateNewLine(final integer _ipinEmpNum_7, final date _ipdtTransDate_4, final character _ipchCrewCode, final integer opinJobtimeId) 2307c2307 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_7 = new integer(_ipinEmpNum_7); 2309c2309 < date ipdtTransDate = new date(_ipdtTransDate); --- > date ipdtTransDate_4 = new date(_ipdtTransDate_4); 2313c2313 < integer linNewId = new integer(0); --- > integer linNewId_3 = new integer(0); 2328,2330c2328,2330 < ControlFlowOps.invokeWithMode("ip_GetNextID", "O", linNewId); < ControlFlowOps.invokeWithMode("ip_GetNextLineSeq", "IIO", ipinEmpNum, ipdtTransDate, linNextSeq); < if (_isNotEqual(linNewId, 0)) --- > ControlFlowOps.invokeWithMode("ip_GetNextID", "O", linNewId_3); > ControlFlowOps.invokeWithMode("ip_GetNextLineSeq", "IIO", ipinEmpNum_7, ipdtTransDate_4, linNextSeq); > if (_isNotEqual(linNewId_3, 0)) 2343,2344c2343,2344 < opinJobtimeId.assign(linNewId); < bJtBuf10.setJobTimeId(linNewId); --- > opinJobtimeId.assign(linNewId_3); > bJtBuf10.setJobTimeId(linNewId_3); 2346c2346 < bJtBuf10.setEmployeeNumber(ipinEmpNum); --- > bJtBuf10.setEmployeeNumber(ipinEmpNum_7); 2348c2348 < bJtBuf10.setTransactionDate(ipdtTransDate); --- > bJtBuf10.setTransactionDate(ipdtTransDate_4); 2372c2372 < public void ipCheckNewHeader(final integer _ipinEmpNumRef7, final date _ipdtTransDateRef4, final logical oplgNewOkay) --- > public void ipCheckNewHeader(final integer _ipinEmpNum_8, final date _ipdtTransDate_5, final logical oplgNewOkay) 2376c2376 < integer ipinEmpNumRef7 = new integer(_ipinEmpNumRef7); --- > integer ipinEmpNum_8 = new integer(_ipinEmpNum_8); 2378c2378 < date ipdtTransDateRef4 = new date(_ipdtTransDateRef4); --- > date ipdtTransDate_5 = new date(_ipdtTransDate_5); 2382,2383c2382,2383 < BlJtc.this.ipinEmpNumRef7 = ipinEmpNumRef7; < BlJtc.this.ipdtTransDateRef4 = ipdtTransDateRef4; --- > BlJtc.this.ipinEmpNum_8 = ipinEmpNum_8; > BlJtc.this.ipdtTransDate_5 = ipdtTransDate_5; 2397,2398c2397,2398 < ipinEmpNumRef7, < ipdtTransDateRef4 --- > ipinEmpNum_8, > ipdtTransDate_5 2414c2414 < public void ipValBillableEmp(final integer _ipinEmpNumRef8, final date _ipdtDate, final logical oplgValid, final character opchMessage) --- > public void ipValBillableEmp(final integer _ipinEmpNum_9, final date _ipdtDate_3, final logical oplgValid, final character opchMessage) 2418c2418 < integer ipinEmpNumRef8 = new integer(_ipinEmpNumRef8); --- > integer ipinEmpNum_9 = new integer(_ipinEmpNum_9); 2420c2420 < date ipdtDate = new date(_ipdtDate); --- > date ipdtDate_3 = new date(_ipdtDate_3); 2424c2424 < character lchMessage = new character(""); --- > character lchMessage_2 = new character(""); 2430c2430 < BlJtc.this.ipinEmpNumRef8 = ipinEmpNumRef8; --- > BlJtc.this.ipinEmpNum_9 = ipinEmpNum_9; 2443c2443 < lchEmpRef.assign(concat("Employee: ", valueOf(ipinEmpNumRef8))); --- > lchEmpRef.assign(concat("Employee: ", valueOf(ipinEmpNum_9))); 2447c2447 < ipinEmpNumRef8 --- > ipinEmpNum_9 2453c2453 < lchMessage.assign(concat(lchEmpRef, " not available.")); --- > lchMessage_2.assign(concat(lchEmpRef, " not available.")); 2457c2457 < if (_isGreaterThan(bEmployeeBuf3.getHireDate(), ipdtDate)) --- > if (_isGreaterThan(bEmployeeBuf3.getHireDate(), ipdtDate_3)) 2460c2460 < lchMessage.assign(concat(lchEmpRef, " not hired as of ", valueOf(ipdtDate), ".")); --- > lchMessage_2.assign(concat(lchEmpRef, " not hired as of ", valueOf(ipdtDate_3), ".")); 2464c2464 < if (_isLessThan(bEmployeeBuf3.getTerminationDate(), ipdtDate)) --- > if (_isLessThan(bEmployeeBuf3.getTerminationDate(), ipdtDate_3)) 2467c2467 < lchMessage.assign(concat(lchEmpRef, " terminated on ", valueOf(bEmployeeBuf3.getTerminationDate()), ".")); --- > lchMessage_2.assign(concat(lchEmpRef, " terminated on ", valueOf(bEmployeeBuf3.getTerminationDate()), ".")); 2474c2474 < lchMessage.assign(concat(lchEmpRef, " is the wrong employee type.")); --- > lchMessage_2.assign(concat(lchEmpRef, " is the wrong employee type.")); 2479c2479 < lchMessage.assign(""); --- > lchMessage_2.assign(""); 2485c2485 < opchMessage.assign(lchMessage); --- > opchMessage.assign(lchMessage_2); 2491c2491 < public void ipValActiveSo(final integer _ipinCoNumRef3, final logical oplgValid, final character opchMessage) --- > public void ipValActiveSo(final integer _ipinCoNum_3, final logical oplgValid_2, final character opchMessage_2) 2495c2495 < integer ipinCoNumRef3 = new integer(_ipinCoNumRef3); --- > integer ipinCoNum_3 = new integer(_ipinCoNum_3); 2497c2497 < logical llgValid = new logical(false); --- > logical llgValid_2 = new logical(false); 2499c2499 < character lchMessage = new character(""); --- > character lchMessage_3 = new character(""); 2503,2504c2503,2504 < BlJtc.this.ipinCoNumRef3 = ipinCoNumRef3; < oplgValid.assign(new logical(false)); --- > BlJtc.this.ipinCoNum_3 = ipinCoNum_3; > oplgValid_2.assign(new logical(false)); 2507,2508c2507,2508 < oplgValid, < opchMessage --- > oplgValid_2, > opchMessage_2 2510c2510 < opchMessage.assign(new character("")); --- > opchMessage_2.assign(new character("")); 2516c2516 < if (_isGreaterThan(ipinCoNumRef3, 0)) --- > if (_isGreaterThan(ipinCoNum_3, 0)) 2521c2521 < ipinCoNumRef3 --- > ipinCoNum_3 2528,2529c2528,2529 < llgValid.assign(true); < lchMessage.assign(""); --- > llgValid_2.assign(true); > lchMessage_3.assign(""); 2533,2534c2533,2534 < llgValid.assign(false); < lchMessage.assign(concat("SO: ", valueOf(ipinCoNumRef3, ">>>>>>9"), " must be in Ordered status.")); --- > llgValid_2.assign(false); > lchMessage_3.assign(concat("SO: ", valueOf(ipinCoNum_3, ">>>>>>9"), " must be in Ordered status.")); 2539,2540c2539,2540 < llgValid.assign(false); < lchMessage.assign(concat("SO: ", valueOf(ipinCoNumRef3, ">>>>>>9"), " not found.")); --- > llgValid_2.assign(false); > lchMessage_3.assign(concat("SO: ", valueOf(ipinCoNum_3, ">>>>>>9"), " not found.")); 2545,2546c2545,2546 < llgValid.assign(false); < lchMessage.assign("SO number must be greater than zero."); --- > llgValid_2.assign(false); > lchMessage_3.assign("SO number must be greater than zero."); 2548,2549c2548,2549 < oplgValid.assign(llgValid); < opchMessage.assign(lchMessage); --- > oplgValid_2.assign(llgValid_2); > opchMessage_2.assign(lchMessage_3); 2555c2555 < public void ipValActiveOper(final integer _ipinCoNumRef4, final integer _ipinTimcoOperRef2, final logical oplgValid, final character opchMessage) --- > public void ipValActiveOper(final integer _ipinCoNum_4, final integer _ipinTimcoOper_2, final logical oplgValid_3, final character opchMessage_3) 2559c2559 < integer ipinCoNumRef4 = new integer(_ipinCoNumRef4); --- > integer ipinCoNum_4 = new integer(_ipinCoNum_4); 2561c2561 < integer ipinTimcoOperRef2 = new integer(_ipinTimcoOperRef2); --- > integer ipinTimcoOper_2 = new integer(_ipinTimcoOper_2); 2563c2563 < logical llgValid = new logical(false); --- > logical llgValid_3 = new logical(false); 2565c2565 < character lchMessage = new character(""); --- > character lchMessage_4 = new character(""); 2569,2571c2569,2571 < BlJtc.this.ipinCoNumRef4 = ipinCoNumRef4; < BlJtc.this.ipinTimcoOperRef2 = ipinTimcoOperRef2; < oplgValid.assign(new logical(false)); --- > BlJtc.this.ipinCoNum_4 = ipinCoNum_4; > BlJtc.this.ipinTimcoOper_2 = ipinTimcoOper_2; > oplgValid_3.assign(new logical(false)); 2574,2575c2574,2575 < oplgValid, < opchMessage --- > oplgValid_3, > opchMessage_3 2577c2577 < opchMessage.assign(new character("")); --- > opchMessage_3.assign(new character("")); 2583c2583 < if (_and(isGreaterThan(ipinCoNumRef4, 0), isGreaterThan(ipinTimcoOperRef2, 0))) --- > if (_and(isGreaterThan(ipinCoNum_4, 0), isGreaterThan(ipinTimcoOper_2, 0))) 2588,2589c2588,2589 < ipinCoNumRef4, < ipinTimcoOperRef2 --- > ipinCoNum_4, > ipinTimcoOper_2 2602,2603c2602,2603 < llgValid.assign(true); < lchMessage.assign(""); --- > llgValid_3.assign(true); > lchMessage_4.assign(""); 2607,2608c2607,2608 < llgValid.assign(false); < lchMessage.assign(concat("Oper: ", valueOf(ipinTimcoOperRef2, ">>>>9"), " must be in Firm or Released status.")); --- > llgValid_3.assign(false); > lchMessage_4.assign(concat("Oper: ", valueOf(ipinTimcoOper_2, ">>>>9"), " must be in Firm or Released status.")); 2613,2614c2613,2614 < llgValid.assign(false); < lchMessage.assign(concat("Oper: ", valueOf(ipinTimcoOperRef2, ">>>>9"), " not found.")); --- > llgValid_3.assign(false); > lchMessage_4.assign(concat("Oper: ", valueOf(ipinTimcoOper_2, ">>>>9"), " not found.")); 2619,2620c2619,2620 < llgValid.assign(false); < lchMessage.assign("SO and Operation numbers must be greater than zero."); --- > llgValid_3.assign(false); > lchMessage_4.assign("SO and Operation numbers must be greater than zero."); 2622,2623c2622,2623 < oplgValid.assign(llgValid); < opchMessage.assign(lchMessage); --- > oplgValid_3.assign(llgValid_3); > opchMessage_3.assign(lchMessage_4); 2629c2629 < public void ipValSkillCode(final character _ipchSkillCodeRef2, final logical oplgValid, final character opchMessage) --- > public void ipValSkillCode(final character _ipchSkillCode_2, final logical oplgValid_4, final character opchMessage_4) 2633c2633 < character ipchSkillCodeRef2 = new character(_ipchSkillCodeRef2); --- > character ipchSkillCode_2 = new character(_ipchSkillCode_2); 2635c2635 < logical llgValid = new logical(false); --- > logical llgValid_4 = new logical(false); 2637c2637 < character lchMessage = new character(""); --- > character lchMessage_5 = new character(""); 2641,2642c2641,2642 < BlJtc.this.ipchSkillCodeRef2 = ipchSkillCodeRef2; < oplgValid.assign(new logical(false)); --- > BlJtc.this.ipchSkillCode_2 = ipchSkillCode_2; > oplgValid_4.assign(new logical(false)); 2645,2646c2645,2646 < oplgValid, < opchMessage --- > oplgValid_4, > opchMessage_4 2648c2648 < opchMessage.assign(new character("")); --- > opchMessage_4.assign(new character("")); 2653c2653 < if (_isEqual(ipchSkillCodeRef2, "")) --- > if (_isEqual(ipchSkillCode_2, "")) 2655,2656c2655,2656 < llgValid.assign(false); < lchMessage.assign("Skill Code cannot be blank."); --- > llgValid_4.assign(false); > lchMessage_5.assign("Skill Code cannot be blank."); 2662c2662 < toUpperCase(ipchSkillCodeRef2) --- > toUpperCase(ipchSkillCode_2) 2665,2666c2665,2666 < llgValid.assign(false); < lchMessage.assign(concat("Skill Code: ", ipchSkillCodeRef2, " not found.")); --- > llgValid_4.assign(false); > lchMessage_5.assign(concat("Skill Code: ", ipchSkillCode_2, " not found.")); 2670,2671c2670,2671 < llgValid.assign(true); < lchMessage.assign(""); --- > llgValid_4.assign(true); > lchMessage_5.assign(""); 2674,2675c2674,2675 < oplgValid.assign(llgValid); < opchMessage.assign(lchMessage); --- > oplgValid_4.assign(llgValid_4); > opchMessage_4.assign(lchMessage_5); diff -r generated/20130314a/src/aero/timco/majic/dc/BlJtcp.java generated/20130314c/src/aero/timco/majic/dc/BlJtcp.java 42c42 < integer ipinBatchIdRef2; --- > integer ipinBatchId_6; 44c44 < integer ipinJobtimeId; --- > integer ipinJobtimeId_6; 46c46 < integer ipinJobtimeIdRef2; --- > integer ipinJobtimeId_7; 66c66 < integer ipinBatchIdRef3; --- > integer ipinBatchId_7; 68c68 < integer ipinBatchIdRef4; --- > integer ipinBatchId_8; 70c70 < integer ipinBatchIdRef5; --- > integer ipinBatchId_9; 76c76 < integer ipinEmpNumRef2; --- > integer ipinEmpNum_2; 78c78 < date ipdtTransDateRef2; --- > date ipdtTransDate_2; 165c165 < public character getTypeDesc(final character _ipchType) --- > public character getTypeDesc(final character _ipchType_2) 169c169 < character ipchType = new character(_ipchType); --- > character ipchType_2 = new character(_ipchType_2); 171c171 < integer linListPos = new integer(0); --- > integer linListPos_2 = new integer(0); 177,178c177,178 < linListPos.assign(lookup(ipchType, gchTypeList)); < if (_and(isGreaterThan(linListPos, 0), isLessThanOrEqual(linListPos, numEntries(gchTypeDesc)))) --- > linListPos_2.assign(lookup(ipchType_2, gchTypeList)); > if (_and(isGreaterThan(linListPos_2, 0), isLessThanOrEqual(linListPos_2, numEntries(gchTypeDesc)))) 180c180 < lchTypeDesc.assign(entry(linListPos, gchTypeDesc)); --- > lchTypeDesc.assign(entry(linListPos_2, gchTypeDesc)); 229c229 < public void ipSetBatchAsNew(final integer _ipinBatchId) --- > public void ipSetBatchAsNew(final integer _ipinBatchId_2) 233c233 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_2 = new integer(_ipinBatchId_2); 237c237 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("New"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_2, new character("New"), new date(), new character("")); 242c242 < public void ipSetBatchAsLoaded(final integer _ipinBatchId) --- > public void ipSetBatchAsLoaded(final integer _ipinBatchId_3) 246c246 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_3 = new integer(_ipinBatchId_3); 250c250 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Loaded"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_3, new character("Loaded"), new date(), new character("")); 255c255 < public void ipSetBatchAsProcessed(final integer _ipinBatchId, final character _ipchResult) --- > public void ipSetBatchAsProcessed(final integer _ipinBatchId_4, final character _ipchResult) 259c259 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_4 = new integer(_ipinBatchId_4); 265c265 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Processed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_4, new character("Processed"), new date(), ipchResult); 270c270 < public void ipSetBatchAsCompleted(final integer _ipinBatchId, final character _ipchResult) --- > public void ipSetBatchAsCompleted(final integer _ipinBatchId_5, final character _ipchResult_2) 274c274 < integer ipinBatchId = new integer(_ipinBatchId); --- > integer ipinBatchId_5 = new integer(_ipinBatchId_5); 276c276 < character ipchResult = new character(_ipchResult); --- > character ipchResult_2 = new character(_ipchResult_2); 280c280 < ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId, new character("Completed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_batch_status", "IIII", ipinBatchId_5, new character("Completed"), new date(), ipchResult_2); 285c285 < public void ipSetBatchStatus(final integer _ipinBatchIdRef2, final character _ipchStatus, final date _ipdtDate, final character _ipchResult) --- > public void ipSetBatchStatus(final integer _ipinBatchId_6, final character _ipchStatus, final date _ipdtDate, final character _ipchResult_3) 289c289 < integer ipinBatchIdRef2 = new integer(_ipinBatchIdRef2); --- > integer ipinBatchId_6 = new integer(_ipinBatchId_6); 295c295 < character ipchResult = new character(_ipchResult); --- > character ipchResult_3 = new character(_ipchResult_3); 299c299 < BlJtcp.this.ipinBatchIdRef2 = ipinBatchIdRef2; --- > BlJtcp.this.ipinBatchId_6 = ipinBatchId_6; 313c313 < ipinBatchIdRef2 --- > ipinBatchId_6 321c321 < bBlBatchBuf2.setBatchResult(ipchResult); --- > bBlBatchBuf2.setBatchResult(ipchResult_3); 343c343 < public void ipSetJobtimeAsLoaded(final integer _ipinJobtimeId) --- > public void ipSetJobtimeAsLoaded(final integer _ipinJobtimeId_2) 347c347 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_2 = new integer(_ipinJobtimeId_2); 351c351 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Loaded"), new date(), new character("")); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_2, new character("Loaded"), new date(), new character("")); 356c356 < public void ipSetJobtimeAsProcessed(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsProcessed(final integer _ipinJobtimeId_3, final character _ipchResult_4) 360c360 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_3 = new integer(_ipinJobtimeId_3); 362c362 < character ipchResult = new character(_ipchResult); --- > character ipchResult_4 = new character(_ipchResult_4); 366c366 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Processed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_3, new character("Processed"), new date(), ipchResult_4); 371c371 < public void ipSetJobtimeAsError(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsError(final integer _ipinJobtimeId_4, final character _ipchResult_5) 375c375 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_4 = new integer(_ipinJobtimeId_4); 377c377 < character ipchResult = new character(_ipchResult); --- > character ipchResult_5 = new character(_ipchResult_5); 381c381 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Error"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_4, new character("Error"), new date(), ipchResult_5); 386c386 < public void ipSetJobtimeAsCompleted(final integer _ipinJobtimeId, final character _ipchResult) --- > public void ipSetJobtimeAsCompleted(final integer _ipinJobtimeId_5, final character _ipchResult_6) 390c390 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_5 = new integer(_ipinJobtimeId_5); 392c392 < character ipchResult = new character(_ipchResult); --- > character ipchResult_6 = new character(_ipchResult_6); 396c396 < ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId, new character("Completed"), new date(), ipchResult); --- > ControlFlowOps.invokeWithMode("ip_set_jobtime_status", "IIII", ipinJobtimeId_5, new character("Completed"), new date(), ipchResult_6); 401c401 < public void ipGetJobtimeStatus(final integer _ipinJobtimeId, final character opchStatus) --- > public void ipGetJobtimeStatus(final integer _ipinJobtimeId_6, final character opchStatus_2) 405c405 < integer ipinJobtimeId = new integer(_ipinJobtimeId); --- > integer ipinJobtimeId_6 = new integer(_ipinJobtimeId_6); 409,410c409,410 < BlJtcp.this.ipinJobtimeId = ipinJobtimeId; < opchStatus.assign(new character("")); --- > BlJtcp.this.ipinJobtimeId_6 = ipinJobtimeId_6; > opchStatus_2.assign(new character("")); 413c413 < opchStatus --- > opchStatus_2 423c423 < ipinJobtimeId --- > ipinJobtimeId_6 428c428 < opchStatus.assign(bBlJobtime.getJobTimeStatus()); --- > opchStatus_2.assign(bBlJobtime.getJobTimeStatus()); 432c432 < opchStatus.assign("Unknown"); --- > opchStatus_2.assign("Unknown"); 439c439 < public void ipSetJobtimeStatus(final integer _ipinJobtimeIdRef2, final character _ipchStatus, final date _ipdtDate, final character _ipchResult) --- > public void ipSetJobtimeStatus(final integer _ipinJobtimeId_7, final character _ipchStatus_2, final date _ipdtDate_2, final character _ipchResult_7) 443c443 < integer ipinJobtimeIdRef2 = new integer(_ipinJobtimeIdRef2); --- > integer ipinJobtimeId_7 = new integer(_ipinJobtimeId_7); 445c445 < character ipchStatus = new character(_ipchStatus); --- > character ipchStatus_2 = new character(_ipchStatus_2); 447c447 < date ipdtDate = new date(_ipdtDate); --- > date ipdtDate_2 = new date(_ipdtDate_2); 449c449 < character ipchResult = new character(_ipchResult); --- > character ipchResult_7 = new character(_ipchResult_7); 453c453 < BlJtcp.this.ipinJobtimeIdRef2 = ipinJobtimeIdRef2; --- > BlJtcp.this.ipinJobtimeId_7 = ipinJobtimeId_7; 467c467 < ipinJobtimeIdRef2 --- > ipinJobtimeId_7 473,475c473,475 < bBlJobtimeBuf2.setJobTimeStatus(ipchStatus); < bBlJobtimeBuf2.setJobTimeDate(ipdtDate); < bBlJobtimeBuf2.setJobTimeResult(ipchResult); --- > bBlJobtimeBuf2.setJobTimeStatus(ipchStatus_2); > bBlJobtimeBuf2.setJobTimeDate(ipdtDate_2); > bBlJobtimeBuf2.setJobTimeResult(ipchResult_7); 499c499 < public integer getUserNum(final character _ipchSymUser) --- > public integer getUserNum(final character _ipchSymUser_2) 503c503 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 509c509 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 523c523 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_3) 527c527 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 533c533 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_3); 606c606 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 610c610 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 612c612 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 616c616 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 621c621 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 625c625 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 627c627 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 631c631 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 636c636 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 640c640 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 642c642 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 646c646 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 651c651 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 655c655 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 657c657 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 661c661 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 666c666 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 670c670 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 672c672 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 676c676 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 681c681 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 685c685 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 687c687 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 691c691 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 797c797 < public void ipSelectData(final integer _ipinBatchIdRef3) --- > public void ipSelectData(final integer _ipinBatchId_7) 801c801 < integer ipinBatchIdRef3 = new integer(_ipinBatchIdRef3); --- > integer ipinBatchId_7 = new integer(_ipinBatchId_7); 805c805 < BlJtcp.this.ipinBatchIdRef3 = ipinBatchIdRef3; --- > BlJtcp.this.ipinBatchId_7 = ipinBatchId_7; 813c813 < ipinBatchIdRef3 --- > ipinBatchId_7 842c842 < blanketJobTime.setBatchId(ipinBatchIdRef3); --- > blanketJobTime.setBatchId(ipinBatchId_7); 851c851 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchIdRef3))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchId_7))); 858c858 < public void ipCalcTimes(final integer _ipinBatchIdRef4) --- > public void ipCalcTimes(final integer _ipinBatchId_8) 862c862 < integer ipinBatchIdRef4 = new integer(_ipinBatchIdRef4); --- > integer ipinBatchId_8 = new integer(_ipinBatchId_8); 870c870 < BlJtcp.this.ipinBatchIdRef4 = ipinBatchIdRef4; --- > BlJtcp.this.ipinBatchId_8 = ipinBatchId_8; 878c878 < ipinBatchIdRef4 --- > ipinBatchId_8 945c945 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchIdRef4))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchId_8))); 952c952 < public void ipProcessData(final integer _ipinBatchIdRef5) --- > public void ipProcessData(final integer _ipinBatchId_9) 956c956 < integer ipinBatchIdRef5 = new integer(_ipinBatchIdRef5); --- > integer ipinBatchId_9 = new integer(_ipinBatchId_9); 968c968 < BlJtcp.this.ipinBatchIdRef5 = ipinBatchIdRef5; --- > BlJtcp.this.ipinBatchId_9 = ipinBatchId_9; 980c980 < ipinBatchIdRef5 --- > ipinBatchId_9 1029c1029 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchIdRef5))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("No batch master found for: ", valueOf(ipinBatchId_9))); 1130c1130 < public void ipGetStartTime(final integer _ipinEmpNumRef2, final date _ipdtTransDateRef2, final integer opinStartTime) --- > public void ipGetStartTime(final integer _ipinEmpNum_2, final date _ipdtTransDate_2, final integer opinStartTime) 1134c1134 < integer ipinEmpNumRef2 = new integer(_ipinEmpNumRef2); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 1136c1136 < date ipdtTransDateRef2 = new date(_ipdtTransDateRef2); --- > date ipdtTransDate_2 = new date(_ipdtTransDate_2); 1142c1142 < integer linStartTime = new integer(0); --- > integer linStartTime_2 = new integer(0); 1148,1149c1148,1149 < BlJtcp.this.ipinEmpNumRef2 = ipinEmpNumRef2; < BlJtcp.this.ipdtTransDateRef2 = ipdtTransDateRef2; --- > BlJtcp.this.ipinEmpNum_2 = ipinEmpNum_2; > BlJtcp.this.ipdtTransDate_2 = ipdtTransDate_2; 1170,1171c1170,1171 < ipinEmpNumRef2, < ipdtTransDateRef2 --- > ipinEmpNum_2, > ipdtTransDate_2 1188c1188 < linStartTime.assign(linLastTime); --- > linStartTime_2.assign(linLastTime); 1192,1193c1192,1193 < ControlFlowOps.invokeWithMode("ip_get_shift_start", "IIO", ipinEmpNumRef2, ipdtTransDateRef2, linShiftStart); < linStartTime.assign(linShiftStart); --- > ControlFlowOps.invokeWithMode("ip_get_shift_start", "IIO", ipinEmpNum_2, ipdtTransDate_2, linShiftStart); > linStartTime_2.assign(linShiftStart); 1195c1195 < opinStartTime.assign(linStartTime); --- > opinStartTime.assign(linStartTime_2); diff -r generated/20130314a/src/aero/timco/majic/dc/BlJtcR.java generated/20130314c/src/aero/timco/majic/dc/BlJtcR.java 87c87 < integer ipinEmpNumRef2; --- > integer ipinEmpNum_2; 93c93 < integer ipinEmpNumRef3; --- > integer ipinEmpNum_3; 572c572 < public void ipGetEmpCrew(final integer _ipinEmpNumRef2, final date _ipdtCheckDate, final character opchCrewCode) --- > public void ipGetEmpCrew(final integer _ipinEmpNum_2, final date _ipdtCheckDate, final character opchCrewCode) 576c576 < integer ipinEmpNumRef2 = new integer(_ipinEmpNumRef2); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 582c582 < BlJtcR.this.ipinEmpNumRef2 = ipinEmpNumRef2; --- > BlJtcR.this.ipinEmpNum_2 = ipinEmpNum_2; 598c598 < ipinEmpNumRef2, --- > ipinEmpNum_2, 609c609 < ipinEmpNumRef2, --- > ipinEmpNum_2, 623c623 < ipinEmpNumRef2 --- > ipinEmpNum_2 640c640 < public void ipGetTotalHours(final integer _ipinEmpNumRef3, final date _ipdtTransDate, final decimal opdeTotalHours) --- > public void ipGetTotalHours(final integer _ipinEmpNum_3, final date _ipdtTransDate, final decimal opdeTotalHours) 644c644 < integer ipinEmpNumRef3 = new integer(_ipinEmpNumRef3); --- > integer ipinEmpNum_3 = new integer(_ipinEmpNum_3); 652c652 < BlJtcR.this.ipinEmpNumRef3 = ipinEmpNumRef3; --- > BlJtcR.this.ipinEmpNum_3 = ipinEmpNum_3; 672c672 < ipinEmpNumRef3, --- > ipinEmpNum_3, diff -r generated/20130314a/src/aero/timco/majic/dc/Dc980.java generated/20130314c/src/aero/timco/majic/dc/Dc980.java 460c460 < public void ipGetShiftInfo(final integer _ipinEmpNum, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) --- > public void ipGetShiftInfo(final integer _ipinEmpNum_2, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) 464c464 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 501c501 < ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum, ipdtClockDate, ipinClockTime, ldtStartDate, linStartTime); --- > ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum_2, ipdtClockDate, ipinClockTime, ldtStartDate, linStartTime); 508c508 < ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum, ldtStartDate, linStartTime, linShift); --- > ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum_2, ldtStartDate, linStartTime, linShift); diff -r generated/20130314a/src/aero/timco/majic/dc/Dc990.java generated/20130314c/src/aero/timco/majic/dc/Dc990.java 453c453 < public void ipGetShiftInfo(final integer _ipinEmpNum, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) --- > public void ipGetShiftInfo(final integer _ipinEmpNum_2, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) 457c457 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 494c494 < ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum, ipdtClockDate, ipinClockTime, ldtStartDate, linStartTime); --- > ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum_2, ipdtClockDate, ipinClockTime, ldtStartDate, linStartTime); 501c501 < ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum, ldtStartDate, linStartTime, linShift); --- > ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum_2, ldtStartDate, linStartTime, linShift); 526c526 < character lchCrewCode = new character(""); --- > character lchCrewCode_2 = new character(""); 573c573 < lchCrewCode.assign(entry(linLoopCount, ipchCrewList)); --- > lchCrewCode_2.assign(entry(linLoopCount, ipchCrewList)); 576c576 < ttSelectedcrew.setTtchCrewcode(lchCrewCode); --- > ttSelectedcrew.setTtchCrewcode(lchCrewCode_2); diff -r generated/20130314a/src/aero/timco/majic/dc/JobPost.java generated/20130314c/src/aero/timco/majic/dc/JobPost.java 1148c1148 < public void createJobtran(final character tErrMsg2, final recid jtRecid, final logical tPosted, final logical tCreated) --- > public void createJobtran(final character tErrMsg2, final recid jtRecid, final logical tPosted_2, final logical tCreated_2) 1155c1155 < TransactionManager.register(tErrMsg2, jtRecid, tPosted, tCreated); --- > TransactionManager.register(tErrMsg2, jtRecid, tPosted_2, tCreated_2); 1157,1158c1157,1158 < tPosted.assign(new logical(false)); < tCreated.assign(new logical(false)); --- > tPosted_2.assign(new logical(false)); > tCreated_2.assign(new logical(false)); 1182,1183c1182,1183 < tPosted.assign(true); < tCreated.assign(false); --- > tPosted_2.assign(true); > tCreated_2.assign(false); 1233c1233 < tPosted.assign(false); --- > tPosted_2.assign(false); 1245c1245 < tPosted.assign(false); --- > tPosted_2.assign(false); 1247c1247 < if ((tPosted).booleanValue()) --- > if ((tPosted_2).booleanValue()) 1292c1292 < tPosted.assign(false); --- > tPosted_2.assign(false); 1298c1298 < tPosted.assign(false); --- > tPosted_2.assign(false); 1307c1307 < if ((tPosted).booleanValue()) --- > if ((tPosted_2).booleanValue()) 1368c1368 < tPosted.assign(false); --- > tPosted_2.assign(false); 1371c1371 < if ((tPosted).booleanValue()) --- > if ((tPosted_2).booleanValue()) 1414c1414 < tPosted.assign(false); --- > tPosted_2.assign(false); 1417c1417 < if ((tPosted).booleanValue()) --- > if ((tPosted_2).booleanValue()) 1424c1424 < tPosted.assign(false); --- > tPosted_2.assign(false); 1427c1427 < if ((tPosted).booleanValue()) --- > if ((tPosted_2).booleanValue()) 1485c1485 < tPosted.assign(false); --- > tPosted_2.assign(false); 1527c1527 < jobTransaction.setPosted(tPosted); --- > jobTransaction.setPosted(tPosted_2); 1529c1529 < if ((tPosted).booleanValue()) --- > if ((tPosted_2).booleanValue()) 1543,1544c1543,1544 < tPosted.assign(false); < tCreated.assign(false); --- > tPosted_2.assign(false); > tCreated_2.assign(false); 1548c1548 < tCreated.assign(true); --- > tCreated_2.assign(true); 1550c1550 < if ((tPosted).booleanValue()) --- > if ((tPosted_2).booleanValue()) 1572c1572 < tPosted.assign(false); --- > tPosted_2.assign(false); diff -r generated/20130314a/src/aero/timco/majic/dc/SoLabr1.java generated/20130314c/src/aero/timco/majic/dc/SoLabr1.java 1797c1797 < public void validateSkill(final character errType) --- > public void validateSkill(final character errType_2) 1803c1803 < errType.assign(new character("")); --- > errType_2.assign(new character("")); 1806c1806 < errType --- > errType_2 1827c1827 < errType.assign("dupe"); --- > errType_2.assign("dupe"); diff -r generated/20130314a/src/aero/timco/majic/dc/TaApprvMaint.java generated/20130314c/src/aero/timco/majic/dc/TaApprvMaint.java 303c303 < public void ipGetShiftInfo(final integer _ipinEmpNum, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) --- > public void ipGetShiftInfo(final integer _ipinEmpNum_2, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) 307c307 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 315c315 < date ldtStartDate = date.instantiateUnknownDate(); --- > date ldtStartDate_2 = date.instantiateUnknownDate(); 344c344 < ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum, ipdtClockDate, ipinClockTime, ldtStartDate, linStartTime); --- > ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum_2, ipdtClockDate, ipinClockTime, ldtStartDate_2, linStartTime); 348c348 < ldtStartDate.assign(ipdtClockDate); --- > ldtStartDate_2.assign(ipdtClockDate); 351,352c351,352 < ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum, ldtStartDate, linStartTime, linShift); < linWeekDay.assign(date.weekday(ldtStartDate)); --- > ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum_2, ldtStartDate_2, linStartTime, linShift); > linWeekDay.assign(date.weekday(ldtStartDate_2)); 476c476 < public void ipBuildTempTable(final character _ipchCrewCode, final date _ipdtStartDate, final date _ipdtEndDate) --- > public void ipBuildTempTable(final character _ipchCrewCode_2, final date _ipdtStartDate, final date _ipdtEndDate) 480c480 < character ipchCrewCode = new character(_ipchCrewCode); --- > character ipchCrewCode_2 = new character(_ipchCrewCode_2); 490c490 < character lchTempName = new character(""); --- > character lchTempName_2 = new character(""); 515c515 < ControlFlowOps.invokeWithMode("so/crew-cal.p", "II", ldtTempDate, ipchCrewCode); --- > ControlFlowOps.invokeWithMode("so/crew-cal.p", "II", ldtTempDate, ipchCrewCode_2); 555c555 < ControlFlowOps.invokeWithMode("ip_GetEmpName", "IO", bEmployeeBuf2.getEmployeeNumber(), lchTempName); --- > ControlFlowOps.invokeWithMode("ip_GetEmpName", "IO", bEmployeeBuf2.getEmployeeNumber(), lchTempName_2); 581c581 < ttApprove.setTtchEmpname(lchTempName); --- > ttApprove.setTtchEmpname(lchTempName_2); diff -r generated/20130314a/src/aero/timco/majic/dc/TaApprvSelect.java generated/20130314c/src/aero/timco/majic/dc/TaApprvSelect.java 218c218 < public void ipGetShiftInfo(final integer _ipinEmpNum, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) --- > public void ipGetShiftInfo(final integer _ipinEmpNum_2, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) 222c222 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 230c230 < date ldtStartDate = date.instantiateUnknownDate(); --- > date ldtStartDate_2 = date.instantiateUnknownDate(); 259c259 < ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum, ipdtClockDate, ipinClockTime, ldtStartDate, linStartTime); --- > ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum_2, ipdtClockDate, ipinClockTime, ldtStartDate_2, linStartTime); 263c263 < ldtStartDate.assign(ipdtClockDate); --- > ldtStartDate_2.assign(ipdtClockDate); 266,267c266,267 < ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum, ldtStartDate, linStartTime, linShift); < linWeekDay.assign(date.weekday(ldtStartDate)); --- > ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum_2, ldtStartDate_2, linStartTime, linShift); > linWeekDay.assign(date.weekday(ldtStartDate_2)); diff -r generated/20130314a/src/aero/timco/majic/dc/TaClockApprv.java generated/20130314c/src/aero/timco/majic/dc/TaClockApprv.java 26c26 < integer ipinEmpNumRef2; --- > integer ipinEmpNum; 58c58 < integer ipinEmpNum; --- > integer ipinEmpNum_2; 62c62 < public void execute(final integer _ipinEmpNumRef2, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final character _ipchIndCode, final integer opinApproveEmp, final logical oplgApproved) --- > public void execute(final integer _ipinEmpNum, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final character _ipchIndCode, final integer opinApproveEmp, final logical oplgApproved) 66c66 < integer ipinEmpNumRef2 = new integer(_ipinEmpNumRef2); --- > integer ipinEmpNum = new integer(_ipinEmpNum); 78c78 < TaClockApprv.this.ipinEmpNumRef2 = ipinEmpNumRef2; --- > TaClockApprv.this.ipinEmpNum = ipinEmpNum; 155c155 < public void ipGetEmpName(final integer _ipinEmpNum, final character opchEmpName) --- > public void ipGetEmpName(final integer _ipinEmpNum_2, final character opchEmpName) 159c159 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 163c163 < TaClockApprv.this.ipinEmpNum = ipinEmpNum; --- > TaClockApprv.this.ipinEmpNum_2 = ipinEmpNum_2; 177c177 < ipinEmpNum --- > ipinEmpNum_2 237c237 < public void ipGetShiftInfo(final integer _ipinEmpNum, final character _ipchClockType, final date _ipdtClockDate, final integer _ipinClockTime, final integer opinShift, final integer opinStartShift, final integer opinEndShift) --- > public void ipGetShiftInfo(final integer _ipinEmpNum_3, final character _ipchClockType_2, final date _ipdtClockDate_2, final integer _ipinClockTime_2, final integer opinShift, final integer opinStartShift, final integer opinEndShift) 241c241 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_3 = new integer(_ipinEmpNum_3); 243c243 < character ipchClockType = new character(_ipchClockType); --- > character ipchClockType_2 = new character(_ipchClockType_2); 245c245 < date ipdtClockDate = new date(_ipdtClockDate); --- > date ipdtClockDate_2 = new date(_ipdtClockDate_2); 247c247 < integer ipinClockTime = new integer(_ipinClockTime); --- > integer ipinClockTime_2 = new integer(_ipinClockTime_2); 255c255 < integer linShift = new integer(0); --- > integer linShift_2 = new integer(0); 276c276 < if (_isNotEqual(ipchClockType, "1")) --- > if (_isNotEqual(ipchClockType_2, "1")) 278c278 < ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum, ipdtClockDate, ipinClockTime, ldtStartDate, linStartTime); --- > ControlFlowOps.invokeWithMode("dc/ta-get-clockin.p", "IIIOO", ipinEmpNum_3, ipdtClockDate_2, ipinClockTime_2, ldtStartDate, linStartTime); 282,283c282,283 < ldtStartDate.assign(ipdtClockDate); < linStartTime.assign(ipinClockTime); --- > ldtStartDate.assign(ipdtClockDate_2); > linStartTime.assign(ipinClockTime_2); 285c285 < ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum, ldtStartDate, linStartTime, linShift); --- > ControlFlowOps.invokeWithMode("codes/emp-shift.p", "IIIO", ipinEmpNum_3, ldtStartDate, linStartTime, linShift_2); 287,288c287,288 < ControlFlowOps.invokeWithMode("codes/shift-time.p", "IIOO", linShift, linWeekDay, linStartShift, linEndShift); < opinShift.assign(linShift); --- > ControlFlowOps.invokeWithMode("codes/shift-time.p", "IIOO", linShift_2, linWeekDay, linStartShift, linEndShift); > opinShift.assign(linShift_2); 302c302 < integer linStartShift = new integer(0); --- > integer linStartShift_2 = new integer(0); 304c304 < integer linEndShift = new integer(0); --- > integer linEndShift_2 = new integer(0); 309c309 < linEmpNum.assign(ipinEmpNumRef2); --- > linEmpNum.assign(ipinEmpNum); 315c315 < ControlFlowOps.invokeWithMode("ip_GetShiftInfo", "IIIIOOO", ipinEmpNumRef2, ipchClockType, ipdtClockDate, ipinClockTime, linTmpShift, linStartShift, linEndShift); --- > ControlFlowOps.invokeWithMode("ip_GetShiftInfo", "IIIIOOO", ipinEmpNum, ipchClockType, ipdtClockDate, ipinClockTime, linTmpShift, linStartShift_2, linEndShift_2); 320c320 < lchShiftTime.assign(valueOf(linStartShift, "HH:MM")); --- > lchShiftTime.assign(valueOf(linStartShift_2, "HH:MM")); 328c328 < lchShiftTime.assign(valueOf(linEndShift, "HH:MM")); --- > lchShiftTime.assign(valueOf(linEndShift_2, "HH:MM")); diff -r generated/20130314a/src/aero/timco/majic/dc/TaMsgs.java generated/20130314c/src/aero/timco/majic/dc/TaMsgs.java 49c49 < integer inEmpNum; --- > integer inEmpNum_2; 409c409 < public logical findMsgs(final character _inType, final integer _inEmpNum) --- > public logical findMsgs(final character _inType_2, final integer _inEmpNum_2) 413c413 < character inType = new character(_inType); --- > character inType_2 = new character(_inType_2); 415c415 < integer inEmpNum = new integer(_inEmpNum); --- > integer inEmpNum_2 = new integer(_inEmpNum_2); 419c419 < TaMsgs.this.inEmpNum = inEmpNum; --- > TaMsgs.this.inEmpNum_2 = inEmpNum_2; 424c424 < character condition1 = inType; --- > character condition1 = inType_2; 484c484 < inEmpNum --- > inEmpNum_2 498c498 < character condition2 = inType; --- > character condition2 = inType_2; diff -r generated/20130314a/src/aero/timco/majic/gl/Gl10R.java generated/20130314c/src/aero/timco/majic/gl/Gl10R.java 830c830 < public logical valDate(final date _sDate, final date _eDate) --- > public logical valDate(final date _sDate_3, final date _eDate_3) 834c834 < date sDate = new date(_sDate); --- > date sDate_3 = new date(_sDate_3); 836c836 < date eDate = new date(_eDate); --- > date eDate_3 = new date(_eDate_3); 840c840 < if (_isUnknown(eDate)) --- > if (_isUnknown(eDate_3)) 844c844 < if (_isLessThan(eDate, sDate)) --- > if (_isLessThan(eDate_3, sDate_3)) 853c853 < public date getDate(final character _ledgerType) --- > public date getDate(final character _ledgerType_2) 857c857 < character ledgerType = new character(_ledgerType); --- > character ledgerType_2 = new character(_ledgerType_2); 861c861 < if (_isGreaterThan(indexOf("AOL", ledgerType), 0)) --- > if (_isGreaterThan(indexOf("AOL", ledgerType_2), 0)) diff -r generated/20130314a/src/aero/timco/majic/Importssn.java generated/20130314c/src/aero/timco/majic/Importssn.java 145c145 < public integer to10from36(final character _myvalue) --- > public integer to10from36(final character _myvalue_2) 149c149 < character myvalue = new character(_myvalue); --- > character myvalue_2 = new character(_myvalue_2); 163c163 < vl.assign(length(myvalue)); --- > vl.assign(length(myvalue_2)); 169c169 < vthisdigit.assign(substring(myvalue, vp, 1)); --- > vthisdigit.assign(substring(myvalue_2, vp, 1)); 206c206 < public character encrypt(final character _mystring, final character _mykey) --- > public character encrypt(final character _mystring_2, final character _mykey) 210c210 < character mystring = new character(_mystring); --- > character mystring_2 = new character(_mystring_2); 230c230 < myraw.setLength(plus(length(mystring), 1)); --- > myraw.setLength(plus(length(mystring_2), 1)); 233,234c233,234 < stringlength.assign(byteLength(mystring)); < mycrc.assign(substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw")); --- > stringlength.assign(byteLength(mystring_2)); > mycrc.assign(substring(SecurityOps.encode(concat(mystring_2, "foobar")), 1, 2, "raw")); 236c236 < myraw.setString(mystring, 1); --- > myraw.setString(mystring_2, 1); 254c254 < mystring.assign(""); --- > mystring_2.assign(""); 262c262 < mystring.assign(concat(mystring, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); --- > mystring_2.assign(concat(mystring_2, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); 267c267 < returnNormal(concat(mycrc, mystring)); --- > returnNormal(concat(mycrc, mystring_2)); 272c272 < public character decrypt(final character _mystring, final character _mykey) --- > public character decrypt(final character _mystring_3, final character _mykey_2) 276c276 < character mystring = new character(_mystring); --- > character mystring_3 = new character(_mystring_3); 278c278 < character mykey = new character(_mykey); --- > character mykey_2 = new character(_mykey_2); 280c280 < integer i = new integer(0); --- > integer i_2 = new integer(0); 282c282 < integer j = new integer(0); --- > integer j_2 = new integer(0); 284c284 < integer keylength = new integer(0); --- > integer keylength_2 = new integer(0); 286c286 < integer stringlength = new integer(0); --- > integer stringlength_2 = new integer(0); 288c288 < character mycrc = new character(""); --- > character mycrc_2 = new character(""); 290c290 < character myhash = new character(""); --- > character myhash_2 = new character(""); 292c292 < memptr myraw = new memptr(); --- > memptr myraw_2 = new memptr(); 296,302c296,302 < mycrc.assign(substring(mystring, 1, 2)); < mystring.assign(substring(mystring, 3, -1, "raw")); < myraw.setLength((length(mystring))); < mykey.assign(substring(SecurityOps.encode(concat(mykey, "foobar")), 1, 16)); < myhash.assign(SecurityOps.encode(concat(mycrc, "foobar", mykey))); < keylength.assign(byteLength(mykey)); < stringlength.assign(byteLength(mystring)); --- > mycrc_2.assign(substring(mystring_3, 1, 2)); > mystring_3.assign(substring(mystring_3, 3, -1, "raw")); > myraw_2.setLength((length(mystring_3))); > mykey_2.assign(substring(SecurityOps.encode(concat(mykey_2, "foobar")), 1, 16)); > myhash_2.assign(SecurityOps.encode(concat(mycrc_2, "foobar", mykey_2))); > keylength_2.assign(byteLength(mykey_2)); > stringlength_2.assign(byteLength(mystring_3)); 304c304 < ToClause toClause1 = new ToClause(i, 1, stringlength, 2); --- > ToClause toClause1 = new ToClause(i_2, 1, stringlength_2, 2); 310,311c310,311 < j.assign(plus(j, 1)); < myraw.setByte(to10from36(new character(substring(mystring, i, 2, "raw"))), j); --- > j_2.assign(plus(j_2, 1)); > myraw_2.setByte(to10from36(new character(substring(mystring_3, i_2, 2, "raw"))), j_2); 315c315 < stringlength.assign(new integer(divide(stringlength, 2))); --- > stringlength_2.assign(new integer(divide(stringlength_2, 2))); 318c318 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 320c320 < myraw.setByte(abs(modulo(minus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256)), i); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(i_2), asc(substring(myhash_2, plus(modulo(i_2, 16), 1), 1, "raw"))), 256)), i_2); 324c324 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_2.assign(0); _isLessThanOrEqual(i_2, minus(stringlength_2, 1)); i_2.assign(plus(i_2, 5))) 327c327 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_2.assign(1); _isLessThanOrEqual(j_2, integer.minimum(keylength_2, minus(stringlength_2, i_2))); j_2.increment()) 329c329 < myraw.setByte(abs(modulo(minus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256)), plus(i, j)); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(plus(i_2, j_2)), asc(substring(mykey_2, j_2, 1, "raw"))), 256)), plus(i_2, j_2)); 333c333 < mystring.assign(""); --- > mystring_3.assign(""); 336c336 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 338c338 < mystring.assign(concat(mystring, chr(myraw.getByte(i)))); --- > mystring_3.assign(concat(mystring_3, chr(myraw_2.getByte(i_2)))); 341,342c341,342 < myraw.setLength(0); < if (_isEqual(mycrc, substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw"))) --- > myraw_2.setLength(0); > if (_isEqual(mycrc_2, substring(SecurityOps.encode(concat(mystring_3, "foobar")), 1, 2, "raw"))) 344c344 < returnNormal(mystring); --- > returnNormal(mystring_3); diff -r generated/20130314a/src/aero/timco/majic/item/ItemT.java generated/20130314c/src/aero/timco/majic/item/ItemT.java 2773c2773 < logical ans = new logical(false); --- > logical ans_2 = new logical(false); 2777c2777 < TransactionManager.registerUndo(ans); --- > TransactionManager.registerUndo(ans_2); 2867,2868c2867,2868 < messageBox("Delete this FACILITY?", false, new AccessorWrapper(ans), ALERT_MESSAGE, BTN_YES_NO, ""); < if (_not(ans)) --- > messageBox("Delete this FACILITY?", false, new AccessorWrapper(ans_2), ALERT_MESSAGE, BTN_YES_NO, ""); > if (_not(ans_2)) diff -r generated/20130314a/src/aero/timco/majic/job/Covsheet.java generated/20130314c/src/aero/timco/majic/job/Covsheet.java 899c899 < public character getOutfile(final character _inOutfile) --- > public character getOutfile(final character _inOutfile_2) 903c903 < character inOutfile = new character(_inOutfile); --- > character inOutfile_2 = new character(_inOutfile_2); 905c905 < character tmpOutfile = new character(""); --- > character tmpOutfile_2 = new character(""); 909c909 < if (_begins(inOutfile, "lp")) --- > if (_begins(inOutfile_2, "lp")) 911c911 < tmpOutfile.assign(concat("unix2dos | ", inOutfile, " -oraw")); --- > tmpOutfile_2.assign(concat("unix2dos | ", inOutfile_2, " -oraw")); 915c915 < tmpOutfile.assign(inOutfile); --- > tmpOutfile_2.assign(inOutfile_2); 917c917 < returnNormal(tmpOutfile); --- > returnNormal(tmpOutfile_2); diff -r generated/20130314a/src/aero/timco/majic/job/Drivernrc.java generated/20130314c/src/aero/timco/majic/job/Drivernrc.java 303c303 < integer i = new integer(0); --- > integer i_2 = new integer(0); 326c326 < for (i.assign(1); _isLessThanOrEqual(i, numEntries(cText, " ")); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, numEntries(cText, " ")); i_2.increment()) 330,331c330,331 < ttEach.setCtext(entry(i, cText, " ")); < ttEach.setInum(i); --- > ttEach.setCtext(entry(i_2, cText, " ")); > ttEach.setInum(i_2); 335c335 < if (_isGreaterThan(i, 0)) --- > if (_isGreaterThan(i_2, 0)) 337c337 < i.assign(minus(i, 1)); --- > i_2.assign(minus(i_2, 1)); 339c339 < if (_isEqual(i, 0)) --- > if (_isEqual(i_2, 0)) 345c345 < if (_isEqual(i, 1)) --- > if (_isEqual(i_2, 1)) 350c350 < for (i.assign(1); _isLessThanOrEqual(i, iNumber); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, iNumber); i_2.increment()) 352c352 < if (_isEqual(i, 1)) --- > if (_isEqual(i_2, 1)) 354c354 < iHold.assign(i); --- > iHold.assign(i_2); 358c358 < iHold.assign(multiply(i, 40)); --- > iHold.assign(multiply(i_2, 40)); 360c360 < cHold.assign(concat(cHold, substring(cText, iHold, multiply(i, 40)), "|", substring(cText, plus(multiply(i, 40), 1)))); --- > cHold.assign(concat(cHold, substring(cText, iHold, multiply(i_2, 40)), "|", substring(cText, plus(multiply(i_2, 40), 1)))); 392c392 < i.assign(lastIndexOf(cHold, " ")); --- > i_2.assign(lastIndexOf(cHold, " ")); 395c395 < while (_isGreaterThan(i, 40)) --- > while (_isGreaterThan(i_2, 40)) 397c397 < i.assign(lastIndexOf(cHold, " ", minus(i, 1))); --- > i_2.assign(lastIndexOf(cHold, " ", minus(i_2, 1))); 403c403 < while (_isGreaterThan(plus(length(substring(cHold, 1, i)), length(entry(iNumber, cText, "|"))), 40)) --- > while (_isGreaterThan(plus(length(substring(cHold, 1, i_2)), length(entry(iNumber, cText, "|"))), 40)) 405c405 < if (_isEqual(i, 0)) --- > if (_isEqual(i_2, 0)) 409c409 < i.assign(lastIndexOf(cHold, " ", minus(i, 1))); --- > i_2.assign(lastIndexOf(cHold, " ", minus(i_2, 1))); 412c412 < if (_isGreaterThan(i, 0)) --- > if (_isGreaterThan(i_2, 0)) 414c414 < cHold.overlay("|", i, 1, "character"); --- > cHold.overlay("|", i_2, 1, "character"); 430c430 < i.assign(lastIndexOf(cHold, " ")); --- > i_2.assign(lastIndexOf(cHold, " ")); 433c433 < while (_isGreaterThan(i, 40)) --- > while (_isGreaterThan(i_2, 40)) 435c435 < i.assign(lastIndexOf(cHold, " ", minus(i, 1))); --- > i_2.assign(lastIndexOf(cHold, " ", minus(i_2, 1))); 441c441 < while (_isGreaterThan(plus(length(substring(cHold, 1, i)), length(entry(iNumber, cText, "|"))), 40)) --- > while (_isGreaterThan(plus(length(substring(cHold, 1, i_2)), length(entry(iNumber, cText, "|"))), 40)) 443c443 < if (_isEqual(i, 0)) --- > if (_isEqual(i_2, 0)) 447c447 < i.assign(lastIndexOf(cHold, " ", minus(i, 1))); --- > i_2.assign(lastIndexOf(cHold, " ", minus(i_2, 1))); 450c450 < if (_isGreaterThan(i, 0)) --- > if (_isGreaterThan(i_2, 0)) 452c452 < cHold.overlay("|", i, 1, "character"); --- > cHold.overlay("|", i_2, 1, "character"); 468c468 < for (i.assign(1); _isLessThanOrEqual(i, 5); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, 5); i_2.increment()) 470c470 < cHold.assign(concat(cHold, "|", entry(i, cText, "|"))); --- > cHold.assign(concat(cHold, "|", entry(i_2, cText, "|"))); 474c474 < for (i.assign(6); _isLessThanOrEqual(i, numEntries(cText, "|")); i.increment()) --- > for (i_2.assign(6); _isLessThanOrEqual(i_2, numEntries(cText, "|")); i_2.increment()) 476c476 < cHold.assign(concat(cHold, " ", entry(i, cText, "|"))); --- > cHold.assign(concat(cHold, " ", entry(i_2, cText, "|"))); diff -r generated/20130314a/src/aero/timco/majic/job/Emp.java generated/20130314c/src/aero/timco/majic/job/Emp.java 4693c4693 < integer ii = new integer(0); --- > integer ii_2 = new integer(0); 4702c4702 < for (ii.assign(1); _isLessThanOrEqual(ii, length(myTest)); ii.increment()) --- > for (ii_2.assign(1); _isLessThanOrEqual(ii_2, length(myTest)); ii_2.increment()) 4704c4704 < xx.assign(substring(myTest, ii, 1)); --- > xx.assign(substring(myTest, ii_2, 1)); 4724c4724 < integer ii = new integer(0); --- > integer ii_3 = new integer(0); 4726c4726 < character xx = new character(""); --- > character xx_2 = new character(""); 4756c4756 < for (ii.assign(1); _isLessThanOrEqual(ii, lenStr); ii.increment()) --- > for (ii_3.assign(1); _isLessThanOrEqual(ii_3, lenStr); ii_3.increment()) 4758,4759c4758,4759 < xx.assign(substring(testString, ii, 1)); < if (_isNotEqual(xx, "-")) --- > xx_2.assign(substring(testString, ii_3, 1)); > if (_isNotEqual(xx_2, "-")) 4761c4761 < noDash.assign(concat(noDash, xx)); --- > noDash.assign(concat(noDash, xx_2)); 4895c4895 < public integer to10from36(final character _myvalue) --- > public integer to10from36(final character _myvalue_2) 4899c4899 < character myvalue = new character(_myvalue); --- > character myvalue_2 = new character(_myvalue_2); 4913c4913 < vl.assign(length(myvalue)); --- > vl.assign(length(myvalue_2)); 4919c4919 < vthisdigit.assign(substring(myvalue, vp, 1)); --- > vthisdigit.assign(substring(myvalue_2, vp, 1)); 4956c4956 < public character encrypt(final character _mystring, final character _mykey) --- > public character encrypt(final character _mystring_2, final character _mykey) 4960c4960 < character mystring = new character(_mystring); --- > character mystring_2 = new character(_mystring_2); 4980c4980 < myraw.setLength(plus(length(mystring), 1)); --- > myraw.setLength(plus(length(mystring_2), 1)); 4983,4984c4983,4984 < stringlength.assign(byteLength(mystring)); < mycrc.assign(substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw")); --- > stringlength.assign(byteLength(mystring_2)); > mycrc.assign(substring(SecurityOps.encode(concat(mystring_2, "foobar")), 1, 2, "raw")); 4986c4986 < myraw.setString(mystring, 1); --- > myraw.setString(mystring_2, 1); 5004c5004 < mystring.assign(""); --- > mystring_2.assign(""); 5012c5012 < mystring.assign(concat(mystring, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); --- > mystring_2.assign(concat(mystring_2, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); 5017c5017 < returnNormal(concat(mycrc, mystring)); --- > returnNormal(concat(mycrc, mystring_2)); 5022c5022 < public character decrypt(final character _mystring, final character _mykey) --- > public character decrypt(final character _mystring_3, final character _mykey_2) 5026c5026 < character mystring = new character(_mystring); --- > character mystring_3 = new character(_mystring_3); 5028c5028 < character mykey = new character(_mykey); --- > character mykey_2 = new character(_mykey_2); 5030c5030 < integer i = new integer(0); --- > integer i_2 = new integer(0); 5032c5032 < integer j = new integer(0); --- > integer j_2 = new integer(0); 5034c5034 < integer keylength = new integer(0); --- > integer keylength_2 = new integer(0); 5036c5036 < integer stringlength = new integer(0); --- > integer stringlength_2 = new integer(0); 5038c5038 < character mycrc = new character(""); --- > character mycrc_2 = new character(""); 5040c5040 < character myhash = new character(""); --- > character myhash_2 = new character(""); 5042c5042 < memptr myraw = new memptr(); --- > memptr myraw_2 = new memptr(); 5046,5052c5046,5052 < mycrc.assign(substring(mystring, 1, 2)); < mystring.assign(substring(mystring, 3, -1, "raw")); < myraw.setLength((length(mystring))); < mykey.assign(substring(SecurityOps.encode(concat(mykey, "foobar")), 1, 16)); < myhash.assign(SecurityOps.encode(concat(mycrc, "foobar", mykey))); < keylength.assign(byteLength(mykey)); < stringlength.assign(byteLength(mystring)); --- > mycrc_2.assign(substring(mystring_3, 1, 2)); > mystring_3.assign(substring(mystring_3, 3, -1, "raw")); > myraw_2.setLength((length(mystring_3))); > mykey_2.assign(substring(SecurityOps.encode(concat(mykey_2, "foobar")), 1, 16)); > myhash_2.assign(SecurityOps.encode(concat(mycrc_2, "foobar", mykey_2))); > keylength_2.assign(byteLength(mykey_2)); > stringlength_2.assign(byteLength(mystring_3)); 5054c5054 < ToClause toClause1 = new ToClause(i, 1, stringlength, 2); --- > ToClause toClause1 = new ToClause(i_2, 1, stringlength_2, 2); 5060,5061c5060,5061 < j.assign(plus(j, 1)); < myraw.setByte(to10from36(new character(substring(mystring, i, 2, "raw"))), j); --- > j_2.assign(plus(j_2, 1)); > myraw_2.setByte(to10from36(new character(substring(mystring_3, i_2, 2, "raw"))), j_2); 5065c5065 < stringlength.assign(new integer(divide(stringlength, 2))); --- > stringlength_2.assign(new integer(divide(stringlength_2, 2))); 5068c5068 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 5070c5070 < myraw.setByte(abs(modulo(minus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256)), i); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(i_2), asc(substring(myhash_2, plus(modulo(i_2, 16), 1), 1, "raw"))), 256)), i_2); 5074c5074 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_2.assign(0); _isLessThanOrEqual(i_2, minus(stringlength_2, 1)); i_2.assign(plus(i_2, 5))) 5077c5077 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_2.assign(1); _isLessThanOrEqual(j_2, integer.minimum(keylength_2, minus(stringlength_2, i_2))); j_2.increment()) 5079c5079 < myraw.setByte(abs(modulo(minus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256)), plus(i, j)); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(plus(i_2, j_2)), asc(substring(mykey_2, j_2, 1, "raw"))), 256)), plus(i_2, j_2)); 5083c5083 < mystring.assign(""); --- > mystring_3.assign(""); 5086c5086 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 5088c5088 < mystring.assign(concat(mystring, chr(myraw.getByte(i)))); --- > mystring_3.assign(concat(mystring_3, chr(myraw_2.getByte(i_2)))); 5091,5092c5091,5092 < myraw.setLength(0); < if (_isEqual(mycrc, substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw"))) --- > myraw_2.setLength(0); > if (_isEqual(mycrc_2, substring(SecurityOps.encode(concat(mystring_3, "foobar")), 1, 2, "raw"))) 5094c5094 < returnNormal(mystring); --- > returnNormal(mystring_3); diff -r generated/20130314a/src/aero/timco/majic/job/ExportEst.java generated/20130314c/src/aero/timco/majic/job/ExportEst.java 47c47 < integer iSoRef2; --- > integer iSo_2; 49c49 < character cStat; --- > character cStat_2; 358c358 < public void outputData(final integer _iSoRef2, final character _cStat, final integer _iSwbc, final integer _iEwbc, final character _cSskillCode, final character _cEskillCode, final integer _iSoper, final integer _iEoper, final character _cOutFile) --- > public void outputData(final integer _iSo_2, final character _cStat_2, final integer _iSwbc, final integer _iEwbc, final character _cSskillCode, final character _cEskillCode, final integer _iSoper, final integer _iEoper, final character _cOutFile_2) 362c362 < integer iSoRef2 = new integer(_iSoRef2); --- > integer iSo_2 = new integer(_iSo_2); 364c364 < character cStat = new character(_cStat); --- > character cStat_2 = new character(_cStat_2); 378c378 < character cOutFile = new character(_cOutFile); --- > character cOutFile_2 = new character(_cOutFile_2); 382,383c382,383 < ExportEst.this.iSoRef2 = iSoRef2; < ExportEst.this.cStat = cStat; --- > ExportEst.this.iSo_2 = iSo_2; > ExportEst.this.cStat_2 = cStat_2; 394c394 < rptStream.assign(StreamFactory.openFileStream((cOutFile).toStringMessage(), true, false)); --- > rptStream.assign(StreamFactory.openFileStream((cOutFile_2).toStringMessage(), true, false)); 423c423 < iSoRef2, --- > iSo_2, 428c428 < toUpperCase(cStat) --- > toUpperCase(cStat_2) diff -r generated/20130314a/src/aero/timco/majic/job/GovtcostR.java generated/20130314c/src/aero/timco/majic/job/GovtcostR.java 639c639 < character lchLogLine = new character(""); --- > character lchLogLine_2 = new character(""); 879,880c879,880 < lchLogLine.assign(concat("Error: No Rate", "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); < ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine); --- > lchLogLine_2.assign(concat("Error: No Rate", "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); > ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine_2); 885,886c885,886 < lchLogLine.assign(concat("Error: No CO", "|", valueOf(bjob.getCustomerOrderNumber(), ">>>>>>9"), "|", valueOf(bjob.getTimcoOperation(), ">>>9"), "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); < ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine); --- > lchLogLine_2.assign(concat("Error: No CO", "|", valueOf(bjob.getCustomerOrderNumber(), ">>>>>>9"), "|", valueOf(bjob.getTimcoOperation(), ">>>9"), "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); > ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine_2); 891,892c891,892 < lchLogLine.assign(concat("Error: No Job", "|", valueOf(bjobtran.getTimcoOperation(), ">>>9"), "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); < ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine); --- > lchLogLine_2.assign(concat("Error: No Job", "|", valueOf(bjobtran.getTimcoOperation(), ">>>9"), "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); > ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine_2); 986c986 < public void ipProcessIndirect(final character _ipchExportFile, final date _ipdtStartDate, final date _ipdtEndDate) --- > public void ipProcessIndirect(final character _ipchExportFile_2, final date _ipdtStartDate, final date _ipdtEndDate) 990c990 < character ipchExportFile = new character(_ipchExportFile); --- > character ipchExportFile_2 = new character(_ipchExportFile_2); 996c996 < decimal ldeEmpRate = new decimal(0); --- > decimal ldeEmpRate_2 = new decimal(0); 998c998 < character lchEmpType = new character(""); --- > character lchEmpType_2 = new character(""); 1008c1008 < sCsvStream.assign(StreamFactory.openFileStream((ipchExportFile).toStringMessage(), true, false)); --- > sCsvStream.assign(StreamFactory.openFileStream((ipchExportFile_2).toStringMessage(), true, false)); 1059c1059 < ControlFlowOps.invokeWithMode("ip_GetEmpRate", "IIOO", bemployeeBuf2.getEmployeeNumber(), bworkrec.getTransactionDate(), ldeEmpRate, lchEmpType); --- > ControlFlowOps.invokeWithMode("ip_GetEmpRate", "IIOO", bemployeeBuf2.getEmployeeNumber(), bworkrec.getTransactionDate(), ldeEmpRate_2, lchEmpType_2); 1068,1069c1068,1069 < new ExportField(ldeEmpRate), < new ExportField(lchEmpType) --- > new ExportField(ldeEmpRate_2), > new ExportField(lchEmpType_2) 1082c1082 < public void ipOutputSummary(final character _ipchExportFile) --- > public void ipOutputSummary(final character _ipchExportFile_3) 1086c1086 < character ipchExportFile = new character(_ipchExportFile); --- > character ipchExportFile_3 = new character(_ipchExportFile_3); 1093c1093 < sCsvStream.assign(StreamFactory.openFileStream((ipchExportFile).toStringMessage(), true, false)); --- > sCsvStream.assign(StreamFactory.openFileStream((ipchExportFile_3).toStringMessage(), true, false)); diff -r generated/20130314a/src/aero/timco/majic/job/Imprates.java generated/20130314c/src/aero/timco/majic/job/Imprates.java 344c344 < public void ipCleanEffDate(final character _ipchDateString, final date opdtEffDate) --- > public void ipCleanEffDate(final character _ipchDateString_2, final date opdtEffDate) 348c348 < character ipchDateString = new character(_ipchDateString); --- > character ipchDateString_2 = new character(_ipchDateString_2); 350c350 < integer linMonth = new integer(0); --- > integer linMonth_2 = new integer(0); 352c352 < integer linDay = new integer(0); --- > integer linDay_2 = new integer(0); 354c354 < integer linYear = new integer(0); --- > integer linYear_2 = new integer(0); 369c369 < if (_isEqual(numEntries(ipchDateString, " "), 2)) --- > if (_isEqual(numEntries(ipchDateString_2, " "), 2)) 371,376c371,376 < lchDate.assign(entry(2, ipchDateString, " ")); < linMonth.assign(new integer(entry(1, lchDate, "/"))); < linDay.assign(new integer(entry(2, lchDate, "/"))); < linYear.assign(new integer(entry(3, lchDate, "/"))); < linYear.assign((_isLessThanOrEqual(plus(linYear, 2000), date.year(new date())) ? plus(linYear, 2000) : plus(linYear, 1900))); < opdtEffDate.assign(new date(linMonth, linDay, linYear)); --- > lchDate.assign(entry(2, ipchDateString_2, " ")); > linMonth_2.assign(new integer(entry(1, lchDate, "/"))); > linDay_2.assign(new integer(entry(2, lchDate, "/"))); > linYear_2.assign(new integer(entry(3, lchDate, "/"))); > linYear_2.assign((_isLessThanOrEqual(plus(linYear_2, 2000), date.year(new date())) ? plus(linYear_2, 2000) : plus(linYear_2, 1900))); > opdtEffDate.assign(new date(linMonth_2, linDay_2, linYear_2)); 386c386 < public void ipCleanContractDate(final character _ipchDateString, final date opdtContractDate) --- > public void ipCleanContractDate(final character _ipchDateString_3, final date opdtContractDate) 390c390 < character ipchDateString = new character(_ipchDateString); --- > character ipchDateString_3 = new character(_ipchDateString_3); 403c403 < opdtContractDate.assign(new date(ipchDateString)); --- > opdtContractDate.assign(new date(ipchDateString_3)); diff -r generated/20130314a/src/aero/timco/majic/job/J63wOut.java generated/20130314c/src/aero/timco/majic/job/J63wOut.java 133c133 < public void xmlEndTags(final character opchTag) --- > public void xmlEndTags(final character opchTag_2) 139c139 < opchTag.assign(new character("")); --- > opchTag_2.assign(new character("")); 142c142 < opchTag --- > opchTag_2 148c148 < opchTag.assign(""); --- > opchTag_2.assign(""); 203c203 < public void xmlBuildCloseTag(final character _ipchName, final character opchCloseTag) --- > public void xmlBuildCloseTag(final character _ipchName_2, final character opchCloseTag) 207c207 < character ipchName = new character(_ipchName); --- > character ipchName_2 = new character(_ipchName_2); 209c209 < character lchTagName = new character(""); --- > character lchTagName_2 = new character(""); 222,225c222,225 < lchTagName.assign(ipchName); < lchTagName.assign(replaceAll(lchTagName, "$", "")); < lchTagName.assign(replaceAll(lchTagName, "#", "")); < opchCloseTag.assign(concat("")); --- > lchTagName_2.assign(ipchName_2); > lchTagName_2.assign(replaceAll(lchTagName_2, "$", "")); > lchTagName_2.assign(replaceAll(lchTagName_2, "#", "")); > opchCloseTag.assign(concat("")); 230c230 < public void xmlBuildCompleteTag(final character _ipchName, final character _ipchAttrKeys, final character _ipchAttrValues, final character opchCompleteTag) --- > public void xmlBuildCompleteTag(final character _ipchName_3, final character _ipchAttrKeys_2, final character _ipchAttrValues_2, final character opchCompleteTag) 234c234 < character ipchName = new character(_ipchName); --- > character ipchName_3 = new character(_ipchName_3); 236c236 < character ipchAttrKeys = new character(_ipchAttrKeys); --- > character ipchAttrKeys_2 = new character(_ipchAttrKeys_2); 238c238 < character ipchAttrValues = new character(_ipchAttrValues); --- > character ipchAttrValues_2 = new character(_ipchAttrValues_2); 240c240 < character lchTagStart = new character(""); --- > character lchTagStart_2 = new character(""); 242c242 < character lchTagAttr = new character(""); --- > character lchTagAttr_2 = new character(""); 244c244 < integer linEntryPos = new integer(0); --- > integer linEntryPos_2 = new integer(0); 246c246 < integer linAttrCount = new integer(0); --- > integer linAttrCount_2 = new integer(0); 248c248 < character lchTagName = new character(""); --- > character lchTagName_3 = new character(""); 261,265c261,265 < lchTagName.assign(ipchName); < lchTagName.assign(replaceAll(lchTagName, "$", "")); < lchTagName.assign(replaceAll(lchTagName, "#", "")); < lchTagStart.assign(concat("<", lchTagName)); < linAttrCount.assign(numEntries(ipchAttrKeys, xmlListSepChar)); --- > lchTagName_3.assign(ipchName_3); > lchTagName_3.assign(replaceAll(lchTagName_3, "$", "")); > lchTagName_3.assign(replaceAll(lchTagName_3, "#", "")); > lchTagStart_2.assign(concat("<", lchTagName_3)); > linAttrCount_2.assign(numEntries(ipchAttrKeys_2, xmlListSepChar)); 268c268 < for (linEntryPos.assign(1); _isLessThanOrEqual(linEntryPos, linAttrCount); linEntryPos.increment()) --- > for (linEntryPos_2.assign(1); _isLessThanOrEqual(linEntryPos_2, linAttrCount_2); linEntryPos_2.increment()) 271c271 < lchTagAttr.assign(concat(lchTagAttr, (_isEqual(linEntryPos, 1) ? new character("") : new character(" ")), entry(linEntryPos, ipchAttrKeys, xmlListSepChar), "=", "\"", entry(linEntryPos, ipchAttrValues, xmlListSepChar), "\"")); --- > lchTagAttr_2.assign(concat(lchTagAttr_2, (_isEqual(linEntryPos_2, 1) ? new character("") : new character(" ")), entry(linEntryPos_2, ipchAttrKeys_2, xmlListSepChar), "=", "\"", entry(linEntryPos_2, ipchAttrValues_2, xmlListSepChar), "\"")); 275c275 < opchCompleteTag.assign(concat(lchTagStart, (_isNotEqual(lchTagAttr, "") ? concat(" ", lchTagAttr) : new character("")), " />")); --- > opchCompleteTag.assign(concat(lchTagStart_2, (_isNotEqual(lchTagAttr_2, "") ? concat(" ", lchTagAttr_2) : new character("")), " />")); 353c353 < public void xmlCleanValue(final character _ipchInputValue, final character opchCleanValue) --- > public void xmlCleanValue(final character _ipchInputValue_2, final character opchCleanValue) 357c357 < character ipchInputValue = new character(_ipchInputValue); --- > character ipchInputValue_2 = new character(_ipchInputValue_2); 381c381 < lchTempValue.assign(ipchInputValue); --- > lchTempValue.assign(ipchInputValue_2); diff -r generated/20130314a/src/aero/timco/majic/job/Job76R1.java generated/20130314c/src/aero/timco/majic/job/Job76R1.java 694c694 < public character getOutfile(final character _inOutfile) --- > public character getOutfile(final character _inOutfile_2) 698c698 < character inOutfile = new character(_inOutfile); --- > character inOutfile_2 = new character(_inOutfile_2); 700c700 < character tmpOutfile = new character(""); --- > character tmpOutfile_2 = new character(""); 704c704 < if (_begins(inOutfile, "lp")) --- > if (_begins(inOutfile_2, "lp")) 706c706 < tmpOutfile.assign(concat("unix2dos | ", inOutfile, " -oraw")); --- > tmpOutfile_2.assign(concat("unix2dos | ", inOutfile_2, " -oraw")); 710c710 < tmpOutfile.assign(inOutfile); --- > tmpOutfile_2.assign(inOutfile_2); 712c712 < returnNormal(tmpOutfile); --- > returnNormal(tmpOutfile_2); diff -r generated/20130314a/src/aero/timco/majic/job/Job78R1.java generated/20130314c/src/aero/timco/majic/job/Job78R1.java 698c698 < public character getOutfile(final character _inOutfile) --- > public character getOutfile(final character _inOutfile_2) 702c702 < character inOutfile = new character(_inOutfile); --- > character inOutfile_2 = new character(_inOutfile_2); 704c704 < character tmpOutfile = new character(""); --- > character tmpOutfile_2 = new character(""); 708c708 < if (_begins(inOutfile, "lp")) --- > if (_begins(inOutfile_2, "lp")) 710c710 < tmpOutfile.assign(concat("unix2dos | ", inOutfile, " -oraw")); --- > tmpOutfile_2.assign(concat("unix2dos | ", inOutfile_2, " -oraw")); 714c714 < tmpOutfile.assign(inOutfile); --- > tmpOutfile_2.assign(inOutfile_2); 716c716 < returnNormal(tmpOutfile); --- > returnNormal(tmpOutfile_2); diff -r generated/20130314a/src/aero/timco/majic/job/Job98R.java generated/20130314c/src/aero/timco/majic/job/Job98R.java 107c107 < date tDateRef2 = SharedVariableManager.addVariable("tDateRef2", new date()); --- > date tDate = SharedVariableManager.addVariable("tDate", new date()); 157c157 < integer empNum; --- > integer empNum_2; 159c159 < date tDate; --- > date tDate_3; 165c165 < character cWorksheetRef; --- > character cWorksheetRef_37; 167c167 < character cWorkBookRef; --- > character cWorkBookRef_3; 169c169 < character cFormatRef; --- > character cFormatRef_33; 171c171 < character cWorkbookRef; --- > character cWorkbookRef_2; 173c173 < character cWorksheetRefRef2; --- > character cWorksheetRef_38; 175c175 < character cWorksheetName; --- > character cWorksheetName_2; 177c177 < character cWorksheetRefRef3; --- > character cWorksheetRef_39; 179c179 < character cWorksheetRefRef4; --- > character cWorksheetRef_40; 181c181 < character cWorkbook; --- > character cWorkbook_2; 183c183 < character cWorksheetRefRef5; --- > character cWorksheetRef_41; 185c185 < integer iWidth; --- > integer iWidth_3; 187c187 < integer iHeight; --- > integer iHeight_3; 189c189 < character cWorksheetRefRef6; --- > character cWorksheetRef_42; 191c191 < integer iOption; --- > integer iOption_2; 193c193 < character cWorksheetRefRef7; --- > character cWorksheetRef_43; 195c195 < integer iOnoff; --- > integer iOnoff_2; 197c197 < character cOutExcel; --- > character cOutExcel_2; 199c199 < character cWorkBookRefRef2; --- > character cWorkBookRef_4; 201c201 < character cWorksheetRefRef8; --- > character cWorksheetRef_44; 203c203 < character cWorksheetRefRef9; --- > character cWorksheetRef_45; 205c205 < character cPassword; --- > character cPassword_2; 207c207 < character cWorksheetRefRef10; --- > character cWorksheetRef_46; 209c209 < integer iFrow; --- > integer iFrow_3; 211c211 < integer iLrow; --- > integer iLrow_3; 213c213 < character cWorksheetRefRef11; --- > character cWorksheetRef_47; 215c215 < integer iFrowRef2; --- > integer iFrow_4; 217c217 < integer iLrowRef2; --- > integer iLrow_4; 219c219 < character cWorksheetRefRef12; --- > character cWorksheetRef_48; 221c221 < character cFormatRefRef2; --- > character cFormatRef_34; 223c223 < character cAlign; --- > character cAlign_2; 225c225 < character cFormatRefRef3; --- > character cFormatRef_35; 227c227 < character cBgcolor; --- > character cBgcolor_2; 229c229 < character cFormatRefRef4; --- > character cFormatRef_36; 231c231 < integer iFontBold; --- > integer iFontBold_2; 233c233 < character cFormatRefRef5; --- > character cFormatRef_37; 235c235 < integer iBorder; --- > integer iBorder_6; 237c237 < character cFormatRefRef6; --- > character cFormatRef_38; 239c239 < integer iBorderRef2; --- > integer iBorder_7; 241c241 < character cFormatRefRef7; --- > character cFormatRef_39; 243c243 < integer iBorderRef3; --- > integer iBorder_8; 245c245 < character cFormatRefRef8; --- > character cFormatRef_40; 247c247 < integer iBorderRef4; --- > integer iBorder_9; 249c249 < character cFormatRefRef9; --- > character cFormatRef_41; 251c251 < integer iBorderRef5; --- > integer iBorder_10; 253c253 < character cFormatRefRef10; --- > character cFormatRef_42; 255c255 < integer iColor; --- > integer iColor_3; 257c257 < character cFormatRefRef11; --- > character cFormatRef_43; 259c259 < character cFontColor; --- > character cFontColor_2; 261c261 < character cWorksheetRefRef13; --- > character cWorksheetRef_49; 263c263 < integer iFstCol; --- > integer iFstCol_2; 265c265 < integer iLstCol; --- > integer iLstCol_2; 267c267 < integer iWidthRef2; --- > integer iWidth_4; 269c269 < character cFormatRefRef12; --- > character cFormatRef_44; 271c271 < integer iHidden; --- > integer iHidden_4; 273c273 < integer iLevel; --- > integer iLevel_3; 275c275 < character cFormatRefRef13; --- > character cFormatRef_45; 277c277 < integer iColorRef2; --- > integer iColor_4; 279c279 < character cFormatRefRef14; --- > character cFormatRef_46; 281c281 < character cFontName; --- > character cFontName_2; 283c283 < character cWorksheetRefRef14; --- > character cWorksheetRef_50; 285c285 < character cValue; --- > character cValue_4; 287c287 < decimal dMargin; --- > decimal dMargin_10; 289c289 < character cWorksheetRefRef15; --- > character cWorksheetRef_51; 291c291 < integer iRow; --- > integer iRow_10; 293c293 < character cWorksheetRefRef16; --- > character cWorksheetRef_52; 295c295 < character cValueRef2; --- > character cValue_5; 297c297 < decimal dMarginRef2; --- > decimal dMargin_11; 299c299 < character cFormatRefRef15; --- > character cFormatRef_47; 301c301 < integer iHiddenRef2; --- > integer iHidden_5; 303c303 < character cFormatRefRef16; --- > character cFormatRef_48; 305c305 < integer iFontItalic; --- > integer iFontItalic_2; 307c307 < character cWorksheetRefRef17; --- > character cWorksheetRef_53; 309c309 < character cFormatRefRef17; --- > character cFormatRef_49; 311c311 < integer iLocking; --- > integer iLocking_2; 313c313 < character cWorksheetRefRef18; --- > character cWorksheetRef_54; 315c315 < decimal dMarginRef3; --- > decimal dMargin_12; 317c317 < character cWorksheetRefRef19; --- > character cWorksheetRef_55; 319c319 < decimal dMarginRef4; --- > decimal dMargin_13; 321c321 < character cWorksheetRefRef20; --- > character cWorksheetRef_56; 323c323 < decimal dMarginRef5; --- > decimal dMargin_14; 325c325 < character cWorksheetRefRef21; --- > character cWorksheetRef_57; 327c327 < decimal dMarginRef6; --- > decimal dMargin_15; 329c329 < character cWorksheetRefRef22; --- > character cWorksheetRef_58; 331c331 < decimal dMarginRef7; --- > decimal dMargin_16; 333c333 < character cWorksheetRefRef23; --- > character cWorksheetRef_59; 335c335 < decimal dMarginRef8; --- > decimal dMargin_17; 337c337 < character cWorksheetRefRef24; --- > character cWorksheetRef_60; 339c339 < decimal dMarginRef9; --- > decimal dMargin_18; 341c341 < character cFormatRefRef18; --- > character cFormatRef_50; 343c343 < character cFormatRefRef19; --- > character cFormatRef_51; 345c345 < character cNumFormat; --- > character cNumFormat_2; 347c347 < character cWorksheetRefRef25; --- > character cWorksheetRef_61; 349c349 < integer iPaperType; --- > integer iPaperType_2; 351c351 < character cFormatRefRef20; --- > character cFormatRef_52; 353c353 < integer iPattern; --- > integer iPattern_2; 355c355 < character cWorksheetRefRef26; --- > character cWorksheetRef_62; 357c357 < character cWorksheetRefRef27; --- > character cWorksheetRef_63; 359c359 < integer iScale; --- > integer iScale_2; 361c361 < character cFormatRefRef21; --- > character cFormatRef_53; 363c363 < integer iRotation; --- > integer iRotation_2; 365c365 < character cWorksheetRefRef28; --- > character cWorksheetRef_64; 367c367 < integer iRowRef2; --- > integer iRow_11; 369c369 < integer iHeightRef2; --- > integer iHeight_4; 371c371 < character cFormatRefRef22; --- > character cFormatRef_54; 373c373 < integer iHiddenRef3; --- > integer iHidden_6; 375c375 < integer iLevelRef2; --- > integer iLevel_4; 377c377 < character cFormatRefRef23; --- > character cFormatRef_55; 379c379 < integer iFontScript; --- > integer iFontScript_2; 381c381 < character cFormatRefRef24; --- > character cFormatRef_56; 383c383 < integer iFontSize; --- > integer iFontSize_2; 385c385 < character cFormatRefRef25; --- > character cFormatRef_57; 387c387 < integer iFontStrikeOut; --- > integer iFontStrikeOut_2; 389c389 < character cFormatRefRef26; --- > character cFormatRef_58; 391c391 < character cFormatRefRef27; --- > character cFormatRef_59; 393c393 < integer iFontUnderline; --- > integer iFontUnderline_2; 395c395 < character cWorksheetRefRef29; --- > character cWorksheetRef_65; 397c397 < integer iRowRef3; --- > integer iRow_12; 399c399 < character cWorksheetRefRef30; --- > character cWorksheetRef_66; 401c401 < integer iRowRef4; --- > integer iRow_13; 403c403 < integer iCol; --- > integer iCol_7; 405c405 < character cFormatRefRef28; --- > character cFormatRef_60; 407c407 < character cWorksheetRefRef31; --- > character cWorksheetRef_67; 409c409 < integer iRowRef5; --- > integer iRow_14; 411c411 < integer iColRef2; --- > integer iCol_8; 413c413 < character cValueRef3; --- > character cValue_6; 415c415 < character cWorksheetRefRef32; --- > character cWorksheetRef_68; 417c417 < integer iRowRef6; --- > integer iRow_15; 419c419 < integer iColRef3; --- > integer iCol_9; 421c421 < character sValue; --- > character sValue_2; 423c423 < character cFormatRefRef29; --- > character cFormatRef_61; 425c425 < character cWorksheetRefRef33; --- > character cWorksheetRef_69; 427c427 < integer iRowRef7; --- > integer iRow_16; 429c429 < integer iColRef4; --- > integer iCol_10; 431c431 < decimal dNumber; --- > decimal dNumber_2; 433c433 < character cFormatRefRef30; --- > character cFormatRef_62; 435c435 < character cWorksheetRefRef34; --- > character cWorksheetRef_70; 437c437 < integer iRowRef8; --- > integer iRow_17; 439c439 < integer iColRef5; --- > integer iCol_11; 441c441 < character cString; --- > character cString_2; 443c443 < character cFormatRefRef31; --- > character cFormatRef_63; 445c445 < character cWorksheetRefRef35; --- > character cWorksheetRef_72; 447c447 < integer iRowRef9; --- > integer iRow_18; 449c449 < integer iColRef6; --- > integer iCol_12; 451c451 < character cUrl; --- > character cUrl_2; 453c453 < character cHref; --- > character cHref_2; 455c455 < character cFormatRefRef32; --- > character cFormatRef_64; 497c497 < TransactionManager.register(tStatus, curCount, sSkillCode, eSkillCode, sCrewCode, eCrewCode, tCrewList, sTeamLead, eTeamLead, sSupervisor, eSupervisor, sEmpNum, eEmpNum, sShift, eShift, tDateRef2, tBillable, tSortPm, tSortCrew, refreshdata, (Object) cntAp, (Object) cntStr, (Object) cntInt, (Object) cntAvi, curRow, curCol, curMax, curRowMax, rowStart, rptName, tRptHdr, tSerial, infile, outfile, startString, endString, ifappend, ifpaged, tPrintFile, version, selection, hChar, lChar, hInt, lInt, tmpPerlScript); --- > TransactionManager.register(tStatus, curCount, sSkillCode, eSkillCode, sCrewCode, eCrewCode, tCrewList, sTeamLead, eTeamLead, sSupervisor, eSupervisor, sEmpNum, eEmpNum, sShift, eShift, tDate, tBillable, tSortPm, tSortCrew, refreshdata, (Object) cntAp, (Object) cntStr, (Object) cntInt, (Object) cntAvi, curRow, curCol, curMax, curRowMax, rowStart, rptName, tRptHdr, tSerial, infile, outfile, startString, endString, ifappend, ifpaged, tPrintFile, version, selection, hChar, lChar, hInt, lInt, tmpPerlScript); 549c549 < new HeaderElement(tDateRef2, fOpt132Frame.widgetTDate()), --- > new HeaderElement(tDate, fOpt132Frame.widgetTDate()), 631c631 < public character getRdo(final character _rdo, final integer _empNum, final date _tDate) --- > public character getRdo(final character _rdo_2, final integer _empNum_2, final date _tDate_3) 635c635 < character rdo = new character(_rdo); --- > character rdo_2 = new character(_rdo_2); 637c637 < integer empNum = new integer(_empNum); --- > integer empNum_2 = new integer(_empNum_2); 639c639 < date tDate = new date(_tDate); --- > date tDate_3 = new date(_tDate_3); 643,644c643,644 < Job98R.this.empNum = empNum; < Job98R.this.tDate = tDate; --- > Job98R.this.empNum_2 = empNum_2; > Job98R.this.tDate_3 = tDate_3; 649c649 < if (_isGreaterThan(indexOf(rdo, valueOf(date.weekday(date.minusDays(tDate, 1)))), 0)) --- > if (_isGreaterThan(indexOf(rdo_2, valueOf(date.weekday(date.minusDays(tDate_3, 1)))), 0)) 653,654c653,654 < empNum, < tDate --- > empNum_2, > tDate_3 659c659 < empNum, --- > empNum_2, 787c787 < tDateRef2 --- > tDate 809c809 < ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDate)); 818c818 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 904c904 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 919c919 < public logical activate(final character _cWorksheetRef) --- > public logical activate(final character _cWorksheetRef_37) 923c923 < character cWorksheetRef = new character(_cWorksheetRef); --- > character cWorksheetRef_37 = new character(_cWorksheetRef_37); 927c927 < Job98R.this.cWorksheetRef = cWorksheetRef; --- > Job98R.this.cWorksheetRef_37 = cWorksheetRef_37; 941c941 < public logical addFormat(final character _cWorkBookRef, final character _cFormatRef) --- > public logical addFormat(final character _cWorkBookRef_3, final character _cFormatRef_33) 945c945 < character cWorkBookRef = new character(_cWorkBookRef); --- > character cWorkBookRef_3 = new character(_cWorkBookRef_3); 947c947 < character cFormatRef = new character(_cFormatRef); --- > character cFormatRef_33 = new character(_cFormatRef_33); 951,952c951,952 < Job98R.this.cWorkBookRef = cWorkBookRef; < Job98R.this.cFormatRef = cFormatRef; --- > Job98R.this.cWorkBookRef_3 = cWorkBookRef_3; > Job98R.this.cFormatRef_33 = cFormatRef_33; 966c966 < public logical addWorksheet(final character _cWorkbookRef, final character _cWorksheetRefRef2, final character _cWorksheetName) --- > public logical addWorksheet(final character _cWorkbookRef_2, final character _cWorksheetRef_38, final character _cWorksheetName_2) 970c970 < character cWorkbookRef = new character(_cWorkbookRef); --- > character cWorkbookRef_2 = new character(_cWorkbookRef_2); 972c972 < character cWorksheetRefRef2 = new character(_cWorksheetRefRef2); --- > character cWorksheetRef_38 = new character(_cWorksheetRef_38); 974c974 < character cWorksheetName = new character(_cWorksheetName); --- > character cWorksheetName_2 = new character(_cWorksheetName_2); 978,980c978,980 < Job98R.this.cWorkbookRef = cWorkbookRef; < Job98R.this.cWorksheetRefRef2 = cWorksheetRefRef2; < Job98R.this.cWorksheetName = cWorksheetName; --- > Job98R.this.cWorkbookRef_2 = cWorkbookRef_2; > Job98R.this.cWorksheetRef_38 = cWorksheetRef_38; > Job98R.this.cWorksheetName_2 = cWorksheetName_2; 994c994 < public logical centerHorizontally(final character _cWorksheetRefRef3) --- > public logical centerHorizontally(final character _cWorksheetRef_39) 998c998 < character cWorksheetRefRef3 = new character(_cWorksheetRefRef3); --- > character cWorksheetRef_39 = new character(_cWorksheetRef_39); 1002c1002 < Job98R.this.cWorksheetRefRef3 = cWorksheetRefRef3; --- > Job98R.this.cWorksheetRef_39 = cWorksheetRef_39; 1016c1016 < public logical centerVertically(final character _cWorksheetRefRef4) --- > public logical centerVertically(final character _cWorksheetRef_40) 1020c1020 < character cWorksheetRefRef4 = new character(_cWorksheetRefRef4); --- > character cWorksheetRef_40 = new character(_cWorksheetRef_40); 1024c1024 < Job98R.this.cWorksheetRefRef4 = cWorksheetRefRef4; --- > Job98R.this.cWorksheetRef_40 = cWorksheetRef_40; 1053c1053 < public logical closeWorkbook(final character _cWorkbook) --- > public logical closeWorkbook(final character _cWorkbook_2) 1057c1057 < character cWorkbook = new character(_cWorkbook); --- > character cWorkbook_2 = new character(_cWorkbook_2); 1061c1061 < Job98R.this.cWorkbook = cWorkbook; --- > Job98R.this.cWorkbook_2 = cWorkbook_2; 1092c1092 < public logical fitToPages(final character _cWorksheetRefRef5, final integer _iWidth, final integer _iHeight) --- > public logical fitToPages(final character _cWorksheetRef_41, final integer _iWidth_3, final integer _iHeight_3) 1096c1096 < character cWorksheetRefRef5 = new character(_cWorksheetRefRef5); --- > character cWorksheetRef_41 = new character(_cWorksheetRef_41); 1098c1098 < integer iWidth = new integer(_iWidth); --- > integer iWidth_3 = new integer(_iWidth_3); 1100c1100 < integer iHeight = new integer(_iHeight); --- > integer iHeight_3 = new integer(_iHeight_3); 1104,1106c1104,1106 < Job98R.this.cWorksheetRefRef5 = cWorksheetRefRef5; < Job98R.this.iWidth = iWidth; < Job98R.this.iHeight = iHeight; --- > Job98R.this.cWorksheetRef_41 = cWorksheetRef_41; > Job98R.this.iWidth_3 = iWidth_3; > Job98R.this.iHeight_3 = iHeight_3; 1120c1120 < public logical hideGridlines(final character _cWorksheetRefRef6, final integer _iOption) --- > public logical hideGridlines(final character _cWorksheetRef_42, final integer _iOption_2) 1124c1124 < character cWorksheetRefRef6 = new character(_cWorksheetRefRef6); --- > character cWorksheetRef_42 = new character(_cWorksheetRef_42); 1126c1126 < integer iOption = new integer(_iOption); --- > integer iOption_2 = new integer(_iOption_2); 1130,1131c1130,1131 < Job98R.this.cWorksheetRefRef6 = cWorksheetRefRef6; < Job98R.this.iOption = iOption; --- > Job98R.this.cWorksheetRef_42 = cWorksheetRef_42; > Job98R.this.iOption_2 = iOption_2; 1145c1145 < public logical keepLeadingZeros(final character _cWorksheetRefRef7, final integer _iOnoff) --- > public logical keepLeadingZeros(final character _cWorksheetRef_43, final integer _iOnoff_2) 1149c1149 < character cWorksheetRefRef7 = new character(_cWorksheetRefRef7); --- > character cWorksheetRef_43 = new character(_cWorksheetRef_43); 1151c1151 < integer iOnoff = new integer(_iOnoff); --- > integer iOnoff_2 = new integer(_iOnoff_2); 1155,1156c1155,1156 < Job98R.this.cWorksheetRefRef7 = cWorksheetRefRef7; < Job98R.this.iOnoff = iOnoff; --- > Job98R.this.cWorksheetRef_43 = cWorksheetRef_43; > Job98R.this.iOnoff_2 = iOnoff_2; 1170c1170 < public logical newWorkbook(final character _cOutExcel, final character _cWorkBookRefRef2) --- > public logical newWorkbook(final character _cOutExcel_2, final character _cWorkBookRef_4) 1174c1174 < character cOutExcel = new character(_cOutExcel); --- > character cOutExcel_2 = new character(_cOutExcel_2); 1176c1176 < character cWorkBookRefRef2 = new character(_cWorkBookRefRef2); --- > character cWorkBookRef_4 = new character(_cWorkBookRef_4); 1180,1181c1180,1181 < Job98R.this.cOutExcel = cOutExcel; < Job98R.this.cWorkBookRefRef2 = cWorkBookRefRef2; --- > Job98R.this.cOutExcel_2 = cOutExcel_2; > Job98R.this.cWorkBookRef_4 = cWorkBookRef_4; 1210c1210 < public logical printRowColHeaders(final character _cWorksheetRefRef8) --- > public logical printRowColHeaders(final character _cWorksheetRef_44) 1214c1214 < character cWorksheetRefRef8 = new character(_cWorksheetRefRef8); --- > character cWorksheetRef_44 = new character(_cWorksheetRef_44); 1218c1218 < Job98R.this.cWorksheetRefRef8 = cWorksheetRefRef8; --- > Job98R.this.cWorksheetRef_44 = cWorksheetRef_44; 1232c1232 < public logical protect(final character _cWorksheetRefRef9, final character _cPassword) --- > public logical protect(final character _cWorksheetRef_45, final character _cPassword_2) 1236c1236 < character cWorksheetRefRef9 = new character(_cWorksheetRefRef9); --- > character cWorksheetRef_45 = new character(_cWorksheetRef_45); 1238c1238 < character cPassword = new character(_cPassword); --- > character cPassword_2 = new character(_cPassword_2); 1242,1243c1242,1243 < Job98R.this.cWorksheetRefRef9 = cWorksheetRefRef9; < Job98R.this.cPassword = cPassword; --- > Job98R.this.cWorksheetRef_45 = cWorksheetRef_45; > Job98R.this.cPassword_2 = cPassword_2; 1257c1257 < public logical repeatColums(final character _cWorksheetRefRef10, final integer _iFrow, final integer _iLrow) --- > public logical repeatColums(final character _cWorksheetRef_46, final integer _iFrow_3, final integer _iLrow_3) 1261c1261 < character cWorksheetRefRef10 = new character(_cWorksheetRefRef10); --- > character cWorksheetRef_46 = new character(_cWorksheetRef_46); 1263c1263 < integer iFrow = new integer(_iFrow); --- > integer iFrow_3 = new integer(_iFrow_3); 1265c1265 < integer iLrow = new integer(_iLrow); --- > integer iLrow_3 = new integer(_iLrow_3); 1269,1271c1269,1271 < Job98R.this.cWorksheetRefRef10 = cWorksheetRefRef10; < Job98R.this.iFrow = iFrow; < Job98R.this.iLrow = iLrow; --- > Job98R.this.cWorksheetRef_46 = cWorksheetRef_46; > Job98R.this.iFrow_3 = iFrow_3; > Job98R.this.iLrow_3 = iLrow_3; 1285c1285 < public logical repeatRows(final character _cWorksheetRefRef11, final integer _iFrowRef2, final integer _iLrowRef2) --- > public logical repeatRows(final character _cWorksheetRef_47, final integer _iFrow_4, final integer _iLrow_4) 1289c1289 < character cWorksheetRefRef11 = new character(_cWorksheetRefRef11); --- > character cWorksheetRef_47 = new character(_cWorksheetRef_47); 1291c1291 < integer iFrowRef2 = new integer(_iFrowRef2); --- > integer iFrow_4 = new integer(_iFrow_4); 1293c1293 < integer iLrowRef2 = new integer(_iLrowRef2); --- > integer iLrow_4 = new integer(_iLrow_4); 1297,1299c1297,1299 < Job98R.this.cWorksheetRefRef11 = cWorksheetRefRef11; < Job98R.this.iFrowRef2 = iFrowRef2; < Job98R.this.iLrowRef2 = iLrowRef2; --- > Job98R.this.cWorksheetRef_47 = cWorksheetRef_47; > Job98R.this.iFrow_4 = iFrow_4; > Job98R.this.iLrow_4 = iLrow_4; 1313c1313 < public logical selectWorksheet(final character _cWorksheetRefRef12) --- > public logical selectWorksheet(final character _cWorksheetRef_48) 1317c1317 < character cWorksheetRefRef12 = new character(_cWorksheetRefRef12); --- > character cWorksheetRef_48 = new character(_cWorksheetRef_48); 1321c1321 < Job98R.this.cWorksheetRefRef12 = cWorksheetRefRef12; --- > Job98R.this.cWorksheetRef_48 = cWorksheetRef_48; 1335c1335 < public logical setAlign(final character _cFormatRefRef2, final character _cAlign) --- > public logical setAlign(final character _cFormatRef_34, final character _cAlign_2) 1339c1339 < character cFormatRefRef2 = new character(_cFormatRefRef2); --- > character cFormatRef_34 = new character(_cFormatRef_34); 1341c1341 < character cAlign = new character(_cAlign); --- > character cAlign_2 = new character(_cAlign_2); 1345,1346c1345,1346 < Job98R.this.cFormatRefRef2 = cFormatRefRef2; < Job98R.this.cAlign = cAlign; --- > Job98R.this.cFormatRef_34 = cFormatRef_34; > Job98R.this.cAlign_2 = cAlign_2; 1360c1360 < public logical setBgColor(final character _cFormatRefRef3, final character _cBgcolor) --- > public logical setBgColor(final character _cFormatRef_35, final character _cBgcolor_2) 1364c1364 < character cFormatRefRef3 = new character(_cFormatRefRef3); --- > character cFormatRef_35 = new character(_cFormatRef_35); 1366c1366 < character cBgcolor = new character(_cBgcolor); --- > character cBgcolor_2 = new character(_cBgcolor_2); 1370,1371c1370,1371 < Job98R.this.cFormatRefRef3 = cFormatRefRef3; < Job98R.this.cBgcolor = cBgcolor; --- > Job98R.this.cFormatRef_35 = cFormatRef_35; > Job98R.this.cBgcolor_2 = cBgcolor_2; 1385c1385 < public logical setBold(final character _cFormatRefRef4, final integer _iFontBold) --- > public logical setBold(final character _cFormatRef_36, final integer _iFontBold_2) 1389c1389 < character cFormatRefRef4 = new character(_cFormatRefRef4); --- > character cFormatRef_36 = new character(_cFormatRef_36); 1391c1391 < integer iFontBold = new integer(_iFontBold); --- > integer iFontBold_2 = new integer(_iFontBold_2); 1395,1396c1395,1396 < Job98R.this.cFormatRefRef4 = cFormatRefRef4; < Job98R.this.iFontBold = iFontBold; --- > Job98R.this.cFormatRef_36 = cFormatRef_36; > Job98R.this.iFontBold_2 = iFontBold_2; 1411c1411 < public logical setBorderBottom(final character _cFormatRefRef5, final integer _iBorder) --- > public logical setBorderBottom(final character _cFormatRef_37, final integer _iBorder_6) 1415c1415 < character cFormatRefRef5 = new character(_cFormatRefRef5); --- > character cFormatRef_37 = new character(_cFormatRef_37); 1417c1417 < integer iBorder = new integer(_iBorder); --- > integer iBorder_6 = new integer(_iBorder_6); 1421,1422c1421,1422 < Job98R.this.cFormatRefRef5 = cFormatRefRef5; < Job98R.this.iBorder = iBorder; --- > Job98R.this.cFormatRef_37 = cFormatRef_37; > Job98R.this.iBorder_6 = iBorder_6; 1438c1438 < public logical setBorderLeft(final character _cFormatRefRef6, final integer _iBorderRef2) --- > public logical setBorderLeft(final character _cFormatRef_38, final integer _iBorder_7) 1442c1442 < character cFormatRefRef6 = new character(_cFormatRefRef6); --- > character cFormatRef_38 = new character(_cFormatRef_38); 1444c1444 < integer iBorderRef2 = new integer(_iBorderRef2); --- > integer iBorder_7 = new integer(_iBorder_7); 1448,1449c1448,1449 < Job98R.this.cFormatRefRef6 = cFormatRefRef6; < Job98R.this.iBorderRef2 = iBorderRef2; --- > Job98R.this.cFormatRef_38 = cFormatRef_38; > Job98R.this.iBorder_7 = iBorder_7; 1465c1465 < public logical setBorderRight(final character _cFormatRefRef7, final integer _iBorderRef3) --- > public logical setBorderRight(final character _cFormatRef_39, final integer _iBorder_8) 1469c1469 < character cFormatRefRef7 = new character(_cFormatRefRef7); --- > character cFormatRef_39 = new character(_cFormatRef_39); 1471c1471 < integer iBorderRef3 = new integer(_iBorderRef3); --- > integer iBorder_8 = new integer(_iBorder_8); 1475,1476c1475,1476 < Job98R.this.cFormatRefRef7 = cFormatRefRef7; < Job98R.this.iBorderRef3 = iBorderRef3; --- > Job98R.this.cFormatRef_39 = cFormatRef_39; > Job98R.this.iBorder_8 = iBorder_8; 1492c1492 < public logical setBorderTop(final character _cFormatRefRef8, final integer _iBorderRef4) --- > public logical setBorderTop(final character _cFormatRef_40, final integer _iBorder_9) 1496c1496 < character cFormatRefRef8 = new character(_cFormatRefRef8); --- > character cFormatRef_40 = new character(_cFormatRef_40); 1498c1498 < integer iBorderRef4 = new integer(_iBorderRef4); --- > integer iBorder_9 = new integer(_iBorder_9); 1502,1503c1502,1503 < Job98R.this.cFormatRefRef8 = cFormatRefRef8; < Job98R.this.iBorderRef4 = iBorderRef4; --- > Job98R.this.cFormatRef_40 = cFormatRef_40; > Job98R.this.iBorder_9 = iBorder_9; 1519c1519 < public logical setBorders(final character _cFormatRefRef9, final integer _iBorderRef5) --- > public logical setBorders(final character _cFormatRef_41, final integer _iBorder_10) 1523c1523 < character cFormatRefRef9 = new character(_cFormatRefRef9); --- > character cFormatRef_41 = new character(_cFormatRef_41); 1525c1525 < integer iBorderRef5 = new integer(_iBorderRef5); --- > integer iBorder_10 = new integer(_iBorder_10); 1529,1530c1529,1530 < Job98R.this.cFormatRefRef9 = cFormatRefRef9; < Job98R.this.iBorderRef5 = iBorderRef5; --- > Job98R.this.cFormatRef_41 = cFormatRef_41; > Job98R.this.iBorder_10 = iBorder_10; 1544c1544 < public logical setBordersColor(final character _cFormatRefRef10, final integer _iColor) --- > public logical setBordersColor(final character _cFormatRef_42, final integer _iColor_3) 1548c1548 < character cFormatRefRef10 = new character(_cFormatRefRef10); --- > character cFormatRef_42 = new character(_cFormatRef_42); 1550c1550 < integer iColor = new integer(_iColor); --- > integer iColor_3 = new integer(_iColor_3); 1554,1555c1554,1555 < Job98R.this.cFormatRefRef10 = cFormatRefRef10; < Job98R.this.iColor = iColor; --- > Job98R.this.cFormatRef_42 = cFormatRef_42; > Job98R.this.iColor_3 = iColor_3; 1571c1571 < public logical setColor(final character _cFormatRefRef11, final character _cFontColor) --- > public logical setColor(final character _cFormatRef_43, final character _cFontColor_2) 1575c1575 < character cFormatRefRef11 = new character(_cFormatRefRef11); --- > character cFormatRef_43 = new character(_cFormatRef_43); 1577c1577 < character cFontColor = new character(_cFontColor); --- > character cFontColor_2 = new character(_cFontColor_2); 1581,1582c1581,1582 < Job98R.this.cFormatRefRef11 = cFormatRefRef11; < Job98R.this.cFontColor = cFontColor; --- > Job98R.this.cFormatRef_43 = cFormatRef_43; > Job98R.this.cFontColor_2 = cFontColor_2; 1596c1596 < public logical setColumn(final character _cWorksheetRefRef13, final integer _iFstCol, final integer _iLstCol, final integer _iWidthRef2, final character _cFormatRefRef12, final integer _iHidden, final integer _iLevel) --- > public logical setColumn(final character _cWorksheetRef_49, final integer _iFstCol_2, final integer _iLstCol_2, final integer _iWidth_4, final character _cFormatRef_44, final integer _iHidden_4, final integer _iLevel_3) 1600c1600 < character cWorksheetRefRef13 = new character(_cWorksheetRefRef13); --- > character cWorksheetRef_49 = new character(_cWorksheetRef_49); 1602c1602 < integer iFstCol = new integer(_iFstCol); --- > integer iFstCol_2 = new integer(_iFstCol_2); 1604c1604 < integer iLstCol = new integer(_iLstCol); --- > integer iLstCol_2 = new integer(_iLstCol_2); 1606c1606 < integer iWidthRef2 = new integer(_iWidthRef2); --- > integer iWidth_4 = new integer(_iWidth_4); 1608c1608 < character cFormatRefRef12 = new character(_cFormatRefRef12); --- > character cFormatRef_44 = new character(_cFormatRef_44); 1610c1610 < integer iHidden = new integer(_iHidden); --- > integer iHidden_4 = new integer(_iHidden_4); 1612c1612 < integer iLevel = new integer(_iLevel); --- > integer iLevel_3 = new integer(_iLevel_3); 1616,1622c1616,1622 < Job98R.this.cWorksheetRefRef13 = cWorksheetRefRef13; < Job98R.this.iFstCol = iFstCol; < Job98R.this.iLstCol = iLstCol; < Job98R.this.iWidthRef2 = iWidthRef2; < Job98R.this.cFormatRefRef12 = cFormatRefRef12; < Job98R.this.iHidden = iHidden; < Job98R.this.iLevel = iLevel; --- > Job98R.this.cWorksheetRef_49 = cWorksheetRef_49; > Job98R.this.iFstCol_2 = iFstCol_2; > Job98R.this.iLstCol_2 = iLstCol_2; > Job98R.this.iWidth_4 = iWidth_4; > Job98R.this.cFormatRef_44 = cFormatRef_44; > Job98R.this.iHidden_4 = iHidden_4; > Job98R.this.iLevel_3 = iLevel_3; 1636c1636 < public logical setFgColor(final character _cFormatRefRef13, final integer _iColorRef2) --- > public logical setFgColor(final character _cFormatRef_45, final integer _iColor_4) 1640c1640 < character cFormatRefRef13 = new character(_cFormatRefRef13); --- > character cFormatRef_45 = new character(_cFormatRef_45); 1642c1642 < integer iColorRef2 = new integer(_iColorRef2); --- > integer iColor_4 = new integer(_iColor_4); 1646,1647c1646,1647 < Job98R.this.cFormatRefRef13 = cFormatRefRef13; < Job98R.this.iColorRef2 = iColorRef2; --- > Job98R.this.cFormatRef_45 = cFormatRef_45; > Job98R.this.iColor_4 = iColor_4; 1661c1661 < public logical setFont(final character _cFormatRefRef14, final character _cFontName) --- > public logical setFont(final character _cFormatRef_46, final character _cFontName_2) 1665c1665 < character cFormatRefRef14 = new character(_cFormatRefRef14); --- > character cFormatRef_46 = new character(_cFormatRef_46); 1667c1667 < character cFontName = new character(_cFontName); --- > character cFontName_2 = new character(_cFontName_2); 1671,1672c1671,1672 < Job98R.this.cFormatRefRef14 = cFormatRefRef14; < Job98R.this.cFontName = cFontName; --- > Job98R.this.cFormatRef_46 = cFormatRef_46; > Job98R.this.cFontName_2 = cFontName_2; 1686c1686 < public logical setFooter(final character _cWorksheetRefRef14, final character _cValue, final decimal _dMargin) --- > public logical setFooter(final character _cWorksheetRef_50, final character _cValue_4, final decimal _dMargin_10) 1690c1690 < character cWorksheetRefRef14 = new character(_cWorksheetRefRef14); --- > character cWorksheetRef_50 = new character(_cWorksheetRef_50); 1692c1692 < character cValue = new character(_cValue); --- > character cValue_4 = new character(_cValue_4); 1694c1694 < decimal dMargin = new decimal(_dMargin); --- > decimal dMargin_10 = new decimal(_dMargin_10); 1698,1700c1698,1700 < Job98R.this.cWorksheetRefRef14 = cWorksheetRefRef14; < Job98R.this.cValue = cValue; < Job98R.this.dMargin = dMargin; --- > Job98R.this.cWorksheetRef_50 = cWorksheetRef_50; > Job98R.this.cValue_4 = cValue_4; > Job98R.this.dMargin_10 = dMargin_10; 1714c1714 < public logical setHPagebreaks(final character _cWorksheetRefRef15, final integer _iRow) --- > public logical setHPagebreaks(final character _cWorksheetRef_51, final integer _iRow_10) 1718c1718 < character cWorksheetRefRef15 = new character(_cWorksheetRefRef15); --- > character cWorksheetRef_51 = new character(_cWorksheetRef_51); 1720c1720 < integer iRow = new integer(_iRow); --- > integer iRow_10 = new integer(_iRow_10); 1724,1725c1724,1725 < Job98R.this.cWorksheetRefRef15 = cWorksheetRefRef15; < Job98R.this.iRow = iRow; --- > Job98R.this.cWorksheetRef_51 = cWorksheetRef_51; > Job98R.this.iRow_10 = iRow_10; 1739c1739 < public logical setHeader(final character _cWorksheetRefRef16, final character _cValueRef2, final decimal _dMarginRef2) --- > public logical setHeader(final character _cWorksheetRef_52, final character _cValue_5, final decimal _dMargin_11) 1743c1743 < character cWorksheetRefRef16 = new character(_cWorksheetRefRef16); --- > character cWorksheetRef_52 = new character(_cWorksheetRef_52); 1745c1745 < character cValueRef2 = new character(_cValueRef2); --- > character cValue_5 = new character(_cValue_5); 1747c1747 < decimal dMarginRef2 = new decimal(_dMarginRef2); --- > decimal dMargin_11 = new decimal(_dMargin_11); 1751,1753c1751,1753 < Job98R.this.cWorksheetRefRef16 = cWorksheetRefRef16; < Job98R.this.cValueRef2 = cValueRef2; < Job98R.this.dMarginRef2 = dMarginRef2; --- > Job98R.this.cWorksheetRef_52 = cWorksheetRef_52; > Job98R.this.cValue_5 = cValue_5; > Job98R.this.dMargin_11 = dMargin_11; 1767c1767 < public logical setHidden(final character _cFormatRefRef15, final integer _iHiddenRef2) --- > public logical setHidden(final character _cFormatRef_47, final integer _iHidden_5) 1771c1771 < character cFormatRefRef15 = new character(_cFormatRefRef15); --- > character cFormatRef_47 = new character(_cFormatRef_47); 1773c1773 < integer iHiddenRef2 = new integer(_iHiddenRef2); --- > integer iHidden_5 = new integer(_iHidden_5); 1777,1778c1777,1778 < Job98R.this.cFormatRefRef15 = cFormatRefRef15; < Job98R.this.iHiddenRef2 = iHiddenRef2; --- > Job98R.this.cFormatRef_47 = cFormatRef_47; > Job98R.this.iHidden_5 = iHidden_5; 1792c1792 < public logical setItalic(final character _cFormatRefRef16, final integer _iFontItalic) --- > public logical setItalic(final character _cFormatRef_48, final integer _iFontItalic_2) 1796c1796 < character cFormatRefRef16 = new character(_cFormatRefRef16); --- > character cFormatRef_48 = new character(_cFormatRef_48); 1798c1798 < integer iFontItalic = new integer(_iFontItalic); --- > integer iFontItalic_2 = new integer(_iFontItalic_2); 1802,1803c1802,1803 < Job98R.this.cFormatRefRef16 = cFormatRefRef16; < Job98R.this.iFontItalic = iFontItalic; --- > Job98R.this.cFormatRef_48 = cFormatRef_48; > Job98R.this.iFontItalic_2 = iFontItalic_2; 1817c1817 < public logical setLandscape(final character _cWorksheetRefRef17) --- > public logical setLandscape(final character _cWorksheetRef_53) 1821c1821 < character cWorksheetRefRef17 = new character(_cWorksheetRefRef17); --- > character cWorksheetRef_53 = new character(_cWorksheetRef_53); 1825c1825 < Job98R.this.cWorksheetRefRef17 = cWorksheetRefRef17; --- > Job98R.this.cWorksheetRef_53 = cWorksheetRef_53; 1839c1839 < public logical setLocked(final character _cFormatRefRef17, final integer _iLocking) --- > public logical setLocked(final character _cFormatRef_49, final integer _iLocking_2) 1843c1843 < character cFormatRefRef17 = new character(_cFormatRefRef17); --- > character cFormatRef_49 = new character(_cFormatRef_49); 1845c1845 < integer iLocking = new integer(_iLocking); --- > integer iLocking_2 = new integer(_iLocking_2); 1849,1850c1849,1850 < Job98R.this.cFormatRefRef17 = cFormatRefRef17; < Job98R.this.iLocking = iLocking; --- > Job98R.this.cFormatRef_49 = cFormatRef_49; > Job98R.this.iLocking_2 = iLocking_2; 1864c1864 < public logical setMarginBottom(final character _cWorksheetRefRef18, final decimal _dMarginRef3) --- > public logical setMarginBottom(final character _cWorksheetRef_54, final decimal _dMargin_12) 1868c1868 < character cWorksheetRefRef18 = new character(_cWorksheetRefRef18); --- > character cWorksheetRef_54 = new character(_cWorksheetRef_54); 1870c1870 < decimal dMarginRef3 = new decimal(_dMarginRef3); --- > decimal dMargin_12 = new decimal(_dMargin_12); 1874,1875c1874,1875 < Job98R.this.cWorksheetRefRef18 = cWorksheetRefRef18; < Job98R.this.dMarginRef3 = dMarginRef3; --- > Job98R.this.cWorksheetRef_54 = cWorksheetRef_54; > Job98R.this.dMargin_12 = dMargin_12; 1889c1889 < public logical setMarginLeft(final character _cWorksheetRefRef19, final decimal _dMarginRef4) --- > public logical setMarginLeft(final character _cWorksheetRef_55, final decimal _dMargin_13) 1893c1893 < character cWorksheetRefRef19 = new character(_cWorksheetRefRef19); --- > character cWorksheetRef_55 = new character(_cWorksheetRef_55); 1895c1895 < decimal dMarginRef4 = new decimal(_dMarginRef4); --- > decimal dMargin_13 = new decimal(_dMargin_13); 1899,1900c1899,1900 < Job98R.this.cWorksheetRefRef19 = cWorksheetRefRef19; < Job98R.this.dMarginRef4 = dMarginRef4; --- > Job98R.this.cWorksheetRef_55 = cWorksheetRef_55; > Job98R.this.dMargin_13 = dMargin_13; 1914c1914 < public logical setMarginRight(final character _cWorksheetRefRef20, final decimal _dMarginRef5) --- > public logical setMarginRight(final character _cWorksheetRef_56, final decimal _dMargin_14) 1918c1918 < character cWorksheetRefRef20 = new character(_cWorksheetRefRef20); --- > character cWorksheetRef_56 = new character(_cWorksheetRef_56); 1920c1920 < decimal dMarginRef5 = new decimal(_dMarginRef5); --- > decimal dMargin_14 = new decimal(_dMargin_14); 1924,1925c1924,1925 < Job98R.this.cWorksheetRefRef20 = cWorksheetRefRef20; < Job98R.this.dMarginRef5 = dMarginRef5; --- > Job98R.this.cWorksheetRef_56 = cWorksheetRef_56; > Job98R.this.dMargin_14 = dMargin_14; 1939c1939 < public logical setMarginTop(final character _cWorksheetRefRef21, final decimal _dMarginRef6) --- > public logical setMarginTop(final character _cWorksheetRef_57, final decimal _dMargin_15) 1943c1943 < character cWorksheetRefRef21 = new character(_cWorksheetRefRef21); --- > character cWorksheetRef_57 = new character(_cWorksheetRef_57); 1945c1945 < decimal dMarginRef6 = new decimal(_dMarginRef6); --- > decimal dMargin_15 = new decimal(_dMargin_15); 1949,1950c1949,1950 < Job98R.this.cWorksheetRefRef21 = cWorksheetRefRef21; < Job98R.this.dMarginRef6 = dMarginRef6; --- > Job98R.this.cWorksheetRef_57 = cWorksheetRef_57; > Job98R.this.dMargin_15 = dMargin_15; 1964c1964 < public logical setMargins(final character _cWorksheetRefRef22, final decimal _dMarginRef7) --- > public logical setMargins(final character _cWorksheetRef_58, final decimal _dMargin_16) 1968c1968 < character cWorksheetRefRef22 = new character(_cWorksheetRefRef22); --- > character cWorksheetRef_58 = new character(_cWorksheetRef_58); 1970c1970 < decimal dMarginRef7 = new decimal(_dMarginRef7); --- > decimal dMargin_16 = new decimal(_dMargin_16); 1974,1975c1974,1975 < Job98R.this.cWorksheetRefRef22 = cWorksheetRefRef22; < Job98R.this.dMarginRef7 = dMarginRef7; --- > Job98R.this.cWorksheetRef_58 = cWorksheetRef_58; > Job98R.this.dMargin_16 = dMargin_16; 1989c1989 < public logical setMarginsLr(final character _cWorksheetRefRef23, final decimal _dMarginRef8) --- > public logical setMarginsLr(final character _cWorksheetRef_59, final decimal _dMargin_17) 1993c1993 < character cWorksheetRefRef23 = new character(_cWorksheetRefRef23); --- > character cWorksheetRef_59 = new character(_cWorksheetRef_59); 1995c1995 < decimal dMarginRef8 = new decimal(_dMarginRef8); --- > decimal dMargin_17 = new decimal(_dMargin_17); 1999,2000c1999,2000 < Job98R.this.cWorksheetRefRef23 = cWorksheetRefRef23; < Job98R.this.dMarginRef8 = dMarginRef8; --- > Job98R.this.cWorksheetRef_59 = cWorksheetRef_59; > Job98R.this.dMargin_17 = dMargin_17; 2014c2014 < public logical setMarginsTb(final character _cWorksheetRefRef24, final decimal _dMarginRef9) --- > public logical setMarginsTb(final character _cWorksheetRef_60, final decimal _dMargin_18) 2018c2018 < character cWorksheetRefRef24 = new character(_cWorksheetRefRef24); --- > character cWorksheetRef_60 = new character(_cWorksheetRef_60); 2020c2020 < decimal dMarginRef9 = new decimal(_dMarginRef9); --- > decimal dMargin_18 = new decimal(_dMargin_18); 2024,2025c2024,2025 < Job98R.this.cWorksheetRefRef24 = cWorksheetRefRef24; < Job98R.this.dMarginRef9 = dMarginRef9; --- > Job98R.this.cWorksheetRef_60 = cWorksheetRef_60; > Job98R.this.dMargin_18 = dMargin_18; 2039c2039 < public logical setMerge(final character _cFormatRefRef18) --- > public logical setMerge(final character _cFormatRef_50) 2043c2043 < character cFormatRefRef18 = new character(_cFormatRefRef18); --- > character cFormatRef_50 = new character(_cFormatRef_50); 2047c2047 < Job98R.this.cFormatRefRef18 = cFormatRefRef18; --- > Job98R.this.cFormatRef_50 = cFormatRef_50; 2061c2061 < public logical setNumberFormat(final character _cFormatRefRef19, final character _cNumFormat) --- > public logical setNumberFormat(final character _cFormatRef_51, final character _cNumFormat_2) 2065c2065 < character cFormatRefRef19 = new character(_cFormatRefRef19); --- > character cFormatRef_51 = new character(_cFormatRef_51); 2067c2067 < character cNumFormat = new character(_cNumFormat); --- > character cNumFormat_2 = new character(_cNumFormat_2); 2071,2072c2071,2072 < Job98R.this.cFormatRefRef19 = cFormatRefRef19; < Job98R.this.cNumFormat = cNumFormat; --- > Job98R.this.cFormatRef_51 = cFormatRef_51; > Job98R.this.cNumFormat_2 = cNumFormat_2; 2086c2086 < public logical setPaper(final character _cWorksheetRefRef25, final integer _iPaperType) --- > public logical setPaper(final character _cWorksheetRef_61, final integer _iPaperType_2) 2090c2090 < character cWorksheetRefRef25 = new character(_cWorksheetRefRef25); --- > character cWorksheetRef_61 = new character(_cWorksheetRef_61); 2092c2092 < integer iPaperType = new integer(_iPaperType); --- > integer iPaperType_2 = new integer(_iPaperType_2); 2096,2097c2096,2097 < Job98R.this.cWorksheetRefRef25 = cWorksheetRefRef25; < Job98R.this.iPaperType = iPaperType; --- > Job98R.this.cWorksheetRef_61 = cWorksheetRef_61; > Job98R.this.iPaperType_2 = iPaperType_2; 2111c2111 < public logical setPattern(final character _cFormatRefRef20, final integer _iPattern) --- > public logical setPattern(final character _cFormatRef_52, final integer _iPattern_2) 2115c2115 < character cFormatRefRef20 = new character(_cFormatRefRef20); --- > character cFormatRef_52 = new character(_cFormatRef_52); 2117c2117 < integer iPattern = new integer(_iPattern); --- > integer iPattern_2 = new integer(_iPattern_2); 2121,2122c2121,2122 < Job98R.this.cFormatRefRef20 = cFormatRefRef20; < Job98R.this.iPattern = iPattern; --- > Job98R.this.cFormatRef_52 = cFormatRef_52; > Job98R.this.iPattern_2 = iPattern_2; 2137c2137 < public logical setPortrait(final character _cWorksheetRefRef26) --- > public logical setPortrait(final character _cWorksheetRef_62) 2141c2141 < character cWorksheetRefRef26 = new character(_cWorksheetRefRef26); --- > character cWorksheetRef_62 = new character(_cWorksheetRef_62); 2145c2145 < Job98R.this.cWorksheetRefRef26 = cWorksheetRefRef26; --- > Job98R.this.cWorksheetRef_62 = cWorksheetRef_62; 2159c2159 < public logical setPrintScale(final character _cWorksheetRefRef27, final integer _iScale) --- > public logical setPrintScale(final character _cWorksheetRef_63, final integer _iScale_2) 2163c2163 < character cWorksheetRefRef27 = new character(_cWorksheetRefRef27); --- > character cWorksheetRef_63 = new character(_cWorksheetRef_63); 2165c2165 < integer iScale = new integer(_iScale); --- > integer iScale_2 = new integer(_iScale_2); 2169,2170c2169,2170 < Job98R.this.cWorksheetRefRef27 = cWorksheetRefRef27; < Job98R.this.iScale = iScale; --- > Job98R.this.cWorksheetRef_63 = cWorksheetRef_63; > Job98R.this.iScale_2 = iScale_2; 2184c2184 < public logical setRotation(final character _cFormatRefRef21, final integer _iRotation) --- > public logical setRotation(final character _cFormatRef_53, final integer _iRotation_2) 2188c2188 < character cFormatRefRef21 = new character(_cFormatRefRef21); --- > character cFormatRef_53 = new character(_cFormatRef_53); 2190c2190 < integer iRotation = new integer(_iRotation); --- > integer iRotation_2 = new integer(_iRotation_2); 2194,2195c2194,2195 < Job98R.this.cFormatRefRef21 = cFormatRefRef21; < Job98R.this.iRotation = iRotation; --- > Job98R.this.cFormatRef_53 = cFormatRef_53; > Job98R.this.iRotation_2 = iRotation_2; 2209c2209 < public logical setRow(final character _cWorksheetRefRef28, final integer _iRowRef2, final integer _iHeightRef2, final character _cFormatRefRef22, final integer _iHiddenRef3, final integer _iLevelRef2) --- > public logical setRow(final character _cWorksheetRef_64, final integer _iRow_11, final integer _iHeight_4, final character _cFormatRef_54, final integer _iHidden_6, final integer _iLevel_4) 2213c2213 < character cWorksheetRefRef28 = new character(_cWorksheetRefRef28); --- > character cWorksheetRef_64 = new character(_cWorksheetRef_64); 2215c2215 < integer iRowRef2 = new integer(_iRowRef2); --- > integer iRow_11 = new integer(_iRow_11); 2217c2217 < integer iHeightRef2 = new integer(_iHeightRef2); --- > integer iHeight_4 = new integer(_iHeight_4); 2219c2219 < character cFormatRefRef22 = new character(_cFormatRefRef22); --- > character cFormatRef_54 = new character(_cFormatRef_54); 2221c2221 < integer iHiddenRef3 = new integer(_iHiddenRef3); --- > integer iHidden_6 = new integer(_iHidden_6); 2223c2223 < integer iLevelRef2 = new integer(_iLevelRef2); --- > integer iLevel_4 = new integer(_iLevel_4); 2227,2232c2227,2232 < Job98R.this.cWorksheetRefRef28 = cWorksheetRefRef28; < Job98R.this.iRowRef2 = iRowRef2; < Job98R.this.iHeightRef2 = iHeightRef2; < Job98R.this.cFormatRefRef22 = cFormatRefRef22; < Job98R.this.iHiddenRef3 = iHiddenRef3; < Job98R.this.iLevelRef2 = iLevelRef2; --- > Job98R.this.cWorksheetRef_64 = cWorksheetRef_64; > Job98R.this.iRow_11 = iRow_11; > Job98R.this.iHeight_4 = iHeight_4; > Job98R.this.cFormatRef_54 = cFormatRef_54; > Job98R.this.iHidden_6 = iHidden_6; > Job98R.this.iLevel_4 = iLevel_4; 2246c2246 < public logical setScript(final character _cFormatRefRef23, final integer _iFontScript) --- > public logical setScript(final character _cFormatRef_55, final integer _iFontScript_2) 2250c2250 < character cFormatRefRef23 = new character(_cFormatRefRef23); --- > character cFormatRef_55 = new character(_cFormatRef_55); 2252c2252 < integer iFontScript = new integer(_iFontScript); --- > integer iFontScript_2 = new integer(_iFontScript_2); 2256,2257c2256,2257 < Job98R.this.cFormatRefRef23 = cFormatRefRef23; < Job98R.this.iFontScript = iFontScript; --- > Job98R.this.cFormatRef_55 = cFormatRef_55; > Job98R.this.iFontScript_2 = iFontScript_2; 2271c2271 < public logical setSize(final character _cFormatRefRef24, final integer _iFontSize) --- > public logical setSize(final character _cFormatRef_56, final integer _iFontSize_2) 2275c2275 < character cFormatRefRef24 = new character(_cFormatRefRef24); --- > character cFormatRef_56 = new character(_cFormatRef_56); 2277c2277 < integer iFontSize = new integer(_iFontSize); --- > integer iFontSize_2 = new integer(_iFontSize_2); 2281,2282c2281,2282 < Job98R.this.cFormatRefRef24 = cFormatRefRef24; < Job98R.this.iFontSize = iFontSize; --- > Job98R.this.cFormatRef_56 = cFormatRef_56; > Job98R.this.iFontSize_2 = iFontSize_2; 2296c2296 < public logical setStrikeout(final character _cFormatRefRef25, final integer _iFontStrikeOut) --- > public logical setStrikeout(final character _cFormatRef_57, final integer _iFontStrikeOut_2) 2300c2300 < character cFormatRefRef25 = new character(_cFormatRefRef25); --- > character cFormatRef_57 = new character(_cFormatRef_57); 2302c2302 < integer iFontStrikeOut = new integer(_iFontStrikeOut); --- > integer iFontStrikeOut_2 = new integer(_iFontStrikeOut_2); 2306,2307c2306,2307 < Job98R.this.cFormatRefRef25 = cFormatRefRef25; < Job98R.this.iFontStrikeOut = iFontStrikeOut; --- > Job98R.this.cFormatRef_57 = cFormatRef_57; > Job98R.this.iFontStrikeOut_2 = iFontStrikeOut_2; 2321c2321 < public logical setTextWrap(final character _cFormatRefRef26) --- > public logical setTextWrap(final character _cFormatRef_58) 2325c2325 < character cFormatRefRef26 = new character(_cFormatRefRef26); --- > character cFormatRef_58 = new character(_cFormatRef_58); 2329c2329 < Job98R.this.cFormatRefRef26 = cFormatRefRef26; --- > Job98R.this.cFormatRef_58 = cFormatRef_58; 2343c2343 < public logical setUnderline(final character _cFormatRefRef27, final integer _iFontUnderline) --- > public logical setUnderline(final character _cFormatRef_59, final integer _iFontUnderline_2) 2347c2347 < character cFormatRefRef27 = new character(_cFormatRefRef27); --- > character cFormatRef_59 = new character(_cFormatRef_59); 2349c2349 < integer iFontUnderline = new integer(_iFontUnderline); --- > integer iFontUnderline_2 = new integer(_iFontUnderline_2); 2353,2354c2353,2354 < Job98R.this.cFormatRefRef27 = cFormatRefRef27; < Job98R.this.iFontUnderline = iFontUnderline; --- > Job98R.this.cFormatRef_59 = cFormatRef_59; > Job98R.this.iFontUnderline_2 = iFontUnderline_2; 2368c2368 < public logical setVPagebreaks(final character _cWorksheetRefRef29, final integer _iRowRef3) --- > public logical setVPagebreaks(final character _cWorksheetRef_65, final integer _iRow_12) 2372c2372 < character cWorksheetRefRef29 = new character(_cWorksheetRefRef29); --- > character cWorksheetRef_65 = new character(_cWorksheetRef_65); 2374c2374 < integer iRowRef3 = new integer(_iRowRef3); --- > integer iRow_12 = new integer(_iRow_12); 2378,2379c2378,2379 < Job98R.this.cWorksheetRefRef29 = cWorksheetRefRef29; < Job98R.this.iRowRef3 = iRowRef3; --- > Job98R.this.cWorksheetRef_65 = cWorksheetRef_65; > Job98R.this.iRow_12 = iRow_12; 2410c2410 < public logical writeBlank(final character _cWorksheetRefRef30, final integer _iRowRef4, final integer _iCol, final character _cFormatRefRef28) --- > public logical writeBlank(final character _cWorksheetRef_66, final integer _iRow_13, final integer _iCol_7, final character _cFormatRef_60) 2414c2414 < character cWorksheetRefRef30 = new character(_cWorksheetRefRef30); --- > character cWorksheetRef_66 = new character(_cWorksheetRef_66); 2416c2416 < integer iRowRef4 = new integer(_iRowRef4); --- > integer iRow_13 = new integer(_iRow_13); 2418c2418 < integer iCol = new integer(_iCol); --- > integer iCol_7 = new integer(_iCol_7); 2420c2420 < character cFormatRefRef28 = new character(_cFormatRefRef28); --- > character cFormatRef_60 = new character(_cFormatRef_60); 2424,2427c2424,2427 < Job98R.this.cWorksheetRefRef30 = cWorksheetRefRef30; < Job98R.this.iRowRef4 = iRowRef4; < Job98R.this.iCol = iCol; < Job98R.this.cFormatRefRef28 = cFormatRefRef28; --- > Job98R.this.cWorksheetRef_66 = cWorksheetRef_66; > Job98R.this.iRow_13 = iRow_13; > Job98R.this.iCol_7 = iCol_7; > Job98R.this.cFormatRef_60 = cFormatRef_60; 2441c2441 < public logical writeComment(final character _cWorksheetRefRef31, final integer _iRowRef5, final integer _iColRef2, final character _cValueRef3) --- > public logical writeComment(final character _cWorksheetRef_67, final integer _iRow_14, final integer _iCol_8, final character _cValue_6) 2445c2445 < character cWorksheetRefRef31 = new character(_cWorksheetRefRef31); --- > character cWorksheetRef_67 = new character(_cWorksheetRef_67); 2447c2447 < integer iRowRef5 = new integer(_iRowRef5); --- > integer iRow_14 = new integer(_iRow_14); 2449c2449 < integer iColRef2 = new integer(_iColRef2); --- > integer iCol_8 = new integer(_iCol_8); 2451c2451 < character cValueRef3 = new character(_cValueRef3); --- > character cValue_6 = new character(_cValue_6); 2455,2458c2455,2458 < Job98R.this.cWorksheetRefRef31 = cWorksheetRefRef31; < Job98R.this.iRowRef5 = iRowRef5; < Job98R.this.iColRef2 = iColRef2; < Job98R.this.cValueRef3 = cValueRef3; --- > Job98R.this.cWorksheetRef_67 = cWorksheetRef_67; > Job98R.this.iRow_14 = iRow_14; > Job98R.this.iCol_8 = iCol_8; > Job98R.this.cValue_6 = cValue_6; 2472c2472 < public logical writeGen(final character _cWorksheetRefRef32, final integer _iRowRef6, final integer _iColRef3, final character _sValue, final character _cFormatRefRef29) --- > public logical writeGen(final character _cWorksheetRef_68, final integer _iRow_15, final integer _iCol_9, final character _sValue_2, final character _cFormatRef_61) 2476c2476 < character cWorksheetRefRef32 = new character(_cWorksheetRefRef32); --- > character cWorksheetRef_68 = new character(_cWorksheetRef_68); 2478c2478 < integer iRowRef6 = new integer(_iRowRef6); --- > integer iRow_15 = new integer(_iRow_15); 2480c2480 < integer iColRef3 = new integer(_iColRef3); --- > integer iCol_9 = new integer(_iCol_9); 2482c2482 < character sValue = new character(_sValue); --- > character sValue_2 = new character(_sValue_2); 2484c2484 < character cFormatRefRef29 = new character(_cFormatRefRef29); --- > character cFormatRef_61 = new character(_cFormatRef_61); 2488,2492c2488,2492 < Job98R.this.cWorksheetRefRef32 = cWorksheetRefRef32; < Job98R.this.iRowRef6 = iRowRef6; < Job98R.this.iColRef3 = iColRef3; < Job98R.this.sValue = sValue; < Job98R.this.cFormatRefRef29 = cFormatRefRef29; --- > Job98R.this.cWorksheetRef_68 = cWorksheetRef_68; > Job98R.this.iRow_15 = iRow_15; > Job98R.this.iCol_9 = iCol_9; > Job98R.this.sValue_2 = sValue_2; > Job98R.this.cFormatRef_61 = cFormatRef_61; 2506c2506 < public logical writeNumber(final character _cWorksheetRefRef33, final integer _iRowRef7, final integer _iColRef4, final decimal _dNumber, final character _cFormatRefRef30) --- > public logical writeNumber(final character _cWorksheetRef_69, final integer _iRow_16, final integer _iCol_10, final decimal _dNumber_2, final character _cFormatRef_62) 2510c2510 < character cWorksheetRefRef33 = new character(_cWorksheetRefRef33); --- > character cWorksheetRef_69 = new character(_cWorksheetRef_69); 2512c2512 < integer iRowRef7 = new integer(_iRowRef7); --- > integer iRow_16 = new integer(_iRow_16); 2514c2514 < integer iColRef4 = new integer(_iColRef4); --- > integer iCol_10 = new integer(_iCol_10); 2516c2516 < decimal dNumber = new decimal(_dNumber); --- > decimal dNumber_2 = new decimal(_dNumber_2); 2518c2518 < character cFormatRefRef30 = new character(_cFormatRefRef30); --- > character cFormatRef_62 = new character(_cFormatRef_62); 2522,2526c2522,2526 < Job98R.this.cWorksheetRefRef33 = cWorksheetRefRef33; < Job98R.this.iRowRef7 = iRowRef7; < Job98R.this.iColRef4 = iColRef4; < Job98R.this.dNumber = dNumber; < Job98R.this.cFormatRefRef30 = cFormatRefRef30; --- > Job98R.this.cWorksheetRef_69 = cWorksheetRef_69; > Job98R.this.iRow_16 = iRow_16; > Job98R.this.iCol_10 = iCol_10; > Job98R.this.dNumber_2 = dNumber_2; > Job98R.this.cFormatRef_62 = cFormatRef_62; 2540c2540 < public logical writeString(final character _cWorksheetRefRef34, final integer _iRowRef8, final integer _iColRef5, final character _cString, final character _cFormatRefRef31) --- > public logical writeString(final character _cWorksheetRef_70, final integer _iRow_17, final integer _iCol_11, final character _cString_2, final character _cFormatRef_63) 2544c2544 < character cWorksheetRefRef34 = new character(_cWorksheetRefRef34); --- > character cWorksheetRef_70 = new character(_cWorksheetRef_70); 2546c2546 < integer iRowRef8 = new integer(_iRowRef8); --- > integer iRow_17 = new integer(_iRow_17); 2548c2548 < integer iColRef5 = new integer(_iColRef5); --- > integer iCol_11 = new integer(_iCol_11); 2550c2550 < character cString = new character(_cString); --- > character cString_2 = new character(_cString_2); 2552c2552 < character cFormatRefRef31 = new character(_cFormatRefRef31); --- > character cFormatRef_63 = new character(_cFormatRef_63); 2556,2560c2556,2560 < Job98R.this.cWorksheetRefRef34 = cWorksheetRefRef34; < Job98R.this.iRowRef8 = iRowRef8; < Job98R.this.iColRef5 = iColRef5; < Job98R.this.cString = cString; < Job98R.this.cFormatRefRef31 = cFormatRefRef31; --- > Job98R.this.cWorksheetRef_70 = cWorksheetRef_70; > Job98R.this.iRow_17 = iRow_17; > Job98R.this.iCol_11 = iCol_11; > Job98R.this.cString_2 = cString_2; > Job98R.this.cFormatRef_63 = cFormatRef_63; 2574c2574 < public logical writeTest(final character _cWorksheetRef, final character _cParseMe) --- > public logical writeTest(final character _cWorksheetRef_71, final character _cParseMe_2) 2578c2578 < character cWorksheetRef = new character(_cWorksheetRef); --- > character cWorksheetRef_71 = new character(_cWorksheetRef_71); 2580c2580 < character cParseMe = new character(_cParseMe); --- > character cParseMe_2 = new character(_cParseMe_2); 2589c2589 < public logical writeUrl(final character _cWorksheetRefRef35, final integer _iRowRef9, final integer _iColRef6, final character _cUrl, final character _cHref, final character _cFormatRefRef32) --- > public logical writeUrl(final character _cWorksheetRef_72, final integer _iRow_18, final integer _iCol_12, final character _cUrl_2, final character _cHref_2, final character _cFormatRef_64) 2593c2593 < character cWorksheetRefRef35 = new character(_cWorksheetRefRef35); --- > character cWorksheetRef_72 = new character(_cWorksheetRef_72); 2595c2595 < integer iRowRef9 = new integer(_iRowRef9); --- > integer iRow_18 = new integer(_iRow_18); 2597c2597 < integer iColRef6 = new integer(_iColRef6); --- > integer iCol_12 = new integer(_iCol_12); 2599c2599 < character cUrl = new character(_cUrl); --- > character cUrl_2 = new character(_cUrl_2); 2601c2601 < character cHref = new character(_cHref); --- > character cHref_2 = new character(_cHref_2); 2603c2603 < character cFormatRefRef32 = new character(_cFormatRefRef32); --- > character cFormatRef_64 = new character(_cFormatRef_64); 2607,2612c2607,2612 < Job98R.this.cWorksheetRefRef35 = cWorksheetRefRef35; < Job98R.this.iRowRef9 = iRowRef9; < Job98R.this.iColRef6 = iColRef6; < Job98R.this.cUrl = cUrl; < Job98R.this.cHref = cHref; < Job98R.this.cFormatRefRef32 = cFormatRefRef32; --- > Job98R.this.cWorksheetRef_72 = cWorksheetRef_72; > Job98R.this.iRow_18 = iRow_18; > Job98R.this.iCol_12 = iCol_12; > Job98R.this.cUrl_2 = cUrl_2; > Job98R.this.cHref_2 = cHref_2; > Job98R.this.cFormatRef_64 = cFormatRef_64; 2626c2626 < public void excelData(final integer _iRow) --- > public void excelData(final integer _iRow_19) 2630c2630 < integer iRow = new integer(_iRow); --- > integer iRow_19 = new integer(_iRow_19); 2634c2634 < TransactionManager.registerUndo(iRow); --- > TransactionManager.registerUndo(iRow_19); 2639c2639 < writeGen(new character("DATA"), iRow, new integer(0), ttEmployee.getEmpName(), new character()); --- > writeGen(new character("DATA"), iRow_19, new integer(0), ttEmployee.getEmpName(), new character()); 2642c2642 < writeGen(new character("DATA"), iRow, new integer(1), ttEmployee.getMpCode(), new character()); --- > writeGen(new character("DATA"), iRow_19, new integer(1), ttEmployee.getMpCode(), new character()); 2646c2646 < writeBlank(new character("DATA"), iRow, new integer(1), new character()); --- > writeBlank(new character("DATA"), iRow_19, new integer(1), new character()); 2648,2651c2648,2651 < writeGen(new character("DATA"), iRow, new integer(2), ttEmployee.getDaysOff(), new character()); < writeGen(new character("DATA"), iRow, new integer(3), ttEmployee.getSkillCode(), new character()); < writeGen(new character("DATA"), iRow, new integer(4), ttEmployee.getCrewCode(), new character()); < writeGen(new character("DATA"), iRow, new integer(5), ttEmployee.getTmpCrew(), new character()); --- > writeGen(new character("DATA"), iRow_19, new integer(2), ttEmployee.getDaysOff(), new character()); > writeGen(new character("DATA"), iRow_19, new integer(3), ttEmployee.getSkillCode(), new character()); > writeGen(new character("DATA"), iRow_19, new integer(4), ttEmployee.getCrewCode(), new character()); > writeGen(new character("DATA"), iRow_19, new integer(5), ttEmployee.getTmpCrew(), new character()); 2654c2654 < writeGen(new character("DATA"), iRow, new integer(6), new character(valueOf(ttEmployee.getSeniorityDate(), "99/99/9999")), new character()); --- > writeGen(new character("DATA"), iRow_19, new integer(6), new character(valueOf(ttEmployee.getSeniorityDate(), "99/99/9999")), new character()); 2658c2658 < writeBlank(new character("DATA"), iRow, new integer(6), new character()); --- > writeBlank(new character("DATA"), iRow_19, new integer(6), new character()); 2660,2664c2660,2664 < writeGen(new character("DATA"), iRow, new integer(7), new character(valueOf(ttEmployee.getEmpNum())), new character()); < writeGen(new character("DATA"), iRow, new integer(8), ttEmployee.getTeamleadName(), new character()); < writeGen(new character("DATA"), iRow, new integer(9), ttEmployee.getSupervisorName(), new character()); < writeGen(new character("DATA"), iRow, new integer(10), new character(valueOf(ttEmployee.getShift())), new character()); < writeGen(new character("DATA"), iRow, new integer(11), new character(valueOf(ttEmployee.getVendNum())), new character()); --- > writeGen(new character("DATA"), iRow_19, new integer(7), new character(valueOf(ttEmployee.getEmpNum())), new character()); > writeGen(new character("DATA"), iRow_19, new integer(8), ttEmployee.getTeamleadName(), new character()); > writeGen(new character("DATA"), iRow_19, new integer(9), ttEmployee.getSupervisorName(), new character()); > writeGen(new character("DATA"), iRow_19, new integer(10), new character(valueOf(ttEmployee.getShift())), new character()); > writeGen(new character("DATA"), iRow_19, new integer(11), new character(valueOf(ttEmployee.getVendNum())), new character()); 2669c2669 < public void getCritria(final logical tStatus) --- > public void getCritria(final logical tStatus_2) 2677,2678c2677,2678 < TransactionManager.register(saveInfile, tStatus); < tStatus.assign(new logical(false)); --- > TransactionManager.register(saveInfile, tStatus_2); > tStatus_2.assign(new logical(false)); 2790c2790 < new Element(tDateRef2, fInFrame.widgetTDate()) --- > new Element(tDate, fInFrame.widgetTDate()) 2862c2862 < tStatus.assign(true); --- > tStatus_2.assign(true); 2871c2871 < character tStatusDefault = new character("Building view, please wait "); --- > character tStatusDefault_2 = new character("Building view, please wait "); 2877c2877 < TransactionManager.register(tStatusDefault, i); --- > TransactionManager.register(tStatusDefault_2, i); 2988c2988 < if (_isGreaterThan(length(tStatusDefault), 50)) --- > if (_isGreaterThan(length(tStatusDefault_2), 50)) 2990c2990 < tStatusDefault.assign("Building view, please wait "); --- > tStatusDefault_2.assign("Building view, please wait "); 2992,2993c2992,2993 < tStatusDefault.assign(concat(tStatusDefault, ".")); < statusDefault(tStatusDefault); --- > tStatusDefault_2.assign(concat(tStatusDefault_2, ".")); > statusDefault(tStatusDefault_2); 3405,3406c3405,3406 < tDateRef2, < tDateRef2 --- > tDate, > tDate 3586c3586 < public void writeTmpDetail(final integer _iAct) --- > public void writeTmpDetail(final integer _iAct_2) 3590c3590 < integer iAct = new integer(_iAct); --- > integer iAct_2 = new integer(_iAct_2); 3594c3594 < TransactionManager.registerUndo(iAct); --- > TransactionManager.registerUndo(iAct_2); 3599c3599 < if (_isLessThanOrEqual(iAct, ttEmployee.getCrewTgtSize())) --- > if (_isLessThanOrEqual(iAct_2, ttEmployee.getCrewTgtSize())) 3601c3601 < writeGen(new character(concat("S", valueOf(ttEmployee.getSupervisorNum()))), curRow, curCol, new character(valueOf(iAct)), new character()); --- > writeGen(new character(concat("S", valueOf(ttEmployee.getSupervisorNum()))), curRow, curCol, new character(valueOf(iAct_2)), new character()); 3627c3627 < return concat("$", cWorksheetRef, "->activate();", chr(10)); --- > return concat("$", cWorksheetRef_37, "->activate();", chr(10)); 3636c3636 < return concat("$", cFormatRef, " = ", "$", cWorkBookRef, "->add_format();", chr(10)); --- > return concat("$", cFormatRef_33, " = ", "$", cWorkBookRef_3, "->add_format();", chr(10)); 3645c3645 < return concat("$", cWorksheetRefRef2, " = ", "$", cWorkbookRef, "->add_worksheet('", cWorksheetName, "');", chr(10)); --- > return concat("$", cWorksheetRef_38, " = ", "$", cWorkbookRef_2, "->add_worksheet('", cWorksheetName_2, "');", chr(10)); 3654c3654 < return concat("$", cWorksheetRefRef3, "->center_horizontally();", chr(10)); --- > return concat("$", cWorksheetRef_39, "->center_horizontally();", chr(10)); 3663c3663 < return concat("$", cWorksheetRefRef4, "->center_vertically();", chr(10)); --- > return concat("$", cWorksheetRef_40, "->center_vertically();", chr(10)); 3672c3672 < return concat("$", cWorkbook, "->close();", chr(10)); --- > return concat("$", cWorkbook_2, "->close();", chr(10)); 3681c3681 < return concat("$", cWorksheetRefRef5, "->fit_to_pages(", (_notUnknown(iWidth) ? valueOf(iWidth) : new character("undef")), ",", (_notUnknown(iHeight) ? valueOf(iHeight) : new character("undef")), ");", chr(10)); --- > return concat("$", cWorksheetRef_41, "->fit_to_pages(", (_notUnknown(iWidth_3) ? valueOf(iWidth_3) : new character("undef")), ",", (_notUnknown(iHeight_3) ? valueOf(iHeight_3) : new character("undef")), ");", chr(10)); 3690c3690 < return concat("$", cWorksheetRefRef6, "->hide_gridlines(", valueOf(iOption), ");", chr(10)); --- > return concat("$", cWorksheetRef_42, "->hide_gridlines(", valueOf(iOption_2), ");", chr(10)); 3699c3699 < return concat("$", cWorksheetRefRef7, "->keep_leading_zeros(", valueOf(iOnoff), ");", chr(10)); --- > return concat("$", cWorksheetRef_43, "->keep_leading_zeros(", valueOf(iOnoff_2), ");", chr(10)); 3717c3717 < return concat("my $", cWorkBookRefRef2, " = Spreadsheet::WriteExcel->new('", cOutExcel, "');", chr(10)); --- > return concat("my $", cWorkBookRef_4, " = Spreadsheet::WriteExcel->new('", cOutExcel_2, "');", chr(10)); 3726c3726 < return concat("$", cWorksheetRefRef8, "->print_row_col_headers();", chr(10)); --- > return concat("$", cWorksheetRef_44, "->print_row_col_headers();", chr(10)); 3735c3735 < return concat("$", cWorksheetRefRef9, "->protect(", (_isUnknown(cPassword) ? new character(");") : concat("'", cPassword, "');")), chr(10)); --- > return concat("$", cWorksheetRef_45, "->protect(", (_isUnknown(cPassword_2) ? new character(");") : concat("'", cPassword_2, "');")), chr(10)); 3744c3744 < return concat("$", cWorksheetRefRef10, "->repeat_columns(", valueOf(iFrow), ",", valueOf(iLrow), ");", chr(10)); --- > return concat("$", cWorksheetRef_46, "->repeat_columns(", valueOf(iFrow_3), ",", valueOf(iLrow_3), ");", chr(10)); 3753c3753 < return concat("$", cWorksheetRefRef11, "->repeat_rows(", valueOf(iFrowRef2), ",", valueOf(iLrowRef2), ");", chr(10)); --- > return concat("$", cWorksheetRef_47, "->repeat_rows(", valueOf(iFrow_4), ",", valueOf(iLrow_4), ");", chr(10)); 3762c3762 < return concat("$", cWorksheetRefRef12, "->select();", chr(10)); --- > return concat("$", cWorksheetRef_48, "->select();", chr(10)); 3771c3771 < return concat("$", cFormatRefRef2, "->set_align('", cAlign, "');", chr(10)); --- > return concat("$", cFormatRef_34, "->set_align('", cAlign_2, "');", chr(10)); 3780c3780 < return concat("$", cFormatRefRef3, "->set_bg_color('", cBgcolor, "');", chr(10)); --- > return concat("$", cFormatRef_35, "->set_bg_color('", cBgcolor_2, "');", chr(10)); 3789c3789 < return concat("$", cFormatRefRef4, "->set_bold("); --- > return concat("$", cFormatRef_36, "->set_bold("); 3798c3798 < return concat(valueOf(iFontBold), ");", chr(10)); --- > return concat(valueOf(iFontBold_2), ");", chr(10)); 3807c3807 < return concat(cFormatRefRef5, "->set_bottom("); --- > return concat(cFormatRef_37, "->set_bottom("); 3816c3816 < return concat(valueOf(iBorder), ");", chr(10)); --- > return concat(valueOf(iBorder_6), ");", chr(10)); 3825c3825 < return concat(cFormatRefRef6, "->set_left("); --- > return concat(cFormatRef_38, "->set_left("); 3834c3834 < return concat(valueOf(iBorderRef2), ");", chr(10)); --- > return concat(valueOf(iBorder_7), ");", chr(10)); 3843c3843 < return concat(cFormatRefRef7, "->set_right("); --- > return concat(cFormatRef_39, "->set_right("); 3852c3852 < return concat(valueOf(iBorderRef3), ");", chr(10)); --- > return concat(valueOf(iBorder_8), ");", chr(10)); 3861c3861 < return concat(cFormatRefRef8, "->set_top("); --- > return concat(cFormatRef_40, "->set_top("); 3870c3870 < return concat(valueOf(iBorderRef4), ");", chr(10)); --- > return concat(valueOf(iBorder_9), ");", chr(10)); 3879c3879 < return concat("$", cFormatRefRef9, "->set_border(", valueOf(iBorderRef5), ");", chr(10)); --- > return concat("$", cFormatRef_41, "->set_border(", valueOf(iBorder_10), ");", chr(10)); 3888c3888 < return concat(cFormatRefRef10, "->set_border_color("); --- > return concat(cFormatRef_42, "->set_border_color("); 3897c3897 < return concat(valueOf(iColor), ");", chr(10)); --- > return concat(valueOf(iColor_3), ");", chr(10)); 3906c3906 < return concat("$", cFormatRefRef11, "->set_color('", cFontColor, "');", chr(10)); --- > return concat("$", cFormatRef_43, "->set_color('", cFontColor_2, "');", chr(10)); 3915c3915 < return concat("$", cWorksheetRefRef13, "->set_column(", valueOf(iFstCol), ",", valueOf(iLstCol), ",", (_notUnknown(iWidthRef2) ? valueOf(iWidthRef2) : new character("undef")), ",", (_notUnknown(cFormatRefRef12) ? concat("$", cFormatRefRef12) : new character("undef")), ",", (_notUnknown(iHidden) ? valueOf(iHidden) : new character("undef")), ",", (_notUnknown(iLevel) ? valueOf(iLevel) : new character("undef")), ");", chr(10)); --- > return concat("$", cWorksheetRef_49, "->set_column(", valueOf(iFstCol_2), ",", valueOf(iLstCol_2), ",", (_notUnknown(iWidth_4) ? valueOf(iWidth_4) : new character("undef")), ",", (_notUnknown(cFormatRef_44) ? concat("$", cFormatRef_44) : new character("undef")), ",", (_notUnknown(iHidden_4) ? valueOf(iHidden_4) : new character("undef")), ",", (_notUnknown(iLevel_3) ? valueOf(iLevel_3) : new character("undef")), ");", chr(10)); 3924c3924 < return concat("$", cFormatRefRef13, "->set_fg_color(", valueOf(iColorRef2), ");", chr(10)); --- > return concat("$", cFormatRef_45, "->set_fg_color(", valueOf(iColor_4), ");", chr(10)); 3933c3933 < return concat("$", cFormatRefRef14, "->set_font('", cFontName, "');", chr(10)); --- > return concat("$", cFormatRef_46, "->set_font('", cFontName_2, "');", chr(10)); 3942c3942 < return concat("$", cWorksheetRefRef14, "->set_footer('", cValue, "',", valueOf(dMargin), ");", chr(10)); --- > return concat("$", cWorksheetRef_50, "->set_footer('", cValue_4, "',", valueOf(dMargin_10), ");", chr(10)); 3951c3951 < return concat("$", cWorksheetRefRef15, "->set_h_pagebreaks(", valueOf(iRow), ");", chr(10)); --- > return concat("$", cWorksheetRef_51, "->set_h_pagebreaks(", valueOf(iRow_10), ");", chr(10)); 3960c3960 < return concat("$", cWorksheetRefRef16, "->set_header('", cValueRef2, "',", valueOf(dMarginRef2), ");", chr(10)); --- > return concat("$", cWorksheetRef_52, "->set_header('", cValue_5, "',", valueOf(dMargin_11), ");", chr(10)); 3969c3969 < return concat("$", cFormatRefRef15, "->set_hidden(", valueOf(iHiddenRef2), ");", chr(10)); --- > return concat("$", cFormatRef_47, "->set_hidden(", valueOf(iHidden_5), ");", chr(10)); 3978c3978 < return concat("$", cFormatRefRef16, "->set_italic(", valueOf(iFontItalic), ");", chr(10)); --- > return concat("$", cFormatRef_48, "->set_italic(", valueOf(iFontItalic_2), ");", chr(10)); 3987c3987 < return concat("$", cWorksheetRefRef17, "->set_landscape();", chr(10)); --- > return concat("$", cWorksheetRef_53, "->set_landscape();", chr(10)); 3996c3996 < return concat("$", cFormatRefRef17, "->set_locked(", valueOf(iLocking), ");", chr(10)); --- > return concat("$", cFormatRef_49, "->set_locked(", valueOf(iLocking_2), ");", chr(10)); 4005c4005 < return concat("$", cWorksheetRefRef18, "->set_margins_bottom(", valueOf(dMarginRef3), ");", chr(10)); --- > return concat("$", cWorksheetRef_54, "->set_margins_bottom(", valueOf(dMargin_12), ");", chr(10)); 4014c4014 < return concat("$", cWorksheetRefRef19, "->set_margins_left(", valueOf(dMarginRef4), ");", chr(10)); --- > return concat("$", cWorksheetRef_55, "->set_margins_left(", valueOf(dMargin_13), ");", chr(10)); 4023c4023 < return concat("$", cWorksheetRefRef20, "->set_margins_right(", valueOf(dMarginRef5), ");", chr(10)); --- > return concat("$", cWorksheetRef_56, "->set_margins_right(", valueOf(dMargin_14), ");", chr(10)); 4032c4032 < return concat("$", cWorksheetRefRef21, "->set_margins_top(", valueOf(dMarginRef6), ");", chr(10)); --- > return concat("$", cWorksheetRef_57, "->set_margins_top(", valueOf(dMargin_15), ");", chr(10)); 4041c4041 < return concat("$", cWorksheetRefRef22, "->set_margins(", valueOf(dMarginRef7), ");", chr(10)); --- > return concat("$", cWorksheetRef_58, "->set_margins(", valueOf(dMargin_16), ");", chr(10)); 4050c4050 < return concat("$", cWorksheetRefRef23, "->set_margins_LR(", valueOf(dMarginRef8), ");", chr(10)); --- > return concat("$", cWorksheetRef_59, "->set_margins_LR(", valueOf(dMargin_17), ");", chr(10)); 4059c4059 < return concat("$", cWorksheetRefRef24, "->set_margins_TB(", valueOf(dMarginRef9), ");", chr(10)); --- > return concat("$", cWorksheetRef_60, "->set_margins_TB(", valueOf(dMargin_18), ");", chr(10)); 4068c4068 < return concat("$", cFormatRefRef18, "->set_merge();", chr(10)); --- > return concat("$", cFormatRef_50, "->set_merge();", chr(10)); 4077c4077 < return concat("$", cFormatRefRef19, "->set_number_format('", cNumFormat, "');", chr(10)); --- > return concat("$", cFormatRef_51, "->set_number_format('", cNumFormat_2, "');", chr(10)); 4086c4086 < return concat("$", cWorksheetRefRef25, "->set_paper(", valueOf(iPaperType), ");", chr(10)); --- > return concat("$", cWorksheetRef_61, "->set_paper(", valueOf(iPaperType_2), ");", chr(10)); 4095c4095 < return concat(cFormatRefRef20, "->set_pattern(", valueOf(iPattern), ");", chr(10)); --- > return concat(cFormatRef_52, "->set_pattern(", valueOf(iPattern_2), ");", chr(10)); 4104c4104 < return concat("$", cWorksheetRefRef26, "->set_portrait();", chr(10)); --- > return concat("$", cWorksheetRef_62, "->set_portrait();", chr(10)); 4113c4113 < return concat("$", cWorksheetRefRef27, "->set_print_scale(", valueOf(iScale), ");", chr(10)); --- > return concat("$", cWorksheetRef_63, "->set_print_scale(", valueOf(iScale_2), ");", chr(10)); 4122c4122 < return concat("$", cFormatRefRef21, "->set_rotation(", valueOf(iRotation), ");", chr(10)); --- > return concat("$", cFormatRef_53, "->set_rotation(", valueOf(iRotation_2), ");", chr(10)); 4131c4131 < return concat("$", cWorksheetRefRef28, "->set_row(", valueOf(iRowRef2), ",", (_isUnknown(iHeightRef2) ? new character("undef") : valueOf(iHeightRef2)), ",", "$", cFormatRefRef22, ",", (_isUnknown(iHiddenRef3) ? new character("undef") : valueOf(iHiddenRef3)), ",", (_isUnknown(iLevelRef2) ? new character("undef") : valueOf(iLevelRef2)), ");", chr(10)); --- > return concat("$", cWorksheetRef_64, "->set_row(", valueOf(iRow_11), ",", (_isUnknown(iHeight_4) ? new character("undef") : valueOf(iHeight_4)), ",", "$", cFormatRef_54, ",", (_isUnknown(iHidden_6) ? new character("undef") : valueOf(iHidden_6)), ",", (_isUnknown(iLevel_4) ? new character("undef") : valueOf(iLevel_4)), ");", chr(10)); 4140c4140 < return concat("$", cFormatRefRef23, "->set_script(", valueOf(iFontScript), ");", chr(10)); --- > return concat("$", cFormatRef_55, "->set_script(", valueOf(iFontScript_2), ");", chr(10)); 4149c4149 < return concat("$", cFormatRefRef24, "->set_size(", valueOf(iFontSize), ");", chr(10)); --- > return concat("$", cFormatRef_56, "->set_size(", valueOf(iFontSize_2), ");", chr(10)); 4158c4158 < return concat("$", cFormatRefRef25, "->set_strikeout(", valueOf(iFontStrikeOut), ");", chr(10)); --- > return concat("$", cFormatRef_57, "->set_strikeout(", valueOf(iFontStrikeOut_2), ");", chr(10)); 4167c4167 < return concat("$", cFormatRefRef26, "->set_text_wrap();", chr(10)); --- > return concat("$", cFormatRef_58, "->set_text_wrap();", chr(10)); 4176c4176 < return concat("$", cFormatRefRef27, "->set_underline(", valueOf(iFontUnderline), ");", chr(10)); --- > return concat("$", cFormatRef_59, "->set_underline(", valueOf(iFontUnderline_2), ");", chr(10)); 4185c4185 < return concat("$", cWorksheetRefRef29, "->set_v_pagebreaks(", valueOf(iRowRef3), ");", chr(10)); --- > return concat("$", cWorksheetRef_65, "->set_v_pagebreaks(", valueOf(iRow_12), ");", chr(10)); 4194c4194 < return concat("$", cWorksheetRefRef30, "->write_blank(", valueOf(iRowRef4), ",", valueOf(iCol), ",", (_notUnknown(cFormatRefRef28) ? concat("$", cFormatRefRef28) : new character("undef")), ");", chr(10)); --- > return concat("$", cWorksheetRef_66, "->write_blank(", valueOf(iRow_13), ",", valueOf(iCol_7), ",", (_notUnknown(cFormatRef_60) ? concat("$", cFormatRef_60) : new character("undef")), ");", chr(10)); 4203c4203 < return concat("$", cWorksheetRefRef31, "->write_comment(", valueOf(iRowRef5), ",", valueOf(iColRef2), ",", cValueRef3, ");", chr(10)); --- > return concat("$", cWorksheetRef_67, "->write_comment(", valueOf(iRow_14), ",", valueOf(iCol_8), ",", cValue_6, ");", chr(10)); 4212c4212 < return concat("$", cWorksheetRefRef32, "->write(", valueOf(iRowRef6), ",", valueOf(iColRef3), ",", "\"", sValue, "\"", ",", (_notUnknown(cFormatRefRef29) ? concat("$", cFormatRefRef29) : new character("undef")), ");", chr(10)); --- > return concat("$", cWorksheetRef_68, "->write(", valueOf(iRow_15), ",", valueOf(iCol_9), ",", "\"", sValue_2, "\"", ",", (_notUnknown(cFormatRef_61) ? concat("$", cFormatRef_61) : new character("undef")), ");", chr(10)); 4221c4221 < return concat("$", cWorksheetRefRef33, "->write_number(", valueOf(iRowRef7), ",", valueOf(iColRef4), ",", valueOf(dNumber), ",", cFormatRefRef30, ");", chr(10)); --- > return concat("$", cWorksheetRef_69, "->write_number(", valueOf(iRow_16), ",", valueOf(iCol_10), ",", valueOf(dNumber_2), ",", cFormatRef_62, ");", chr(10)); 4230c4230 < return concat("$", cWorksheetRefRef34, "->write_string(", valueOf(iRowRef8), ",", valueOf(iColRef5), ",", cString, ",", cFormatRefRef31, ");", chr(10)); --- > return concat("$", cWorksheetRef_70, "->write_string(", valueOf(iRow_17), ",", valueOf(iCol_11), ",", cString_2, ",", cFormatRef_63, ");", chr(10)); 4239c4239 < return concat("$", cWorksheetRefRef35, "->write_url(", valueOf(iRowRef9), ",", valueOf(iColRef6), ",", cUrl, ",", cHref, ",", cFormatRefRef32, ");", chr(10)); --- > return concat("$", cWorksheetRef_72, "->write_url(", valueOf(iRow_18), ",", valueOf(iCol_12), ",", cUrl_2, ",", cHref_2, ",", cFormatRef_64, ");", chr(10)); diff -r generated/20130314a/src/aero/timco/majic/job/ManUpd.java generated/20130314c/src/aero/timco/majic/job/ManUpd.java 640c640 < public integer to10from36(final character _myvalue) --- > public integer to10from36(final character _myvalue_2) 644c644 < character myvalue = new character(_myvalue); --- > character myvalue_2 = new character(_myvalue_2); 658c658 < vl.assign(length(myvalue)); --- > vl.assign(length(myvalue_2)); 664c664 < vthisdigit.assign(substring(myvalue, vp, 1)); --- > vthisdigit.assign(substring(myvalue_2, vp, 1)); 701c701 < public character encrypt(final character _mystring, final character _mykey) --- > public character encrypt(final character _mystring_2, final character _mykey) 705c705 < character mystring = new character(_mystring); --- > character mystring_2 = new character(_mystring_2); 725c725 < myraw.setLength(plus(length(mystring), 1)); --- > myraw.setLength(plus(length(mystring_2), 1)); 728,729c728,729 < stringlength.assign(byteLength(mystring)); < mycrc.assign(substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw")); --- > stringlength.assign(byteLength(mystring_2)); > mycrc.assign(substring(SecurityOps.encode(concat(mystring_2, "foobar")), 1, 2, "raw")); 731c731 < myraw.setString(mystring, 1); --- > myraw.setString(mystring_2, 1); 749c749 < mystring.assign(""); --- > mystring_2.assign(""); 757c757 < mystring.assign(concat(mystring, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); --- > mystring_2.assign(concat(mystring_2, zeroPad(toBase36(myraw.getByte(i)), new integer(2)))); 762c762 < returnNormal(concat(mycrc, mystring)); --- > returnNormal(concat(mycrc, mystring_2)); 767c767 < public character decrypt(final character _mystring, final character _mykey) --- > public character decrypt(final character _mystring_3, final character _mykey_2) 771c771 < character mystring = new character(_mystring); --- > character mystring_3 = new character(_mystring_3); 773c773 < character mykey = new character(_mykey); --- > character mykey_2 = new character(_mykey_2); 775c775 < integer i = new integer(0); --- > integer i_2 = new integer(0); 777c777 < integer j = new integer(0); --- > integer j_2 = new integer(0); 779c779 < integer keylength = new integer(0); --- > integer keylength_2 = new integer(0); 781c781 < integer stringlength = new integer(0); --- > integer stringlength_2 = new integer(0); 783c783 < character mycrc = new character(""); --- > character mycrc_2 = new character(""); 785c785 < character myhash = new character(""); --- > character myhash_2 = new character(""); 787c787 < memptr myraw = new memptr(); --- > memptr myraw_2 = new memptr(); 791,797c791,797 < mycrc.assign(substring(mystring, 1, 2)); < mystring.assign(substring(mystring, 3, -1, "raw")); < myraw.setLength((length(mystring))); < mykey.assign(substring(SecurityOps.encode(concat(mykey, "foobar")), 1, 16)); < myhash.assign(SecurityOps.encode(concat(mycrc, "foobar", mykey))); < keylength.assign(byteLength(mykey)); < stringlength.assign(byteLength(mystring)); --- > mycrc_2.assign(substring(mystring_3, 1, 2)); > mystring_3.assign(substring(mystring_3, 3, -1, "raw")); > myraw_2.setLength((length(mystring_3))); > mykey_2.assign(substring(SecurityOps.encode(concat(mykey_2, "foobar")), 1, 16)); > myhash_2.assign(SecurityOps.encode(concat(mycrc_2, "foobar", mykey_2))); > keylength_2.assign(byteLength(mykey_2)); > stringlength_2.assign(byteLength(mystring_3)); 799c799 < ToClause toClause1 = new ToClause(i, 1, stringlength, 2); --- > ToClause toClause1 = new ToClause(i_2, 1, stringlength_2, 2); 805,806c805,806 < j.assign(plus(j, 1)); < myraw.setByte(to10from36(new character(substring(mystring, i, 2, "raw"))), j); --- > j_2.assign(plus(j_2, 1)); > myraw_2.setByte(to10from36(new character(substring(mystring_3, i_2, 2, "raw"))), j_2); 810c810 < stringlength.assign(new integer(divide(stringlength, 2))); --- > stringlength_2.assign(new integer(divide(stringlength_2, 2))); 813c813 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 815c815 < myraw.setByte(abs(modulo(minus(myraw.getByte(i), asc(substring(myhash, plus(modulo(i, 16), 1), 1, "raw"))), 256)), i); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(i_2), asc(substring(myhash_2, plus(modulo(i_2, 16), 1), 1, "raw"))), 256)), i_2); 819c819 < for (i.assign(0); _isLessThanOrEqual(i, minus(stringlength, 1)); i.assign(plus(i, 5))) --- > for (i_2.assign(0); _isLessThanOrEqual(i_2, minus(stringlength_2, 1)); i_2.assign(plus(i_2, 5))) 822c822 < for (j.assign(1); _isLessThanOrEqual(j, integer.minimum(keylength, minus(stringlength, i))); j.increment()) --- > for (j_2.assign(1); _isLessThanOrEqual(j_2, integer.minimum(keylength_2, minus(stringlength_2, i_2))); j_2.increment()) 824c824 < myraw.setByte(abs(modulo(minus(myraw.getByte(plus(i, j)), asc(substring(mykey, j, 1, "raw"))), 256)), plus(i, j)); --- > myraw_2.setByte(abs(modulo(minus(myraw_2.getByte(plus(i_2, j_2)), asc(substring(mykey_2, j_2, 1, "raw"))), 256)), plus(i_2, j_2)); 828c828 < mystring.assign(""); --- > mystring_3.assign(""); 831c831 < for (i.assign(1); _isLessThanOrEqual(i, stringlength); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, stringlength_2); i_2.increment()) 833c833 < mystring.assign(concat(mystring, chr(myraw.getByte(i)))); --- > mystring_3.assign(concat(mystring_3, chr(myraw_2.getByte(i_2)))); 836,837c836,837 < myraw.setLength(0); < if (_isEqual(mycrc, substring(SecurityOps.encode(concat(mystring, "foobar")), 1, 2, "raw"))) --- > myraw_2.setLength(0); > if (_isEqual(mycrc_2, substring(SecurityOps.encode(concat(mystring_3, "foobar")), 1, 2, "raw"))) 839c839 < returnNormal(mystring); --- > returnNormal(mystring_3); diff -r generated/20130314a/src/aero/timco/majic/job/NrjobBatchAdd.java generated/20130314c/src/aero/timco/majic/job/NrjobBatchAdd.java 167c167 < integer ipCoNumRef2; --- > integer ipCoNum_2; 169c169 < integer ipTimcoOper; --- > integer ipTimcoOper_2; 346c346 < public integer getUserNum(final character _ipchSymUser) --- > public integer getUserNum(final character _ipchSymUser_2) 350c350 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 356c356 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 370c370 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_3) 374c374 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 380c380 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_3); 453c453 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 457c457 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 459c459 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 463c463 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 468c468 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 472c472 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 474c474 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 478c478 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 483c483 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 487c487 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 489c489 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 493c493 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 498c498 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 502c502 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 504c504 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 508c508 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 513c513 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 517c517 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 519c519 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 523c523 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 528c528 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 532c532 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 534c534 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 538c538 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 547c547 < integer linUserNum = new integer(0); --- > integer linUserNum_2 = new integer(0); 549c549 < character lchUserCode = new character(""); --- > character lchUserCode_2 = new character(""); 563,565c563,565 < linUserNum.assign(getUserNum(ipchSymUser)); < lchUserCode.assign(getUserCode(ipchSymUser)); < if (_isUnknown(linUserNum)) --- > linUserNum_2.assign(getUserNum(ipchSymUser)); > lchUserCode_2.assign(getUserCode(ipchSymUser)); > if (_isUnknown(linUserNum_2)) 569c569 < if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum))) --- > if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum_2))) 571c571 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum_2))); 650c650 < public void ipValCoNum(final integer opWipAcct, final integer opWipSub) --- > public void ipValCoNum(final integer opWipAcct_2, final integer opWipSub_2) 658c658 < opWipAcct.assign(new integer(0)); --- > opWipAcct_2.assign(new integer(0)); 661,662c661,662 < opWipAcct, < opWipSub --- > opWipAcct_2, > opWipSub_2 664c664 < opWipSub.assign(new integer(0)); --- > opWipSub_2.assign(new integer(0)); 775,776c775,776 < opWipAcct.assign(prodcode.getWipAccount()); < opWipSub.assign(prodcode.getWipSub()); --- > opWipAcct_2.assign(prodcode.getWipAccount()); > opWipSub_2.assign(prodcode.getWipSub()); 1785c1785 < public void ipBuildOperSkill(final integer _ipCoNumRef2, final integer _ipTimcoOper, final character _ipSkillCode) --- > public void ipBuildOperSkill(final integer _ipCoNum_2, final integer _ipTimcoOper_2, final character _ipSkillCode) 1789c1789 < integer ipCoNumRef2 = new integer(_ipCoNumRef2); --- > integer ipCoNum_2 = new integer(_ipCoNum_2); 1791c1791 < integer ipTimcoOper = new integer(_ipTimcoOper); --- > integer ipTimcoOper_2 = new integer(_ipTimcoOper_2); 1797,1798c1797,1798 < NrjobBatchAdd.this.ipCoNumRef2 = ipCoNumRef2; < NrjobBatchAdd.this.ipTimcoOper = ipTimcoOper; --- > NrjobBatchAdd.this.ipCoNum_2 = ipCoNum_2; > NrjobBatchAdd.this.ipTimcoOper_2 = ipTimcoOper_2; 1819,1820c1819,1820 < ipCoNumRef2, < ipTimcoOper, --- > ipCoNum_2, > ipTimcoOper_2, 1835,1836c1835,1836 < operskil.setCustomerOrderNumber(ipCoNumRef2); < operskil.setOperation(ipTimcoOper); --- > operskil.setCustomerOrderNumber(ipCoNum_2); > operskil.setOperation(ipTimcoOper_2); diff -r generated/20130314a/src/aero/timco/majic/job/OasisSettleUpdate.java generated/20130314c/src/aero/timco/majic/job/OasisSettleUpdate.java 225c225 < public integer getUserNum(final character _ipchSymUser) --- > public integer getUserNum(final character _ipchSymUser_2) 229c229 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 235c235 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 249c249 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_3) 253c253 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 259c259 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_3); 332c332 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 336c336 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 338c338 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 342c342 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 347c347 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 351c351 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 353c353 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 357c357 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 362c362 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 366c366 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 368c368 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 372c372 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 377c377 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 381c381 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 383c383 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 387c387 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 392c392 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 396c396 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 398c398 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 402c402 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 407c407 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 411c411 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 413c413 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 417c417 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 676c676 < integer linUserNum = new integer(0); --- > integer linUserNum_2 = new integer(0); 678c678 < character lchUserCode = new character(""); --- > character lchUserCode_2 = new character(""); 692,694c692,694 < linUserNum.assign(getUserNum(ipchSymUser)); < lchUserCode.assign(getUserCode(ipchSymUser)); < if (_isUnknown(linUserNum)) --- > linUserNum_2.assign(getUserNum(ipchSymUser)); > lchUserCode_2.assign(getUserCode(ipchSymUser)); > if (_isUnknown(linUserNum_2)) 698c698 < if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum))) --- > if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum_2))) 700c700 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum_2))); diff -r generated/20130314a/src/aero/timco/majic/job/OtanalysisR.java generated/20130314c/src/aero/timco/majic/job/OtanalysisR.java 159c159 < date piBegDateRef2; --- > date piBegDate_3; 161c161 < date piEndDateRef2; --- > date piEndDate_3; 761c761 < public void ipCalcPayrollWeeks(final date _piBegDate, final date _piEndDate, final date poCalcdsdate, final date poCalcdedate) --- > public void ipCalcPayrollWeeks(final date _piBegDate_2, final date _piEndDate_2, final date poCalcdsdate, final date poCalcdedate) 765c765 < date piBegDate = new date(_piBegDate); --- > date piBegDate_2 = new date(_piBegDate_2); 767c767 < date piEndDate = new date(_piEndDate); --- > date piEndDate_2 = new date(_piEndDate_2); 783c783 < integer vInt = new integer(0); --- > integer vInt_2 = new integer(0); 801c801 < vDaysInBegDateYear.assign(plus(date.differenceNum(new date(concat("12/31/", valueOf(date.year(piBegDate)))), new date(concat("01/01/", valueOf(date.year(piBegDate))))), 1)); --- > vDaysInBegDateYear.assign(plus(date.differenceNum(new date(concat("12/31/", valueOf(date.year(piBegDate_2)))), new date(concat("01/01/", valueOf(date.year(piBegDate_2))))), 1)); 803,805c803,805 < vWeekDay.assign(date.weekday(piBegDate)); < vBoundedBegDate.assign(_isEqual(vWeekDay, 7) ? piBegDate : date.plusDays(piBegDate, multiply(-1, vWeekDay))); < vDaySpan.assign(plus(date.differenceNum(piEndDate, vBoundedBegDate), 1)); --- > vWeekDay.assign(date.weekday(piBegDate_2)); > vBoundedBegDate.assign(_isEqual(vWeekDay, 7) ? piBegDate_2 : date.plusDays(piBegDate_2, multiply(-1, vWeekDay))); > vDaySpan.assign(plus(date.differenceNum(piEndDate_2, vBoundedBegDate), 1)); 810c810 < poCalcdedate.assign(piEndDate); --- > poCalcdedate.assign(piEndDate_2); 813c813 < for (vInt.assign(1); _isLessThanOrEqual(vInt, vNumWeeks); vInt.increment()) --- > for (vInt_2.assign(1); _isLessThanOrEqual(vInt_2, vNumWeeks); vInt_2.increment()) 817c817 < ttPayrollweeks.setSeq(vInt); --- > ttPayrollweeks.setSeq(vInt_2); 837c837 < ttPayrollweeks.setEndDate(piEndDate); --- > ttPayrollweeks.setEndDate(piEndDate_2); 876c876 < public void ipExportToCsv(final character _piRepType) --- > public void ipExportToCsv(final character _piRepType_2) 880c880 < character piRepType = new character(_piRepType); --- > character piRepType_2 = new character(_piRepType_2); 887c887 < if (_isEqual(piRepType, "D")) --- > if (_isEqual(piRepType_2, "D")) 974c974 < public void ipOutputToTerminal(final character _piRepType) --- > public void ipOutputToTerminal(final character _piRepType_3) 978c978 < character piRepType = new character(_piRepType); --- > character piRepType_3 = new character(_piRepType_3); 996c996 < if (_isEqual(piRepType, "D")) --- > if (_isEqual(piRepType_3, "D")) 1105c1105 < public void ipOutputToPrinterOrFile(final character _piRepType) --- > public void ipOutputToPrinterOrFile(final character _piRepType_4) 1109c1109 < character piRepType = new character(_piRepType); --- > character piRepType_4 = new character(_piRepType_4); 1128c1128 < if (_isEqual(piRepType, "D")) --- > if (_isEqual(piRepType_4, "D")) 1248c1248 < public void ipGenEmpList(final character _piListGenMethod, final integer _piBegEmpNum, final integer _piEndEmpNum, final date _piBegDateRef2, final date _piEndDateRef2, final integer _piBegCoNum, final integer _piEndCoNum, final character _piStatusList) --- > public void ipGenEmpList(final character _piListGenMethod, final integer _piBegEmpNum, final integer _piEndEmpNum, final date _piBegDate_3, final date _piEndDate_3, final integer _piBegCoNum, final integer _piEndCoNum, final character _piStatusList) 1258c1258 < date piBegDateRef2 = new date(_piBegDateRef2); --- > date piBegDate_3 = new date(_piBegDate_3); 1260c1260 < date piEndDateRef2 = new date(_piEndDateRef2); --- > date piEndDate_3 = new date(_piEndDate_3); 1270,1271c1270,1271 < OtanalysisR.this.piBegDateRef2 = piBegDateRef2; < OtanalysisR.this.piEndDateRef2 = piEndDateRef2; --- > OtanalysisR.this.piBegDate_3 = piBegDate_3; > OtanalysisR.this.piEndDate_3 = piEndDate_3; 1295,1296c1295,1296 < piBegDateRef2, < piEndDateRef2, --- > piBegDate_3, > piEndDate_3, 1354,1355c1354,1355 < piBegDateRef2, < piEndDateRef2, --- > piBegDate_3, > piEndDate_3, 1414,1415c1414,1415 < piBegDateRef2, < piEndDateRef2 --- > piBegDate_3, > piEndDate_3 1451c1451 < public void ipGetListGenMethod(final integer _piBegEmpNum, final integer _piEndEmpNum, final integer _piBegCoNum, final integer _piEndCoNum, final character poListGenMethod) --- > public void ipGetListGenMethod(final integer _piBegEmpNum_2, final integer _piEndEmpNum_2, final integer _piBegCoNum_2, final integer _piEndCoNum_2, final character poListGenMethod) 1455c1455 < integer piBegEmpNum = new integer(_piBegEmpNum); --- > integer piBegEmpNum_2 = new integer(_piBegEmpNum_2); 1457c1457 < integer piEndEmpNum = new integer(_piEndEmpNum); --- > integer piEndEmpNum_2 = new integer(_piEndEmpNum_2); 1459c1459 < integer piBegCoNum = new integer(_piBegCoNum); --- > integer piBegCoNum_2 = new integer(_piBegCoNum_2); 1461c1461 < integer piEndCoNum = new integer(_piEndCoNum); --- > integer piEndCoNum_2 = new integer(_piEndCoNum_2); 1474c1474 < if (_isEqual(piBegEmpNum, piEndEmpNum)) --- > if (_isEqual(piBegEmpNum_2, piEndEmpNum_2)) 1480c1480 < if (_isEqual(piBegCoNum, piEndCoNum)) --- > if (_isEqual(piBegCoNum_2, piEndCoNum_2)) diff -r generated/20130314a/src/aero/timco/majic/job/PlanctR.java generated/20130314c/src/aero/timco/majic/job/PlanctR.java 88c88 < date tDateRef2 = new date(); --- > date tDate = new date(); 94c94 < integer empNum; --- > integer empNum_2; 96c96 < date tDate; --- > date tDate_3; 152c152 < TransactionManager.register(lDebug, tDateRef2, rptName, tRptHdr, tSerial, infile, outfile, startString, endString, ifappend, ifpaged, tPrintFile, version, selection, lSkill, lSupervisor, lCrew, tBillable, i, daylist, dayConvert, tDaytitle, tDaylist, daySpace); --- > TransactionManager.register(lDebug, tDate, rptName, tRptHdr, tSerial, infile, outfile, startString, endString, ifappend, ifpaged, tPrintFile, version, selection, lSkill, lSupervisor, lCrew, tBillable, i, daylist, dayConvert, tDaytitle, tDaylist, daySpace); 264c264 < new HeaderElement(tDateRef2, fOpt132Frame.widgetTDate()), --- > new HeaderElement(tDate, fOpt132Frame.widgetTDate()), 332c332 < new Element(tDateRef2, fInFrame.widgetTDate()), --- > new Element(tDate, fInFrame.widgetTDate()), 454c454 < if (_isEqual(indexOf(ttEmployee.getDaysOff(), entry(date.weekday(date.plusDays(tDateRef2, i)), dayConvert)), 0)) --- > if (_isEqual(indexOf(ttEmployee.getDaysOff(), entry(date.weekday(date.plusDays(tDate, i)), dayConvert)), 0)) 473c473 < ttPlanct.setDayCount(minus((plus(date.differenceNum(date.plusDays(tDateRef2, i), tDateRef2), 1)), 1), plus(ttPlanct.getDayCount(minus((plus(date.differenceNum(date.plusDays(tDateRef2, i), tDateRef2), 1)), 1)), 1)); --- > ttPlanct.setDayCount(minus((plus(date.differenceNum(date.plusDays(tDate, i), tDate), 1)), 1), plus(ttPlanct.getDayCount(minus((plus(date.differenceNum(date.plusDays(tDate, i), tDate), 1)), 1)), 1)); 866c866 < public character getRdo(final character _rdo, final integer _empNum, final date _tDate) --- > public character getRdo(final character _rdo_2, final integer _empNum_2, final date _tDate_3) 870c870 < character rdo = new character(_rdo); --- > character rdo_2 = new character(_rdo_2); 872c872 < integer empNum = new integer(_empNum); --- > integer empNum_2 = new integer(_empNum_2); 874c874 < date tDate = new date(_tDate); --- > date tDate_3 = new date(_tDate_3); 878,879c878,879 < PlanctR.this.empNum = empNum; < PlanctR.this.tDate = tDate; --- > PlanctR.this.empNum_2 = empNum_2; > PlanctR.this.tDate_3 = tDate_3; 884c884 < if (_isGreaterThan(indexOf(rdo, valueOf(date.weekday(date.minusDays(tDate, 1)))), 0)) --- > if (_isGreaterThan(indexOf(rdo_2, valueOf(date.weekday(date.minusDays(tDate_3, 1)))), 0)) 888,889c888,889 < empNum, < tDate --- > empNum_2, > tDate_3 894c894 < empNum, --- > empNum_2, 1022c1022 < tDateRef2 --- > tDate 1044c1044 < ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDate)); 1053c1053 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 1139c1139 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 1163c1163 < tDaytitle.assign(concat(tDaytitle, entry(new integer(entry(date.weekday(date.plusDays(tDateRef2, i)), dayConvert)), daylist), " ")); --- > tDaytitle.assign(concat(tDaytitle, entry(new integer(entry(date.weekday(date.plusDays(tDate, i)), dayConvert)), daylist), " ")); diff -r generated/20130314a/src/aero/timco/majic/name_map.xml generated/20130314c/src/aero/timco/majic/name_map.xml 9c9 < --- > 16c16 < --- > 20,21c20,21 < < --- > > 33c33 < --- > 40c40 < --- > 44,45c44,45 < < --- > > 65c65 < --- > 85c85 < --- > 90,91c90,91 < < --- > > 385c385 < --- > 392c392 < --- > 396,397c396,397 < < --- > > 405c405 < --- > 412c412 < --- > 416,417c416,417 < < --- > > 479c479 < --- > 482c482 < --- > 485c485 < --- > 488c488 < --- > 550c550 < --- > 572c572 < --- > 575,576c575,576 < < --- > > 702c702 < --- > 723c723 < --- > 726c726 < --- > 729,730c729,730 < < --- > > 746c746 < --- > 768c768 < --- > 775c775 < --- > 778c778 < --- > 781c781 < --- > 785,786c785,786 < < --- > > 789c789 < --- > 792c792 < --- > 798c798 < --- > 801,802c801,802 < < --- > > 805,806c805,806 < < --- > > 809,810c809,810 < < --- > > 813,814c813,814 < < --- > > 817,820c817,820 < < < < --- > > > > 834c834 < --- > 837c837 < --- > 845,846c845,846 < < --- > > 849,850c849,850 < < --- > > 853,854c853,854 < < --- > > 857,858c857,858 < < --- > > 861,862c861,862 < < --- > > 865,866c865,866 < < --- > > 874,875c874,875 < < --- > > 879c879 < --- > 882c882 < --- > 889,890c889,890 < < --- > > 894c894 < --- > 963c963 < --- > 968c968 < --- > 979c979 < --- > 982c982 < --- > 985c985 < --- > 989,990c989,990 < < --- > > 993c993 < --- > 996c996 < --- > 1002c1002 < --- > 1005,1006c1005,1006 < < --- > > 1009,1010c1009,1010 < < --- > > 1013,1014c1013,1014 < < --- > > 1017,1018c1017,1018 < < --- > > 1021,1024c1021,1024 < < < < --- > > > > 1036,1037c1036,1037 < < --- > > 1048c1048 < --- > 1052,1053c1052,1053 < < --- > > 1063c1063 < --- > 1084c1084 < --- > 1089c1089 < --- > 1093,1094c1093,1094 < < --- > > 1099,1100c1099,1100 < < --- > > 1104,1105c1104,1105 < < --- > > 1110,1112c1110,1112 < < < --- > > > 1115,1118c1115,1118 < < < < --- > > > > 1121,1123c1121,1123 < < < --- > > > 1134c1134 < --- > 1141c1141 < --- > 1144c1144 < --- > 1147c1147 < --- > 1151,1152c1151,1152 < < --- > > 1155c1155 < --- > 1158c1158 < --- > 1164c1164 < --- > 1167,1168c1167,1168 < < --- > > 1171,1172c1171,1172 < < --- > > 1175,1176c1175,1176 < < --- > > 1179,1180c1179,1180 < < --- > > 1183,1186c1183,1186 < < < < --- > > > > 1192c1192 < --- > 1195c1195 < --- > 1203,1204c1203,1204 < < --- > > 1207,1208c1207,1208 < < --- > > 1211,1212c1211,1212 < < --- > > 1215,1216c1215,1216 < < --- > > 1219,1220c1219,1220 < < --- > > 1223,1224c1223,1224 < < --- > > 1232c1232 < --- > 1235c1235 < --- > 1238c1238 < --- > 1250,1251c1250,1251 < < --- > > 1313c1313 < --- > 1340c1340 < --- > 1413,1414c1413,1414 < < --- > > 1463c1463 < --- > 1509c1509 < --- > 1523c1523 < --- > 1548c1548 < --- > 1574c1574 < --- > 1582c1582 < --- > 1591,1594c1591,1594 < < < < --- > > > > 1643,1644c1643,1644 < < --- > > 1749,1750c1749,1750 < < --- > > 1756,1757c1756,1757 < < --- > > 1760c1760 < --- > 1804c1804 < --- > 1811c1811 < --- > 1815,1816c1815,1816 < < --- > > 2172c2172 < --- > 2217c2217 < --- > 2224c2224 < --- > 2228,2229c2228,2229 < < --- > > 2246,2247c2246,2247 < < --- > > 2254c2254 < --- > 2287c2287 < --- > 2292c2292 < --- > 2324c2324 < --- > 2328c2328 < --- > 2407c2407 < --- > 2416c2416 < --- > 2420,2422c2420,2422 < < < --- > > > 2436c2436 < --- > 2594c2594 < --- > 2604c2604 < --- > 2661c2661 < --- > 2667,2669c2667,2669 < < < --- > > > 2683c2683 < --- > 2687c2687 < --- > 2690c2690 < --- > 2698c2698 < --- > 2703c2703 < --- > 2707c2707 < --- > 2712c2712 < --- > 2716c2716 < --- > 2719c2719 < --- > 2723c2723 < --- > 2728,2730c2728,2730 < < < --- > > > 2733c2733 < --- > 2736c2736 < --- > 2740c2740 < --- > 2744c2744 < --- > 2748c2748 < --- > 2752,2753c2752,2753 < < --- > > 2756,2757c2756,2757 < < --- > > 2760,2761c2760,2761 < < --- > > 2764,2765c2764,2765 < < --- > > 2768c2768 < --- > 2772c2772 < --- > 2776c2776 < --- > 2779,2780c2779,2780 < < --- > > 2785,2786c2785,2786 < < --- > > 2789c2789 < --- > 2793c2793 < --- > 2798c2798 < --- > 2802,2804c2802,2804 < < < --- > > > 2807,2808c2807,2808 < < --- > > 2811c2811 < --- > 2815c2815 < --- > 2818c2818 < --- > 2822,2823c2822,2823 < < --- > > 2826,2827c2826,2827 < < --- > > 2830,2831c2830,2831 < < --- > > 2834,2835c2834,2835 < < --- > > 2838,2839c2838,2839 < < --- > > 2842,2843c2842,2843 < < --- > > 2846,2847c2846,2847 < < --- > > 2850c2850 < --- > 2853c2853 < --- > 2857c2857 < --- > 2861c2861 < --- > 2865c2865 < --- > 2868c2868 < --- > 2872c2872 < --- > 2876,2881c2876,2881 < < < < < < --- > > > > > > 2884c2884 < --- > 2888c2888 < --- > 2892c2892 < --- > 2896c2896 < --- > 2899c2899 < --- > 2903,2904c2903,2904 < < --- > > 2908,2909c2908,2909 < < --- > > 2911c2911 < --- > 2914,2917c2914,2917 < < < < --- > > > > 2920,2922c2920,2922 < < < --- > > > 2924c2924 < --- > 2927,2929c2927,2929 < < < --- > > > 2931c2931 < --- > 2934,2936c2934,2936 < < < --- > > > 2938c2938 < --- > 2941c2941 < --- > 2945,2947c2945,2947 < < < --- > > > 2950c2950 < --- > 2953c2953 < --- > 2956,2957c2956,2957 < < --- > > 2960,2962c2960,2962 < < < --- > > > 2965c2965 < --- > 2968c2968 < --- > 2972c2972 < --- > 2976,2978c2976,2978 < < < --- > > > 2981,2982c2981,2982 < < --- > > 2985,2986c2985,2986 < < --- > > 2989,2990c2989,2990 < < --- > > 2994c2994 < --- > 2997,2998c2997,2998 < < --- > > 3001,3003c3001,3003 < < < --- > > > 3006,3008c3006,3008 < < < --- > > > 3011c3011 < --- > 3014,3015c3014,3015 < < --- > > 3018,3019c3018,3019 < < --- > > 3022,3023c3022,3023 < < --- > > 3026,3027c3026,3027 < < --- > > 3030,3031c3030,3031 < < --- > > 3034,3035c3034,3035 < < --- > > 3038,3039c3038,3039 < < --- > > 3042,3043c3042,3043 < < --- > > 3046,3047c3046,3047 < < --- > > 3050,3051c3050,3051 < < --- > > 3054,3060c3054,3060 < < < < < < < --- > > > > > > > 3063,3064c3063,3064 < < --- > > 3067,3068c3067,3068 < < --- > > 3071,3073c3071,3073 < < < --- > > > 3076,3077c3076,3077 < < --- > > 3080,3082c3080,3082 < < < --- > > > 3085,3086c3085,3086 < < --- > > 3089,3090c3089,3090 < < --- > > 3093c3093 < --- > 3096,3097c3096,3097 < < --- > > 3100,3101c3100,3101 < < --- > > 3104,3105c3104,3105 < < --- > > 3108,3109c3108,3109 < < --- > > 3112,3113c3112,3113 < < --- > > 3116,3117c3116,3117 < < --- > > 3120,3121c3120,3121 < < --- > > 3124,3125c3124,3125 < < --- > > 3128c3128 < --- > 3131,3132c3131,3132 < < --- > > 3135,3136c3135,3136 < < --- > > 3139,3140c3139,3140 < < --- > > 3143c3143 < --- > 3146,3147c3146,3147 < < --- > > 3150,3151c3150,3151 < < --- > > 3154,3159c3154,3159 < < < < < < --- > > > > > > 3162,3163c3162,3163 < < --- > > 3166,3167c3166,3167 < < --- > > 3170,3171c3170,3171 < < --- > > 3174c3174 < --- > 3177,3178c3177,3178 < < --- > > 3181,3182c3181,3182 < < --- > > 3186,3189c3186,3189 < < < < --- > > > > 3192,3195c3192,3195 < < < < --- > > > > 3198,3202c3198,3202 < < < < < --- > > > > > 3205,3209c3205,3209 < < < < < --- > > > > > 3212,3216c3212,3216 < < < < < --- > > > > > 3219,3220c3219,3220 < < --- > > 3223,3228c3223,3228 < < < < < < --- > > > > > > 3231c3231 < --- > 3234c3234 < --- > 3245c3245 < --- > 3262c3262 < --- > 3269c3269 < --- > 3273,3274c3273,3274 < < --- > > 3313c3313 < --- > 3316c3316 < --- > 3324,3325c3324,3325 < < --- > > 3328,3329c3328,3329 < < --- > > 3332,3333c3332,3333 < < --- > > 3336,3337c3336,3337 < < --- > > 3340,3341c3340,3341 < < --- > > 3344,3345c3344,3345 < < --- > > 3353,3354c3353,3354 < < --- > > 3395,3396c3395,3396 < < --- > > 3420c3420 < --- > 3423c3423 < --- > 3431,3432c3431,3432 < < --- > > 3435,3436c3435,3436 < < --- > > 3439,3440c3439,3440 < < --- > > 3443,3444c3443,3444 < < --- > > 3447,3448c3447,3448 < < --- > > 3451,3452c3451,3452 < < --- > > 3484,3485c3484,3485 < < --- > > 3494c3494 < --- > 3497c3497 < --- > 3500c3500 < --- > 3506,3507c3506,3507 < < --- > > 3513,3516c3513,3516 < < < < --- > > > > 3525c3525 < --- > 3531,3533c3531,3533 < < < --- > > > 3747,3748c3747,3748 < < --- > > 3752,3753c3752,3753 < < --- > > 3756c3756 < --- > 3760c3760 < --- > 3764c3764 < --- > 3858,3869c3858,3869 < < < < < < < < < < < < --- > > > > > > > > > > > > 3936c3936 < --- > 3939c3939 < --- > 3947,3948c3947,3948 < < --- > > 3951,3952c3951,3952 < < --- > > 3955,3956c3955,3956 < < --- > > 3959,3960c3959,3960 < < --- > > 3963,3964c3963,3964 < < --- > > 3967,3968c3967,3968 < < --- > > 3973,3974c3973,3974 < < --- > > 3977,3978c3977,3978 < < --- > > 3981c3981 < --- > 3984,3985c3984,3985 < < --- > > 3989,3990c3989,3990 < < --- > > 4009c4009 < --- > 4017,4018c4017,4018 < < --- > > 4021,4022c4021,4022 < < --- > > 4025,4026c4025,4026 < < --- > > 4029,4030c4029,4030 < < --- > > 4033,4034c4033,4034 < < --- > > 4037,4038c4037,4038 < < --- > > 4060,4062c4060,4062 < < < --- > > > 4067,4072c4067,4072 < < < < < < --- > > > > > > 4114c4114 < --- > 4122,4123c4122,4123 < < --- > > 4126,4127c4126,4127 < < --- > > 4130,4131c4130,4131 < < --- > > 4134,4135c4134,4135 < < --- > > 4138,4139c4138,4139 < < --- > > 4142,4143c4142,4143 < < --- > > 4153c4153 < --- > 4158,4160c4158,4160 < < < --- > > > 4165,4166c4165,4166 < < --- > > 4169c4169 < --- > 4200c4200 < --- > 4213,4214c4213,4214 < < --- > > 4251c4251 < --- > 4260c4260 < --- > 4264,4266c4264,4266 < < < --- > > > 4280c4280 < --- > 4337c4337 < --- > 4346c4346 < --- > 4350,4352c4350,4352 < < < --- > > > 4366c4366 < --- > 4516c4516 < --- > 4519c4519 < --- > 4527,4528c4527,4528 < < --- > > 4531,4532c4531,4532 < < --- > > 4535,4536c4535,4536 < < --- > > 4539,4540c4539,4540 < < --- > > 4543,4544c4543,4544 < < --- > > 4547,4548c4547,4548 < < --- > > 4583c4583 < --- > 4589,4591c4589,4591 < < < --- > > > 4597c4597 < --- > 4652c4652 < --- > 4655c4655 < --- > 4663,4664c4663,4664 < < --- > > 4667,4668c4667,4668 < < --- > > 4671,4672c4671,4672 < < --- > > 4675,4676c4675,4676 < < --- > > 4679,4680c4679,4680 < < --- > > 4683,4684c4683,4684 < < --- > > 4751,4752c4751,4752 < < --- > > 4759,4760c4759,4760 < < --- > > 4763,4764c4763,4764 < < --- > > 4799c4799 < --- > 4802c4802 < --- > 4810,4811c4810,4811 < < --- > > 4814,4815c4814,4815 < < --- > > 4818,4819c4818,4819 < < --- > > 4822,4823c4822,4823 < < --- > > 4826,4827c4826,4827 < < --- > > 4830,4831c4830,4831 < < --- > > 5025c5025 < --- > 5041c5041 < --- > 5060c5060 < --- > 5072c5072 < --- > 5086c5086 < --- > 5090c5090 < --- > 5111,5112c5111,5112 < < --- > > 5116c5116 < --- > 5128c5128 < --- > 5134,5136c5134,5136 < < < --- > > > 5152c5152 < --- > 5167c5167 < --- > 5173,5175c5173,5175 < < < --- > > > 5203c5203 < --- > 5209,5211c5209,5211 < < < --- > > > 5254c5254 < --- > 5275,5276c5275,5276 < < --- > > 5294c5294 < --- > 5308c5308 < --- > 5311c5311 < --- > 5322c5322 < --- > 5328,5330c5328,5330 < < < --- > > > 5336c5336 < --- > 5361,5362c5361,5362 < < --- > > 5367c5367 < --- > 5771c5771 < --- > 5779,5781c5779,5781 < < < --- > > > 5784c5784 < --- > 5796c5796 < --- > 5799,5800c5799,5800 < < --- > > 5813c5813 < --- > 5817c5817 < --- > 5822c5822 < --- > 6149c6149 < --- > 6160c6160 < --- > 6168,6169c6168,6169 < < --- > > 6173,6176c6173,6176 < < < < --- > > > > 6180,6183c6180,6183 < < < < --- > > > > 6185c6185 < --- > 6188,6189c6188,6189 < < --- > > 6194,6197c6194,6197 < < < < --- > > > > 6218c6218 < --- > diff -r generated/20130314a/src/aero/timco/majic/po/Po1aR.java generated/20130314c/src/aero/timco/majic/po/Po1aR.java 159c159 < integer ipinPonumRef2; --- > integer ipinPonum_2; 161c161 < character ipchFlagTypeRef2; --- > character ipchFlagType_2; 163c163 < integer ipinPonumRef3; --- > integer ipinPonum_3; 165c165 < character ipchFlagTypeRef3; --- > character ipchFlagType_3; 1413c1413 < public void ipSetPoflagValue(final integer _ipinPonumRef2, final character _ipchFlagTypeRef2, final character _ipchFlagValue) --- > public void ipSetPoflagValue(final integer _ipinPonum_2, final character _ipchFlagType_2, final character _ipchFlagValue) 1417c1417 < integer ipinPonumRef2 = new integer(_ipinPonumRef2); --- > integer ipinPonum_2 = new integer(_ipinPonum_2); 1419c1419 < character ipchFlagTypeRef2 = new character(_ipchFlagTypeRef2); --- > character ipchFlagType_2 = new character(_ipchFlagType_2); 1425,1426c1425,1426 < Po1aR.this.ipinPonumRef2 = ipinPonumRef2; < Po1aR.this.ipchFlagTypeRef2 = ipchFlagTypeRef2; --- > Po1aR.this.ipinPonum_2 = ipinPonum_2; > Po1aR.this.ipchFlagType_2 = ipchFlagType_2; 1443,1444c1443,1444 < ipinPonumRef2, < toUpperCase(ipchFlagTypeRef2) --- > ipinPonum_2, > toUpperCase(ipchFlagType_2) 1451,1452c1451,1452 < bPoFlagBuf2.setPurchaseOrderNumber(ipinPonumRef2); < bPoFlagBuf2.setFlagType(ipchFlagTypeRef2); --- > bPoFlagBuf2.setPurchaseOrderNumber(ipinPonum_2); > bPoFlagBuf2.setFlagType(ipchFlagType_2); 1466c1466 < public void ipDeletePoflag(final integer _ipinPonumRef3, final character _ipchFlagTypeRef3) --- > public void ipDeletePoflag(final integer _ipinPonum_3, final character _ipchFlagType_3) 1470c1470 < integer ipinPonumRef3 = new integer(_ipinPonumRef3); --- > integer ipinPonum_3 = new integer(_ipinPonum_3); 1472c1472 < character ipchFlagTypeRef3 = new character(_ipchFlagTypeRef3); --- > character ipchFlagType_3 = new character(_ipchFlagType_3); 1476,1477c1476,1477 < Po1aR.this.ipinPonumRef3 = ipinPonumRef3; < Po1aR.this.ipchFlagTypeRef3 = ipchFlagTypeRef3; --- > Po1aR.this.ipinPonum_3 = ipinPonum_3; > Po1aR.this.ipchFlagType_3 = ipchFlagType_3; 1494,1495c1494,1495 < ipinPonumRef3, < toUpperCase(ipchFlagTypeRef3) --- > ipinPonum_3, > toUpperCase(ipchFlagType_3) 1510c1510 < public void ipGetDaflagValue(final integer _ipinPonum, final logical oplgDaflag) --- > public void ipGetDaflagValue(final integer _ipinPonum_4, final logical oplgDaflag) 1514c1514 < integer ipinPonum = new integer(_ipinPonum); --- > integer ipinPonum_4 = new integer(_ipinPonum_4); 1529c1529 < ControlFlowOps.invokeWithMode("ip_GetPOFlagValue", "IIO", ipinPonum, gchDaflagType, lchFlagValue); --- > ControlFlowOps.invokeWithMode("ip_GetPOFlagValue", "IIO", ipinPonum_4, gchDaflagType, lchFlagValue); 1543c1543 < public void ipSetDaflagValue(final integer _ipinPonum, final logical _iplgDaflag) --- > public void ipSetDaflagValue(final integer _ipinPonum_5, final logical _iplgDaflag) 1547c1547 < integer ipinPonum = new integer(_ipinPonum); --- > integer ipinPonum_5 = new integer(_ipinPonum_5); 1551c1551 < character lchFlagValue = new character(""); --- > character lchFlagValue_2 = new character(""); 1557c1557 < lchFlagValue.assign("Yes"); --- > lchFlagValue_2.assign("Yes"); 1561c1561 < lchFlagValue.assign("No"); --- > lchFlagValue_2.assign("No"); 1563c1563 < ControlFlowOps.invokeWithMode("ip_SetPOFlagValue", "III", ipinPonum, gchDaflagType, lchFlagValue); --- > ControlFlowOps.invokeWithMode("ip_SetPOFlagValue", "III", ipinPonum_5, gchDaflagType, lchFlagValue_2); 1569c1569 < public void ipDeleteDaflag(final integer _ipinPonum) --- > public void ipDeleteDaflag(final integer _ipinPonum_6) 1573c1573 < integer ipinPonum = new integer(_ipinPonum); --- > integer ipinPonum_6 = new integer(_ipinPonum_6); 1577c1577 < ControlFlowOps.invokeWithMode("ip_DeletePOFlag", "II", ipinPonum, gchDaflagType); --- > ControlFlowOps.invokeWithMode("ip_DeletePOFlag", "II", ipinPonum_6, gchDaflagType); diff -r generated/20130314a/src/aero/timco/majic/so/BlJobt.java generated/20130314c/src/aero/timco/majic/so/BlJobt.java 76c76 < integer ipinEmpNumRef2; --- > integer ipinEmpNum_2; 78c78 < integer ipinCoNumRef2; --- > integer ipinCoNum_2; 80c80 < integer ipinTimcoOperRef2; --- > integer ipinTimcoOper_2; 82c82 < character ipchSkillCodeRef2; --- > character ipchSkillCode_2; 230c230 < public integer getUserNum(final character _ipchSymUser) --- > public integer getUserNum(final character _ipchSymUser_2) 234c234 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 240c240 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 254c254 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_3) 258c258 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 264c264 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_3); 337c337 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 341c341 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 343c343 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 347c347 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 352c352 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 356c356 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 358c358 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 362c362 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 367c367 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 371c371 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 373c373 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 377c377 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 382c382 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 386c386 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 388c388 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 392c392 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 397c397 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 401c401 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 403c403 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 407c407 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 412c412 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 416c416 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 418c418 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 422c422 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 490c490 < public void ipValidateEmployee(final integer _ipinEmpNumRef2, final date _ipdtTransDate) --- > public void ipValidateEmployee(final integer _ipinEmpNum_2, final date _ipdtTransDate_2) 494c494 < integer ipinEmpNumRef2 = new integer(_ipinEmpNumRef2); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 496c496 < date ipdtTransDate = new date(_ipdtTransDate); --- > date ipdtTransDate_2 = new date(_ipdtTransDate_2); 502c502 < BlJobt.this.ipinEmpNumRef2 = ipinEmpNumRef2; --- > BlJobt.this.ipinEmpNum_2 = ipinEmpNum_2; 519c519 < lchEmployeeMsg.assign(concat("Employee: ", valueOf(ipinEmpNumRef2))); --- > lchEmployeeMsg.assign(concat("Employee: ", valueOf(ipinEmpNum_2))); 523c523 < ipinEmpNumRef2 --- > ipinEmpNum_2 532c532 < if (_isLessThan(ipdtTransDate, employee.getHireDate())) --- > if (_isLessThan(ipdtTransDate_2, employee.getHireDate())) 534c534 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat(lchEmployeeMsg, " not hired as of ", valueOf(ipdtTransDate))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat(lchEmployeeMsg, " not hired as of ", valueOf(ipdtTransDate_2))); 540c540 < return isGreaterThanOrEqual(ipdtTransDate, employee.getTerminationDate()); --- > return isGreaterThanOrEqual(ipdtTransDate_2, employee.getTerminationDate()); 562c562 < public void ipValidateSo(final integer _ipinCoNumRef2, final integer _ipinTimcoOperRef2) --- > public void ipValidateSo(final integer _ipinCoNum_2, final integer _ipinTimcoOper_2) 566c566 < integer ipinCoNumRef2 = new integer(_ipinCoNumRef2); --- > integer ipinCoNum_2 = new integer(_ipinCoNum_2); 568c568 < integer ipinTimcoOperRef2 = new integer(_ipinTimcoOperRef2); --- > integer ipinTimcoOper_2 = new integer(_ipinTimcoOper_2); 572,573c572,573 < BlJobt.this.ipinCoNumRef2 = ipinCoNumRef2; < BlJobt.this.ipinTimcoOperRef2 = ipinTimcoOperRef2; --- > BlJobt.this.ipinCoNum_2 = ipinCoNum_2; > BlJobt.this.ipinTimcoOper_2 = ipinTimcoOper_2; 593c593 < ipinCoNumRef2 --- > ipinCoNum_2 600c600 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("This Order: ", valueOf(ipinCoNumRef2), " is not a Service Order.")); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("This Order: ", valueOf(ipinCoNum_2), " is not a Service Order.")); 604c604 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("This Service Order: ", valueOf(ipinCoNumRef2), " is planned not ordered.")); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("This Service Order: ", valueOf(ipinCoNum_2), " is planned not ordered.")); 609,610c609,610 < ipinCoNumRef2, < ipinTimcoOperRef2 --- > ipinCoNum_2, > ipinTimcoOper_2 656c656 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Operation: ", valueOf(ipinTimcoOperRef2), " status is ", job.getStatus(), ".")); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Operation: ", valueOf(ipinTimcoOper_2), " status is ", job.getStatus(), ".")); 661c661 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Operation: ", valueOf(ipinTimcoOperRef2), " for SO: ", valueOf(ipinCoNumRef2), " not found.")); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Operation: ", valueOf(ipinTimcoOper_2), " for SO: ", valueOf(ipinCoNum_2), " not found.")); 666c666 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Service Order: ", valueOf(ipinCoNumRef2), " not found.")); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Service Order: ", valueOf(ipinCoNum_2), " not found.")); 676c676 < public void ipValidateSkill(final character _ipchSkillCodeRef2) --- > public void ipValidateSkill(final character _ipchSkillCode_2) 680c680 < character ipchSkillCodeRef2 = new character(_ipchSkillCodeRef2); --- > character ipchSkillCode_2 = new character(_ipchSkillCode_2); 684c684 < BlJobt.this.ipchSkillCodeRef2 = ipchSkillCodeRef2; --- > BlJobt.this.ipchSkillCode_2 = ipchSkillCode_2; 701c701 < if (_isNotEqual(ipchSkillCodeRef2, "")) --- > if (_isNotEqual(ipchSkillCode_2, "")) 706c706 < toUpperCase(ipchSkillCodeRef2) --- > toUpperCase(ipchSkillCode_2) 711c711 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Skill code: ", ipchSkillCodeRef2, " not found.")); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Skill code: ", ipchSkillCode_2, " not found.")); 726c726 < public void ipValidateTime(final integer _ipinStartTime, final integer _ipinEndTime) --- > public void ipValidateTime(final integer _ipinStartTime_2, final integer _ipinEndTime_2) 730c730 < integer ipinStartTime = new integer(_ipinStartTime); --- > integer ipinStartTime_2 = new integer(_ipinStartTime_2); 732c732 < integer ipinEndTime = new integer(_ipinEndTime); --- > integer ipinEndTime_2 = new integer(_ipinEndTime_2); 755c755 < if (_or(isLessThan(ipinStartTime, 0), isGreaterThan(ipinStartTime, linMaxSeconds))) --- > if (_or(isLessThan(ipinStartTime_2, 0), isGreaterThan(ipinStartTime_2, linMaxSeconds))) 759c759 < if (_or(isLessThan(ipinEndTime, 0), isGreaterThan(ipinEndTime, linMaxSeconds))) --- > if (_or(isLessThan(ipinEndTime_2, 0), isGreaterThan(ipinEndTime_2, linMaxSeconds))) 763c763 < linTimeDiff.assign(minus(ipinEndTime, ipinStartTime)); --- > linTimeDiff.assign(minus(ipinEndTime_2, ipinStartTime_2)); 766c766 < linTimeDiff.assign(minus(plus(ipinEndTime, linMaxSeconds), ipinStartTime)); --- > linTimeDiff.assign(minus(plus(ipinEndTime_2, linMaxSeconds), ipinStartTime_2)); 835c835 < public void ipGetAhours(final integer _ipinStartTime, final integer _ipinEndTime, final decimal opdeAhours) --- > public void ipGetAhours(final integer _ipinStartTime_3, final integer _ipinEndTime_3, final decimal opdeAhours) 839c839 < integer ipinStartTime = new integer(_ipinStartTime); --- > integer ipinStartTime_3 = new integer(_ipinStartTime_3); 841c841 < integer ipinEndTime = new integer(_ipinEndTime); --- > integer ipinEndTime_3 = new integer(_ipinEndTime_3); 858c858 < ldeAhours.assign(divide(minus(ipinEndTime, ipinStartTime), multiply(60, 60))); --- > ldeAhours.assign(divide(minus(ipinEndTime_3, ipinStartTime_3), multiply(60, 60))); diff -r generated/20130314a/src/aero/timco/majic/so/BlJstat.java generated/20130314c/src/aero/timco/majic/so/BlJstat.java 441c441 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_2) 445c445 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 451c451 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 524c524 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 528c528 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 530c530 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 534c534 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 539c539 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 543c543 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 545c545 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 549c549 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 554c554 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 558c558 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 560c560 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 564c564 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 569c569 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 573c573 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 575c575 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 579c579 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 584c584 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 588c588 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 590c590 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 594c594 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 599c599 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 603c603 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 605c605 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 609c609 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); diff -r generated/20130314a/src/aero/timco/majic/so/CcOpset.java generated/20130314c/src/aero/timco/majic/so/CcOpset.java 235c235 < public void ipCreateAuditRecord(final character _ipchAction, final integer _ipinCoNum, final integer _ipinTimcoOper, final date _ipdtSetDate, final character _ipchOldStatus, final character _ipchNewStatus) --- > public void ipCreateAuditRecord(final character _ipchAction, final integer _ipinCoNum_2, final integer _ipinTimcoOper_2, final date _ipdtSetDate_2, final character _ipchOldStatus, final character _ipchNewStatus) 241c241 < integer ipinCoNum = new integer(_ipinCoNum); --- > integer ipinCoNum_2 = new integer(_ipinCoNum_2); 243c243 < integer ipinTimcoOper = new integer(_ipinTimcoOper); --- > integer ipinTimcoOper_2 = new integer(_ipinTimcoOper_2); 245c245 < date ipdtSetDate = new date(_ipdtSetDate); --- > date ipdtSetDate_2 = new date(_ipdtSetDate_2); 267,268c267,268 < lchTempDate.assign(valueOf(ipdtSetDate, "99/99/9999")); < lchIdentifier.assign(concat(valueOf(ipinCoNum, "9999999"), ".", valueOf(ipinTimcoOper, "999999"), ".", substring(lchTempDate, 7, 4), substring(lchTempDate, 1, 2), substring(lchTempDate, 4, 2))); --- > lchTempDate.assign(valueOf(ipdtSetDate_2, "99/99/9999")); > lchIdentifier.assign(concat(valueOf(ipinCoNum_2, "9999999"), ".", valueOf(ipinTimcoOper_2, "999999"), ".", substring(lchTempDate, 7, 4), substring(lchTempDate, 1, 2), substring(lchTempDate, 4, 2))); 276c276 < public void ipCreateAuditRecordHold(final character _ipchAction, final integer _ipinCoNum, final integer _ipinTimcoOper, final date _ipdtSetDate, final character _ipchNewHoldFor, final character _ipchOldHoldFor) --- > public void ipCreateAuditRecordHold(final character _ipchAction_2, final integer _ipinCoNum_3, final integer _ipinTimcoOper_3, final date _ipdtSetDate_3, final character _ipchNewHoldFor_2, final character _ipchOldHoldFor_2) 280c280 < character ipchAction = new character(_ipchAction); --- > character ipchAction_2 = new character(_ipchAction_2); 282c282 < integer ipinCoNum = new integer(_ipinCoNum); --- > integer ipinCoNum_3 = new integer(_ipinCoNum_3); 284c284 < integer ipinTimcoOper = new integer(_ipinTimcoOper); --- > integer ipinTimcoOper_3 = new integer(_ipinTimcoOper_3); 286c286 < date ipdtSetDate = new date(_ipdtSetDate); --- > date ipdtSetDate_3 = new date(_ipdtSetDate_3); 288c288 < character ipchNewHoldFor = new character(_ipchNewHoldFor); --- > character ipchNewHoldFor_2 = new character(_ipchNewHoldFor_2); 290c290 < character ipchOldHoldFor = new character(_ipchOldHoldFor); --- > character ipchOldHoldFor_2 = new character(_ipchOldHoldFor_2); 292c292 < character lchAction = new character(""); --- > character lchAction_2 = new character(""); 294c294 < character lchFileName = new character(""); --- > character lchFileName_2 = new character(""); 296c296 < character lchIdentifier = new character(""); --- > character lchIdentifier_2 = new character(""); 298c298 < character lchBeforeChange = new character(""); --- > character lchBeforeChange_2 = new character(""); 300c300 < character lchAfterChange = new character(""); --- > character lchAfterChange_2 = new character(""); 302c302 < character lchTempDate = new character(""); --- > character lchTempDate_2 = new character(""); 306,312c306,312 < lchAction.assign(ipchAction); < lchFileName.assign("cc-job"); < lchTempDate.assign(valueOf(ipdtSetDate, "99/99/9999")); < lchIdentifier.assign(concat(valueOf(ipinCoNum, "9999999"), ".", valueOf(ipinTimcoOper, "999999"), ".", substring(lchTempDate, 7, 4), substring(lchTempDate, 1, 2), substring(lchTempDate, 4, 2))); < lchBeforeChange.assign(concat("Old Hold For: ", ipchOldHoldFor)); < lchAfterChange.assign(concat("New Hold For: ", ipchNewHoldFor)); < ControlFlowOps.invokeWithMode("util/audit.p", "IIIII", lchAction, lchFileName, lchIdentifier, lchBeforeChange, lchAfterChange); --- > lchAction_2.assign(ipchAction_2); > lchFileName_2.assign("cc-job"); > lchTempDate_2.assign(valueOf(ipdtSetDate_3, "99/99/9999")); > lchIdentifier_2.assign(concat(valueOf(ipinCoNum_3, "9999999"), ".", valueOf(ipinTimcoOper_3, "999999"), ".", substring(lchTempDate_2, 7, 4), substring(lchTempDate_2, 1, 2), substring(lchTempDate_2, 4, 2))); > lchBeforeChange_2.assign(concat("Old Hold For: ", ipchOldHoldFor_2)); > lchAfterChange_2.assign(concat("New Hold For: ", ipchNewHoldFor_2)); > ControlFlowOps.invokeWithMode("util/audit.p", "IIIII", lchAction_2, lchFileName_2, lchIdentifier_2, lchBeforeChange_2, lchAfterChange_2); diff -r generated/20130314a/src/aero/timco/majic/so/Driverlabor.java generated/20130314c/src/aero/timco/majic/so/Driverlabor.java 73c73 < integer ipinCoNum; --- > integer ipinCoNum_2; 79c79 < integer ipinCoNumRef2; --- > integer ipinCoNum_3; 81c81 < integer ipinTimcoOperRef2; --- > integer ipinTimcoOper_2; 83c83 < integer ipinCoNumRef3; --- > integer ipinCoNum_4; 85c85 < integer ipinTimcoOperRef3; --- > integer ipinTimcoOper_3; 406c406 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_2) 410c410 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 416c416 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 489c489 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 493c493 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 495c495 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 499c499 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 504c504 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 508c508 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 510c510 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 514c514 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 519c519 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 523c523 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 525c525 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 529c529 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 534c534 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 538c538 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 540c540 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 544c544 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 549c549 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 553c553 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 555c555 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 559c559 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 564c564 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 568c568 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 570c570 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 574c574 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 622c622 < integer linUserNum = new integer(0); --- > integer linUserNum_2 = new integer(0); 659c659 < linUserNum.assign(getUserNum(ttLabor.getCsymuser())); --- > linUserNum_2.assign(getUserNum(ttLabor.getCsymuser())); 662c662 < ControlFlowOps.invokeWithMode("ip_SendToOasis", "IIIII", ttLabor.getIconum(), ttLabor.getItimcooper(), ttLabor.getIempnum(), estHrs, linUserNum); --- > ControlFlowOps.invokeWithMode("ip_SendToOasis", "IIIII", ttLabor.getIconum(), ttLabor.getItimcooper(), ttLabor.getIempnum(), estHrs, linUserNum_2); 677c677 < public void ipCanBeSentToOasis(final integer _ipinCoNum, final integer _ipinTimcoOper, final integer _ipinEmpNum) --- > public void ipCanBeSentToOasis(final integer _ipinCoNum_2, final integer _ipinTimcoOper, final integer _ipinEmpNum) 681c681 < integer ipinCoNum = new integer(_ipinCoNum); --- > integer ipinCoNum_2 = new integer(_ipinCoNum_2); 691c691 < Driverlabor.this.ipinCoNum = ipinCoNum; --- > Driverlabor.this.ipinCoNum_2 = ipinCoNum_2; 703c703 < ipinCoNum --- > ipinCoNum_2 713c713 < ipinCoNum, --- > ipinCoNum_2, 725c725 < ipinCoNum, --- > ipinCoNum_2, 749c749 < ipinCoNum, --- > ipinCoNum_2, 771c771 < public void ipSendToOasis(final integer _ipinCoNumRef2, final integer _ipinTimcoOperRef2, final integer _ipinEmpNum, final decimal _ipinEstHrs, final integer _ipinUserNum) --- > public void ipSendToOasis(final integer _ipinCoNum_3, final integer _ipinTimcoOper_2, final integer _ipinEmpNum_2, final decimal _ipinEstHrs, final integer _ipinUserNum) 775c775 < integer ipinCoNumRef2 = new integer(_ipinCoNumRef2); --- > integer ipinCoNum_3 = new integer(_ipinCoNum_3); 777c777 < integer ipinTimcoOperRef2 = new integer(_ipinTimcoOperRef2); --- > integer ipinTimcoOper_2 = new integer(_ipinTimcoOper_2); 779c779 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 787c787 < integer wbc = new integer(0); --- > integer wbc_2 = new integer(0); 793,794c793,794 < Driverlabor.this.ipinCoNumRef2 = ipinCoNumRef2; < Driverlabor.this.ipinTimcoOperRef2 = ipinTimcoOperRef2; --- > Driverlabor.this.ipinCoNum_3 = ipinCoNum_3; > Driverlabor.this.ipinTimcoOper_2 = ipinTimcoOper_2; 796c796 < TransactionManager.register(curOperNum, wbc, lBatch); --- > TransactionManager.register(curOperNum, wbc_2, lBatch); 803c803 < lchCoNumMsg.assign(concat("SO: ", valueOf(ipinCoNumRef2), " Oper: ", valueOf(ipinTimcoOperRef2))); --- > lchCoNumMsg.assign(concat("SO: ", valueOf(ipinCoNum_3), " Oper: ", valueOf(ipinTimcoOper_2))); 817c817 < ipinCoNumRef2 --- > ipinCoNum_3 821,822c821,822 < ipinCoNumRef2, < ipinTimcoOperRef2 --- > ipinCoNum_3, > ipinTimcoOper_2 824c824 < wbc.assign(plus(plus(multiply(10000, xJobBuf2.getBillClass()), multiply(100, xJobBuf2.getBillType())), xJobBuf2.getBillSeq())); --- > wbc_2.assign(plus(plus(multiply(10000, xJobBuf2.getBillClass()), multiply(100, xJobBuf2.getBillType())), xJobBuf2.getBillSeq())); 835,837c835,837 < estimateApproval.setCustomerOrderNumber(ipinCoNumRef2); < estimateApproval.setWbc(wbc); < estimateApproval.setTimcoOperation(ipinTimcoOperRef2); --- > estimateApproval.setCustomerOrderNumber(ipinCoNum_3); > estimateApproval.setWbc(wbc_2); > estimateApproval.setTimcoOperation(ipinTimcoOper_2); 839c839 < estimateApproval.setEmployeeNumber(ipinEmpNum); --- > estimateApproval.setEmployeeNumber(ipinEmpNum_2); 911c911 < public void ipCreateEstApprvSkill(final integer _ipinCoNumRef3, final integer _ipinTimcoOperRef3, final character _ipchSkill, final decimal _ipdeEstimate, final character _ipchSymUser) --- > public void ipCreateEstApprvSkill(final integer _ipinCoNum_4, final integer _ipinTimcoOper_3, final character _ipchSkill, final decimal _ipdeEstimate, final character _ipchSymUser_3) 915c915 < integer ipinCoNumRef3 = new integer(_ipinCoNumRef3); --- > integer ipinCoNum_4 = new integer(_ipinCoNum_4); 917c917 < integer ipinTimcoOperRef3 = new integer(_ipinTimcoOperRef3); --- > integer ipinTimcoOper_3 = new integer(_ipinTimcoOper_3); 923c923 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 927,928c927,928 < Driverlabor.this.ipinCoNumRef3 = ipinCoNumRef3; < Driverlabor.this.ipinTimcoOperRef3 = ipinTimcoOperRef3; --- > Driverlabor.this.ipinCoNum_4 = ipinCoNum_4; > Driverlabor.this.ipinTimcoOper_3 = ipinTimcoOper_3; 947,948c947,948 < ipinCoNumRef3, < ipinTimcoOperRef3, --- > ipinCoNum_4, > ipinTimcoOper_3, 963,964c963,964 < estimateApprovalSkill.setCustomerOrderNumber(ipinCoNumRef3); < estimateApprovalSkill.setOperation(ipinTimcoOperRef3); --- > estimateApprovalSkill.setCustomerOrderNumber(ipinCoNum_4); > estimateApprovalSkill.setOperation(ipinTimcoOper_3); 981c981 < estimateApprovalSkill.setSymUser(ipchSymUser); --- > estimateApprovalSkill.setSymUser(ipchSymUser_3); diff -r generated/20130314a/src/aero/timco/majic/so/Driverrca.java generated/20130314c/src/aero/timco/majic/so/Driverrca.java 289c289 < integer i = new integer(0); --- > integer i_2 = new integer(0); 293c293 < integer iNum = new integer(0); --- > integer iNum_2 = new integer(0); 312c312 < for (i.assign(1); _isLessThanOrEqual(i, numEntries(cText, " ")); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, numEntries(cText, " ")); i_2.increment()) 316,317c316,317 < ttEach.setCtext(entry(i, cText, " ")); < ttEach.setInum(i); --- > ttEach.setCtext(entry(i_2, cText, " ")); > ttEach.setInum(i_2); 321c321 < if (_isGreaterThan(i, 0)) --- > if (_isGreaterThan(i_2, 0)) 323c323 < i.assign(minus(i, 1)); --- > i_2.assign(minus(i_2, 1)); 325c325 < if (_isEqual(i, 0)) --- > if (_isEqual(i_2, 0)) 331c331 < if (_isEqual(i, 1)) --- > if (_isEqual(i_2, 1)) 333c333 < iNum.assign(divide(length(cText), 75)); --- > iNum_2.assign(divide(length(cText), 75)); 336c336 < for (i.assign(1); _isLessThanOrEqual(i, iNum); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, iNum_2); i_2.increment()) 338c338 < if (_isEqual(i, 1)) --- > if (_isEqual(i_2, 1)) 340c340 < iHold.assign(i); --- > iHold.assign(i_2); 344c344 < iHold.assign(multiply(i, 75)); --- > iHold.assign(multiply(i_2, 75)); 346c346 < cHold.assign(concat(cHold, substring(cText, iHold, multiply(i, 75)), "|", substring(cText, plus(multiply(i, 75), 1)))); --- > cHold.assign(concat(cHold, substring(cText, iHold, multiply(i_2, 75)), "|", substring(cText, plus(multiply(i_2, 75), 1)))); 378c378 < i.assign(lastIndexOf(cHold, " ")); --- > i_2.assign(lastIndexOf(cHold, " ")); 381c381 < while (_isGreaterThan(i, 75)) --- > while (_isGreaterThan(i_2, 75)) 383c383 < i.assign(lastIndexOf(cHold, " ", minus(i, 1))); --- > i_2.assign(lastIndexOf(cHold, " ", minus(i_2, 1))); 386c386 < if (_isGreaterThan(iNum, 0)) --- > if (_isGreaterThan(iNum_2, 0)) 389c389 < while (_isGreaterThan(plus(length(substring(cHold, 1, i)), length(entry(iNum, cText, "|"))), 75)) --- > while (_isGreaterThan(plus(length(substring(cHold, 1, i_2)), length(entry(iNum_2, cText, "|"))), 75)) 391c391 < i.assign(lastIndexOf(cHold, " ", minus(i, 1))); --- > i_2.assign(lastIndexOf(cHold, " ", minus(i_2, 1))); 394c394 < cHold.overlay("|", i, 1, "character"); --- > cHold.overlay("|", i_2, 1, "character"); 396c396 < iNum.assign(numEntries(cText, "|")); --- > iNum_2.assign(numEntries(cText, "|")); 402,403c402,403 < iNum.assign(numEntries(cText, "|")); < if (_isGreaterThan(length(concat(cHold, " ", entry(iNum, cText, "|"))), 75)) --- > iNum_2.assign(numEntries(cText, "|")); > if (_isGreaterThan(length(concat(cHold, " ", entry(iNum_2, cText, "|"))), 75)) 405c405 < i.assign(lastIndexOf(cHold, " ")); --- > i_2.assign(lastIndexOf(cHold, " ")); 408c408 < while (_isGreaterThan(i, 75)) --- > while (_isGreaterThan(i_2, 75)) 410c410 < i.assign(lastIndexOf(cHold, " ", minus(i, 1))); --- > i_2.assign(lastIndexOf(cHold, " ", minus(i_2, 1))); 413c413 < if (_isGreaterThan(iNum, 0)) --- > if (_isGreaterThan(iNum_2, 0)) 416c416 < while (_isGreaterThan(plus(length(substring(cHold, 1, i)), length(entry(iNum, cText, "|"))), 75)) --- > while (_isGreaterThan(plus(length(substring(cHold, 1, i_2)), length(entry(iNum_2, cText, "|"))), 75)) 418c418 < if (_isEqual(i, 0)) --- > if (_isEqual(i_2, 0)) 422c422 < i.assign(lastIndexOf(cHold, " ", minus(i, 1))); --- > i_2.assign(lastIndexOf(cHold, " ", minus(i_2, 1))); 425c425 < if (_isGreaterThan(i, 0)) --- > if (_isGreaterThan(i_2, 0)) 427c427 < cHold.overlay("|", i, 1, "character"); --- > cHold.overlay("|", i_2, 1, "character"); diff -r generated/20130314a/src/aero/timco/majic/so/Est.java generated/20130314c/src/aero/timco/majic/so/Est.java 127c127 < integer ipinEmpNumRef2; --- > integer ipinEmpNum_2; 129c129 < date ipdtCheckDateRef2; --- > date ipdtCheckDate_2; 1150c1150 < public void ipPendingCount(final integer _ipinEmpNumRef2, final date _ipdtCheckDateRef2, final integer opinPendingCount) --- > public void ipPendingCount(final integer _ipinEmpNum_2, final date _ipdtCheckDate_2, final integer opinPendingCount) 1154c1154 < integer ipinEmpNumRef2 = new integer(_ipinEmpNumRef2); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 1156c1156 < date ipdtCheckDateRef2 = new date(_ipdtCheckDateRef2); --- > date ipdtCheckDate_2 = new date(_ipdtCheckDate_2); 1160,1161c1160,1161 < Est.this.ipinEmpNumRef2 = ipinEmpNumRef2; < Est.this.ipdtCheckDateRef2 = ipdtCheckDateRef2; --- > Est.this.ipinEmpNum_2 = ipinEmpNum_2; > Est.this.ipdtCheckDate_2 = ipdtCheckDate_2; 1180,1181c1180,1181 < ipinEmpNumRef2, < ipdtCheckDateRef2 --- > ipinEmpNum_2, > ipdtCheckDate_2 diff -r generated/20130314a/src/aero/timco/majic/so/EstPmR.java generated/20130314c/src/aero/timco/majic/so/EstPmR.java 270c270 < public void getCritria(final logical tLeave) --- > public void getCritria(final logical tLeave_2) 276c276 < tLeave.assign(new logical(false)); --- > tLeave_2.assign(new logical(false)); 279c279 < tLeave --- > tLeave_2 286c286 < tLeave.assign(true); --- > tLeave_2.assign(true); 532c532 < tLeave.assign(false); --- > tLeave_2.assign(false); diff -r generated/20130314a/src/aero/timco/majic/so/EstwOut.java generated/20130314c/src/aero/timco/majic/so/EstwOut.java 158c158 < public void xmlEndTags(final character opchTag) --- > public void xmlEndTags(final character opchTag_2) 164c164 < opchTag.assign(new character("")); --- > opchTag_2.assign(new character("")); 167c167 < opchTag --- > opchTag_2 173c173 < opchTag.assign(""); --- > opchTag_2.assign(""); 228c228 < public void xmlBuildCloseTag(final character _ipchName, final character opchCloseTag) --- > public void xmlBuildCloseTag(final character _ipchName_2, final character opchCloseTag) 232c232 < character ipchName = new character(_ipchName); --- > character ipchName_2 = new character(_ipchName_2); 234c234 < character lchTagName = new character(""); --- > character lchTagName_2 = new character(""); 247,250c247,250 < lchTagName.assign(ipchName); < lchTagName.assign(replaceAll(lchTagName, "$", "")); < lchTagName.assign(replaceAll(lchTagName, "#", "")); < opchCloseTag.assign(concat("")); --- > lchTagName_2.assign(ipchName_2); > lchTagName_2.assign(replaceAll(lchTagName_2, "$", "")); > lchTagName_2.assign(replaceAll(lchTagName_2, "#", "")); > opchCloseTag.assign(concat("")); 255c255 < public void xmlBuildCompleteTag(final character _ipchName, final character _ipchAttrKeys, final character _ipchAttrValues, final character opchCompleteTag) --- > public void xmlBuildCompleteTag(final character _ipchName_3, final character _ipchAttrKeys_2, final character _ipchAttrValues_2, final character opchCompleteTag) 259c259 < character ipchName = new character(_ipchName); --- > character ipchName_3 = new character(_ipchName_3); 261c261 < character ipchAttrKeys = new character(_ipchAttrKeys); --- > character ipchAttrKeys_2 = new character(_ipchAttrKeys_2); 263c263 < character ipchAttrValues = new character(_ipchAttrValues); --- > character ipchAttrValues_2 = new character(_ipchAttrValues_2); 265c265 < character lchTagStart = new character(""); --- > character lchTagStart_2 = new character(""); 267c267 < character lchTagAttr = new character(""); --- > character lchTagAttr_2 = new character(""); 269c269 < integer linEntryPos = new integer(0); --- > integer linEntryPos_2 = new integer(0); 271c271 < integer linAttrCount = new integer(0); --- > integer linAttrCount_2 = new integer(0); 273c273 < character lchTagName = new character(""); --- > character lchTagName_3 = new character(""); 286,290c286,290 < lchTagName.assign(ipchName); < lchTagName.assign(replaceAll(lchTagName, "$", "")); < lchTagName.assign(replaceAll(lchTagName, "#", "")); < lchTagStart.assign(concat("<", lchTagName)); < linAttrCount.assign(numEntries(ipchAttrKeys, xmlListSepChar)); --- > lchTagName_3.assign(ipchName_3); > lchTagName_3.assign(replaceAll(lchTagName_3, "$", "")); > lchTagName_3.assign(replaceAll(lchTagName_3, "#", "")); > lchTagStart_2.assign(concat("<", lchTagName_3)); > linAttrCount_2.assign(numEntries(ipchAttrKeys_2, xmlListSepChar)); 293c293 < for (linEntryPos.assign(1); _isLessThanOrEqual(linEntryPos, linAttrCount); linEntryPos.increment()) --- > for (linEntryPos_2.assign(1); _isLessThanOrEqual(linEntryPos_2, linAttrCount_2); linEntryPos_2.increment()) 296c296 < lchTagAttr.assign(concat(lchTagAttr, (_isEqual(linEntryPos, 1) ? new character("") : new character(" ")), entry(linEntryPos, ipchAttrKeys, xmlListSepChar), "=", "\"", entry(linEntryPos, ipchAttrValues, xmlListSepChar), "\"")); --- > lchTagAttr_2.assign(concat(lchTagAttr_2, (_isEqual(linEntryPos_2, 1) ? new character("") : new character(" ")), entry(linEntryPos_2, ipchAttrKeys_2, xmlListSepChar), "=", "\"", entry(linEntryPos_2, ipchAttrValues_2, xmlListSepChar), "\"")); 300c300 < opchCompleteTag.assign(concat(lchTagStart, (_isNotEqual(lchTagAttr, "") ? concat(" ", lchTagAttr) : new character("")), " />")); --- > opchCompleteTag.assign(concat(lchTagStart_2, (_isNotEqual(lchTagAttr_2, "") ? concat(" ", lchTagAttr_2) : new character("")), " />")); 378c378 < public void xmlCleanValue(final character _ipchInputValue, final character opchCleanValue) --- > public void xmlCleanValue(final character _ipchInputValue_2, final character opchCleanValue) 382c382 < character ipchInputValue = new character(_ipchInputValue); --- > character ipchInputValue_2 = new character(_ipchInputValue_2); 406c406 < lchTempValue.assign(ipchInputValue); --- > lchTempValue.assign(ipchInputValue_2); diff -r generated/20130314a/src/aero/timco/majic/so/ExpOut.java generated/20130314c/src/aero/timco/majic/so/ExpOut.java 145c145 < public void xmlEndTags(final character opchTag) --- > public void xmlEndTags(final character opchTag_2) 151c151 < opchTag.assign(new character("")); --- > opchTag_2.assign(new character("")); 154c154 < opchTag --- > opchTag_2 160c160 < opchTag.assign(""); --- > opchTag_2.assign(""); 215c215 < public void xmlBuildCloseTag(final character _ipchName, final character opchCloseTag) --- > public void xmlBuildCloseTag(final character _ipchName_2, final character opchCloseTag) 219c219 < character ipchName = new character(_ipchName); --- > character ipchName_2 = new character(_ipchName_2); 221c221 < character lchTagName = new character(""); --- > character lchTagName_2 = new character(""); 234,237c234,237 < lchTagName.assign(ipchName); < lchTagName.assign(replaceAll(lchTagName, "$", "")); < lchTagName.assign(replaceAll(lchTagName, "#", "")); < opchCloseTag.assign(concat("")); --- > lchTagName_2.assign(ipchName_2); > lchTagName_2.assign(replaceAll(lchTagName_2, "$", "")); > lchTagName_2.assign(replaceAll(lchTagName_2, "#", "")); > opchCloseTag.assign(concat("")); 242c242 < public void xmlBuildCompleteTag(final character _ipchName, final character _ipchAttrKeys, final character _ipchAttrValues, final character opchCompleteTag) --- > public void xmlBuildCompleteTag(final character _ipchName_3, final character _ipchAttrKeys_2, final character _ipchAttrValues_2, final character opchCompleteTag) 246c246 < character ipchName = new character(_ipchName); --- > character ipchName_3 = new character(_ipchName_3); 248c248 < character ipchAttrKeys = new character(_ipchAttrKeys); --- > character ipchAttrKeys_2 = new character(_ipchAttrKeys_2); 250c250 < character ipchAttrValues = new character(_ipchAttrValues); --- > character ipchAttrValues_2 = new character(_ipchAttrValues_2); 252c252 < character lchTagStart = new character(""); --- > character lchTagStart_2 = new character(""); 254c254 < character lchTagAttr = new character(""); --- > character lchTagAttr_2 = new character(""); 256c256 < integer linEntryPos = new integer(0); --- > integer linEntryPos_2 = new integer(0); 258c258 < integer linAttrCount = new integer(0); --- > integer linAttrCount_2 = new integer(0); 260c260 < character lchTagName = new character(""); --- > character lchTagName_3 = new character(""); 273,277c273,277 < lchTagName.assign(ipchName); < lchTagName.assign(replaceAll(lchTagName, "$", "")); < lchTagName.assign(replaceAll(lchTagName, "#", "")); < lchTagStart.assign(concat("<", lchTagName)); < linAttrCount.assign(numEntries(ipchAttrKeys, xmlListSepChar)); --- > lchTagName_3.assign(ipchName_3); > lchTagName_3.assign(replaceAll(lchTagName_3, "$", "")); > lchTagName_3.assign(replaceAll(lchTagName_3, "#", "")); > lchTagStart_2.assign(concat("<", lchTagName_3)); > linAttrCount_2.assign(numEntries(ipchAttrKeys_2, xmlListSepChar)); 280c280 < for (linEntryPos.assign(1); _isLessThanOrEqual(linEntryPos, linAttrCount); linEntryPos.increment()) --- > for (linEntryPos_2.assign(1); _isLessThanOrEqual(linEntryPos_2, linAttrCount_2); linEntryPos_2.increment()) 283c283 < lchTagAttr.assign(concat(lchTagAttr, (_isEqual(linEntryPos, 1) ? new character("") : new character(" ")), entry(linEntryPos, ipchAttrKeys, xmlListSepChar), "=", "\"", entry(linEntryPos, ipchAttrValues, xmlListSepChar), "\"")); --- > lchTagAttr_2.assign(concat(lchTagAttr_2, (_isEqual(linEntryPos_2, 1) ? new character("") : new character(" ")), entry(linEntryPos_2, ipchAttrKeys_2, xmlListSepChar), "=", "\"", entry(linEntryPos_2, ipchAttrValues_2, xmlListSepChar), "\"")); 287c287 < opchCompleteTag.assign(concat(lchTagStart, (_isNotEqual(lchTagAttr, "") ? concat(" ", lchTagAttr) : new character("")), " />")); --- > opchCompleteTag.assign(concat(lchTagStart_2, (_isNotEqual(lchTagAttr_2, "") ? concat(" ", lchTagAttr_2) : new character("")), " />")); 365c365 < public void xmlCleanValue(final character _ipchInputValue, final character opchCleanValue) --- > public void xmlCleanValue(final character _ipchInputValue_2, final character opchCleanValue) 369c369 < character ipchInputValue = new character(_ipchInputValue); --- > character ipchInputValue_2 = new character(_ipchInputValue_2); 393c393 < lchTempValue.assign(ipchInputValue); --- > lchTempValue.assign(ipchInputValue_2); diff -r generated/20130314a/src/aero/timco/majic/so/LaborBatchAdd.java generated/20130314c/src/aero/timco/majic/so/LaborBatchAdd.java 201c201 < public integer getUserNum(final character _ipchSymUser) --- > public integer getUserNum(final character _ipchSymUser_2) 205c205 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 211c211 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 225c225 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_3) 229c229 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 235c235 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_3); 308c308 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 312c312 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 314c314 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 318c318 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 323c323 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 327c327 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 329c329 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 333c333 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 338c338 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 342c342 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 344c344 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 348c348 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 353c353 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 357c357 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 359c359 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 363c363 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 368c368 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 372c372 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 374c374 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 378c378 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 383c383 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 387c387 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 389c389 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 393c393 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 402c402 < integer linUserNum = new integer(0); --- > integer linUserNum_2 = new integer(0); 404c404 < character lchUserCode = new character(""); --- > character lchUserCode_2 = new character(""); 418,420c418,420 < linUserNum.assign(getUserNum(ipchSymUser)); < lchUserCode.assign(getUserCode(ipchSymUser)); < if (_isUnknown(linUserNum)) --- > linUserNum_2.assign(getUserNum(ipchSymUser)); > lchUserCode_2.assign(getUserCode(ipchSymUser)); > if (_isUnknown(linUserNum_2)) 424c424 < if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum))) --- > if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum_2))) 426c426 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum_2))); diff -r generated/20130314a/src/aero/timco/majic/so/Man08R.java generated/20130314c/src/aero/timco/majic/so/Man08R.java 87c87 < date tDateRef2 = new date(); --- > date tDate = new date(); 93c93 < integer empNum; --- > integer empNum_2; 95c95 < date tDate; --- > date tDate_3; 169c169 < TransactionManager.register(tDateRef2, rptName, tRptHdr, tSerial, infile, outfile, startString, endString, ifappend, ifpaged, tPrintFile, version, infileH, tLeave, sCrew, eCrew, sEmpNum, eEmpNum, sPmEmpNum, ePmEmpNum, sSkill, eSkill, sShift); --- > TransactionManager.register(tDate, rptName, tRptHdr, tSerial, infile, outfile, startString, endString, ifappend, ifpaged, tPrintFile, version, infileH, tLeave, sCrew, eCrew, sEmpNum, eEmpNum, sPmEmpNum, ePmEmpNum, sSkill, eSkill, sShift); 270c270 < public character getRdo(final character _rdo, final integer _empNum, final date _tDate) --- > public character getRdo(final character _rdo_2, final integer _empNum_2, final date _tDate_3) 274c274 < character rdo = new character(_rdo); --- > character rdo_2 = new character(_rdo_2); 276c276 < integer empNum = new integer(_empNum); --- > integer empNum_2 = new integer(_empNum_2); 278c278 < date tDate = new date(_tDate); --- > date tDate_3 = new date(_tDate_3); 282,283c282,283 < Man08R.this.empNum = empNum; < Man08R.this.tDate = tDate; --- > Man08R.this.empNum_2 = empNum_2; > Man08R.this.tDate_3 = tDate_3; 288c288 < if (_isGreaterThan(indexOf(rdo, valueOf(date.weekday(date.minusDays(tDate, 1)))), 0)) --- > if (_isGreaterThan(indexOf(rdo_2, valueOf(date.weekday(date.minusDays(tDate_3, 1)))), 0)) 292,293c292,293 < empNum, < tDate --- > empNum_2, > tDate_3 298c298 < empNum, --- > empNum_2, 426c426 < tDateRef2 --- > tDate 448c448 < ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDate)); 457c457 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 543c543 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 558c558 < public void getCritria(final logical tLeave) --- > public void getCritria(final logical tLeave_2) 564,565c564,565 < tLeave.assign(new logical(false)); < TransactionManager.registerUndo(tLeave); --- > tLeave_2.assign(new logical(false)); > TransactionManager.registerUndo(tLeave_2); 570c570 < tLeave.assign(true); --- > tLeave_2.assign(true); 728c728 < tLeave.assign(false); --- > tLeave_2.assign(false); diff -r generated/20130314a/src/aero/timco/majic/so/OasisEstimateUpdate.java generated/20130314c/src/aero/timco/majic/so/OasisEstimateUpdate.java 233c233 < public integer getUserNum(final character _ipchSymUser) --- > public integer getUserNum(final character _ipchSymUser_2) 237c237 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 243c243 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 257c257 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_3) 261c261 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 267c267 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_3); 340c340 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 344c344 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 346c346 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 350c350 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 355c355 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 359c359 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 361c361 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 365c365 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 370c370 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 374c374 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 376c376 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 380c380 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 385c385 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 389c389 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 391c391 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 395c395 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 400c400 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 404c404 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 406c406 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 410c410 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 415c415 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 419c419 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 421c421 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 425c425 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 684c684 < integer linUserNum = new integer(0); --- > integer linUserNum_2 = new integer(0); 686c686 < character lchUserCode = new character(""); --- > character lchUserCode_2 = new character(""); 700,702c700,702 < linUserNum.assign(getUserNum(ipchSymUser)); < lchUserCode.assign(getUserCode(ipchSymUser)); < if (_isUnknown(linUserNum)) --- > linUserNum_2.assign(getUserNum(ipchSymUser)); > lchUserCode_2.assign(getUserCode(ipchSymUser)); > if (_isUnknown(linUserNum_2)) 706c706 < if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum))) --- > if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum_2))) 708c708 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum_2))); diff -r generated/20130314a/src/aero/timco/majic/so/Pick04.java generated/20130314c/src/aero/timco/majic/so/Pick04.java 947c947 < public character fGetCriticalMark(final integer _ipinCoNum, final integer _ipinTimcoOper) --- > public character fGetCriticalMark(final integer _ipinCoNum_3, final integer _ipinTimcoOper_3) 951c951 < integer ipinCoNum = new integer(_ipinCoNum); --- > integer ipinCoNum_3 = new integer(_ipinCoNum_3); 953c953 < integer ipinTimcoOper = new integer(_ipinTimcoOper); --- > integer ipinTimcoOper_3 = new integer(_ipinTimcoOper_3); 963c963 < ControlFlowOps.invokeWithMode("so/cc-opchk.p", "IIIOO", ipinCoNum, ipinTimcoOper, new date(), lgOnFlag, chSecondReturnValue); --- > ControlFlowOps.invokeWithMode("so/cc-opchk.p", "IIIOO", ipinCoNum_3, ipinTimcoOper_3, new date(), lgOnFlag, chSecondReturnValue); 977c977 < public character fGetHoldFor(final integer _ipinCoNum, final integer _ipinTimcoOper) --- > public character fGetHoldFor(final integer _ipinCoNum_4, final integer _ipinTimcoOper_4) 981c981 < integer ipinCoNum = new integer(_ipinCoNum); --- > integer ipinCoNum_4 = new integer(_ipinCoNum_4); 983c983 < integer ipinTimcoOper = new integer(_ipinTimcoOper); --- > integer ipinTimcoOper_4 = new integer(_ipinTimcoOper_4); 993c993 < ControlFlowOps.invokeWithMode("so/cc-opchk.p", "IIIOO", ipinCoNum, ipinTimcoOper, new date(), lgFirstReturnValue, chOnHoldFor); --- > ControlFlowOps.invokeWithMode("so/cc-opchk.p", "IIIOO", ipinCoNum_4, ipinTimcoOper_4, new date(), lgFirstReturnValue, chOnHoldFor); diff -r generated/20130314a/src/aero/timco/majic/so/RcaBatchAdd.java generated/20130314c/src/aero/timco/majic/so/RcaBatchAdd.java 200c200 < public integer getUserNum(final character _ipchSymUser) --- > public integer getUserNum(final character _ipchSymUser_2) 204c204 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_2 = new character(_ipchSymUser_2); 210c210 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_2); 224c224 < public character getUserCode(final character _ipchSymUser) --- > public character getUserCode(final character _ipchSymUser_3) 228c228 < character ipchSymUser = new character(_ipchSymUser); --- > character ipchSymUser_3 = new character(_ipchSymUser_3); 234c234 < _lookupUserId_.assign(ipchSymUser); --- > _lookupUserId_.assign(ipchSymUser_3); 307c307 < public logical canRun(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canRun(final character _ipchPfunct_2, final integer _ipinUsernum_2) 311c311 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_2 = new character(_ipchPfunct_2); 313c313 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_2 = new integer(_ipinUsernum_2); 317c317 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(1))); --- > returnNormal(checkPermit(ipchPfunct_2, ipinUsernum_2, new integer(1))); 322c322 < public logical canAdd(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canAdd(final character _ipchPfunct_3, final integer _ipinUsernum_3) 326c326 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_3 = new character(_ipchPfunct_3); 328c328 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_3 = new integer(_ipinUsernum_3); 332c332 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(2))); --- > returnNormal(checkPermit(ipchPfunct_3, ipinUsernum_3, new integer(2))); 337c337 < public logical canUpdate(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canUpdate(final character _ipchPfunct_4, final integer _ipinUsernum_4) 341c341 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_4 = new character(_ipchPfunct_4); 343c343 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_4 = new integer(_ipinUsernum_4); 347c347 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(3))); --- > returnNormal(checkPermit(ipchPfunct_4, ipinUsernum_4, new integer(3))); 352c352 < public logical canDelete(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canDelete(final character _ipchPfunct_5, final integer _ipinUsernum_5) 356c356 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_5 = new character(_ipchPfunct_5); 358c358 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_5 = new integer(_ipinUsernum_5); 362c362 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(4))); --- > returnNormal(checkPermit(ipchPfunct_5, ipinUsernum_5, new integer(4))); 367c367 < public logical canCost(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canCost(final character _ipchPfunct_6, final integer _ipinUsernum_6) 371c371 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_6 = new character(_ipchPfunct_6); 373c373 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_6 = new integer(_ipinUsernum_6); 377c377 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(5))); --- > returnNormal(checkPermit(ipchPfunct_6, ipinUsernum_6, new integer(5))); 382c382 < public logical canPrice(final character _ipchPfunct, final integer _ipinUsernum) --- > public logical canPrice(final character _ipchPfunct_7, final integer _ipinUsernum_7) 386c386 < character ipchPfunct = new character(_ipchPfunct); --- > character ipchPfunct_7 = new character(_ipchPfunct_7); 388c388 < integer ipinUsernum = new integer(_ipinUsernum); --- > integer ipinUsernum_7 = new integer(_ipinUsernum_7); 392c392 < returnNormal(checkPermit(ipchPfunct, ipinUsernum, new integer(6))); --- > returnNormal(checkPermit(ipchPfunct_7, ipinUsernum_7, new integer(6))); 401c401 < integer linUserNum = new integer(0); --- > integer linUserNum_2 = new integer(0); 403c403 < character lchUserCode = new character(""); --- > character lchUserCode_2 = new character(""); 417,419c417,419 < linUserNum.assign(getUserNum(ipchSymUser)); < lchUserCode.assign(getUserCode(ipchSymUser)); < if (_isUnknown(linUserNum)) --- > linUserNum_2.assign(getUserNum(ipchSymUser)); > lchUserCode_2.assign(getUserCode(ipchSymUser)); > if (_isUnknown(linUserNum_2)) 423c423 < if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum))) --- > if (_not(canAdd(new character("Batch Non Routine Job Add"), linUserNum_2))) 425c425 < ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum))); --- > ControlFlowOps.invokeWithMode("ip_RaiseError", "I", concat("Authorization error for Operation Transactions by: ", valueOf(linUserNum_2))); diff -r generated/20130314a/src/aero/timco/majic/train2/BCode.java generated/20130314c/src/aero/timco/majic/train2/BCode.java 105c105 < public logical openQ(final logical _tBy) --- > public logical openQ(final logical _tBy_2) 109c109 < logical tBy = new logical(_tBy); --- > logical tBy_2 = new logical(_tBy_2); diff -r generated/20130314a/src/aero/timco/majic/train2/BCrew.java generated/20130314c/src/aero/timco/majic/train2/BCrew.java 96c96 < public logical openQ(final logical _tBy) --- > public logical openQ(final logical _tBy_2) 100c100 < logical tBy = new logical(_tBy); --- > logical tBy_2 = new logical(_tBy_2); 104c104 < if ((tBy).booleanValue()) --- > if ((tBy_2).booleanValue()) diff -r generated/20130314a/src/aero/timco/majic/train2/BSkill.java generated/20130314c/src/aero/timco/majic/train2/BSkill.java 91c91 < public logical openQ(final logical _tBy) --- > public logical openQ(final logical _tBy_2) 95c95 < logical tBy = new logical(_tBy); --- > logical tBy_2 = new logical(_tBy_2); 99c99 < if ((tBy).booleanValue()) --- > if ((tBy_2).booleanValue()) diff -r generated/20130314a/src/aero/timco/majic/train2/Crs01.java generated/20130314c/src/aero/timco/majic/train2/Crs01.java 122c122 < character ctypeRef2; --- > character ctype_4; 1720c1720 < public logical findCourse(final character _lookit, final character _ctypeRef2) --- > public logical findCourse(final character _lookit_2, final character _ctype_4) 1724c1724 < character lookit = new character(_lookit); --- > character lookit_2 = new character(_lookit_2); 1726c1726 < character ctypeRef2 = new character(_ctypeRef2); --- > character ctype_4 = new character(_ctype_4); 1730c1730 < Crs01.this.ctypeRef2 = ctypeRef2; --- > Crs01.this.ctype_4 = ctype_4; 1736c1736 < character condition1 = lookit; --- > character condition1 = lookit_2; 1742c1742 < toUpperCase(ctypeRef2) --- > toUpperCase(ctype_4) 1751c1751 < toUpperCase(ctypeRef2) --- > toUpperCase(ctype_4) 1760c1760 < toUpperCase(ctypeRef2) --- > toUpperCase(ctype_4) 1769c1769 < toUpperCase(ctypeRef2) --- > toUpperCase(ctype_4) 1777c1777 < findCourse(new character("FIRST"), ctypeRef2); --- > findCourse(new character("FIRST"), ctype_4); 1916c1916 < character condition2 = lookit; --- > character condition2 = lookit_2; 1919c1919 < findCourse(new character("LAST"), ctypeRef2); --- > findCourse(new character("LAST"), ctype_4); 1923c1923 < findCourse(new character("FIRST"), ctypeRef2); --- > findCourse(new character("FIRST"), ctype_4); 1967c1967 < public logical saveCourse(final character _ctype) --- > public logical saveCourse(final character _ctype_5) 1971c1971 < character ctype = new character(_ctype); --- > character ctype_5 = new character(_ctype_5); 1998c1998 < course2.setType(ctype); --- > course2.setType(ctype_5); diff -r generated/20130314a/src/aero/timco/majic/train2/Crs01R.java generated/20130314c/src/aero/timco/majic/train2/Crs01R.java 248c248 < public void getCritria(final logical tLeave) --- > public void getCritria(final logical tLeave_2) 254c254 < tLeave.assign(new logical(false)); --- > tLeave_2.assign(new logical(false)); 257c257 < tLeave --- > tLeave_2 264c264 < tLeave.assign(true); --- > tLeave_2.assign(true); 555c555 < tLeave.assign(false); --- > tLeave_2.assign(false); diff -r generated/20130314a/src/aero/timco/majic/train2/EmpExportEval.java generated/20130314c/src/aero/timco/majic/train2/EmpExportEval.java 40c40 < date tDateRef2 = new date(); --- > date tDate = new date(); 48c48 < integer empNum; --- > integer empNum_2; 50c50 < date tDate; --- > date tDate_3; 105c105 < public character getRdo(final character _rdo, final integer _empNum, final date _tDate) --- > public character getRdo(final character _rdo_2, final integer _empNum_2, final date _tDate_3) 109c109 < character rdo = new character(_rdo); --- > character rdo_2 = new character(_rdo_2); 111c111 < integer empNum = new integer(_empNum); --- > integer empNum_2 = new integer(_empNum_2); 113c113 < date tDate = new date(_tDate); --- > date tDate_3 = new date(_tDate_3); 117,118c117,118 < EmpExportEval.this.empNum = empNum; < EmpExportEval.this.tDate = tDate; --- > EmpExportEval.this.empNum_2 = empNum_2; > EmpExportEval.this.tDate_3 = tDate_3; 123c123 < if (_isGreaterThan(indexOf(rdo, valueOf(date.weekday(date.minusDays(tDate, 1)))), 0)) --- > if (_isGreaterThan(indexOf(rdo_2, valueOf(date.weekday(date.minusDays(tDate_3, 1)))), 0)) 127,128c127,128 < empNum, < tDate --- > empNum_2, > tDate_3 133c133 < empNum, --- > empNum_2, 261c261 < tDateRef2 --- > tDate 283c283 < ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDate)); 292c292 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 378c378 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); diff -r generated/20130314a/src/aero/timco/majic/train2/EmpTransfer.java generated/20130314c/src/aero/timco/majic/train2/EmpTransfer.java 228c228 < public void pGetCritria(final logical lLeave) --- > public void pGetCritria(final logical lLeave_2) 234c234 < lLeave.assign(new logical(false)); --- > lLeave_2.assign(new logical(false)); 237c237 < lLeave --- > lLeave_2 244c244 < lLeave.assign(true); --- > lLeave_2.assign(true); 441c441 < lLeave.assign(true); --- > lLeave_2.assign(true); 443c443 < lLeave.assign(false); --- > lLeave_2.assign(false); diff -r generated/20130314a/src/aero/timco/majic/train2/RecurR.java generated/20130314c/src/aero/timco/majic/train2/RecurR.java 93c93 < date tDateRef2 = new date(); --- > date tDate = new date(); 119c119 < integer empNum; --- > integer empNum_2; 121c121 < date tDate; --- > date tDate_3; 501c501 < public character getRdo(final character _rdo, final integer _empNum, final date _tDate) --- > public character getRdo(final character _rdo_2, final integer _empNum_2, final date _tDate_3) 505c505 < character rdo = new character(_rdo); --- > character rdo_2 = new character(_rdo_2); 507c507 < integer empNum = new integer(_empNum); --- > integer empNum_2 = new integer(_empNum_2); 509c509 < date tDate = new date(_tDate); --- > date tDate_3 = new date(_tDate_3); 513,514c513,514 < RecurR.this.empNum = empNum; < RecurR.this.tDate = tDate; --- > RecurR.this.empNum_2 = empNum_2; > RecurR.this.tDate_3 = tDate_3; 519c519 < if (_isGreaterThan(indexOf(rdo, valueOf(date.weekday(date.minusDays(tDate, 1)))), 0)) --- > if (_isGreaterThan(indexOf(rdo_2, valueOf(date.weekday(date.minusDays(tDate_3, 1)))), 0)) 523,524c523,524 < empNum, < tDate --- > empNum_2, > tDate_3 529c529 < empNum, --- > empNum_2, 657c657 < tDateRef2 --- > tDate 679c679 < ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDate)); 688c688 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 774c774 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); diff -r generated/20130314a/src/aero/timco/majic/train2/Rst01.java generated/20130314c/src/aero/timco/majic/train2/Rst01.java 1034c1034 < public logical openQ(final logical _report) --- > public logical openQ(final logical _report_2) 1038c1038 < logical report = new logical(_report); --- > logical report_2 = new logical(_report_2); 1066c1066 < if ((report).booleanValue()) --- > if ((report_2).booleanValue()) diff -r generated/20130314a/src/aero/timco/majic/train2/RstTlPmR.java generated/20130314c/src/aero/timco/majic/train2/RstTlPmR.java 692c692 < integer i = new integer(0); --- > integer i_2 = new integer(0); 725c725 < for (i.assign(vMaxLen); _isGreaterThanOrEqual(i, 1); i.decrement()) --- > for (i_2.assign(vMaxLen); _isGreaterThanOrEqual(i_2, 1); i_2.decrement()) 727c727 < subscript(vTitleLine, vCurPos).replace(substring(ttCourses.getFldLabel(), i, 1), vCurCol, 1); --- > subscript(vTitleLine, vCurPos).replace(substring(ttCourses.getFldLabel(), i_2, 1), vCurCol, 1); 736c736 < for (i.assign(1); _isLessThanOrEqual(i, vLblLen); i.increment()) --- > for (i_2.assign(1); _isLessThanOrEqual(i_2, vLblLen); i_2.increment()) 738c738 < vTempLbl.assign(concat(vTempLbl, (_or(isEqual(trim(vTempLbl), ""), isGreaterThan(i, 9)) ? new character("") : new character("!")), substring(ttCourses.getFldLabel(), i, 1))); --- > vTempLbl.assign(concat(vTempLbl, (_or(isEqual(trim(vTempLbl), ""), isGreaterThan(i_2, 9)) ? new character("") : new character("!")), substring(ttCourses.getFldLabel(), i_2, 1))); 754c754 < integer i = new integer(0); --- > integer i_3 = new integer(0); 759c759 < for (i.assign(1); _isLessThanOrEqual(i, 16); i.increment()) --- > for (i_3.assign(1); _isLessThanOrEqual(i_3, 16); i_3.increment()) 761c761 < assignSingle(vTitleLine, i, fill(" ", 130)); --- > assignSingle(vTitleLine, i_3, fill(" ", 130)); diff -r generated/20130314a/src/aero/timco/majic/train2/TmpCrew.java generated/20130314c/src/aero/timco/majic/train2/TmpCrew.java 55c55 < integer inEmpNum; --- > integer inEmpNum_2; 428c428 < public logical findTmpCrews(final character _inType, final integer _inEmpNum) --- > public logical findTmpCrews(final character _inType_2, final integer _inEmpNum_2) 432c432 < character inType = new character(_inType); --- > character inType_2 = new character(_inType_2); 434c434 < integer inEmpNum = new integer(_inEmpNum); --- > integer inEmpNum_2 = new integer(_inEmpNum_2); 438c438 < TmpCrew.this.inEmpNum = inEmpNum; --- > TmpCrew.this.inEmpNum_2 = inEmpNum_2; 443c443 < character condition1 = inType; --- > character condition1 = inType_2; 503c503 < inEmpNum --- > inEmpNum_2 517c517 < character condition2 = inType; --- > character condition2 = inType_2; diff -r generated/20130314a/src/aero/timco/majic/train2/Train01.java generated/20130314c/src/aero/timco/majic/train2/Train01.java 550c550 < public logical openEmpList(final logical _tSort) --- > public logical openEmpList(final logical _tSort_3) 554c554 < logical tSort = new logical(_tSort); --- > logical tSort_3 = new logical(_tSort_3); 558c558 < if ((tSort).booleanValue()) --- > if ((tSort_3).booleanValue()) 590c590 < public logical openEmpSel(final logical _tSort) --- > public logical openEmpSel(final logical _tSort_4) 594c594 < logical tSort = new logical(_tSort); --- > logical tSort_4 = new logical(_tSort_4); 598c598 < if ((tSort).booleanValue()) --- > if ((tSort_4).booleanValue()) diff -r generated/20130314a/src/aero/timco/majic/train2/Train02R.java generated/20130314c/src/aero/timco/majic/train2/Train02R.java 104c104 < date tDateRef2 = new date(); --- > date tDate = new date(); 154c154 < integer empNum; --- > integer empNum_2; 156c156 < date tDate; --- > date tDate_3; 325c325 < public character getRdo(final character _rdo, final integer _empNum, final date _tDate) --- > public character getRdo(final character _rdo_2, final integer _empNum_2, final date _tDate_3) 329c329 < character rdo = new character(_rdo); --- > character rdo_2 = new character(_rdo_2); 331c331 < integer empNum = new integer(_empNum); --- > integer empNum_2 = new integer(_empNum_2); 333c333 < date tDate = new date(_tDate); --- > date tDate_3 = new date(_tDate_3); 337,338c337,338 < Train02R.this.empNum = empNum; < Train02R.this.tDate = tDate; --- > Train02R.this.empNum_2 = empNum_2; > Train02R.this.tDate_3 = tDate_3; 343c343 < if (_isGreaterThan(indexOf(rdo, valueOf(date.weekday(date.minusDays(tDate, 1)))), 0)) --- > if (_isGreaterThan(indexOf(rdo_2, valueOf(date.weekday(date.minusDays(tDate_3, 1)))), 0)) 347,348c347,348 < empNum, < tDate --- > empNum_2, > tDate_3 353c353 < empNum, --- > empNum_2, 444c444 < character tStatusDefault = new character("Building View, please wait "); --- > character tStatusDefault_2 = new character("Building View, please wait "); 469c469 < if (_isGreaterThan(length(tStatusDefault), 50)) --- > if (_isGreaterThan(length(tStatusDefault_2), 50)) 471c471 < tStatusDefault.assign("Building view, please wait "); --- > tStatusDefault_2.assign("Building view, please wait "); 473,474c473,474 < tStatusDefault.assign(concat(tStatusDefault, ".")); < statusDefault(tStatusDefault); --- > tStatusDefault_2.assign(concat(tStatusDefault_2, ".")); > statusDefault(tStatusDefault_2); 481c481 < tDateRef2 --- > tDate 503c503 < ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employeeCalendar.getDaysOff(), employee.getEmployeeNumber(), tDate)); 512c512 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 598c598 < ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDateRef2)); --- > ttEmployee.setIndirect(getRdo(employee.getDaysOff(), employee.getEmployeeNumber(), tDate)); 613c613 < public void getCritria(final logical tLeave) --- > public void getCritria(final logical tLeave_2) 619c619 < tLeave.assign(new logical(true)); --- > tLeave_2.assign(new logical(true)); 622c622 < tLeave --- > tLeave_2 825c825 < tLeave.assign(false); --- > tLeave_2.assign(false); diff -r generated/20130314a/src/aero/timco/majic/train2/Train03.java generated/20130314c/src/aero/timco/majic/train2/Train03.java 63c63 < integer inEmpNum; --- > integer inEmpNum_2; 579c579 < public logical findTraining2(final character _inType, final integer _inEmpNum) --- > public logical findTraining2(final character _inType_2, final integer _inEmpNum_2) 583c583 < character inType = new character(_inType); --- > character inType_2 = new character(_inType_2); 585c585 < integer inEmpNum = new integer(_inEmpNum); --- > integer inEmpNum_2 = new integer(_inEmpNum_2); 589c589 < Train03.this.inEmpNum = inEmpNum; --- > Train03.this.inEmpNum_2 = inEmpNum_2; 594c594 < character condition1 = inType; --- > character condition1 = inType_2; 654c654 < inEmpNum --- > inEmpNum_2 665c665 < character condition2 = inType; --- > character condition2 = inType_2; diff -r generated/20130314a/src/aero/timco/majic/train2/Train04R.java generated/20130314c/src/aero/timco/majic/train2/Train04R.java 314c314 < public void pGetCritria(final logical tLeave) --- > public void pGetCritria(final logical tLeave_2) 320c320 < tLeave.assign(new logical(false)); --- > tLeave_2.assign(new logical(false)); 323c323 < tLeave --- > tLeave_2 330c330 < tLeave.assign(true); --- > tLeave_2.assign(true); 1090c1090 < tLeave.assign(false); --- > tLeave_2.assign(false); diff -r generated/20130314a/src/aero/timco/majic/ui/codes/EmpHistFrame0.java generated/20130314c/src/aero/timco/majic/ui/codes/EmpHistFrame0.java 11c11 < public integer getI(); --- > public integer getI_3(); 13c13 < public void setI(integer parm); --- > public void setI_3(integer parm); 15c15 < public void setI(int parm); --- > public void setI_3(int parm); 17c17 < public void setI(BaseDataType parm); --- > public void setI_3(BaseDataType parm); 19c19 < public FillInWidget widgeti(); --- > public FillInWidget widgetI_3(); 84c84 < FillInWidget i = new FillInWidget(); --- > FillInWidget i_3 = new FillInWidget(); 101c101 < i.setDataType("integer"); --- > i_3.setDataType("integer"); 111a112 > i_3.setLabel("i"); 120d120 < i.setLabel("i"); 124c124 < addWidget("i", "i", i); --- > addWidget("i_3", "i", i_3); diff -r generated/20130314a/src/aero/timco/majic/ui/dan/TrendRFcosum.java generated/20130314c/src/aero/timco/majic/ui/dan/TrendRFcosum.java 65c65 < public integer getTot(); --- > public integer getTot_2(); 67c67 < public void setTot(integer parm); --- > public void setTot_2(integer parm); 69c69 < public void setTot(int parm); --- > public void setTot_2(int parm); 71c71 < public void setTot(BaseDataType parm); --- > public void setTot_2(BaseDataType parm); 73c73 < public FillInWidget widgetTot(); --- > public FillInWidget widgetTot_2(); 114c114 < FillInWidget tot = new FillInWidget(); --- > FillInWidget tot_2 = new FillInWidget(); 147,150c147,150 < tot.setDataType("integer"); < tot.setFormat("zz,zz9"); < tot.setColumn(1); < tot.setNoLabels(true); --- > tot_2.setDataType("integer"); > tot_2.setFormat("zz,zz9"); > tot_2.setColumn(1); > tot_2.setNoLabels(true); 158c158 < tot.setLabel("tot"); --- > tot_2.setLabel("tot"); 171c171 < addWidget("tot", "tot", tot); --- > addWidget("tot_2", "tot", tot_2); diff -r generated/20130314a/src/aero/timco/majic/ui/util/MjicmailWhoami.java generated/20130314c/src/aero/timco/majic/ui/util/MjicmailWhoami.java 11c11 < public character getTUser(); --- > public character getTUser_2(); 13c13 < public void setTUser(character parm); --- > public void setTUser_2(character parm); 15c15 < public void setTUser(String parm); --- > public void setTUser_2(String parm); 17c17 < public void setTUser(BaseDataType parm); --- > public void setTUser_2(BaseDataType parm); 19c19 < public FillInWidget widgetTUser(); --- > public FillInWidget widgetTUser_2(); 74c74 < FillInWidget tUser = new FillInWidget(); --- > FillInWidget tUser_2 = new FillInWidget(); 92,93c92,93 < tUser.setDataType("character"); < tUser.setFormat("x(35)"); --- > tUser_2.setDataType("character"); > tUser_2.setFormat("x(35)"); 106d105 < tUser.setLabel("t-user"); 109a109 > tUser_2.setLabel("t-user"); 113c113 < addWidget("tUser", "t-user", tUser); --- > addWidget("tUser_2", "t-user", tUser_2); diff -r generated/20130314a/src/aero/timco/majic/util/Lcqcostexp.java generated/20130314c/src/aero/timco/majic/util/Lcqcostexp.java 57c57 < date ipdtStartDateRef2; --- > date ipdtStartDate_2; 59c59 < date ipdtEndDateRef2; --- > date ipdtEndDate_2; 65c65 < integer ipinEmpNum; --- > integer ipinEmpNum_2; 67c67 < date ipdtEffDate; --- > date ipdtEffDate_2; 238c238 < public void ipLoadContractorWages(final character _ipchLoadFile) --- > public void ipLoadContractorWages(final character _ipchLoadFile_2) 242c242 < character ipchLoadFile = new character(_ipchLoadFile); --- > character ipchLoadFile_2 = new character(_ipchLoadFile_2); 244c244 < character lchHeaderLine = new character(""); --- > character lchHeaderLine_2 = new character(""); 246c246 < integer linEmpNum = new integer(0); --- > integer linEmpNum_2 = new integer(0); 252c252 < character lchTempDate = new character(""); --- > character lchTempDate_2 = new character(""); 256c256 < character lchTempRate = new character(""); --- > character lchTempRate_2 = new character(""); 258c258 < date ldtEffDate = date.instantiateUnknownDate(); --- > date ldtEffDate_2 = date.instantiateUnknownDate(); 260c260 < decimal ldeRegRate = new decimal(0); --- > decimal ldeRegRate_2 = new decimal(0); 262c262 < character lchEmpType = new character(""); --- > character lchEmpType_2 = new character(""); 266,267c266,267 < sInStream.assign(StreamFactory.openFileStream((ipchLoadFile).toStringMessage(), false, false)); < sInStream.readLine(lchHeaderLine); --- > sInStream.assign(StreamFactory.openFileStream((ipchLoadFile_2).toStringMessage(), false, false)); > sInStream.readLine(lchHeaderLine_2); 274c274 < sInStream.readField(linEmpNum); --- > sInStream.readField(linEmpNum_2); 277c277 < sInStream.readField(lchTempDate); --- > sInStream.readField(lchTempDate_2); 279c279 < sInStream.readField(lchTempRate); --- > sInStream.readField(lchTempRate_2); 281,284c281,284 < ControlFlowOps.invokeWithMode("ip_CleanContractDate", "IO", lchTempDate, ldtEffDate); < ControlFlowOps.invokeWithMode("ip_CleanRegRate", "IO", lchTempRate, ldeRegRate); < lchEmpType.assign("C"); < ControlFlowOps.invokeWithMode("ip_CreateEmpRate", "IIII", linEmpNum, ldtEffDate, ldeRegRate, lchEmpType); --- > ControlFlowOps.invokeWithMode("ip_CleanContractDate", "IO", lchTempDate_2, ldtEffDate_2); > ControlFlowOps.invokeWithMode("ip_CleanRegRate", "IO", lchTempRate_2, ldeRegRate_2); > lchEmpType_2.assign("C"); > ControlFlowOps.invokeWithMode("ip_CreateEmpRate", "IIII", linEmpNum_2, ldtEffDate_2, ldeRegRate_2, lchEmpType_2); 303c303 < character lchEmpType = new character(""); --- > character lchEmpType_3 = new character(""); 305c305 < character lchLogLine = new character(""); --- > character lchLogLine_2 = new character(""); 383c383 < ControlFlowOps.invokeWithMode("ip_GetEmpRate", "IIOO", bemployee.getEmployeeNumber(), bjobtran.getTransactionDate(), ldeEmpRate, lchEmpType); --- > ControlFlowOps.invokeWithMode("ip_GetEmpRate", "IIOO", bemployee.getEmployeeNumber(), bjobtran.getTransactionDate(), ldeEmpRate, lchEmpType_3); 396c396 < new PutField(lchEmpType), --- > new PutField(lchEmpType_3), 407c407 < ControlFlowOps.invokeWithMode("ip_AddDirectCost", "IIII", bco.getCustomerOrderNumber(), bjobtran.getApprovedHours(), ldeEmpRate, lchEmpType); --- > ControlFlowOps.invokeWithMode("ip_AddDirectCost", "IIII", bco.getCustomerOrderNumber(), bjobtran.getApprovedHours(), ldeEmpRate, lchEmpType_3); 411,412c411,412 < lchLogLine.assign(concat("Error: No Rate", "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); < ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine); --- > lchLogLine_2.assign(concat("Error: No Rate", "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); > ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine_2); 417,418c417,418 < lchLogLine.assign(concat("Error: No CO", "|", valueOf(bjob.getCustomerOrderNumber(), ">>>>>>9"), "|", valueOf(bjob.getTimcoOperation(), ">>>9"), "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); < ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine); --- > lchLogLine_2.assign(concat("Error: No CO", "|", valueOf(bjob.getCustomerOrderNumber(), ">>>>>>9"), "|", valueOf(bjob.getTimcoOperation(), ">>>9"), "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); > ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine_2); 423,424c423,424 < lchLogLine.assign(concat("Error: No Job", "|", valueOf(bjobtran.getTimcoOperation(), ">>>9"), "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); < ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine); --- > lchLogLine_2.assign(concat("Error: No Job", "|", valueOf(bjobtran.getTimcoOperation(), ">>>9"), "|", valueOf(bemployee.getEmployeeNumber(), ">>>>>9"), "|", valueOf(bjobtran.getTransactionDate(), "99/99/9999"))); > ControlFlowOps.invokeWithMode("ip_LogEntry", "I", lchLogLine_2); 436c436 < public void ipProcessIndirect(final character _ipchExportFile, final date _ipdtStartDateRef2, final date _ipdtEndDateRef2) --- > public void ipProcessIndirect(final character _ipchExportFile_2, final date _ipdtStartDate_2, final date _ipdtEndDate_2) 440c440 < character ipchExportFile = new character(_ipchExportFile); --- > character ipchExportFile_2 = new character(_ipchExportFile_2); 442c442 < date ipdtStartDateRef2 = new date(_ipdtStartDateRef2); --- > date ipdtStartDate_2 = new date(_ipdtStartDate_2); 444c444 < date ipdtEndDateRef2 = new date(_ipdtEndDateRef2); --- > date ipdtEndDate_2 = new date(_ipdtEndDate_2); 446c446 < decimal ldeEmpRate = new decimal(0); --- > decimal ldeEmpRate_2 = new decimal(0); 448c448 < character lchEmpType = new character(""); --- > character lchEmpType_4 = new character(""); 452,453c452,453 < Lcqcostexp.this.ipdtStartDateRef2 = ipdtStartDateRef2; < Lcqcostexp.this.ipdtEndDateRef2 = ipdtEndDateRef2; --- > Lcqcostexp.this.ipdtStartDate_2 = ipdtStartDate_2; > Lcqcostexp.this.ipdtEndDate_2 = ipdtEndDate_2; 458c458 < sOutStream.assign(StreamFactory.openFileStream((ipchExportFile).toStringMessage(), true, false)); --- > sOutStream.assign(StreamFactory.openFileStream((ipchExportFile_2).toStringMessage(), true, false)); 501,502c501,502 < ipdtStartDateRef2, < ipdtEndDateRef2 --- > ipdtStartDate_2, > ipdtEndDate_2 509c509 < ControlFlowOps.invokeWithMode("ip_GetEmpRate", "IIOO", bemployeeBuf2.getEmployeeNumber(), bworkrec.getTransactionDate(), ldeEmpRate, lchEmpType); --- > ControlFlowOps.invokeWithMode("ip_GetEmpRate", "IIOO", bemployeeBuf2.getEmployeeNumber(), bworkrec.getTransactionDate(), ldeEmpRate_2, lchEmpType_4); 522c522 < new PutField(ldeEmpRate), --- > new PutField(ldeEmpRate_2), 524c524 < new PutField(lchEmpType), --- > new PutField(lchEmpType_4), 537c537 < public void ipOutputSummary(final character _ipchExportFile) --- > public void ipOutputSummary(final character _ipchExportFile_3) 541c541 < character ipchExportFile = new character(_ipchExportFile); --- > character ipchExportFile_3 = new character(_ipchExportFile_3); 552c552 < sOutStream.assign(StreamFactory.openFileStream((ipchExportFile).toStringMessage(), true, false)); --- > sOutStream.assign(StreamFactory.openFileStream((ipchExportFile_3).toStringMessage(), true, false)); 644c644 < public void ipCreateEmpRate(final integer _ipinEmpNum, final date _ipdtEffDate, final decimal _ipdeRegRate, final character _ipchEmpType) --- > public void ipCreateEmpRate(final integer _ipinEmpNum, final date _ipdtEffDate, final decimal _ipdeRegRate, final character _ipchEmpType_2) 654c654 < character ipchEmpType = new character(_ipchEmpType); --- > character ipchEmpType_2 = new character(_ipchEmpType_2); 669c669 < bttemprate.setEmptype(ipchEmpType); --- > bttemprate.setEmptype(ipchEmpType_2); 677c677 < public void ipGetEmpRate(final integer _ipinEmpNum, final date _ipdtEffDate, final decimal opdeRegRate, final character opchEmpType) --- > public void ipGetEmpRate(final integer _ipinEmpNum_2, final date _ipdtEffDate_2, final decimal opdeRegRate, final character opchEmpType) 681c681 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 683c683 < date ipdtEffDate = new date(_ipdtEffDate); --- > date ipdtEffDate_2 = new date(_ipdtEffDate_2); 687,688c687,688 < Lcqcostexp.this.ipinEmpNum = ipinEmpNum; < Lcqcostexp.this.ipdtEffDate = ipdtEffDate; --- > Lcqcostexp.this.ipinEmpNum_2 = ipinEmpNum_2; > Lcqcostexp.this.ipdtEffDate_2 = ipdtEffDate_2; 704,705c704,705 < ipinEmpNum, < ipdtEffDate --- > ipinEmpNum_2, > ipdtEffDate_2 780c780 < public void ipCleanEffDate(final character _ipchDateString, final date opdtEffDate) --- > public void ipCleanEffDate(final character _ipchDateString_2, final date opdtEffDate) 784c784 < character ipchDateString = new character(_ipchDateString); --- > character ipchDateString_2 = new character(_ipchDateString_2); 786c786 < integer linMonth = new integer(0); --- > integer linMonth_2 = new integer(0); 788c788 < integer linDay = new integer(0); --- > integer linDay_2 = new integer(0); 790c790 < integer linYear = new integer(0); --- > integer linYear_2 = new integer(0); 805c805 < if (_isEqual(numEntries(ipchDateString, " "), 2)) --- > if (_isEqual(numEntries(ipchDateString_2, " "), 2)) 807,812c807,812 < lchDate.assign(entry(2, ipchDateString, " ")); < linMonth.assign(new integer(entry(1, lchDate, "/"))); < linDay.assign(new integer(entry(2, lchDate, "/"))); < linYear.assign(new integer(entry(3, lchDate, "/"))); < linYear.assign((_isLessThanOrEqual(plus(linYear, 2000), date.year(new date())) ? plus(linYear, 2000) : plus(linYear, 1900))); < opdtEffDate.assign(new date(linMonth, linDay, linYear)); --- > lchDate.assign(entry(2, ipchDateString_2, " ")); > linMonth_2.assign(new integer(entry(1, lchDate, "/"))); > linDay_2.assign(new integer(entry(2, lchDate, "/"))); > linYear_2.assign(new integer(entry(3, lchDate, "/"))); > linYear_2.assign((_isLessThanOrEqual(plus(linYear_2, 2000), date.year(new date())) ? plus(linYear_2, 2000) : plus(linYear_2, 1900))); > opdtEffDate.assign(new date(linMonth_2, linDay_2, linYear_2)); 822c822 < public void ipCleanContractDate(final character _ipchDateString, final date opdtContractDate) --- > public void ipCleanContractDate(final character _ipchDateString_3, final date opdtContractDate) 826c826 < character ipchDateString = new character(_ipchDateString); --- > character ipchDateString_3 = new character(_ipchDateString_3); 839c839 < opdtContractDate.assign(new date(ipchDateString)); --- > opdtContractDate.assign(new date(ipchDateString_3)); 844c844 < public void ipCleanRegRate(final character _ipchRateString, final decimal opdeRegRate) --- > public void ipCleanRegRate(final character _ipchRateString, final decimal opdeRegRate_2) 854c854 < opdeRegRate.assign(new decimal(0)); --- > opdeRegRate_2.assign(new decimal(0)); 857c857 < opdeRegRate --- > opdeRegRate_2 864c864 < opdeRegRate.assign(new decimal(lchCleanString)); --- > opdeRegRate_2.assign(new decimal(lchCleanString)); diff -r generated/20130314a/src/aero/timco/majic/util/Mjicmail.java generated/20130314c/src/aero/timco/majic/util/Mjicmail.java 78c78 < character tUser = new character(""); --- > character tUser_2 = new character(""); 115c115 < new Element(tUser, whoamiFrame.widgetTUser()), --- > new Element(tUser_2, whoamiFrame.widgetTUser_2()), 127c127 < tUser.assign(tUser); --- > tUser_2.assign(tUser_2); 143c143 < tUser.assign("DOS"); --- > tUser_2.assign("DOS"); 147c147 < tHdr.assign(concat(" MAJIC MAIL FOR USER: ", toUpperCase(tUser), " ")); --- > tHdr.assign(concat(" MAJIC MAIL FOR USER: ", toUpperCase(tUser_2), " ")); diff -r generated/20130314a/src/aero/timco/majic/util/Wrkrecta.java generated/20130314c/src/aero/timco/majic/util/Wrkrecta.java 125c125 < integer ipinEmpNum; --- > integer ipinEmpNum_2; 127c127 < integer ipinEmpNumRef2; --- > integer ipinEmpNum_3; 129c129 < date ipdtTransDate; --- > date ipdtTransDate_3; 133c133 < integer ipinEmpNumRef3; --- > integer ipinEmpNum_4; 135c135 < date ipdtTransDateRef2; --- > date ipdtTransDate_4; 137c137 < integer ipinSeqNum; --- > integer ipinSeqNum_2; 139c139 < integer ipinTransNum; --- > integer ipinTransNum_2; 141c141 < integer ipinStartEmpNum; --- > integer ipinStartEmpNum_2; 143c143 < integer ipinEndEmpNum; --- > integer ipinEndEmpNum_2; 145c145 < date ipdtStartTransDate; --- > date ipdtStartTransDate_2; 147c147 < date ipdtEndTransDate; --- > date ipdtEndTransDate_2; 657c657 < public void ipGetEmpName(final integer _ipinEmpNum, final character opchEmpName) --- > public void ipGetEmpName(final integer _ipinEmpNum_2, final character opchEmpName) 661c661 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_2 = new integer(_ipinEmpNum_2); 665c665 < Wrkrecta.this.ipinEmpNum = ipinEmpNum; --- > Wrkrecta.this.ipinEmpNum_2 = ipinEmpNum_2; 679c679 < ipinEmpNum --- > ipinEmpNum_2 699c699 < decimal ldeClockHours = new decimal(0); --- > decimal ldeClockHours_2 = new decimal(0); 705c705 < logical llgResultOk = new logical(false); --- > logical llgResultOk_2 = new logical(false); 713c713 < integer linSecsStartOfDay = new integer(0); --- > integer linSecsStartOfDay_2 = new integer(0); 715c715 < integer linSecsEndOfDay = new integer(86400); --- > integer linSecsEndOfDay_2 = new integer(86400); 728,729c728,729 < ldeStartClockIn.assign(plus(new integer(ipdtStartTransDate), divide(linSecsStartOfDay, 100000))); < ldeEndClockOut.assign(plus(new integer(ipdtEndTransDate), divide(linSecsEndOfDay, 100000))); --- > ldeStartClockIn.assign(plus(new integer(ipdtStartTransDate), divide(linSecsStartOfDay_2, 100000))); > ldeEndClockOut.assign(plus(new integer(ipdtEndTransDate), divide(linSecsEndOfDay_2, 100000))); 764,765c764,765 < ControlFlowOps.invokeWithMode("ip_CalcHours", "IIIIO", bWorkrec.getPostTime(0), bWorkrec.getPostTime(3), bWorkrec.getPostTime(2), bWorkrec.getPostTime(1), ldeClockHours); < if (_isNotEqual(ldeClockHours, bWorkrec.getTotalHours())) --- > ControlFlowOps.invokeWithMode("ip_CalcHours", "IIIIO", bWorkrec.getPostTime(0), bWorkrec.getPostTime(3), bWorkrec.getPostTime(2), bWorkrec.getPostTime(1), ldeClockHours_2); > if (_isNotEqual(ldeClockHours_2, bWorkrec.getTotalHours())) 770,771c770,771 < ControlFlowOps.invokeWithMode("ip_SetHours", "IIIIIO", bWorkrec.getEmployeeNumber(), bWorkrec.getTransactionDate(), bWorkrec.getSeqNumber(), bWorkrec.getTransactionNumber(), ldeClockHours, llgResultOk); < if ((llgResultOk).booleanValue()) --- > ControlFlowOps.invokeWithMode("ip_SetHours", "IIIIIO", bWorkrec.getEmployeeNumber(), bWorkrec.getTransactionDate(), bWorkrec.getSeqNumber(), bWorkrec.getTransactionNumber(), ldeClockHours_2, llgResultOk_2); > if ((llgResultOk_2).booleanValue()) 773,774c773,774 < ControlFlowOps.invokeWithMode("ip_CreateAuditRecord", "IIII", bWorkrec.getEmployeeNumber(), bWorkrec.getTransactionDate(), ldeOldHours, ldeClockHours); < ControlFlowOps.invokeWithMode("ip_WorkrecChanged", "IIIIIIIIII", bWorkrec.getEmployeeNumber(), bWorkrec.getTransactionDate(), bWorkrec.getSeqNumber(), bWorkrec.getTransactionNumber(), bWorkrec.getPostTime(0), bWorkrec.getPostTime(3), bWorkrec.getPostTime(2), bWorkrec.getPostTime(1), ldeOldHours, ldeClockHours); --- > ControlFlowOps.invokeWithMode("ip_CreateAuditRecord", "IIII", bWorkrec.getEmployeeNumber(), bWorkrec.getTransactionDate(), ldeOldHours, ldeClockHours_2); > ControlFlowOps.invokeWithMode("ip_WorkrecChanged", "IIIIIIIIII", bWorkrec.getEmployeeNumber(), bWorkrec.getTransactionDate(), bWorkrec.getSeqNumber(), bWorkrec.getTransactionNumber(), bWorkrec.getPostTime(0), bWorkrec.getPostTime(3), bWorkrec.getPostTime(2), bWorkrec.getPostTime(1), ldeOldHours, ldeClockHours_2); 779c779 < ControlFlowOps.invokeWithMode("ip_WorkrecChanged", "IIIIIIIIII", bWorkrec.getEmployeeNumber(), bWorkrec.getTransactionDate(), bWorkrec.getSeqNumber(), bWorkrec.getTransactionNumber(), bWorkrec.getPostTime(0), bWorkrec.getPostTime(3), bWorkrec.getPostTime(2), bWorkrec.getPostTime(1), ldeOldHours, ldeClockHours); --- > ControlFlowOps.invokeWithMode("ip_WorkrecChanged", "IIIIIIIIII", bWorkrec.getEmployeeNumber(), bWorkrec.getTransactionDate(), bWorkrec.getSeqNumber(), bWorkrec.getTransactionNumber(), bWorkrec.getPostTime(0), bWorkrec.getPostTime(3), bWorkrec.getPostTime(2), bWorkrec.getPostTime(1), ldeOldHours, ldeClockHours_2); 792c792 < public void ipCheckTimeRange(final date _ipdtTransDate, final integer _ipinClockInTime, final integer _ipinClockOutTime, final decimal _ipdeStartClockIn, final decimal _ipdeEndClockOut, final logical oplgTimeRangeOk) --- > public void ipCheckTimeRange(final date _ipdtTransDate_2, final integer _ipinClockInTime, final integer _ipinClockOutTime, final decimal _ipdeStartClockIn, final decimal _ipdeEndClockOut, final logical oplgTimeRangeOk) 796c796 < date ipdtTransDate = new date(_ipdtTransDate); --- > date ipdtTransDate_2 = new date(_ipdtTransDate_2); 821,822c821,822 < ldeCheckClockIn.assign(plus(new integer(ipdtTransDate), divide(ipinClockInTime, 100000))); < ldeCheckClockOut.assign((_isGreaterThan(ipinClockInTime, ipinClockOutTime) ? plus(new integer(ipdtTransDate), divide(ipinClockOutTime, 100000)) : plus(new integer(date.plusDays(ipdtTransDate, 1)), divide(ipinClockOutTime, 100000)))); --- > ldeCheckClockIn.assign(plus(new integer(ipdtTransDate_2), divide(ipinClockInTime, 100000))); > ldeCheckClockOut.assign((_isGreaterThan(ipinClockInTime, ipinClockOutTime) ? plus(new integer(ipdtTransDate_2), divide(ipinClockOutTime, 100000)) : plus(new integer(date.plusDays(ipdtTransDate_2, 1)), divide(ipinClockOutTime, 100000)))); 835c835 < public void ipCheckShift(final integer _ipinEmpNumRef2, final date _ipdtTransDate, final logical oplgShiftOk) --- > public void ipCheckShift(final integer _ipinEmpNum_3, final date _ipdtTransDate_3, final logical oplgShiftOk) 839c839 < integer ipinEmpNumRef2 = new integer(_ipinEmpNumRef2); --- > integer ipinEmpNum_3 = new integer(_ipinEmpNum_3); 841c841 < date ipdtTransDate = new date(_ipdtTransDate); --- > date ipdtTransDate_3 = new date(_ipdtTransDate_3); 847,848c847,848 < Wrkrecta.this.ipinEmpNumRef2 = ipinEmpNumRef2; < Wrkrecta.this.ipdtTransDate = ipdtTransDate; --- > Wrkrecta.this.ipinEmpNum_3 = ipinEmpNum_3; > Wrkrecta.this.ipdtTransDate_3 = ipdtTransDate_3; 858c858 < ldtEndDate.assign(date.plusDays(ipdtTransDate, 1)); --- > ldtEndDate.assign(date.plusDays(ipdtTransDate_3, 1)); 869,870c869,870 < ipinEmpNumRef2, < ipdtTransDate, --- > ipinEmpNum_3, > ipdtTransDate_3, 882c882 < return isGreaterThan(bTimeatt.getTransactionDate(), ipdtTransDate); --- > return isGreaterThan(bTimeatt.getTransactionDate(), ipdtTransDate_3); 911c911 < public void ipCalcHours(final integer _ipinClockIn, final integer _ipinLunchOut, final integer _ipinLunchIn, final integer _ipinClockOut, final decimal opdeHours) --- > public void ipCalcHours(final integer _ipinClockIn_2, final integer _ipinLunchOut_2, final integer _ipinLunchIn_2, final integer _ipinClockOut_2, final decimal opdeHours) 915c915 < integer ipinClockIn = new integer(_ipinClockIn); --- > integer ipinClockIn_2 = new integer(_ipinClockIn_2); 917c917 < integer ipinLunchOut = new integer(_ipinLunchOut); --- > integer ipinLunchOut_2 = new integer(_ipinLunchOut_2); 919c919 < integer ipinLunchIn = new integer(_ipinLunchIn); --- > integer ipinLunchIn_2 = new integer(_ipinLunchIn_2); 921c921 < integer ipinClockOut = new integer(_ipinClockOut); --- > integer ipinClockOut_2 = new integer(_ipinClockOut_2); 929c929 < integer linSecsPerHour = new integer(3600); --- > integer linSecsPerHour_3 = new integer(3600); 942c942 < if (_or(isNotEqual(ipinLunchOut, 0), isNotEqual(ipinLunchIn, 0))) --- > if (_or(isNotEqual(ipinLunchOut_2, 0), isNotEqual(ipinLunchIn_2, 0))) 944,946c944,946 < linBeforeLunch.assign((_isGreaterThan(ipinLunchOut, ipinClockIn) ? minus(ipinLunchOut, ipinClockIn) : minus(plus(linSecsPerDay, ipinLunchOut), ipinClockIn))); < linAfterLunch.assign((_isGreaterThan(ipinClockOut, ipinLunchIn) ? minus(ipinClockOut, ipinLunchIn) : minus(plus(linSecsPerDay, ipinClockOut), ipinLunchIn))); < opdeHours.assign(round(divide(plus(linBeforeLunch, linAfterLunch), linSecsPerHour), 2)); --- > linBeforeLunch.assign((_isGreaterThan(ipinLunchOut_2, ipinClockIn_2) ? minus(ipinLunchOut_2, ipinClockIn_2) : minus(plus(linSecsPerDay, ipinLunchOut_2), ipinClockIn_2))); > linAfterLunch.assign((_isGreaterThan(ipinClockOut_2, ipinLunchIn_2) ? minus(ipinClockOut_2, ipinLunchIn_2) : minus(plus(linSecsPerDay, ipinClockOut_2), ipinLunchIn_2))); > opdeHours.assign(round(divide(plus(linBeforeLunch, linAfterLunch), linSecsPerHour_3), 2)); 950c950 < if (_isGreaterThan(ipinClockOut, ipinClockIn)) --- > if (_isGreaterThan(ipinClockOut_2, ipinClockIn_2)) 952c952 < opdeHours.assign(round(divide(minus(ipinClockOut, ipinClockIn), linSecsPerHour), 2)); --- > opdeHours.assign(round(divide(minus(ipinClockOut_2, ipinClockIn_2), linSecsPerHour_3), 2)); 956c956 < opdeHours.assign(round(divide(plus(minus(linSecsPerDay, ipinClockIn), ipinClockOut), linSecsPerHour), 2)); --- > opdeHours.assign(round(divide(plus(minus(linSecsPerDay, ipinClockIn_2), ipinClockOut_2), linSecsPerHour_3), 2)); 963c963 < public void ipSetHours(final integer _ipinEmpNumRef3, final date _ipdtTransDateRef2, final integer _ipinSeqNum, final integer _ipinTransNum, final decimal _ipdeTotHrs, final logical oplgResultOk) --- > public void ipSetHours(final integer _ipinEmpNum_4, final date _ipdtTransDate_4, final integer _ipinSeqNum_2, final integer _ipinTransNum_2, final decimal _ipdeTotHrs, final logical oplgResultOk_2) 967c967 < integer ipinEmpNumRef3 = new integer(_ipinEmpNumRef3); --- > integer ipinEmpNum_4 = new integer(_ipinEmpNum_4); 969c969 < date ipdtTransDateRef2 = new date(_ipdtTransDateRef2); --- > date ipdtTransDate_4 = new date(_ipdtTransDate_4); 971c971 < integer ipinSeqNum = new integer(_ipinSeqNum); --- > integer ipinSeqNum_2 = new integer(_ipinSeqNum_2); 973c973 < integer ipinTransNum = new integer(_ipinTransNum); --- > integer ipinTransNum_2 = new integer(_ipinTransNum_2); 979,982c979,982 < Wrkrecta.this.ipinEmpNumRef3 = ipinEmpNumRef3; < Wrkrecta.this.ipdtTransDateRef2 = ipdtTransDateRef2; < Wrkrecta.this.ipinSeqNum = ipinSeqNum; < Wrkrecta.this.ipinTransNum = ipinTransNum; --- > Wrkrecta.this.ipinEmpNum_4 = ipinEmpNum_4; > Wrkrecta.this.ipdtTransDate_4 = ipdtTransDate_4; > Wrkrecta.this.ipinSeqNum_2 = ipinSeqNum_2; > Wrkrecta.this.ipinTransNum_2 = ipinTransNum_2; 984c984 < oplgResultOk.assign(new logical(false)); --- > oplgResultOk_2.assign(new logical(false)); 987c987 < oplgResultOk --- > oplgResultOk_2 1002,1005c1002,1005 < ipinEmpNumRef3, < ipdtTransDateRef2, < ipinSeqNum, < ipinTransNum --- > ipinEmpNum_4, > ipdtTransDate_4, > ipinSeqNum_2, > ipinTransNum_2 1012c1012 < oplgResultOk.assign(true); --- > oplgResultOk_2.assign(true); 1017c1017 < oplgResultOk.assign(false); --- > oplgResultOk_2.assign(false); 1025c1025 < public void ipCreateAuditRecord(final integer _ipinEmpNum, final date _ipdtTransDate, final decimal _ipinBeforeHours, final decimal _ipinAfterHours) --- > public void ipCreateAuditRecord(final integer _ipinEmpNum_5, final date _ipdtTransDate_5, final decimal _ipinBeforeHours, final decimal _ipinAfterHours) 1029c1029 < integer ipinEmpNum = new integer(_ipinEmpNum); --- > integer ipinEmpNum_5 = new integer(_ipinEmpNum_5); 1031c1031 < date ipdtTransDate = new date(_ipdtTransDate); --- > date ipdtTransDate_5 = new date(_ipdtTransDate_5); 1059,1060c1059,1060 < lchTempDate.assign(valueOf(ipdtTransDate, "99/99/9999")); < lchIdentifier.assign(concat(valueOf(ipinEmpNum, "9999999"), ".", substring(lchTempDate, 7, 4), substring(lchTempDate, 1, 2), substring(lchTempDate, 4, 2))); --- > lchTempDate.assign(valueOf(ipdtTransDate_5, "99/99/9999")); > lchIdentifier.assign(concat(valueOf(ipinEmpNum_5, "9999999"), ".", substring(lchTempDate, 7, 4), substring(lchTempDate, 1, 2), substring(lchTempDate, 4, 2))); 1068c1068 < public void ipBuildWorkrecQuery(final integer _ipinStartEmpNum, final integer _ipinEndEmpNum, final date _ipdtStartTransDate, final date _ipdtEndTransDate) --- > public void ipBuildWorkrecQuery(final integer _ipinStartEmpNum_2, final integer _ipinEndEmpNum_2, final date _ipdtStartTransDate_2, final date _ipdtEndTransDate_2) 1072c1072 < integer ipinStartEmpNum = new integer(_ipinStartEmpNum); --- > integer ipinStartEmpNum_2 = new integer(_ipinStartEmpNum_2); 1074c1074 < integer ipinEndEmpNum = new integer(_ipinEndEmpNum); --- > integer ipinEndEmpNum_2 = new integer(_ipinEndEmpNum_2); 1076c1076 < date ipdtStartTransDate = new date(_ipdtStartTransDate); --- > date ipdtStartTransDate_2 = new date(_ipdtStartTransDate_2); 1078c1078 < date ipdtEndTransDate = new date(_ipdtEndTransDate); --- > date ipdtEndTransDate_2 = new date(_ipdtEndTransDate_2); 1086,1089c1086,1089 < Wrkrecta.this.ipinStartEmpNum = ipinStartEmpNum; < Wrkrecta.this.ipinEndEmpNum = ipinEndEmpNum; < Wrkrecta.this.ipdtStartTransDate = ipdtStartTransDate; < Wrkrecta.this.ipdtEndTransDate = ipdtEndTransDate; --- > Wrkrecta.this.ipinStartEmpNum_2 = ipinStartEmpNum_2; > Wrkrecta.this.ipinEndEmpNum_2 = ipinEndEmpNum_2; > Wrkrecta.this.ipdtStartTransDate_2 = ipdtStartTransDate_2; > Wrkrecta.this.ipdtEndTransDate_2 = ipdtEndTransDate_2; 1094,1095c1094,1095 < llgEqEmpNum.assign((_isEqual(ipinStartEmpNum, ipinEndEmpNum) ? new logical(true) : new logical(false))); < llgEqTransDate.assign((_isEqual(ipdtStartTransDate, ipdtEndTransDate) ? new logical(true) : new logical(false))); --- > llgEqEmpNum.assign((_isEqual(ipinStartEmpNum_2, ipinEndEmpNum_2) ? new logical(true) : new logical(false))); > llgEqTransDate.assign((_isEqual(ipdtStartTransDate_2, ipdtEndTransDate_2) ? new logical(true) : new logical(false))); 1100,1101c1100,1101 < ipinStartEmpNum, < ipdtStartTransDate --- > ipinStartEmpNum_2, > ipdtStartTransDate_2 1111,1113c1111,1113 < ipinStartEmpNum, < ipdtStartTransDate, < ipdtEndTransDate --- > ipinStartEmpNum_2, > ipdtStartTransDate_2, > ipdtEndTransDate_2 1123,1125c1123,1125 < ipdtStartTransDate, < ipinStartEmpNum, < ipinEndEmpNum --- > ipdtStartTransDate_2, > ipinStartEmpNum_2, > ipinEndEmpNum_2 1133,1136c1133,1136 < ipdtStartTransDate, < ipdtEndTransDate, < ipinStartEmpNum, < ipinEndEmpNum --- > ipdtStartTransDate_2, > ipdtEndTransDate_2, > ipinStartEmpNum_2, > ipinEndEmpNum_2 diff -r generated/20130314a/src/aero/timco/majic/xt/Menulaun.java generated/20130314c/src/aero/timco/majic/xt/Menulaun.java 1501c1501 < public void hasMail(final character tMailMsg) --- > public void hasMail(final character tMailMsg_2) 1509,1510c1509,1510 < tMailMsg.assign(new character("")); < TransactionManager.register(tMailMsg, haveMail); --- > tMailMsg_2.assign(new character("")); > TransactionManager.register(tMailMsg_2, haveMail); 1525c1525 < tMailMsg.assign("YOU HAVE MAIL!"); --- > tMailMsg_2.assign("YOU HAVE MAIL!"); 1529c1529 < tMailMsg.assign(" No mail "); --- > tMailMsg_2.assign(" No mail ");