Optimizations to create instances in Number classes and Character (original) (raw)
Otávio Gonçalves de Santana otaviojava at java.net
Fri Jun 20 13:12:14 UTC 2014
- Previous message: RFR 8035490: move xml jaxp unit tests in bugxxx dir into jaxp repo
- Next message: Please review: (JDK-8044866) Fix raw and unchecked lint warnings in asm
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
The Number classes (Integer, Short, Byte, Long) and Character have cache and it is used when is called the valueOf method, this way it creates new instances when is necessary. Using the valueOf, when the value is in the cache, beyond save memory will faster than always create new instances.
[1] WebDrev: https://dl.dropboxusercontent.com/u/16109193/open_jdk/number_character.zip
Benchmark (size) Mode Samples Mean Mean error Units m.InstancesBenchmark.newInstanceByte 1000000 thrpt 10 295.250 3.964 ops/s m.InstancesBenchmark.newInstanceChar 1000000 thrpt 10 290.962 6.096 ops/s m.InstancesBenchmark.newInstanceInteger 1000000 thrpt 10 280.035 5.997 ops/s m.InstancesBenchmark.newInstanceLong 1000000 thrpt 10 195.535 5.326 ops/s m.InstancesBenchmark.newInstanceShort 1000000 thrpt 10 289.213 6.920 ops/s m.InstancesBenchmark.valueOfByte 1000000 thrpt 10 457.773 0.788 ops/s m.InstancesBenchmark.valueOfChar 1000000 thrpt 10 343.380 1.364 ops/s m.InstancesBenchmark.valueOfInteger 1000000 thrpt 10 332.707 1.771 ops/s m.InstancesBenchmark.valueOfLong 1000000 thrpt 10 336.833 3.318 ops/s m.InstancesBenchmark.valueOfShort 1000000 thrpt 10 333.420 0.651 ops/s
[1]
import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.GenerateMicroBenchmark; import org.openjdk.jmh.annotations.OutputTimeUnit; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.logic.BlackHole;
@State(Scope.Thread) @OutputTimeUnit(TimeUnit.SECONDS) public class InstancesBenchmark {
@Param("1000000")
private int size;
private Random random;
private short[] shorts;
private byte[] bytes;
private int[] interges;
private long[] longs;
private char[] chars;
@Setup
public void s() {
random = new Random();
shorts = new short[size];
bytes = new byte[size];
interges = new int[size];
longs = new long[size];
chars = new char[size];
for (int i = 0; i < size; i++) {
int value = random.nextInt();
longs[i] = (long) value;
interges[i] = value;
shorts[i] = (short) value;
bytes[i] = (byte) value;
chars[i] = (char) value;
}
}
@GenerateMicroBenchmark
public void valueOfInteger(BlackHole bh) {
for (int value : interges) {
Integer number = value;
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void newInstanceInteger(BlackHole bh) {
for (int value : interges) {
Integer number = new Integer(value);
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void valueOfLong(BlackHole bh) {
for (long value : longs) {
Long number = value;
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void newInstanceLong(BlackHole bh) {
for (long value : longs) {
Long number = new Long(value);
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void valueOfByte(BlackHole bh) {
for (byte value : bytes) {
Byte number = value;
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void newInstanceByte(BlackHole bh) {
for (byte value : bytes) {
Byte number = new Byte(value);
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void valueOfShort(BlackHole bh) {
for (short value : shorts) {
Short number = value;
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void newInstanceShort(BlackHole bh) {
for (short value : shorts) {
Short number = new Short(value);
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void valueOfChar(BlackHole bh) {
for (char value : chars) {
Character number = value;
bh.consume(number);
}
}
@GenerateMicroBenchmark
public void newInstanceChar(BlackHole bh) {
for (char value : chars) {
Character number = new Character(value);
bh.consume(number);
}
}}
-- Atenciosamente.
Otávio Gonçalves de Santana
blog: http://otaviosantana.blogspot.com.br/ twitter: http://twitter.com/otaviojava site: http://www.otaviojava.com.br (11) 98255-3513 -------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java --- a/src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java Fri Jun 20 09:57:19 2014 -0300 @@ -461,10 +461,10 @@ if ((currentBreakPositions.size() == 0 || currentBreakPositions.peek().intValue() != text.getIndex()) && text.getIndex() != startPos) {
currentBreakPositions.push(new Integer(text.getIndex()));
currentBreakPositions.push(text.getIndex()); } getNext();
currentBreakPositions.push(new Integer(text.getIndex()));
currentBreakPositions.push(text.getIndex()); } }
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/tools/asm/Assembler.java --- a/src/share/classes/sun/tools/asm/Assembler.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/asm/Assembler.java Fri Jun 20 09:57:19 2014 -0300 @@ -558,7 +558,7 @@ case opc_tableswitch: { SwitchData sw = (SwitchData)inst.value; for (int i = sw.minValue; i <= sw.maxValue; i++) {
TableLot.addElement(new Cover(CT_CASE, sw.whereCase(new Integer(i)), inst.pc));
TableLot.addElement(new Cover(CT_CASE, sw.whereCase(i), inst.pc)); count++; } if (!sw.getDefault()) {
diff -r d02b062bc827 src/share/classes/sun/tools/asm/Instruction.java --- a/src/share/classes/sun/tools/asm/Instruction.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/asm/Instruction.java Fri Jun 20 09:57:19 2014 -0300 @@ -142,7 +142,7 @@ // Don't keep the LocalVariable info around, unless we // are actually going to generate a local variable table. if ((value instanceof LocalVariable) && !env.debug_vars()) {
value = new Integer(((LocalVariable)value).slot);
value = ((LocalVariable)value).slot; } break;
diff -r d02b062bc827 src/share/classes/sun/tools/java/BinaryConstantPool.java --- a/src/share/classes/sun/tools/java/BinaryConstantPool.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/java/BinaryConstantPool.java Fri Jun 20 09:57:19 2014 -0300 @@ -60,13 +60,13 @@ break;
case CONSTANT_INTEGER:cpool[i] = new Integer(in.readInt());
cpool[i] = in.readInt(); break; case CONSTANT_FLOAT: cpool[i] = new Float(in.readFloat()); break; case CONSTANT_LONG:
cpool[i++] = new Long(in.readLong());
cpool[i++] = in.readLong(); break; case CONSTANT_DOUBLE: cpool[i++] = new Double(in.readDouble());
@@ -76,7 +76,7 @@ case CONSTANT_STRING: // JVM 4.4.3 CONSTANT_String_info.string_index // or JVM 4.4.1 CONSTANT_Class_info.name_index
cpool[i] = new Integer(in.readUnsignedShort());
cpool[i] = in.readUnsignedShort(); break; case CONSTANT_FIELD:
@@ -84,7 +84,7 @@ case CONSTANT_INTERFACEMETHOD: case CONSTANT_NAMEANDTYPE: // JVM 4.4.2 CONSTANT_*ref_info.class_index & name_and_type_index
cpool[i] = new Integer((in.readUnsignedShort() << 16) | in.readUnsignedShort());
cpool[i] = (in.readUnsignedShort() << 16) | in.readUnsignedShort(); break; case CONSTANT_METHODHANDLE:
@@ -260,7 +260,7 @@ Integer result = (Integer)indexHashAscii.get(string); if (result == null) { if (MoreStuff == null) MoreStuff = new Vector();
result = new Integer(cpool.length + MoreStuff.size());
result = cpool.length + MoreStuff.size(); MoreStuff.addElement(string); indexHashAscii.put(string, result); }
@@ -277,10 +277,10 @@ indexHashAscii = new Hashtable(); for (int i = 1; i < cpool.length; i++) { if (types[i] == CONSTANT_UTF8) {
indexHashAscii.put(cpool[i], new Integer(i));
indexHashAscii.put(cpool[i], i); } else { try {
indexHashObject.put(getConstant(i, env), new Integer(i));
indexHashObject.put(getConstant(i, env), i); } catch (ClassFormatError e) { } } }
diff -r d02b062bc827 src/share/classes/sun/tools/java/Identifier.java --- a/src/share/classes/sun/tools/java/Identifier.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/java/Identifier.java Fri Jun 20 09:57:19 2014 -0300 @@ -106,7 +106,7 @@ * Set the type of the identifier. */ void setType(int t) {
value = new Integer(t);
}value = t; //System.out.println("type(" + this + ")=" + t);
diff -r d02b062bc827 src/share/classes/sun/tools/javac/BatchEnvironment.java --- a/src/share/classes/sun/tools/javac/BatchEnvironment.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/javac/BatchEnvironment.java Fri Jun 20 09:57:19 2014 -0300 @@ -1172,7 +1172,7 @@ if (!hitErrorLimit) { hitErrorLimit = true; output(errorString("too.many.errors",
new Integer(errorLimit),null,null));
errorLimit,null,null)); } return; }
diff -r d02b062bc827 src/share/classes/sun/tools/javac/Main.java --- a/src/share/classes/sun/tools/javac/Main.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/javac/Main.java Fri Jun 20 09:57:19 2014 -0300 @@ -668,19 +668,18 @@ Object file1 = env.deprecationFiles.elementAt(0); if (env.deprecation()) { if (ndepfiles > 1) {
env.error(0, "warn.note.deprecations",new Integer(ndepfiles), new Integer(ndeps));
env.error(0, "warn.note.deprecations", ndepfiles, ndeps); } else { env.error(0, "warn.note.1deprecation",
file1, new Integer(ndeps));
file1, ndeps); } } else { if (ndepfiles > 1) { env.error(0, "warn.note.deprecations.silent",
new Integer(ndepfiles), new Integer(ndeps));
ndepfiles, ndeps); } else { env.error(0, "warn.note.1deprecation.silent",
file1, new Integer(ndeps));
file1, ndeps); } } }
diff -r d02b062bc827 src/share/classes/sun/tools/javac/SourceMember.java --- a/src/share/classes/sun/tools/javac/SourceMember.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/javac/SourceMember.java Fri Jun 20 09:57:19 2014 -0300 @@ -885,7 +885,7 @@ // instance initializers. Code for these is generated // in the makeVarInits() method of the class // MethodExpression.
asm.add(getWhere(), opc_aload, new Integer(0));
asm.add(getWhere(), opc_aload, 0); e.codeValue(env, ctx, asm); asm.add(getWhere(), opc_putfield, this); }
diff -r d02b062bc827 src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java --- a/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java Fri Jun 20 09:57:19 2014 -0300 @@ -56,7 +56,7 @@ ObjectName mbeanName = new ObjectName(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",name=" + name); if (client.isRegistered(mbeanName)) {
gcMBeans.put(mbeanName, new Long(0));
gcMBeans.put(mbeanName, 0L); } } catch (Exception e) { assert false;
@@ -97,7 +97,7 @@ Long gcCount = e.getValue(); Long newCount = gc.getCollectionCount(); if (newCount > gcCount) {
gcMBeans.put(e.getKey(), new Long(newCount));
gcMBeans.put(e.getKey(), newCount); lastGcInfo = gc.getLastGcInfo(); if (lastGcInfo.getEndTime() > lastGcEndTime) { gcId = lastGcInfo.getId();
diff -r d02b062bc827 src/share/classes/sun/tools/jconsole/inspector/Utils.java --- a/src/share/classes/sun/tools/jconsole/inspector/Utils.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/jconsole/inspector/Utils.java Fri Jun 20 09:57:19 2014 -0300 @@ -342,14 +342,14 @@ Object result; if (primitiveToWrapper.containsKey(type)) { if (type.equals(Character.TYPE.getName())) {
result = new Character(value.charAt(0));
result = value.charAt(0); } else { result = newStringConstructor( ((Class<?>) primitiveToWrapper.get(type)).getName(), value); } } else if (type.equals(Character.class.getName())) {
result = new Character(value.charAt(0));
result = value.charAt(0); } else if (Number.class.isAssignableFrom(Utils.getClass(type))) { result = createNumberFromStringValue(value); } else if (value == null || value.equals("null")) {
diff -r d02b062bc827 src/share/classes/sun/tools/jstat/Jstat.java --- a/src/share/classes/sun/tools/jstat/Jstat.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/jstat/Jstat.java Fri Jun 20 09:57:19 2014 -0300 @@ -158,7 +158,7 @@ // handle target termination events for targets other than ourself HostListener terminator = new HostListener() { public void vmStatusChanged(VmStatusChangeEvent ev) {
Integer lvmid = new Integer(vmId.getLocalVmId());
Integer lvmid = vmId.getLocalVmId(); if (ev.getTerminated().contains(lvmid)) { logger.stopLogging(); } else if (!ev.getActive().contains(lvmid)) {
diff -r d02b062bc827 src/share/classes/sun/tools/jstatd/RemoteHostImpl.java --- a/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java Fri Jun 20 09:57:19 2014 -0300 @@ -62,7 +62,7 @@
public RemoteVm attachVm(int lvmid, String mode)
throws RemoteException, MonitorException {Integer v = new Integer(lvmid);
Integer v = lvmid; RemoteVm stub = null; StringBuffer sb = new StringBuffer();
diff -r d02b062bc827 src/share/classes/sun/tools/tree/ArrayExpression.java --- a/src/share/classes/sun/tools/tree/ArrayExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/ArrayExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -92,16 +92,16 @@ */ public void codeValue(Environment env, Context ctx, Assembler asm) { int t = 0;
asm.add(where, opc_ldc, new Integer(args.length));
asm.add(where, opc_ldc, args.length); switch (type.getElementType().getTypeCode()) {
case TC_BOOLEAN: asm.add(where, opc_newarray, new Integer(T_BOOLEAN)); break;case TC_BYTE: asm.add(where, opc_newarray, new Integer(T_BYTE)); break;case TC_SHORT: asm.add(where, opc_newarray, new Integer(T_SHORT)); break;case TC_CHAR: asm.add(where, opc_newarray, new Integer(T_CHAR)); break;case TC_INT: asm.add(where, opc_newarray, new Integer(T_INT)); break;case TC_LONG: asm.add(where, opc_newarray, new Integer(T_LONG)); break;case TC_FLOAT: asm.add(where, opc_newarray, new Integer(T_FLOAT)); break;case TC_DOUBLE: asm.add(where, opc_newarray, new Integer(T_DOUBLE)); break;
case TC_BOOLEAN: asm.add(where, opc_newarray, T_BOOLEAN); break;case TC_BYTE: asm.add(where, opc_newarray, T_BYTE); break;case TC_SHORT: asm.add(where, opc_newarray, T_SHORT); break;case TC_CHAR: asm.add(where, opc_newarray, T_CHAR); break;case TC_INT: asm.add(where, opc_newarray, T_INT); break;case TC_LONG: asm.add(where, opc_newarray, T_LONG); break;case TC_FLOAT: asm.add(where, opc_newarray, T_FLOAT); break;case TC_DOUBLE: asm.add(where, opc_newarray, T_DOUBLE); break; case TC_ARRAY: asm.add(where, opc_anewarray, type.getElementType());
@@ -122,7 +122,7 @@ if (args[i].equalsDefault()) continue;
asm.add(where, opc_dup);asm.add(where, opc_ldc, new Integer(i));
asm.add(where, opc_ldc, i); args[i].codeValue(env, ctx, asm); switch (type.getElementType().getTypeCode()) { case TC_BOOLEAN:
diff -r d02b062bc827 src/share/classes/sun/tools/tree/BinaryExpression.java --- a/src/share/classes/sun/tools/tree/BinaryExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/BinaryExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -212,10 +212,10 @@ Label l2 = new Label();
codeBranch(env, ctx, asm, l1, true);asm.add(true, where, opc_ldc, new Integer(0));
asm.add(true, where, opc_ldc, 0); asm.add(true, where, opc_goto, l2); asm.add(l1);
asm.add(true, where, opc_ldc, new Integer(1));
asm.add(true, where, opc_ldc, 1); asm.add(l2); } else { left.codeValue(env, ctx, asm);
diff -r d02b062bc827 src/share/classes/sun/tools/tree/BitNotExpression.java --- a/src/share/classes/sun/tools/tree/BitNotExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/BitNotExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -80,10 +80,10 @@ public void codeValue(Environment env, Context ctx, Assembler asm) { right.codeValue(env, ctx, asm); if (type.isType(TC_INT)) {
asm.add(where, opc_ldc, new Integer(-1));
asm.add(where, opc_ldc, -1); asm.add(where, opc_ixor); } else {
asm.add(where, opc_ldc2_w, new Long(-1));
} diff -r d02b062bc827 src/share/classes/sun/tools/tree/BooleanExpression.java --- a/src/share/classes/sun/tools/tree/BooleanExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/BooleanExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -52,7 +52,7 @@ * Get the value */ public Object getValue() {asm.add(where, opc_ldc2_w, -1L); asm.add(where, opc_lxor); }
return new Integer(value ? 1 : 0);
return value ? 1 : 0;}
/**
@@ -106,7 +106,7 @@ } } public void codeValue(Environment env, Context ctx, Assembler asm) {
asm.add(where, opc_ldc, new Integer(value ? 1 : 0));
asm.add(where, opc_ldc, value ? 1 : 0);}
/**
diff -r d02b062bc827 src/share/classes/sun/tools/tree/Expression.java --- a/src/share/classes/sun/tools/tree/Expression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/Expression.java Fri Jun 20 09:57:19 2014 -0300 @@ -432,10 +432,10 @@ Label l2 = new Label();
codeBranch(env, ctx, asm, l1, true);asm.add(true, where, opc_ldc, new Integer(0));
asm.add(true, where, opc_ldc, 0); asm.add(true, where, opc_goto, l2); asm.add(l1);
asm.add(true, where, opc_ldc, new Integer(1));
asm.add(true, where, opc_ldc, 1); asm.add(l2); } else { throw new CompilerError("codeValue");
diff -r d02b062bc827 src/share/classes/sun/tools/tree/FinallyStatement.java --- a/src/share/classes/sun/tools/tree/FinallyStatement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/FinallyStatement.java Fri Jun 20 09:57:19 2014 -0300 @@ -287,8 +287,8 @@ // allocate space for the exception and return address f1 = new LocalMember(where, thisClass, 0, Type.tObject, null); f2 = new LocalMember(where, thisClass, 0, Type.tInt, null);
num1 = new Integer(ctx.declare(env, f1));num2 = new Integer(ctx.declare(env, f2));
num1 = ctx.declare(env, f1);num2 = ctx.declare(env, f2); } TryData td = new TryData();
diff -r d02b062bc827 src/share/classes/sun/tools/tree/IdentifierExpression.java --- a/src/share/classes/sun/tools/tree/IdentifierExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/IdentifierExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -452,7 +452,7 @@ } void codeLoad(Environment env, Context ctx, Assembler asm) { asm.add(where, opc_iload + type.getTypeCodeOffset(),
new Integer(((LocalMember)field).number));
} void codeStore(Environment env, Context ctx, Assembler asm) { LocalMember local = (LocalMember)field;((LocalMember)field).number);
diff -r d02b062bc827 src/share/classes/sun/tools/tree/IncDecExpression.java --- a/src/share/classes/sun/tools/tree/IncDecExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/IncDecExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -112,26 +112,26 @@ private void codeIncDecOp(Assembler asm, boolean inc) { switch (type.getTypeCode()) { case TC_BYTE:
asm.add(where, opc_ldc, new Integer(1));
asm.add(where, opc_ldc, 1); asm.add(where, inc ? opc_iadd : opc_isub); asm.add(where, opc_i2b); break; case TC_SHORT:
asm.add(where, opc_ldc, new Integer(1));
asm.add(where, opc_ldc, 1); asm.add(where, inc ? opc_iadd : opc_isub); asm.add(where, opc_i2s); break; case TC_CHAR:
asm.add(where, opc_ldc, new Integer(1));
asm.add(where, opc_ldc, 1); asm.add(where, inc ? opc_iadd : opc_isub); asm.add(where, opc_i2c); break; case TC_INT:
asm.add(where, opc_ldc, new Integer(1));
asm.add(where, opc_ldc, 1); asm.add(where, inc ? opc_iadd : opc_isub); break; case TC_LONG:
asm.add(where, opc_ldc2_w, new Long(1));
asm.add(where, opc_ldc2_w, 1L); asm.add(where, inc ? opc_ladd : opc_lsub); break; case TC_FLOAT:
diff -r d02b062bc827 src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java --- a/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -93,11 +93,11 @@ LocalMember v = (LocalMember)field.getArguments().elementAt(0); CodeContext newctx = new CodeContext(ctx, this); newctx.declare(env, v);
asm.add(where, opc_astore, new Integer(v.number));
asm.add(where, opc_astore, v.number); body.code(env, newctx, asm); asm.add(newctx.breakLabel); if (forValue) {
asm.add(where, opc_aload, new Integer(v.number));
} diff -r d02b062bc827 src/share/classes/sun/tools/tree/IntegerExpression.java --- a/src/share/classes/sun/tools/tree/IntegerExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/IntegerExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -70,7 +70,7 @@ * Get the value */ public Object getValue() {asm.add(where, opc_aload, v.number); } }
return new Integer(value);
return value;}
/**
@@ -91,6 +91,6 @@ * Code */ public void codeValue(Environment env, Context ctx, Assembler asm) {
asm.add(where, opc_ldc, new Integer(value));
} } diff -r d02b062bc827 src/share/classes/sun/tools/tree/LongExpression.java --- a/src/share/classes/sun/tools/tree/LongExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/LongExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -50,7 +50,7 @@ * Get the value */ public Object getValue() {asm.add(where, opc_ldc, value);
return new Long(value);
return value;}
/**
@@ -71,7 +71,7 @@ * Code */ public void codeValue(Environment env, Context ctx, Assembler asm) {
asm.add(where, opc_ldc2_w, new Long(value));
asm.add(where, opc_ldc2_w, value);}
/**
diff -r d02b062bc827 src/share/classes/sun/tools/tree/MethodExpression.java --- a/src/share/classes/sun/tools/tree/MethodExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/MethodExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -857,7 +857,7 @@ right.code(env, ctx, asm); } } else if (right == null) {
asm.add(where, opc_aload, new Integer(0));
asm.add(where, opc_aload, 0); } else if (right.op == SUPER) { // 'super.<method>(...)', 'super(...)', or '<expr>.super(...)' /*****
diff -r d02b062bc827 src/share/classes/sun/tools/tree/NewArrayExpression.java --- a/src/share/classes/sun/tools/tree/NewArrayExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/NewArrayExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -133,21 +133,21 @@
switch (type.getElementType().getTypeCode()) {
case TC_BOOLEAN:asm.add(where, opc_newarray, new Integer(T_BOOLEAN)); break;
asm.add(where, opc_newarray, T_BOOLEAN); break; case TC_BYTE:
asm.add(where, opc_newarray, new Integer(T_BYTE)); break;
asm.add(where, opc_newarray, T_BYTE); break; case TC_SHORT:
asm.add(where, opc_newarray, new Integer(T_SHORT)); break;
asm.add(where, opc_newarray, T_SHORT); break; case TC_CHAR:
asm.add(where, opc_newarray, new Integer(T_CHAR)); break;
asm.add(where, opc_newarray, T_CHAR); break; case TC_INT:
asm.add(where, opc_newarray, new Integer(T_INT)); break;
asm.add(where, opc_newarray, T_INT); break; case TC_LONG:
asm.add(where, opc_newarray, new Integer(T_LONG)); break;
asm.add(where, opc_newarray, T_LONG); break; case TC_FLOAT:
asm.add(where, opc_newarray, new Integer(T_FLOAT)); break;
asm.add(where, opc_newarray, T_FLOAT); break; case TC_DOUBLE:
asm.add(where, opc_newarray, new Integer(T_DOUBLE)); break;
asm.add(where, opc_newarray, T_DOUBLE); break; case TC_ARRAY: asm.add(where, opc_anewarray, type.getElementType()); break; case TC_CLASS:
diff -r d02b062bc827 src/share/classes/sun/tools/tree/NotExpression.java --- a/src/share/classes/sun/tools/tree/NotExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/NotExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -139,7 +139,7 @@ */ public void codeValue(Environment env, Context ctx, Assembler asm) { right.codeValue(env, ctx, asm);
asm.add(where, opc_ldc, new Integer(1));
}asm.add(where, opc_ldc, 1); asm.add(where, opc_ixor);
diff -r d02b062bc827 src/share/classes/sun/tools/tree/Statement.java --- a/src/share/classes/sun/tools/tree/Statement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/Statement.java Fri Jun 20 09:57:19 2014 -0300 @@ -249,7 +249,7 @@ // Save the return value in the register which should have // been reserved. LocalMember lf = ctx.getLocalField(idFinallyReturnValue);
num = new Integer(lf.number);
num = lf.number; asm.add(where, opc_istore + save.getTypeCodeOffset(), num); } else { // Pop the return value.
diff -r d02b062bc827 src/share/classes/sun/tools/tree/SynchronizedStatement.java --- a/src/share/classes/sun/tools/tree/SynchronizedStatement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/SynchronizedStatement.java Fri Jun 20 09:57:19 2014 -0300 @@ -125,8 +125,8 @@
LocalMember f1 = new LocalMember(where, clazz, 0, Type.tObject, null);
LocalMember f2 = new LocalMember(where, clazz, 0, Type.tInt, null);Integer num1 = new Integer(ctx.declare(env, f1));Integer num2 = new Integer(ctx.declare(env, f2));
Integer num1 = ctx.declare(env, f1);Integer num2 = ctx.declare(env, f2); Label endLabel = new Label();
diff -r d02b062bc827 src/share/classes/sun/tools/tree/ThisExpression.java --- a/src/share/classes/sun/tools/tree/ThisExpression.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/tools/tree/ThisExpression.java Fri Jun 20 09:57:19 2014 -0300 @@ -169,7 +169,7 @@ * Code */ public void codeValue(Environment env, Context ctx, Assembler asm) {
asm.add(where, opc_aload, new Integer(field.number));
asm.add(where, opc_aload, field.number);}
/**
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/swing/PrintingStatus.java --- a/src/share/classes/sun/swing/PrintingStatus.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/swing/PrintingStatus.java Fri Jun 20 09:57:18 2014 -0300 @@ -295,7 +295,7 @@ private void updateStatusOnEDT(int pageIndex) { assert SwingUtilities.isEventDispatchThread(); Object[] pageNumber = new Object[]{
new Integer(pageIndex + 1)};
} -------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/security/action/GetIntegerAction.java --- a/src/share/classes/sun/security/action/GetIntegerAction.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/action/GetIntegerAction.java Fri Jun 20 09:57:18 2014 -0300 @@ -107,7 +107,7 @@ public Integer run() { Integer value = Integer.getInteger(theProp); if ((value == null) && defaultSet)pageIndex + 1}; statusLabel.setText(statusFormat.format(pageNumber)); }
return new Integer(defaultVal);
} } diff -r d02b062bc827 src/share/classes/sun/security/action/GetLongAction.java --- a/src/share/classes/sun/security/action/GetLongAction.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/action/GetLongAction.java Fri Jun 20 09:57:18 2014 -0300 @@ -106,7 +106,7 @@ public Long run() { Long value = Long.getLong(theProp); if ((value == null) && defaultSet)return defaultVal; return value;
return new Long(defaultVal);
} } diff -r d02b062bc827 src/share/classes/sun/security/jgss/krb5/ServiceCreds.java --- a/src/share/classes/sun/security/jgss/krb5/ServiceCreds.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/jgss/krb5/ServiceCreds.java Fri Jun 20 09:57:18 2014 -0300 @@ -231,7 +231,7 @@ for (int i=0; i<ekeys.length; i++) { ekeys[i] = new EncryptionKey( kkeys[i].getEncoded(), kkeys[i].getKeyType(),return defaultVal; return value;
new Integer(kkeys[i].getVersionNumber()));
kkeys[i].getVersionNumber()); } return ekeys;} diff -r d02b062bc827 src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java --- a/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java Fri Jun 20 09:57:18 2014 -0300 @@ -203,7 +203,7 @@ }
public int hashCode() {
return new Long(pName).hashCode();
return Long.valueOf(pName).hashCode();}
public byte[] export() throws GSSException {
diff -r d02b062bc827 src/share/classes/sun/security/krb5/EncryptedData.java --- a/src/share/classes/sun/security/krb5/EncryptedData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/EncryptedData.java Fri Jun 20 09:57:18 2014 -0300 @@ -87,7 +87,7 @@ EncryptedData new_encryptedData = new EncryptedData(); new_encryptedData.eType = eType; if (kvno != null) {
new_encryptedData.kvno = new Integer(kvno.intValue());
new_encryptedData.kvno = kvno.intValue(); } if (cipher != null) { new_encryptedData.cipher = new byte[cipher.length];
@@ -241,7 +241,7 @@ if ((encoding.getData().peekByte() & 0x1F) == 1) { der = encoding.getData().getDerValue(); int i = (der.getData().getBigInteger()).intValue();
kvno = new Integer(i);
kvno = i; } else { kvno = null; }
diff -r d02b062bc827 src/share/classes/sun/security/krb5/KrbApRep.java --- a/src/share/classes/sun/security/krb5/KrbApRep.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/KrbApRep.java Fri Jun 20 09:57:18 2014 -0300 @@ -180,7 +180,7 @@ Integer seqno = null;
if (seqNumber != null)seqno = new Integer(seqNumber.current());
seqno = seqNumber.current(); encPart = new EncAPRepPart(ctime, cusec,
diff -r d02b062bc827 src/share/classes/sun/security/krb5/KrbApReq.java --- a/src/share/classes/sun/security/krb5/KrbApReq.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/KrbApReq.java Fri Jun 20 09:57:18 2014 -0300 @@ -485,7 +485,7 @@ Integer seqno = null;
if (seqNumber != null)seqno = new Integer(seqNumber.current());
seqno = seqNumber.current(); authenticator = new Authenticator(cname,
diff -r d02b062bc827 src/share/classes/sun/security/krb5/KrbPriv.java --- a/src/share/classes/sun/security/krb5/KrbPriv.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/KrbPriv.java Fri Jun 20 09:57:18 2014 -0300 @@ -114,10 +114,10 @@ Integer seqno = null;
if (timestamp != null)usec = new Integer(timestamp.getMicroSeconds());
usec = timestamp.getMicroSeconds(); if (seqNumber != null) {
seqno = new Integer(seqNumber.current());
seqno = seqNumber.current(); seqNumber.step(); }
diff -r d02b062bc827 src/share/classes/sun/security/krb5/KrbSafe.java --- a/src/share/classes/sun/security/krb5/KrbSafe.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/KrbSafe.java Fri Jun 20 09:57:18 2014 -0300 @@ -115,10 +115,10 @@ Integer seqno = null;
if (timestamp != null)usec = new Integer(timestamp.getMicroSeconds());
usec = timestamp.getMicroSeconds(); if (seqNumber != null) {
seqno = new Integer(seqNumber.current());
seqno = seqNumber.current(); seqNumber.step(); }
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/Authenticator.java --- a/src/share/classes/sun/security/krb5/internal/Authenticator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/Authenticator.java Fri Jun 20 09:57:18 2014 -0300 @@ -149,7 +149,7 @@ if ((der.getData().peekByte() & 0x1F) == 0x07) { subDer = der.getData().getDerValue(); if ((subDer.getTag() & (byte) 0x1F) == (byte) 0x07) {
seqNumber = new Integer(subDer.getData().getBigInteger().intValue());
seqNumber = subDer.getData().getBigInteger().intValue(); } } } else {
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/EncAPRepPart.java --- a/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java Fri Jun 20 09:57:18 2014 -0300 @@ -117,7 +117,7 @@ if ((subDer.getTag() & 0x1F) != 0x03) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); }
seqNumber = new Integer(subDer.getData().getBigInteger().intValue());
seqNumber = subDer.getData().getBigInteger().intValue(); } else { seqNumber = null; }
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java --- a/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java Fri Jun 20 09:57:18 2014 -0300 @@ -140,7 +140,7 @@ if (der.getData().available() > 0) { if (((byte) (der.getData().peekByte()) & (byte) 0x1F) == (byte) 0x01) { subDer = der.getData().getDerValue();
nonce = new Integer(subDer.getData().getBigInteger().intValue());
nonce = subDer.getData().getBigInteger().intValue(); } } if (der.getData().available() > 0) {
@@ -149,7 +149,7 @@ if (der.getData().available() > 0) { if (((byte) (der.getData().peekByte()) & (byte) 0x1F) == (byte) 0x03) { subDer = der.getData().getDerValue();
usec = new Integer(subDer.getData().getBigInteger().intValue());
usec = subDer.getData().getBigInteger().intValue(); } } if (der.getData().available() > 0) {
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java --- a/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java Fri Jun 20 09:57:18 2014 -0300 @@ -115,13 +115,13 @@ timestamp = KerberosTime.parse(der.getData(), (byte) 0x01, true); if ((der.getData().peekByte() & 0x1F) == 0x02) { subDer = der.getData().getDerValue();
usec = new Integer(subDer.getData().getBigInteger().intValue());
usec = subDer.getData().getBigInteger().intValue(); } else { usec = null; } if ((der.getData().peekByte() & 0x1F) == 0x03) { subDer = der.getData().getDerValue();
seqNumber = new Integer(subDer.getData().getBigInteger().intValue());
seqNumber = subDer.getData().getBigInteger().intValue(); } else { seqNumber = null; }
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/KRBError.java --- a/src/share/classes/sun/security/krb5/internal/KRBError.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/KRBError.java Fri Jun 20 09:57:18 2014 -0300 @@ -335,7 +335,7 @@ cTime = KerberosTime.parse(der.getData(), (byte)0x02, true); if ((der.getData().peekByte() & 0x1F) == 0x03) { subDer = der.getData().getDerValue();
cuSec = new Integer(subDer.getData().getBigInteger().intValue());
cuSec = subDer.getData().getBigInteger().intValue(); } else cuSec = null; sTime = KerberosTime.parse(der.getData(), (byte)0x04, false);
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/KRBSafeBody.java --- a/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java Fri Jun 20 09:57:18 2014 -0300 @@ -104,11 +104,11 @@ timestamp = KerberosTime.parse(encoding.getData(), (byte)0x01, true); if ((encoding.getData().peekByte() & 0x1F) == 0x02) { der = encoding.getData().getDerValue();
usec = new Integer(der.getData().getBigInteger().intValue());
usec = der.getData().getBigInteger().intValue(); } if ((encoding.getData().peekByte() & 0x1F) == 0x03) { der = encoding.getData().getDerValue();
seqNumber = new Integer(der.getData().getBigInteger().intValue());
seqNumber = der.getData().getBigInteger().intValue(); } sAddress = HostAddress.parse(encoding.getData(), (byte)0x04, false); if (encoding.getData().available() > 0)
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/KerberosTime.java --- a/src/share/classes/sun/security/krb5/internal/KerberosTime.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/KerberosTime.java Fri Jun 20 09:57:18 2014 -0300 @@ -188,7 +188,7 @@ }
public int getMicroSeconds() {Long temp_long = new Long((kerberosTime % 1000L) * 1000L);
}Long temp_long = (kerberosTime % 1000L) * 1000L; return temp_long.intValue() + microSeconds;
@@ -250,7 +250,7 @@ }
public int getSeconds() {Long temp_long = new Long(kerberosTime / 1000L);
}Long temp_long = kerberosTime / 1000L; return temp_long.intValue();
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java --- a/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java Fri Jun 20 09:57:18 2014 -0300 @@ -67,7 +67,7 @@ public PAEncTSEnc() { KerberosTime now = KerberosTime.now(); pATimeStamp = now;
pAUSec = new Integer(now.getMicroSeconds());
pAUSec = now.getMicroSeconds();}
/**
@@ -85,7 +85,7 @@ if (encoding.getData().available() > 0) { der = encoding.getData().getDerValue(); if ((der.getTag() & 0x1F) == 0x01) {
pAUSec = new Integer(der.getData().getBigInteger().intValue());
pAUSec = der.getData().getBigInteger().intValue(); } else throw new Asn1Exception(Krb5.ASN1_BAD_ID); }
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java --- a/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Fri Jun 20 09:57:18 2014 -0300 @@ -94,8 +94,8 @@ taglen = read(2); switch (tag) { case FCC_TAG_DELTATIME:
time_offset = new Integer(read(4));usec_offset = new Integer(read(4));
time_offset = read(4);usec_offset = read(4); break; default: }
@@ -186,7 +186,7 @@ read(2); /* keytype recorded twice in fvno 3 */ keyLen = read(4); byte[] bytes = IOUtils.readFully(this, keyLen, true);
return new EncryptionKey(bytes, keyType, new Integer(version));
return new EncryptionKey(bytes, keyType, version);}
long[] readTimes() throws IOException {
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java --- a/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Fri Jun 20 09:57:18 2014 -0300 @@ -297,7 +297,7 @@ if (EType.isSupported(entry.keyType)) { key = new EncryptionKey(entry.keyblock, entry.keyType,
new Integer(entry.keyVersion));
entry.keyVersion); keys.add(key); if (DEBUG) { System.out.println("Added key: " + entry.keyType +
diff -r d02b062bc827 src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java --- a/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java Fri Jun 20 09:57:18 2014 -0300 @@ -68,7 +68,7 @@ public EncryptionKey getKey() { EncryptionKey key = new EncryptionKey(keyblock, keyType,
new Integer(keyVersion));
}keyVersion); return key;
diff -r d02b062bc827 src/share/classes/sun/security/pkcs/PKCS9Attribute.java --- a/src/share/classes/sun/security/pkcs/PKCS9Attribute.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/pkcs/PKCS9Attribute.java Fri Jun 20 09:57:18 2014 -0300 @@ -309,26 +309,26 @@ */ private static final Byte[][] PKCS9_VALUE_TAGS = { null,
{new Byte(DerValue.tag_IA5String)}, // EMailAddress{new Byte(DerValue.tag_IA5String), // UnstructuredNamenew Byte(DerValue.tag_PrintableString)},{new Byte(DerValue.tag_ObjectId)}, // ContentType{new Byte(DerValue.tag_OctetString)}, // MessageDigest{new Byte(DerValue.tag_UtcTime)}, // SigningTime{new Byte(DerValue.tag_Sequence)}, // Countersignature{new Byte(DerValue.tag_PrintableString),new Byte(DerValue.tag_T61String)}, // ChallengePassword{new Byte(DerValue.tag_PrintableString),new Byte(DerValue.tag_T61String)}, // UnstructuredAddress{new Byte(DerValue.tag_SetOf)}, // ExtendedCertificateAttributes{new Byte(DerValue.tag_Sequence)}, // issuerAndSerialNumber
{DerValue.tag_IA5String}, // EMailAddress{DerValue.tag_IA5String, // UnstructuredNameDerValue.tag_PrintableString},{DerValue.tag_ObjectId}, // ContentType{DerValue.tag_OctetString}, // MessageDigest{DerValue.tag_UtcTime}, // SigningTime{DerValue.tag_Sequence}, // Countersignature{DerValue.tag_PrintableString,DerValue.tag_T61String}, // ChallengePassword{DerValue.tag_PrintableString,DerValue.tag_T61String}, // UnstructuredAddress{DerValue.tag_SetOf}, // ExtendedCertificateAttributes{DerValue.tag_Sequence}, // issuerAndSerialNumber null, null, null,
{new Byte(DerValue.tag_Sequence)}, // extensionRequest{new Byte(DerValue.tag_Sequence)}, // SMIMECapability{new Byte(DerValue.tag_Sequence)}, // SigningCertificate{new Byte(DerValue.tag_Sequence)} // SignatureTimestampToken
{DerValue.tag_Sequence}, // extensionRequest{DerValue.tag_Sequence}, // SMIMECapability{DerValue.tag_Sequence}, // SigningCertificate{DerValue.tag_Sequence} // SignatureTimestampToken};
private static final Class[] VALUE_CLASSES = new Class[18];
@@ -511,7 +511,7 @@ // check for illegal element tags Byte tag; for (int i=0; i < elems.length; i++) {
tag = new Byte(elems[i].tag);
tag = elems[i].tag; if (indexOf(tag, PKCS9_VALUE_TAGS[index], 0) == -1) throwTagException(tag);
diff -r d02b062bc827 src/share/classes/sun/security/provider/ConfigFile.java --- a/src/share/classes/sun/security/provider/ConfigFile.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/provider/ConfigFile.java Fri Jun 20 09:57:18 2014 -0300 @@ -531,7 +531,7 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.found.value.",
new Integer(linenum), expect, st.sval);
linenum, expect, st.sval); } break;
@@ -541,7 +541,7 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.",
new Integer(linenum), expect, st.sval);
linenum, expect, st.sval); } break;
@@ -551,7 +551,7 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.",
new Integer(linenum), expect, st.sval);
linenum, expect, st.sval); } break;
@@ -561,7 +561,7 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.",
new Integer(linenum), expect, st.sval);
linenum, expect, st.sval); } break;
@@ -571,14 +571,14 @@ } else { throw ioException( "Configuration.Error.Line.line.expected.expect.",
new Integer(linenum), expect, st.sval);
linenum, expect, st.sval); } break; default: throw ioException( "Configuration.Error.Line.line.expected.expect.found.value.",
new Integer(linenum), expect, st.sval);
linenum, expect, st.sval); } return value; }
@@ -655,7 +655,7 @@ if (s == null || s.length() == 0) { throw ioException( "Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
new Integer(linenum), value);
linenum, value); } return s; }
diff -r d02b062bc827 src/share/classes/sun/security/provider/PolicyParser.java --- a/src/share/classes/sun/security/provider/PolicyParser.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/provider/PolicyParser.java Fri Jun 20 09:57:18 2014 -0300 @@ -1405,7 +1405,7 @@ super("line " + line + ": " + msg); MessageFormat form = new MessageFormat (ResourcesMgr.getString("line.number.msg"));
Object[] source = {new Integer(line), msg};
Object[] source = {line, msg}; i18nMessage = form.format(source); }
@@ -1414,7 +1414,7 @@ "], found [" + actual + "]"); MessageFormat form = new MessageFormat(ResourcesMgr.getString ("line.number.expected.expect.found.actual."));
Object[] source = {new Integer(line), expect, actual};
Object[] source = {line, expect, actual}; i18nMessage = form.format(source); }
diff -r d02b062bc827 src/share/classes/sun/security/tools/keytool/Main.java --- a/src/share/classes/sun/security/tools/keytool/Main.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/tools/keytool/Main.java Fri Jun 20 09:57:18 2014 -0300 @@ -1531,7 +1531,7 @@ if (verbose) { MessageFormat form = new MessageFormat(rb.getString ("Generated.keysize.bit.keyAlgName.secret.key"));
Object[] source = {new Integer(keysize),
Object[] source = {keysize, secKey.getAlgorithm()}; System.err.println(form.format(source)); }
@@ -1626,10 +1626,10 @@ if (verbose) { MessageFormat form = new MessageFormat(rb.getString ("Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for"));
Object[] source = {new Integer(keysize),
Object[] source = {keysize, privKey.getAlgorithm(), chain[0].getSigAlgName(),
new Long(validity),
validity, x500Name}; System.err.println(form.format(source)); }
@@ -1787,7 +1787,7 @@ for (int i = 0; i < chain.length; i ++) { MessageFormat form = new MessageFormat (rb.getString("Certificate.i.1."));
Object[] source = {new Integer((i + 1))};
Object[] source = {(i + 1)}; out.println(form.format(source)); if (verbose && (chain[i] instanceof X509Certificate)) { printX509Cert((X509Certificate)(chain[i]), out);
@@ -2062,7 +2062,7 @@ ("Your.keystore.contains.keyStore.size.entry")) : new MessageFormat(rb.getString ("Your.keystore.contains.keyStore.size.entries"));
Object[] source = {new Integer(keyStore.size())};
Object[] source = {keyStore.size()}; out.println(form.format(source)); out.println();
@@ -2334,7 +2334,7 @@ if (certs.length > 1) { MessageFormat form = new MessageFormat (rb.getString("Certificate.i.1."));
Object[] source = {new Integer(i + 1)};
Object[] source = {i + 1}; out.println(form.format(source)); } if (rfc)
diff -r d02b062bc827 src/share/classes/sun/security/util/DerIndefLenConverter.java --- a/src/share/classes/sun/security/util/DerIndefLenConverter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/util/DerIndefLenConverter.java Fri Jun 20 09:57:18 2014 -0300 @@ -150,7 +150,7 @@ return curLen; int lenByte = data[dataPos++] & 0xff; if (isIndefinite(lenByte)) {
ndefsList.add(new Integer(dataPos));
ndefsList.add(dataPos); unresolved++; return curLen; }
diff -r d02b062bc827 src/share/classes/sun/security/x509/AVA.java --- a/src/share/classes/sun/security/x509/AVA.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/AVA.java Fri Jun 20 09:57:18 2014 -0300 @@ -517,7 +517,7 @@ if (hexDigits.indexOf(Character.toUpperCase((char)c2)) >= 0) { int hi = Character.digit((char)c1, 16); int lo = Character.digit((char)c2, 16);
return new Byte((byte)((hi<<4) + lo));
return (byte)((hi<<4) + lo); } else { throw new IOException ("escaped hex value must include two valid digits");
diff -r d02b062bc827 src/share/classes/sun/security/x509/CRLReasonCodeExtension.java --- a/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java Fri Jun 20 09:57:18 2014 -0300 @@ -125,7 +125,7 @@ */ public Integer get(String name) throws IOException { if (name.equalsIgnoreCase(REASON)) {
return new Integer(reasonCode);
return reasonCode; } else { throw new IOException ("Name not supported by CRLReasonCodeExtension");
diff -r d02b062bc827 src/share/classes/sun/security/x509/CertificateVersion.java --- a/src/share/classes/sun/security/x509/CertificateVersion.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/CertificateVersion.java Fri Jun 20 09:57:18 2014 -0300 @@ -193,7 +193,7 @@ */ public Integer get(String name) throws IOException { if (name.equalsIgnoreCase(VERSION)) {
return(new Integer(getVersion()));
return(getVersion()); } else { throw new IOException("Attribute name not recognized by " + "CertAttrSet: CertificateVersion.");
diff -r d02b062bc827 src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java --- a/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java Fri Jun 20 09:57:18 2014 -0300 @@ -217,7 +217,7 @@ */ public Integer get(String name) throws IOException { if (name.equalsIgnoreCase(SKIP_CERTS))
return (new Integer(skipCerts));
return (skipCerts); else throw new IOException("Attribute name not recognized by " + "CertAttrSet:InhibitAnyPolicy.");
diff -r d02b062bc827 src/share/classes/sun/security/x509/PolicyConstraintsExtension.java --- a/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java Fri Jun 20 09:57:18 2014 -0300 @@ -233,9 +233,9 @@ */ public Integer get(String name) throws IOException { if (name.equalsIgnoreCase(REQUIRE)) {
return new Integer(require);
return require; } else if (name.equalsIgnoreCase(INHIBIT)) {
return new Integer(inhibit);
return inhibit; } else { throw new IOException("Attribute name not recognized by " + "CertAttrSet:PolicyConstraints.");
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/rmi/rmic/RMIGenerator.java --- a/src/share/classes/sun/rmi/rmic/RMIGenerator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/rmi/rmic/RMIGenerator.java Fri Jun 20 09:57:18 2014 -0300 @@ -63,9 +63,9 @@
private static final Hashtable<String, Integer> versionOptions = new Hashtable<>();
static {versionOptions.put("-v1.1", new Integer(STUB_VERSION_1_1));versionOptions.put("-vcompat", new Integer(STUB_VERSION_FAT));versionOptions.put("-v1.2", new Integer(STUB_VERSION_1_2));
versionOptions.put("-v1.1", STUB_VERSION_1_1);versionOptions.put("-vcompat", STUB_VERSION_FAT);versionOptions.put("-v1.2", STUB_VERSION_1_2);}
/**
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/print/ServiceDialog.java --- a/src/share/classes/sun/print/ServiceDialog.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/print/ServiceDialog.java Fri Jun 20 09:57:18 2014 -0300 @@ -1017,8 +1017,8 @@ format.setParseIntegerOnly(true); format.setDecimalSeparatorAlwaysShown(false); NumberFormatter nf = new NumberFormatter(format);
nf.setMinimum(new Integer(1));nf.setMaximum(new Integer(Integer.MAX_VALUE));
nf.setMinimum(1);nf.setMaximum(Integer.MAX_VALUE); nf.setAllowsInvalid(true); nf.setCommitsOnValidEdit(true); tfRangeFrom = new JFormattedTextField(nf);
@@ -1110,12 +1110,12 @@
if (min < 1) {
min = 1;tfRangeFrom.setValue(new Integer(1));
tfRangeFrom.setValue(1); } if (max < min) { max = min;
tfRangeTo.setValue(new Integer(min));
tfRangeTo.setValue(min); } PageRanges pr = new PageRanges(min, max);
@@ -1165,8 +1165,8 @@ } else { // RANGE rbPages.setSelected(true); }
tfRangeFrom.setValue(new Integer(min));tfRangeTo.setValue(new Integer(max));
tfRangeFrom.setValue(min);tfRangeTo.setValue(max); rbAll.setEnabled(prSupported); rbPages.setEnabled(prSupported); setupRangeWidgets();
@@ -1275,14 +1275,14 @@ min = 1; max = Integer.MAX_VALUE; }
snModel.setMinimum(new Integer(min));snModel.setMaximum(new Integer(max));
snModel.setMinimum(min);snModel.setMaximum(max); int value = cp.getValue(); if ((value < min) || (value > max)) { value = min; }
snModel.setValue(new Integer(value));
snModel.setValue(value); // setup Collate checkbox if (psCurrent.isAttributeCategorySupported(scCategory)) {
@@ -2763,7 +2763,7 @@ if ((value < 1) || (value > 100)) { value = 1; }
snModel.setValue(new Integer(value));
snModel.setValue(value); lblPriority.setEnabled(jpSupported); spinPriority.setEnabled(jpSupported);
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/nio/ch/Util.java --- a/src/share/classes/sun/nio/ch/Util.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/nio/ch/Util.java Fri Jun 20 09:57:18 2014 -0300 @@ -328,8 +328,8 @@ initDBBConstructor(); try { dbb = (MappedByteBuffer)directByteBufferConstructor.newInstance(
new Object[] { new Integer(size),new Long(addr),
new Object[] { size,addr, fd, unmapper }); } catch (InstantiationException |
@@ -373,8 +373,8 @@ initDBBRConstructor(); try { dbb = (MappedByteBuffer)directByteBufferRConstructor.newInstance(
new Object[] { new Integer(size),new Long(addr),
new Object[] { size,addr, fd, unmapper }); } catch (InstantiationException |
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/net/NetProperties.java --- a/src/share/classes/sun/net/NetProperties.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/net/NetProperties.java Fri Jun 20 09:57:18 2014 -0300 @@ -123,7 +123,7 @@ } catch (NumberFormatException ex) { } }
return new Integer(defval);
return defval;}
/**
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/misc/ProxyGenerator.java --- a/src/share/classes/sun/misc/ProxyGenerator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/misc/ProxyGenerator.java Fri Jun 20 09:57:18 2014 -0300 @@ -1743,7 +1743,7 @@ * Get or assign the index for a CONSTANT_Integer entry. */ public short getInteger(int i) {
return getValue(new Integer(i));
return getValue(i); } /**
@@ -1885,7 +1885,7 @@ "late constant pool addition: " + key); } short i = addEntry(new ValueEntry(key));
map.put(key, new Short(i));
map.put(key, i); return i; } }
@@ -1903,7 +1903,7 @@ throw new InternalError("late constant pool addition"); } short i = addEntry(e);
map.put(e, new Short(i));
map.put(e, i); return i; } }
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/management/GcInfoCompositeData.java --- a/src/share/classes/sun/management/GcInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/GcInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -105,10 +105,10 @@
try {
baseGcInfoItemValues = new Object[] {new Long(info.getId()),new Long(info.getStartTime()),new Long(info.getEndTime()),new Long(info.getDuration()),
info.getId(),info.getStartTime(),info.getEndTime(),info.getDuration(), memoryUsageMapType.toOpenTypeData(info.getMemoryUsageBeforeGc()), memoryUsageMapType.toOpenTypeData(info.getMemoryUsageAfterGc()), };
diff -r d02b062bc827 src/share/classes/sun/management/HotspotThread.java --- a/src/share/classes/sun/management/HotspotThread.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/HotspotThread.java Fri Jun 20 09:57:18 2014 -0300 @@ -60,7 +60,7 @@ int numThreads = getInternalThreadTimes0(names, times); Map<String, Long> result = new HashMap<>(numThreads); for (int i = 0; i < numThreads; i++) {
result.put(names[i], new Long(times[i]));
} diff -r d02b062bc827 src/share/classes/sun/management/LockInfoCompositeData.java --- a/src/share/classes/sun/management/LockInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/LockInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -61,7 +61,7 @@ // lockInfoItemNames! final Object[] lockInfoItemValues = { new String(lock.getClassName()),result.put(names[i], times[i]); } return result;
new Integer(lock.getIdentityHashCode()),
lock.getIdentityHashCode(), }; try {
diff -r d02b062bc827 src/share/classes/sun/management/MemoryNotifInfoCompositeData.java --- a/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -60,7 +60,7 @@ final Object[] memoryNotifInfoItemValues = { memoryNotifInfo.getPoolName(), MemoryUsageCompositeData.toCompositeData(memoryNotifInfo.getUsage()),
new Long(memoryNotifInfo.getCount()),
memoryNotifInfo.getCount(), }; try {
diff -r d02b062bc827 src/share/classes/sun/management/MemoryUsageCompositeData.java --- a/src/share/classes/sun/management/MemoryUsageCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/MemoryUsageCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -56,10 +56,10 @@ // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH // memoryUsageItemNames! final Object[] memoryUsageItemValues = {
new Long(usage.getInit()),new Long(usage.getUsed()),new Long(usage.getCommitted()),new Long(usage.getMax()),
usage.getInit(),usage.getUsed(),usage.getCommitted(),usage.getMax(), }; try {
diff -r d02b062bc827 src/share/classes/sun/management/MonitorInfoCompositeData.java --- a/src/share/classes/sun/management/MonitorInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/MonitorInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -69,7 +69,7 @@ toCompositeData(ste) : null); } else if (item.equals(LOCKED_STACK_DEPTH)) {
values[i] = new Integer(lock.getLockedStackDepth());
values[i] = lock.getLockedStackDepth(); } else { values[i] = li.get(item); }
diff -r d02b062bc827 src/share/classes/sun/management/StackTraceElementCompositeData.java --- a/src/share/classes/sun/management/StackTraceElementCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/StackTraceElementCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -67,7 +67,7 @@ ste.getClassName(), ste.getMethodName(), ste.getFileName(),
new Integer(ste.getLineNumber()),
ste.getLineNumber(), ste.isNativeMethod(), }; try {
diff -r d02b062bc827 src/share/classes/sun/management/ThreadInfoCompositeData.java --- a/src/share/classes/sun/management/ThreadInfoCompositeData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/ThreadInfoCompositeData.java Fri Jun 20 09:57:18 2014 -0300 @@ -108,16 +108,16 @@ // CONTENTS OF THIS ARRAY MUST BE SYNCHRONIZED WITH // threadInfoItemNames! final Object[] threadInfoItemValues = {
new Long(threadInfo.getThreadId()),
threadInfo.getThreadId(), threadInfo.getThreadName(), threadInfo.getThreadState().name(),
new Long(threadInfo.getBlockedTime()),new Long(threadInfo.getBlockedCount()),new Long(threadInfo.getWaitedTime()),new Long(threadInfo.getWaitedCount()),
threadInfo.getBlockedTime(),threadInfo.getBlockedCount(),threadInfo.getWaitedTime(),threadInfo.getWaitedCount(), lockInfoData, threadInfo.getLockName(),
new Long(threadInfo.getLockOwnerId()),
threadInfo.getLockOwnerId(), threadInfo.getLockOwnerName(), stackTraceData, threadInfo.isSuspended(),
diff -r d02b062bc827 src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java --- a/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java Fri Jun 20 09:57:18 2014 -0300 @@ -43,7 +43,7 @@ }
public Object getValue() {return new Long(value);
return Long.valueOf(value);}
/**
diff -r d02b062bc827 src/share/classes/sun/management/counter/perf/PerfLongCounter.java --- a/src/share/classes/sun/management/counter/perf/PerfLongCounter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/counter/perf/PerfLongCounter.java Fri Jun 20 09:57:18 2014 -0300 @@ -42,7 +42,7 @@ }
public Object getValue() {return new Long(lb.get(0));
return Long.valueOf(lb.get(0));}
/**
diff -r d02b062bc827 src/share/classes/sun/management/jdp/JdpController.java --- a/src/share/classes/sun/management/jdp/JdpController.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/jdp/JdpController.java Fri Jun 20 09:57:18 2014 -0300 @@ -204,7 +204,7 @@ packet.setRmiHostname(rmiHostname);
// Set broadcast intervalpacket.setBroadcastInterval(new Integer(pause).toString());
packet.setBroadcastInterval(Integer.valueOf(pause).toString()); // Set process id Integer pid = getProcessId();
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -129,21 +129,21 @@ * Getter for the "JvmClassesUnloadedCount" variable. */ public Long getJvmClassesUnloadedCount() throws SnmpStatusException {
return new Long(getClassLoadingMXBean().getUnloadedClassCount());
return getClassLoadingMXBean().getUnloadedClassCount();}
/** * Getter for the "JvmClassesTotalLoadedCount" variable. */ public Long getJvmClassesTotalLoadedCount() throws SnmpStatusException {
return new Long(getClassLoadingMXBean().getTotalLoadedClassCount());
return getClassLoadingMXBean().getTotalLoadedClassCount();}
/** * Getter for the "JvmClassesLoadedCount" variable. */ public Long getJvmClassesLoadedCount() throws SnmpStatusException {
return new Long(getClassLoadingMXBean().getLoadedClassCount());
}return (long)getClassLoadingMXBean().getLoadedClassCount();
} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -115,7 +115,7 @@ t = getCompilationMXBean().getTotalCompilationTime(); else t = 0;
return new Long(t);
return t;}
/**
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -70,7 +70,7 @@ */ // Don't bother to uses the request contextual cache for this. public Long getJvmMemGCTimeMs() throws SnmpStatusException {
return new Long(gcm.getCollectionTime());
return gcm.getCollectionTime();}
/**
@@ -78,14 +78,14 @@ */ // Don't bother to uses the request contextual cache for this. public Long getJvmMemGCCount() throws SnmpStatusException {
return new Long(gcm.getCollectionCount());
return gcm.getCollectionCount();}
/** * Getter for the "JvmMemManagerIndex" variable. */ public Integer getJvmMemManagerIndex() throws SnmpStatusException {
return new Integer(JvmMemManagerIndex);
}return JvmMemManagerIndex;
} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -79,7 +79,7 @@ * Getter for the "JvmMemManagerIndex" variable. */ public Integer getJvmMemManagerIndex() throws SnmpStatusException {
return new Integer(JvmMemManagerIndex);
return JvmMemManagerIndex;}
/**
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -92,14 +92,14 @@ * Getter for the "JvmMemManagerIndex" variable. */ public Integer getJvmMemManagerIndex() throws SnmpStatusException {
return new Integer(JvmMemManagerIndex);
return JvmMemManagerIndex;}
/** * Getter for the "JvmMemPoolIndex" variable. */ public Integer getJvmMemPoolIndex() throws SnmpStatusException {
return new Integer(JvmMemPoolIndex);
}return JvmMemPoolIndex;
} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -191,7 +191,7 @@ */ public Long getJvmMemPoolMaxSize() throws SnmpStatusException { final long val = getMemoryUsage().getMax();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -200,7 +200,7 @@ */ public Long getJvmMemPoolUsed() throws SnmpStatusException { final long val = getMemoryUsage().getUsed();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -209,7 +209,7 @@ */ public Long getJvmMemPoolInitSize() throws SnmpStatusException { final long val = getMemoryUsage().getInit();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -218,7 +218,7 @@ */ public Long getJvmMemPoolCommitted() throws SnmpStatusException { final long val = getMemoryUsage().getCommitted();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -227,7 +227,7 @@ */ public Long getJvmMemPoolPeakMaxSize() throws SnmpStatusException { final long val = getPeakMemoryUsage().getMax();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -236,7 +236,7 @@ */ public Long getJvmMemPoolPeakUsed() throws SnmpStatusException { final long val = getPeakMemoryUsage().getUsed();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -245,7 +245,7 @@ */ public Long getJvmMemPoolPeakCommitted() throws SnmpStatusException { final long val = getPeakMemoryUsage().getCommitted();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -254,7 +254,7 @@ */ public Long getJvmMemPoolCollectMaxSize() throws SnmpStatusException { final long val = getCollectMemoryUsage().getMax();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -263,7 +263,7 @@ */ public Long getJvmMemPoolCollectUsed() throws SnmpStatusException { final long val = getCollectMemoryUsage().getUsed();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -272,7 +272,7 @@ */ public Long getJvmMemPoolCollectCommitted() throws SnmpStatusException { final long val = getCollectMemoryUsage().getCommitted();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -283,7 +283,7 @@ if (!pool.isUsageThresholdSupported()) return JvmMemoryImpl.Long0; final long val = pool.getUsageThreshold();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -334,7 +334,7 @@ if (!pool.isUsageThresholdSupported()) return JvmMemoryImpl.Long0; final long val = pool.getUsageThresholdCount();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -345,7 +345,7 @@ if (!pool.isCollectionUsageThresholdSupported()) return JvmMemoryImpl.Long0; final long val = pool.getCollectionUsageThreshold();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -399,7 +399,7 @@ if (!pool.isCollectionUsageThresholdSupported()) return JvmMemoryImpl.Long0; final long val = pool.getCollectionUsageThresholdCount();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return JvmMemoryImpl.Long0;
@@ -430,7 +430,7 @@ * Getter for the "JvmMemPoolIndex" variable. */ public Integer getJvmMemPoolIndex() throws SnmpStatusException {
return new Integer(jvmMemPoolIndex);
}return jvmMemPoolIndex;
@@ -450,7 +450,7 @@ */ public synchronized Long getJvmMemPoolPeakReset() throws SnmpStatusException {
return new Long(jvmMemPoolPeakReset);
return jvmMemPoolPeakReset;}
/**
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -222,7 +222,7 @@ } }
- static final Long Long0 = new Long(0);
static final Long Long0 = 0L;
/**
- Getter for the "JvmMemoryNonHeapMaxSize" variable.
@@ -230,7 +230,7 @@ public Long getJvmMemoryNonHeapMaxSize() throws SnmpStatusException { final long val = getNonHeapMemoryUsage().getMax();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return Long0;
@@ -239,7 +239,7 @@ */ public Long getJvmMemoryNonHeapCommitted() throws SnmpStatusException { final long val = getNonHeapMemoryUsage().getCommitted();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return Long0;
@@ -248,7 +248,7 @@ */ public Long getJvmMemoryNonHeapUsed() throws SnmpStatusException { final long val = getNonHeapMemoryUsage().getUsed();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return Long0;
@@ -257,7 +257,7 @@ */ public Long getJvmMemoryNonHeapInitSize() throws SnmpStatusException { final long val = getNonHeapMemoryUsage().getInit();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return Long0;
@@ -266,7 +266,7 @@ */ public Long getJvmMemoryHeapMaxSize() throws SnmpStatusException { final long val = getHeapMemoryUsage().getMax();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return Long0;
@@ -320,7 +320,7 @@ */ public Long getJvmMemoryHeapCommitted() throws SnmpStatusException { final long val = getHeapMemoryUsage().getCommitted();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return Long0;
@@ -359,7 +359,7 @@ */ public Long getJvmMemoryHeapUsed() throws SnmpStatusException { final long val = getHeapMemoryUsage().getUsed();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return Long0;
@@ -368,7 +368,7 @@ */ public Long getJvmMemoryHeapInitSize() throws SnmpStatusException { final long val = getHeapMemoryUsage().getInit();
if (val > -1) return new Long(val);
}if (val > -1) return val; else return Long0;
@@ -380,11 +380,11 @@ final long val = ManagementFactory.getMemoryMXBean(). getObjectPendingFinalizationCount();
if (val > -1) return new Long((int)val);
if (val > -1) return val; // Should never happen... but stay safe all the same. //
else return new Long(0);
else return 0L;}
static final MibLogger log = new MibLogger(JvmMemoryImpl.class);
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -82,7 +82,7 @@ * Getter for the "JvmRTProcessorCount" variable. */ public Integer getJvmOSProcessorCount() throws SnmpStatusException {
return new Integer(getOSMBean().getAvailableProcessors());
}return getOSMBean().getAvailableProcessors();
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -72,7 +72,7 @@ * Getter for the "JvmRTBootClassPathIndex" variable. */ public Integer getJvmRTBootClassPathIndex() throws SnmpStatusException {
return new Integer(index);
}return index;
} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -71,7 +71,7 @@ * Getter for the "JvmRTClassPathIndex" variable. */ public Integer getJvmRTClassPathIndex() throws SnmpStatusException {
return new Integer(index);
}return index;
} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -71,7 +71,7 @@ * Getter for the "JvmRTInputArgsIndex" variable. */ public Integer getJvmRTInputArgsIndex() throws SnmpStatusException {
return new Integer(index);
}return index;
} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -71,7 +71,7 @@ * Getter for the "JvmRTLibraryPathIndex" variable. */ public Integer getJvmRTLibraryPathIndex() throws SnmpStatusException {
return new Integer(index);
}return index;
} diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -241,7 +241,7 @@
final String[] args = getInputArguments(JvmContextFactory.
getUserData());return new Integer(args.length);
return args.length;}
/**
@@ -259,14 +259,14 @@ * Getter for the "JvmRTUptimeMs" variable. */ public Long getJvmRTUptimeMs() throws SnmpStatusException {
return new Long(getRuntimeMXBean().getUptime());
return getRuntimeMXBean().getUptime();}
/** * Getter for the "JvmRTStartTimeMs" variable. */ public Long getJvmRTStartTimeMs() throws SnmpStatusException {
return new Long(getRuntimeMXBean().getStartTime());
return getRuntimeMXBean().getStartTime();}
/**
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -139,7 +139,7 @@ "Unexpected exception: " + r); log.debug("getJvmThreadInstState",r); }
Byte[] result = { new Byte(bitmap[0]), new Byte(bitmap[1]) };
Byte[] result = { bitmap[0], bitmap[1] }; return result; } }
@@ -231,7 +231,7 @@ log.debug("getJvmThreadInstCpuTimeNs", "Operation not supported: " + e); }
return new Long(l);
return l;}
/**
@@ -248,14 +248,14 @@ //Monitoring is disabled if(l == -1) l = 0; }
return new Long(l);
return l;}
/** * Getter for the "JvmThreadInstBlockCount" variable. */ public Long getJvmThreadInstBlockCount() throws SnmpStatusException {
return new Long(info.getBlockedCount());
return info.getBlockedCount();}
/**
@@ -272,14 +272,14 @@ //Monitoring is disabled if(l == -1) l = 0; }
return new Long(l);
return l;}
/** * Getter for the "JvmThreadInstWaitCount" variable. */ public Long getJvmThreadInstWaitCount() throws SnmpStatusException {
return new Long(info.getWaitedCount());
return info.getWaitedCount();}
/**
@@ -294,7 +294,7 @@ * Getter for the "JvmThreadInstId" variable. */ public Long getJvmThreadInstId() throws SnmpStatusException {
return new Long(info.getThreadId());
return info.getThreadId();}
/**
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java --- a/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java Fri Jun 20 09:57:18 2014 -0300 @@ -303,28 +303,28 @@ * Getter for the "JvmThreadTotalStartedCount" variable. */ public Long getJvmThreadTotalStartedCount() throws SnmpStatusException {
return new Long(getThreadMXBean().getTotalStartedThreadCount());
return getThreadMXBean().getTotalStartedThreadCount();}
/** * Getter for the "JvmThreadPeakCount" variable. */ public Long getJvmThreadPeakCount() throws SnmpStatusException {
return new Long(getThreadMXBean().getPeakThreadCount());
return (long)getThreadMXBean().getPeakThreadCount();}
/** * Getter for the "JvmThreadDaemonCount" variable. */ public Long getJvmThreadDaemonCount() throws SnmpStatusException {
return new Long(getThreadMXBean().getDaemonThreadCount());
return (long)getThreadMXBean().getDaemonThreadCount();}
/** * Getter for the "JvmThreadCount" variable. */ public Long getJvmThreadCount() throws SnmpStatusException {
return new Long(getThreadMXBean().getThreadCount());
return (long)getThreadMXBean().getThreadCount();}
/**
@@ -332,7 +332,7 @@ */ public synchronized Long getJvmThreadPeakCountReset() throws SnmpStatusException {
return new Long(jvmThreadPeakCountReset);
return jvmThreadPeakCountReset;}
/**
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "verbose");intTable.put(new Integer(1), "silent");stringTable.put("verbose", new Integer(2));stringTable.put("silent", new Integer(1));
intTable.put(2, "verbose");intTable.put(1, "silent");stringTable.put("verbose", 2);stringTable.put("silent", 1);}
public EnumJvmClassesVerboseLevel(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "supported");intTable.put(new Integer(1), "unsupported");stringTable.put("supported", new Integer(2));stringTable.put("unsupported", new Integer(1));
intTable.put(2, "supported");intTable.put(1, "unsupported");stringTable.put("supported", 2);stringTable.put("unsupported", 1);}
public EnumJvmJITCompilerTimeMonitoring(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java Fri Jun 20 09:57:18 2014 -0300 @@ -50,10 +50,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "valid");intTable.put(new Integer(1), "invalid");stringTable.put("valid", new Integer(2));stringTable.put("invalid", new Integer(1));
intTable.put(2, "valid");intTable.put(1, "invalid");stringTable.put("valid", 2);stringTable.put("invalid", 1);}
public EnumJvmMemManagerState(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "supported");intTable.put(new Integer(1), "unsupported");stringTable.put("supported", new Integer(2));stringTable.put("unsupported", new Integer(1));
intTable.put(2, "supported");intTable.put(1, "unsupported");stringTable.put("supported", 2);stringTable.put("unsupported", 1);}
public EnumJvmMemPoolCollectThreshdSupport(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "valid");intTable.put(new Integer(1), "invalid");stringTable.put("valid", new Integer(2));stringTable.put("invalid", new Integer(1));
intTable.put(2, "valid");intTable.put(1, "invalid");stringTable.put("valid", 2);stringTable.put("invalid", 1);}
public EnumJvmMemPoolState(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "supported");intTable.put(new Integer(1), "unsupported");stringTable.put("supported", new Integer(2));stringTable.put("unsupported", new Integer(1));
intTable.put(2, "supported");intTable.put(1, "unsupported");stringTable.put("supported", 2);stringTable.put("unsupported", 1);}
public EnumJvmMemPoolThreshdSupport(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "heap");intTable.put(new Integer(1), "nonheap");stringTable.put("heap", new Integer(2));stringTable.put("nonheap", new Integer(1));
intTable.put(2, "heap");intTable.put(1, "nonheap");stringTable.put("heap", 2);stringTable.put("nonheap", 1);}
public EnumJvmMemPoolType(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,16 +49,16 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "supported");intTable.put(new Integer(5), "failed");intTable.put(new Integer(4), "started");intTable.put(new Integer(1), "unsupported");intTable.put(new Integer(3), "start");stringTable.put("supported", new Integer(2));stringTable.put("failed", new Integer(5));stringTable.put("started", new Integer(4));stringTable.put("unsupported", new Integer(1));stringTable.put("start", new Integer(3));
intTable.put(2, "supported");intTable.put(5, "failed");intTable.put(4, "started");intTable.put(1, "unsupported");intTable.put(3, "start");stringTable.put("supported", 2);stringTable.put("failed", 5);stringTable.put("started", 4);stringTable.put("unsupported", 1);stringTable.put("start", 3);}
public EnumJvmMemoryGCCall(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "verbose");intTable.put(new Integer(1), "silent");stringTable.put("verbose", new Integer(2));stringTable.put("silent", new Integer(1));
intTable.put(2, "verbose");intTable.put(1, "silent");stringTable.put("verbose", 2);stringTable.put("silent", 1);}
public EnumJvmMemoryGCVerboseLevel(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,10 +49,10 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(2), "supported");intTable.put(new Integer(1), "unsupported");stringTable.put("supported", new Integer(2));stringTable.put("unsupported", new Integer(1));
intTable.put(2, "supported");intTable.put(1, "unsupported");stringTable.put("supported", 2);stringTable.put("unsupported", 1);}
public EnumJvmRTBootClassPathSupport(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,12 +49,12 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(3), "enabled");intTable.put(new Integer(4), "disabled");intTable.put(new Integer(1), "unsupported");stringTable.put("enabled", new Integer(3));stringTable.put("disabled", new Integer(4));stringTable.put("unsupported", new Integer(1));
intTable.put(3, "enabled");intTable.put(4, "disabled");intTable.put(1, "unsupported");stringTable.put("enabled", 3);stringTable.put("disabled", 4);stringTable.put("unsupported", 1);}
public EnumJvmThreadContentionMonitoring(int valueIndex) throws IllegalArgumentException {
diff -r d02b062bc827 src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java --- a/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java Fri Jun 20 09:57:18 2014 -0300 @@ -49,12 +49,12 @@ protected static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(3), "enabled");intTable.put(new Integer(4), "disabled");intTable.put(new Integer(1), "unsupported");stringTable.put("enabled", new Integer(3));stringTable.put("disabled", new Integer(4));stringTable.put("unsupported", new Integer(1));
intTable.put(3, "enabled");intTable.put(4, "disabled");intTable.put(1, "unsupported");stringTable.put("enabled", 3);stringTable.put("disabled", 4);stringTable.put("unsupported", 1);}
public EnumJvmThreadCpuTimeMonitoring(int valueIndex) throws IllegalArgumentException {
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java Fri Jun 20 09:57:17 2014 -0300 @@ -174,9 +174,8 @@ Integer.TYPE });
impl = (PerfDataBufferImpl)cons.newInstance(new Object[] {bb, new Integer(lvmid)});
impl = (PerfDataBufferImpl) cons.newInstance(new Object[] { bb,lvmid }); } catch (ClassNotFoundException e) { // from Class.forName();
diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java Fri Jun 20 09:57:17 2014 -0300 @@ -67,7 +67,7 @@ * return type is guaranteed to be of type Integer. */ public Object getValue() {
return new Integer(ib.get(0));
return ib.get(0);}
/**
diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java Fri Jun 20 09:57:17 2014 -0300 @@ -66,7 +66,7 @@ * return type is guaranteed to be of type Long. */ public Object getValue() {
return new Long(lb.get(0));
return Long.valueOf(lb.get(0));}
/**
diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java Fri Jun 20 09:57:17 2014 -0300 @@ -156,8 +156,7 @@ if (files != null) { for (int j = 0; j < files.length; j++) { if (files[j].isFile() && files[j].canRead()) {
jvmSet.add(new Integer(PerfDataFile.getLocalVmId(files[j])));
jvmSet.add(PerfDataFile.getLocalVmId(files[j])); } } }
@@ -175,8 +174,7 @@ if (files != null) { for (int j = 0; j < files.length; j++) { if (files[j].isFile() && files[j].canRead()) {
jvmSet.add(new Integer(PerfDataFile.getLocalVmId(files[j])));
jvmSet.add(PerfDataFile.getLocalVmId(files[j])); } } }
@@ -187,8 +185,7 @@ if (files != null) { for (int j = 0; j < files.length; j++) { if (files[j].isFile() && files[j].canRead()) {
jvmSet.add(new Integer(PerfDataFile.getLocalVmId(files[j])));
jvmSet.add(PerfDataFile.getLocalVmId(files[j])); } } }
diff -r d02b062bc827 src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java --- a/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java Fri Jun 20 09:57:17 2014 -0300 @@ -106,7 +106,7 @@ Set activeSet = new HashSet(active.length);
for (int i = 0; i < active.length; i++) {activeSet.add(new Integer(active[i]));
activeSet.add(active[i]); } return activeSet;
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/sun/java2d/SunGraphics2D.java --- a/src/share/classes/sun/java2d/SunGraphics2D.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/sun/java2d/SunGraphics2D.java Fri Jun 20 09:57:17 2014 -0300 @@ -1322,7 +1322,7 @@ return SunHints.Value.get(SunHints.INTKEY_FRACTIONALMETRICS, fractionalMetricsHint); case SunHints.INTKEY_AATEXT_LCD_CONTRAST:
return new Integer(lcdTextContrast);
return lcdTextContrast; case SunHints.INTKEY_INTERPOLATION: switch (interpolationHint) { case SunHints.INTVAL_INTERPOLATION_NEAREST_NEIGHBOR:
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Fri Jun 20 09:57:17 2014 -0300 @@ -1857,8 +1857,7 @@ v += 2; break; case 'B': // pointer to CONSTANT_Byte
av.visit(name,new Byte((byte) readInt(items[readUnsignedShort(v)])));
av.visit(name, (byte) readInt(items[readUnsignedShort(v)])); v += 2; break; case 'Z': // pointer to CONSTANT_Boolean
@@ -1868,13 +1867,11 @@ v += 2; break; case 'S': // pointer to CONSTANT_Short
av.visit(name, new Short((short) readInt(items[readUnsignedShort(v)])));
av.visit(name, (short) readInt(items[readUnsignedShort(v)])); v += 2; break; case 'C': // pointer to CONSTANT_Char
av.visit(name, new Character((char) readInt(items[readUnsignedShort(v)])));
av.visit(name, (char) readInt(items[readUnsignedShort(v)])); v += 2; break; case 's': // pointer to CONSTANT_Utf8
@@ -2498,11 +2495,11 @@ int index = items[item]; switch (b[index - 1]) { case ClassWriter.INT:
return new Integer(readInt(index));
return readInt(index); case ClassWriter.FLOAT: return new Float(Float.intBitsToFloat(readInt(index))); case ClassWriter.LONG:
return new Long(readLong(index));
return Long.valueOf(readLong(index)); case ClassWriter.DOUBLE: return new Double(Double.longBitsToDouble(readLong(index))); case ClassWriter.CLASS:
diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java Fri Jun 20 09:57:17 2014 -0300 @@ -175,13 +175,13 @@ */ int F_SAME1 = 4;
- Integer TOP = new Integer(0);
- Integer INTEGER = new Integer(1);
- Integer FLOAT = new Integer(2);
- Integer DOUBLE = new Integer(3);
- Integer LONG = new Integer(4);
- Integer NULL = new Integer(5);
- Integer UNINITIALIZED_THIS = new Integer(6);
Integer TOP = 0;
Integer INTEGER = 1;
Integer FLOAT = 2;
Integer DOUBLE = 3;
Integer LONG = 4;
Integer NULL = 5;
Integer UNINITIALIZED_THIS = 6;
// opcodes // visit method (- = idem)
diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java Fri Jun 20 09:57:17 2014 -0300 @@ -408,7 +408,7 @@ } else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) { mv.visitIntInsn(Opcodes.SIPUSH, value); } else {
mv.visitLdcInsn(new Integer(value));
}mv.visitLdcInsn(value); }
@@ -422,7 +422,7 @@ if (value == 0L || value == 1L) { mv.visitInsn(Opcodes.LCONST_0 + (int) value); } else {
mv.visitLdcInsn(new Long(value));
}mv.visitLdcInsn(value); }
diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java Fri Jun 20 09:57:17 2014 -0300 @@ -737,7 +737,7 @@ } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) { mv.visitIntInsn(Opcodes.SIPUSH, cst); } else {
mv.visitLdcInsn(new Integer(cst));
}mv.visitLdcInsn(cst); }
@@ -745,7 +745,7 @@ if (cst == 0L || cst == 1L) { mv.visitInsn(Opcodes.LCONST_0 + (int) cst); } else {
mv.visitLdcInsn(new Long(cst));
}mv.visitLdcInsn(cst); }
diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java Fri Jun 20 09:57:17 2014 -0300 @@ -366,8 +366,7 @@
protected void addSVUID(long svuid) {
FieldVisitor fv = super.visitField(Opcodes.ACC_FINAL+ Opcodes.ACC_STATIC, "serialVersionUID", "J", null, new Long(svuid));
+ Opcodes.ACC_STATIC, "serialVersionUID", "J", null, svuid); if (fv != null) { fv.visitEnd(); }
diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java Fri Jun 20 09:57:17 2014 -0300 @@ -110,7 +110,7 @@ : labels.length); if (keys != null) { for (int i = 0; i < keys.length; ++i) {
this.keys.add(new Integer(keys[i]));
this.keys.add(keys[i]); } } if (labels != null) {
diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java Fri Jun 20 09:57:17 2014 -0300 @@ -802,7 +802,7 @@ if (labels.get(label) != null) { throw new IllegalArgumentException("Already visited label"); }
labels.put(label, new Integer(insnCount));
}labels.put(label, insnCount); super.visitLabel(label);
diff -r d02b062bc827 src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java --- a/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java Fri Jun 20 09:57:17 2014 -0300 @@ -732,7 +732,7 @@ Textifier t = createTextifier(); text.add(t.getText()); text.add(visible ? ") // parameter " : ") // invisible, parameter ");
text.add(new Integer(parameter));
} -------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/swing/JInternalFrame.java --- a/src/share/classes/javax/swing/JInternalFrame.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/JInternalFrame.java Fri Jun 20 09:57:17 2014 -0300 @@ -2106,7 +2106,7 @@ if (n == null) { return false; }text.add(parameter); text.add("\n"); return t;
setLayer(new Integer(n.intValue()));
setLayer(n.intValue()); return true; }
diff -r d02b062bc827 src/share/classes/javax/swing/JLayeredPane.java --- a/src/share/classes/javax/swing/JLayeredPane.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/JLayeredPane.java Fri Jun 20 09:57:17 2014 -0300 @@ -295,7 +295,7 @@ /// MAKE SURE THIS AND setLayer(Component c, int layer, int position) are SYNCED Integer layerObj;
layerObj = new Integer(layer);
}layerObj = layer; c.putClientProperty(LAYER_PROPERTY, layerObj);
@@ -626,7 +626,7 @@ layerObj = DRAG_LAYER; break; default:
layerObj = new Integer(layer);
} diff -r d02b062bc827 src/share/classes/javax/swing/JScrollBar.java --- a/src/share/classes/javax/swing/JScrollBar.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/JScrollBar.java Fri Jun 20 09:57:17 2014 -0300 @@ -327,7 +327,7 @@ if (accessibleContext != null) { accessibleContext.firePropertyChange( AccessibleContext.ACCESSIBLE_VALUE_PROPERTY,layerObj = layer; } return layerObj;
oldValue, new Integer(model.getValue()));
}oldValue, model.getValue()); }
@@ -928,7 +928,7 @@ */ public Number getMaximumAccessibleValue() { // TIGER - 4422362
return new Integer(model.getMaximum() - model.getExtent());
} // AccessibleJScrollBarreturn model.getMaximum() - model.getExtent(); }
diff -r d02b062bc827 src/share/classes/javax/swing/filechooser/FileSystemView.java --- a/src/share/classes/javax/swing/filechooser/FileSystemView.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/filechooser/FileSystemView.java Fri Jun 20 09:57:17 2014 -0300 @@ -645,7 +645,7 @@ int i = 1; while (newFolder.exists() && i < 100) { newFolder = createFileObject(containingDir, MessageFormat.format(
newFolderNextString, new Integer(i)));
newFolderNextString, i)); i++; }
@@ -754,7 +754,7 @@ int i = 2; while (newFolder.exists() && i < 100) { newFolder = createFileObject(containingDir, MessageFormat.format(
newFolderNextString, new Integer(i)));
newFolderNextString, i)); i++; }
diff -r d02b062bc827 src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java --- a/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Fri Jun 20 09:57:17 2014 -0300 @@ -455,10 +455,10 @@ initResourceBundle(table);
// *** Shared IntegersInteger fiveHundred = new Integer(500);
Integer fiveHundred = 500; // *** Shared Longs
Long oneThousand = new Long(1000);
Long oneThousand = 1000L; LazyValue dialogPlain12 = t -> new FontUIResource(Font.DIALOG, Font.PLAIN, 12);
@@ -673,7 +673,7 @@ Object editorMargin = threeInsets;
Object caretBlinkRate = fiveHundred;Integer four = new Integer(4);
Integer four = 4; Object[] allAuditoryCues = new Object[] { "CheckBoxMenuItem.commandSound",
@@ -1087,10 +1087,10 @@ "Menu.margin", twoInsets, "Menu.checkIcon", menuItemCheckIcon, "Menu.arrowIcon", menuArrowIcon,
"Menu.menuPopupOffsetX", new Integer(0),"Menu.menuPopupOffsetY", new Integer(0),"Menu.submenuPopupOffsetX", new Integer(0),"Menu.submenuPopupOffsetY", new Integer(0),
"Menu.menuPopupOffsetX", 0,"Menu.menuPopupOffsetY", 0,"Menu.submenuPopupOffsetX", 0,"Menu.submenuPopupOffsetY", 0, "Menu.shortcutKeys", new int[]{ SwingUtilities2.getSystemMnemonicKeyMask() },
@@ -1188,10 +1188,10 @@ "ProgressBar.selectionForeground", control, "ProgressBar.selectionBackground", textHighlight, "ProgressBar.border", progressBarBorder,
"ProgressBar.cellLength", new Integer(1),
"ProgressBar.cellLength", 1, "ProgressBar.cellSpacing", zero,
"ProgressBar.repaintInterval", new Integer(50),"ProgressBar.cycleTime", new Integer(3000),
"ProgressBar.repaintInterval", 50,"ProgressBar.cycleTime", 3000, "ProgressBar.horizontalSize", new DimensionUIResource(146, 12), "ProgressBar.verticalSize", new DimensionUIResource(12, 146),
@@ -1236,7 +1236,7 @@ "LEFT", "positiveUnitIncrement", "KP_LEFT", "positiveUnitIncrement", }),
"ScrollBar.width", new Integer(16),
"ScrollBar.width", 16, "ScrollPane.font", dialogPlain12, "ScrollPane.background", control,
@@ -1332,7 +1332,7 @@ "SplitPane.shadow", controlShadow, "SplitPane.darkShadow", controlDkShadow, "SplitPane.border", splitPaneBorder,
"SplitPane.dividerSize", new Integer(7),
"SplitPane.dividerSize", 7, "SplitPaneDivider.border", splitPaneDividerBorder, "SplitPaneDivider.draggingColor", darkGray, "SplitPane.ancestorInputMap",
@@ -1377,7 +1377,7 @@ "TabbedPane.selectedTabPadInsets", tabbedPaneTabPadInsets, "TabbedPane.tabAreaInsets", tabbedPaneTabAreaInsets, "TabbedPane.contentBorderInsets", tabbedPaneContentBorderInsets,
"TabbedPane.tabRunOverlay", new Integer(2),
"TabbedPane.tabRunOverlay", 2, "TabbedPane.tabsOpaque", Boolean.TRUE, "TabbedPane.contentOpaque", Boolean.TRUE, "TabbedPane.focusInputMap",
@@ -1737,9 +1737,9 @@ "Tree.selectionBorderColor", black, "Tree.dropLineColor", controlShadow, "Tree.editorBorder", blackLineBorder,
"Tree.leftChildIndent", new Integer(7),"Tree.rightChildIndent", new Integer(13),"Tree.rowHeight", new Integer(16),
"Tree.leftChildIndent", 7,"Tree.rightChildIndent", 13,"Tree.rowHeight", 16, "Tree.scrollsOnExpand", Boolean.TRUE, "Tree.openIcon", SwingUtilities2.makeIcon(getClass(), BasicLookAndFeel.class,
diff -r d02b062bc827 src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java --- a/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Fri Jun 20 09:57:17 2014 -0300 @@ -633,7 +633,7 @@ LazyValue toolBarBorder = t -> new MetalBorders.ToolBarBorder();
LazyValue progressBarBorder = t ->new BorderUIResource.LineBorderUIResource(controlDarkShadow, new Integer(1));
new BorderUIResource.LineBorderUIResource(controlDarkShadow, 1); LazyValue toolTipBorder = t -> new BorderUIResource.LineBorderUIResource(primaryControlDarkShadow);
@@ -851,8 +851,8 @@ "Slider.foreground", primaryControlShadow, "Slider.focus", focusColor, "Slider.focusInsets", zeroInsets,
"Slider.trackWidth", new Integer( 7 ),"Slider.majorTickLength", new Integer( 6 ),
"Slider.trackWidth", 7,"Slider.majorTickLength", 6, "Slider.horizontalThumbIcon",(LazyValue) t -> MetalIconFactory.getHorizontalSliderThumbIcon(), "Slider.verticalThumbIcon",(LazyValue) t -> MetalIconFactory.getVerticalSliderThumbIcon(), "Slider.focusInputMap",
@@ -914,7 +914,7 @@ new MetalBorders.OptionDialogBorder(), "InternalFrame.paletteBorder",(LazyValue) t -> new MetalBorders.PaletteBorder(),
"InternalFrame.paletteTitleHeight", new Integer(11),
"InternalFrame.paletteTitleHeight", 11, "InternalFrame.paletteCloseIcon",(LazyValue) t -> new MetalIconFactory.PaletteCloseIcon(), "InternalFrame.closeIcon",
@@ -1067,7 +1067,7 @@ "ScrollBar.thumb", primaryControlShadow, "ScrollBar.thumbShadow", primaryControlDarkShadow, "ScrollBar.thumbHighlight", primaryControl,
"ScrollBar.width", new Integer( 17 ),
"ScrollBar.width", 17, "ScrollBar.allowsAbsolutePositioning", Boolean.TRUE, "ScrollBar.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] {
@@ -1238,8 +1238,8 @@ "Menu.borderPainted", Boolean.TRUE, "Menu.menuPopupOffsetX", zero, "Menu.menuPopupOffsetY", zero,
"Menu.submenuPopupOffsetX", new Integer(-4),"Menu.submenuPopupOffsetY", new Integer(-3),
"Menu.submenuPopupOffsetX", -4,"Menu.submenuPopupOffsetY", -3, "Menu.font", menuTextValue, "Menu.selectionForeground", menuSelectedForeground, "Menu.selectionBackground", menuSelectedBackground,
@@ -1354,7 +1354,7 @@
// SplitPane"SplitPane.dividerSize", new Integer(10),
"SplitPane.dividerSize", 10, "SplitPane.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] { "UP", "negativeIncrement",
diff -r d02b062bc827 src/share/classes/javax/swing/plaf/synth/SynthParser.java --- a/src/share/classes/javax/swing/plaf/synth/SynthParser.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/plaf/synth/SynthParser.java Fri Jun 20 09:57:17 2014 -0300 @@ -763,7 +763,7 @@ break; case 4: // integer try {
value = new Integer(Integer.parseInt(aValue));
value = Integer.parseInt(aValue); } catch (NumberFormatException nfe) { throw new SAXException(property + " invalid value"); }
diff -r d02b062bc827 src/share/classes/javax/swing/text/JTextComponent.java --- a/src/share/classes/javax/swing/text/JTextComponent.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/text/JTextComponent.java Fri Jun 20 09:57:17 2014 -0300 @@ -2554,8 +2554,7 @@ int mark = e.getMark(); if (caretPos != dot) { // the caret moved
firePropertyChange(ACCESSIBLE_CARET_PROPERTY,new Integer(caretPos), new Integer(dot));
firePropertyChange(ACCESSIBLE_CARET_PROPERTY, caretPos, dot); caretPos = dot; try {
diff -r d02b062bc827 src/share/classes/javax/swing/text/html/CSS.java --- a/src/share/classes/javax/swing/text/html/CSS.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/text/html/CSS.java Fri Jun 20 09:57:17 2014 -0300 @@ -1748,13 +1748,13 @@ return Boolean.FALSE; } else if (key == StyleConstants.Alignment) { if (svalue.equals("right")) {
return new Integer(StyleConstants.ALIGN_RIGHT);
return StyleConstants.ALIGN_RIGHT; } else if (svalue.equals("center")) {
return new Integer(StyleConstants.ALIGN_CENTER);
return StyleConstants.ALIGN_CENTER; } else if (svalue.equals("justify")) {
return new Integer(StyleConstants.ALIGN_JUSTIFIED);
return StyleConstants.ALIGN_JUSTIFIED; }
return new Integer(StyleConstants.ALIGN_LEFT);
return StyleConstants.ALIGN_LEFT; } else if (key == StyleConstants.StrikeThrough) { if (svalue.indexOf("line-through") >= 0) { return Boolean.TRUE;
diff -r d02b062bc827 src/share/classes/javax/swing/text/html/HTMLDocument.java --- a/src/share/classes/javax/swing/text/html/HTMLDocument.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/text/html/HTMLDocument.java Fri Jun 20 09:57:17 2014 -0300 @@ -623,7 +623,7 @@ * @param n the number of tokens to buffer */ public void setTokenThreshold(int n) {
putProperty(TokenThreshold, new Integer(n));
putProperty(TokenThreshold, n);}
/**
diff -r d02b062bc827 src/share/classes/javax/swing/text/rtf/RTFGenerator.java --- a/src/share/classes/javax/swing/text/rtf/RTFGenerator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/swing/text/rtf/RTFGenerator.java Fri Jun 20 09:57:17 2014 -0300 @@ -165,14 +165,14 @@ foregroundColor = StyleConstants.getForeground(a); if (foregroundColor != null && colorTable.get(foregroundColor) == null) {
colorTable.put(foregroundColor, new Integer(colorCount));
colorTable.put(foregroundColor, colorCount); colorCount ++; } backgroundColor = a.getAttribute(StyleConstants.Background); if (backgroundColor != null && colorTable.get(backgroundColor) == null) {
colorTable.put(backgroundColor, new Integer(colorCount));
colorTable.put(backgroundColor, colorCount); colorCount ++; }
@@ -183,7 +183,7 @@
if (fontName != null &&
fontTable.get(fontName) == null) {fontTable.put(fontName, new Integer(fontCount));
} @@ -200,7 +200,7 @@ Integer aNum = styleTable.get(a); if (aNum == null) { styleCount = styleCount + 1;fontTable.put(fontName, fontCount); fontCount ++; }
aNum = new Integer(styleCount);
aNum = styleCount; styleTable.put(a, aNum); } }
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/sound/midi/MidiSystem.java --- a/src/share/classes/javax/sound/midi/MidiSystem.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/sound/midi/MidiSystem.java Fri Jun 20 09:57:17 2014 -0300 @@ -914,7 +914,7 @@ MidiFileWriter writer = (MidiFileWriter) providers.get(i); int[] types = writer.getMidiFileTypes(); for (int j = 0; j < types.length; j++ ) {
allTypes.add(new Integer(types[j]));
allTypes.add(types[j]); } } int resultTypes[] = new int[allTypes.size()];
@@ -968,7 +968,7 @@ MidiFileWriter writer = (MidiFileWriter) providers.get(i); int[] types = writer.getMidiFileTypes(sequence); for (int j = 0; j < types.length; j++ ) {
allTypes.add(new Integer(types[j]));
allTypes.add(types[j]); } } int resultTypes[] = new int[allTypes.size()];
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/management/loading/MLet.java --- a/src/share/classes/javax/management/loading/MLet.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/management/loading/MLet.java Fri Jun 20 09:57:17 2014 -0300 @@ -1307,13 +1307,13 @@ if (type.compareTo("java.lang.Boolean") == 0) return Boolean.valueOf(param); if (type.compareTo("java.lang.Byte") == 0)
return new Byte(param);
return Byte.valueOf(param); if (type.compareTo("java.lang.Short") == 0)
return new Short(param);
return Short.valueOf(param); if (type.compareTo("java.lang.Long") == 0)
return new Long(param);
return Long.valueOf(param); if (type.compareTo("java.lang.Integer") == 0)
return new Integer(param);
return Integer.valueOf(param); if (type.compareTo("java.lang.Float") == 0) return new Float(param); if (type.compareTo("java.lang.Double") == 0)
diff -r d02b062bc827 src/share/classes/javax/management/modelmbean/RequiredModelMBean.java --- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Fri Jun 20 09:57:17 2014 -0300 @@ -544,7 +544,7 @@ }
// convert seconds to milliseconds for time comparisoncurrencyPeriod = ((new Long(expTime)).longValue()) * 1000;
currencyPeriod = ((Long.valueOf(expTime)).longValue()) * 1000; if (currencyPeriod < 0) { /* if currencyTimeLimit is -1 then value is never cached */ returnCachedValue = false;
@@ -580,7 +580,7 @@ if (tStamp == null) tStamp = "0";
long lastTime = (new Long(tStamp)).longValue();
long lastTime = (Long.valueOf(tStamp)).longValue(); if (tracing) { MODELMBEAN_LOGGER.logp(Level.FINER,
diff -r d02b062bc827 src/share/classes/javax/management/relation/RelationService.java --- a/src/share/classes/javax/management/relation/RelationService.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/management/relation/RelationService.java Fri Jun 20 09:57:17 2014 -0300 @@ -3208,7 +3208,7 @@ // End of check :) RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");
return new Integer(0);
return 0; } }
@@ -3218,7 +3218,7 @@ if (!isWritable) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");
return new Integer(RoleStatus.ROLE_NOT_WRITABLE);
return RoleStatus.ROLE_NOT_WRITABLE; } }
@@ -3229,7 +3229,7 @@ if (!chkMinFlag) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");
return new Integer(RoleStatus.LESS_THAN_MIN_ROLE_DEGREE);
return RoleStatus.LESS_THAN_MIN_ROLE_DEGREE; } // Checks maximum cardinality
@@ -3237,7 +3237,7 @@ if (!chkMaxFlag) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");
return new Integer(RoleStatus.MORE_THAN_MAX_ROLE_DEGREE);
return RoleStatus.MORE_THAN_MAX_ROLE_DEGREE; } // Verifies that each referenced MBean is registered in the MBean
@@ -3254,7 +3254,7 @@ if (currObjName == null) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");
return new Integer(RoleStatus.REF_MBEAN_NOT_REGISTERED);
return RoleStatus.REF_MBEAN_NOT_REGISTERED; } // Checks if it is of the correct class
@@ -3265,19 +3265,19 @@ if (!classSts) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");
return new Integer(RoleStatus.REF_MBEAN_OF_INCORRECT_CLASS);
return RoleStatus.REF_MBEAN_OF_INCORRECT_CLASS; } } catch (InstanceNotFoundException exc) { RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");
return new Integer(RoleStatus.REF_MBEAN_NOT_REGISTERED);
return RoleStatus.REF_MBEAN_NOT_REGISTERED; } } RELATION_LOGGER.exiting(RelationService.class.getName(), "checkRoleInt");
return new Integer(0);
}return 0;
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java --- a/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java Fri Jun 20 09:57:17 2014 -0300 @@ -170,7 +170,7 @@ while (iter.hasNext()) { DigraphNode node = iter.next(); int inDegree = node.getInDegree();
inDegrees.put(node, new Integer(inDegree));
inDegrees.put(node, inDegree); // Add nodes with zero in-degree to the zero list if (inDegree == 0) {
@@ -191,7 +191,7 @@ while (outNodes.hasNext()) { DigraphNode node = outNodes.next(); int inDegree = inDegrees.get(node).intValue() - 1;
inDegrees.put(node, new Integer(inDegree));
inDegrees.put(node, inDegree); // If the in-degree has fallen to 0, place the node on the list if (inDegree == 0) {
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/util/Locale.java --- a/src/share/classes/java/util/Locale.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/util/Locale.java Fri Jun 20 09:57:17 2014 -0300 @@ -1924,7 +1924,7 @@ // the qualifier; if there are no qualifiers, the third element is // unused by the format pattern. Object[] displayNames = {
new Integer(qualifierNames.length != 0 ? 2 : 1),
qualifierNames.length != 0 ? 2 : 1, mainName, // We could also just call formatList() and have it handle the empty // list case, but this is more efficient, and we want it to be
@@ -2078,7 +2078,7 @@ // Rebuild the argument list with the list length as the first element Object[] args = new Object[stringList.length + 1]; System.arraycopy(stringList, 0, args, 1, stringList.length);
args[0] = new Integer(stringList.length);
args[0] = stringList.length; // Format it using the pattern in the resource MessageFormat format = new MessageFormat(listPattern);
diff -r d02b062bc827 src/share/classes/java/util/prefs/XmlSupport.java --- a/src/share/classes/java/util/prefs/XmlSupport.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/util/prefs/XmlSupport.java Fri Jun 20 09:57:17 2014 -0300 @@ -262,7 +262,7 @@ try { TransformerFactory tf = TransformerFactory.newInstance(); try {
tf.setAttribute("indent-number", new Integer(2));
tf.setAttribute("indent-number", 2); } catch (IllegalArgumentException iae) { //Ignore the IAE. Should not fail the writeout even the //transformer provider does not support "indent-number".
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/text/DecimalFormat.java --- a/src/share/classes/java/text/DecimalFormat.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/text/DecimalFormat.java Fri Jun 20 09:57:16 2014 -0300 @@ -2094,7 +2094,7 @@ }
return gotDouble ?(Number)new Double(doubleResult) : (Number)new Long(longResult);
}(Number)new Double(doubleResult) : (Number)Long.valueOf(longResult); }
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/nio/charset/CoderResult.java --- a/src/share/classes/java/nio/charset/CoderResult.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/nio/charset/CoderResult.java Fri Jun 20 09:57:16 2014 -0300 @@ -200,7 +200,7 @@ private synchronized CoderResult get(int len) { if (len <= 0) throw new IllegalArgumentException("Non-positive length");
Integer k = new Integer(len);
Integer k = len; WeakReference<CoderResult> w; CoderResult e = null; if (cache == null) {
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java --- a/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -322,13 +322,13 @@
switch (optID) {
case SO_TIMEOUT:result = new Integer(timeout);
result = timeout; break; case IP_TOS: result = socketGetOption(optID); if ( ((Integer)result).intValue() == -1) {
result = new Integer(trafficClass);
result = trafficClass; } break;
diff -r d02b062bc827 src/share/classes/java/net/AbstractPlainSocketImpl.java --- a/src/share/classes/java/net/AbstractPlainSocketImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/AbstractPlainSocketImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -279,7 +279,7 @@ throw new SocketException("Socket Closed"); } if (opt == SO_TIMEOUT) {
return new Integer(timeout);
return timeout; } int ret = 0; /*
@@ -299,7 +299,7 @@ return Boolean.valueOf(ret != -1); case SO_LINGER: ret = socketGetOption(opt, null);
return (ret == -1) ? Boolean.FALSE: (Object)(new Integer(ret));
return (ret == -1) ? Boolean.FALSE: (Object)(ret); case SO_REUSEADDR: ret = socketGetOption(opt, null); return Boolean.valueOf(ret != -1);
@@ -310,13 +310,13 @@ case SO_SNDBUF: case SO_RCVBUF: ret = socketGetOption(opt, null);
return new Integer(ret);
return ret; case IP_TOS: ret = socketGetOption(opt, null); if (ret == -1) { // ipv6 tos
return new Integer(trafficClass);
return trafficClass; } else {
return new Integer(ret);
return ret; } case SO_KEEPALIVE: ret = socketGetOption(opt, null);
diff -r d02b062bc827 src/share/classes/java/net/DatagramSocket.java --- a/src/share/classes/java/net/DatagramSocket.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/DatagramSocket.java Fri Jun 20 09:57:16 2014 -0300 @@ -858,7 +858,7 @@ public synchronized void setSoTimeout(int timeout) throws SocketException { if (isClosed()) throw new SocketException("Socket is closed");
getImpl().setOption(SocketOptions.SO_TIMEOUT, new Integer(timeout));
getImpl().setOption(SocketOptions.SO_TIMEOUT, timeout);}
/**
@@ -920,7 +920,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");
getImpl().setOption(SocketOptions.SO_SNDBUF, new Integer(size));
getImpl().setOption(SocketOptions.SO_SNDBUF, size);}
/**
@@ -978,7 +978,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");
getImpl().setOption(SocketOptions.SO_RCVBUF, new Integer(size));
getImpl().setOption(SocketOptions.SO_RCVBUF, size);}
/**
@@ -1040,7 +1040,7 @@ throw new SocketException("Socket is closed"); // Integer instead of Boolean for compatibility with older DatagramSocketImpl if (oldImpl)
getImpl().setOption(SocketOptions.SO_REUSEADDR, new Integer(on?-1:0));
getImpl().setOption(SocketOptions.SO_REUSEADDR, on?-1:0); else getImpl().setOption(SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));} @@ -1141,7 +1141,7 @@
if (isClosed()) throw new SocketException("Socket is closed");
getImpl().setOption(SocketOptions.IP_TOS, new Integer(tc));
getImpl().setOption(SocketOptions.IP_TOS, tc);}
/**
diff -r d02b062bc827 src/share/classes/java/net/ServerSocket.java --- a/src/share/classes/java/net/ServerSocket.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/ServerSocket.java Fri Jun 20 09:57:16 2014 -0300 @@ -650,7 +650,7 @@ public synchronized void setSoTimeout(int timeout) throws SocketException { if (isClosed()) throw new SocketException("Socket is closed");
getImpl().setOption(SocketOptions.SO_TIMEOUT, new Integer(timeout));
getImpl().setOption(SocketOptions.SO_TIMEOUT, timeout);}
/**
@@ -847,7 +847,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");
getImpl().setOption(SocketOptions.SO_RCVBUF, new Integer(size));
getImpl().setOption(SocketOptions.SO_RCVBUF, size);}
/**
diff -r d02b062bc827 src/share/classes/java/net/Socket.java --- a/src/share/classes/java/net/Socket.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/net/Socket.java Fri Jun 20 09:57:16 2014 -0300 @@ -1024,7 +1024,7 @@ } if (linger > 65535) linger = 65535;
getImpl().setOption(SocketOptions.SO_LINGER, new Integer(linger));
}getImpl().setOption(SocketOptions.SO_LINGER, linger); }
@@ -1140,7 +1140,7 @@ if (timeout < 0) throw new IllegalArgumentException("timeout can't be negative");
getImpl().setOption(SocketOptions.SO_TIMEOUT, new Integer(timeout));
getImpl().setOption(SocketOptions.SO_TIMEOUT, timeout);}
/**
@@ -1196,7 +1196,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");
getImpl().setOption(SocketOptions.SO_SNDBUF, new Integer(size));
getImpl().setOption(SocketOptions.SO_SNDBUF, size);}
/**
@@ -1270,7 +1270,7 @@ } if (isClosed()) throw new SocketException("Socket is closed");
getImpl().setOption(SocketOptions.SO_RCVBUF, new Integer(size));
getImpl().setOption(SocketOptions.SO_RCVBUF, size);}
/**
@@ -1380,7 +1380,7 @@
if (isClosed())
throw new SocketException("Socket is closed");getImpl().setOption(SocketOptions.IP_TOS, new Integer(tc));
getImpl().setOption(SocketOptions.IP_TOS, tc);}
/**
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/lang/ConditionalSpecialCasing.java --- a/src/share/classes/java/lang/ConditionalSpecialCasing.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/lang/ConditionalSpecialCasing.java Fri Jun 20 09:57:16 2014 -0300 @@ -147,7 +147,7 @@ }
private static char[] lookUpTable(String src, int index, Locale locale, boolean bLowerCasing) {HashSet<Entry> set = entryTable.get(new Integer(src.codePointAt(index)));
HashSet<Entry> set = entryTable.get(src.codePointAt(index)); char[] ret = null; if (set != null) {
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/javax/crypto/CryptoPolicyParser.java --- a/src/share/classes/javax/crypto/CryptoPolicyParser.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/javax/crypto/CryptoPolicyParser.java Fri Jun 20 09:57:17 2014 -0300 @@ -256,11 +256,11 @@ while (peek(",")) { match(","); if (peek("number")) {
paramsV.addElement(new Integer(match()));
paramsV.addElement(match()); } else { if (peek("*")) { match("*");
paramsV.addElement(new Integer(Integer.MAX_VALUE));
paramsV.addElement(Integer.MAX_VALUE); } else { throw new ParsingException(st.lineno(), "Expecting an integer");
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/beans/EventHandler.java --- a/src/share/classes/java/beans/EventHandler.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/beans/EventHandler.java Fri Jun 20 09:57:16 2014 -0300 @@ -437,7 +437,7 @@ if (method.getDeclaringClass() == Object.class) { // Handle the Object public methods. if (methodName.equals("hashCode")) {
return new Integer(System.identityHashCode(proxy));
return System.identityHashCode(proxy); } else if (methodName.equals("equals")) { return (proxy == arguments[0] ? Boolean.TRUE : Boolean.FALSE); } else if (methodName.equals("toString")) {
diff -r d02b062bc827 src/share/classes/java/beans/MetaData.java --- a/src/share/classes/java/beans/MetaData.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/beans/MetaData.java Fri Jun 20 09:57:16 2014 -0300 @@ -123,13 +123,13 @@ Class<?> oldClass = oldInstance.getClass(); return new Expression(oldInstance, Array.class, "newInstance", new Object[]{oldClass.getComponentType(),
new Integer(Array.getLength(oldInstance))});
protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) { int n = Array.getLength(oldInstance); for (int i = 0; i < n; i++) {Array.getLength(oldInstance)}); }
Object index = new Integer(i);
Object index = i; // Expression oldGetExp = new Expression(Array.class, "get", new Object[]{oldInstance, index}); // Expression newGetExp = new Expression(Array.class, "get", new Object[]{newInstance, index}); Expression oldGetExp = new Expression(oldInstance, "get", new Object[]{index});
@@ -635,7 +635,7 @@ newSize = 0; } for (int i = 0; i < newSize; i++) {
Object index = new Integer(i);
Object index = i; Expression oldGetExp = new Expression(oldInstance, "get", new Object[]{index}); Expression newGetExp = new Expression(newInstance, "get", new Object[]{index});
@@ -892,7 +892,7 @@ protected Expression instantiate(Object oldInstance, Encoder out) { java.awt.MenuShortcut m = (java.awt.MenuShortcut)oldInstance; return new Expression(oldInstance, m.getClass(), "new",
new Object[]{new Integer(m.getKey()), Boolean.valueOf(m.usesShiftModifier())});
} }new Object[]{m.getKey(), Boolean.valueOf(m.usesShiftModifier())});
diff -r d02b062bc827 src/share/classes/java/beans/NameGenerator.java --- a/src/share/classes/java/beans/NameGenerator.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/beans/NameGenerator.java Fri Jun 20 09:57:16 2014 -0300 @@ -107,7 +107,7 @@
Integer size = nameToCount.get(className);
int instanceNumber = (size == null) ? 0 : (size).intValue() + 1;nameToCount.put(className, new Integer(instanceNumber));
nameToCount.put(className, instanceNumber); result = className + instanceNumber; valueToName.put(instance, result);
diff -r d02b062bc827 src/share/classes/java/beans/Statement.java --- a/src/share/classes/java/beans/Statement.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/beans/Statement.java Fri Jun 20 09:57:16 2014 -0300 @@ -248,7 +248,7 @@ // ignored elsewhere. if (target == Character.class && arguments.length == 1 && argClasses[0] == String.class) {
return new Character(((String)arguments[0]).charAt(0));
return ((String)arguments[0]).charAt(0); } try { m = ConstructorFinder.findConstructor((Class)target, argClasses);
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/java/awt/Component.java --- a/src/share/classes/java/awt/Component.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/awt/Component.java Fri Jun 20 09:57:16 2014 -0300 @@ -8506,7 +8506,7 @@ if (changeSupport == null || oldValue == newValue) { return; }
firePropertyChange(propertyName, new Character(oldValue), new Character(newValue));
firePropertyChange(propertyName, oldValue, newValue);}
/**
diff -r d02b062bc827 src/share/classes/java/awt/image/renderable/ParameterBlock.java --- a/src/share/classes/java/awt/image/renderable/ParameterBlock.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/java/awt/image/renderable/ParameterBlock.java Fri Jun 20 09:57:16 2014 -0300 @@ -337,7 +337,7 @@ * the specified parameter. */ public ParameterBlock add(byte b) {
return add(new Byte(b));
return add(b);}
/**
@@ -348,7 +348,7 @@ * the specified parameter. */ public ParameterBlock add(char c) {
return add(new Character(c));
return add(c);}
/**
@@ -359,7 +359,7 @@ * the specified parameter. */ public ParameterBlock add(short s) {
return add(new Short(s));
return add(s);}
/**
@@ -370,7 +370,7 @@ * the specified parameter. */ public ParameterBlock add(int i) {
return add(new Integer(i));
return add(i);}
/**
@@ -381,7 +381,7 @@ * the specified parameter. */ public ParameterBlock add(long l) {
return add(new Long(l));
return add(l);}
/**
@@ -441,7 +441,7 @@ * the specified parameter. */ public ParameterBlock set(byte b, int index) {
return set(new Byte(b), index);
return set(b, index);}
/**
@@ -457,7 +457,7 @@ * the specified parameter. */ public ParameterBlock set(char c, int index) {
return set(new Character(c), index);
return set(c, index);}
/**
@@ -473,7 +473,7 @@ * the specified parameter. */ public ParameterBlock set(short s, int index) {
return set(new Short(s), index);
return set(s, index);}
/**
@@ -489,7 +489,7 @@ * the specified parameter. */ public ParameterBlock set(int i, int index) {
return set(new Integer(i), index);
return set(i, index);}
/**
@@ -505,7 +505,7 @@ * the specified parameter. */ public ParameterBlock set(long l, int index) {
return set(new Long(l), index);
return set(l, index);}
/**
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java --- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Fri Jun 20 09:57:16 2014 -0300 @@ -211,7 +211,7 @@ }
private void setCurrentFrameIndex(ThreadInfo tinfo, int index) {tinfo.setUserObject(new Integer(index));
tinfo.setUserObject(index); //### In fact, the value may not have changed at this point. //### We need to signal that the user attempted to change it, //### however, so that the selection can be "warped" to the
diff -r d02b062bc827 src/share/classes/com/sun/tools/example/debug/tty/Commands.java --- a/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Fri Jun 20 09:57:16 2014 -0300 @@ -84,7 +84,7 @@ MessageOutput.println("Current thread isnt suspended."); } catch (ArrayIndexOutOfBoundsException e) { MessageOutput.println("Requested stack frame is no longer active:",
new Object []{new Integer(stackFrame)});
new Object []{stackFrame}); } } MessageOutput.printPrompt();
@@ -935,21 +935,21 @@ try { methodInfo = loc.sourceName() + MessageOutput.format("line number",
new Object [] {new Long(lineNumber)});
new Object [] {Long.valueOf(lineNumber)}); } catch (AbsentInformationException e) { methodInfo = MessageOutput.format("unknown"); } } if (pc != -1) { MessageOutput.println("stack frame dump with pc",
new Object [] {new Integer(frameNumber + 1),
new Object [] {frameNumber + 1, meth.declaringType().name(), meth.name(), methodInfo,
new Long(pc)});
Long.valueOf(pc)}); } else { MessageOutput.println("stack frame dump",
new Object [] {new Integer(frameNumber + 1),
new Object [] {frameNumber + 1, meth.declaringType().name(), meth.name(), methodInfo});
@@ -2093,8 +2093,8 @@ VirtualMachineManager vmm) { MessageOutput.println("minus version", new Object [] { debuggerName,
new Integer(vmm.majorInterfaceVersion()),new Integer(vmm.minorInterfaceVersion()),
vmm.majorInterfaceVersion(),vmm.minorInterfaceVersion(), System.getProperty("java.version")}); if (Env.connection() != null) { try {
diff -r d02b062bc827 src/share/classes/com/sun/tools/example/debug/tty/TTY.java --- a/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Fri Jun 20 09:57:16 2014 -0300 @@ -241,8 +241,7 @@ } if (line != null) { MessageOutput.println("source line number and line",
new Object [] {new Integer(loc.lineNumber()),line});
new Object[] { loc.lineNumber(), line }); } } }
diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java --- a/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java Fri Jun 20 09:57:16 2014 -0300 @@ -100,9 +100,9 @@ // make Integer or Long for given object ID protected static Number makeId(long id) { if ((id & ~Snapshot.SMALL_ID_MASK) == 0) {
return new Integer((int)id);
return (int)id; } else {
return new Long(id);
}return id; }
diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java --- a/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java Fri Jun 20 09:57:16 2014 -0300 @@ -581,9 +581,9 @@ // Internals only below this point private Number makeId(long id) { if (identifierSize == 4) {
return new Integer((int)id);
return (int)id; } else {
return new Long(id);
}return id; }
diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java --- a/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java Fri Jun 20 09:57:16 2014 -0300 @@ -215,7 +215,7 @@ long id = readID(); byte[] chars = new byte[(int)length - identifierSize]; in.readFully(chars);
names.put(new Long(id), new String(chars));
names.put(id, new String(chars)); break; } case HPROF_LOAD_CLASS: {
@@ -223,11 +223,11 @@ long classID = readID(); int stackTraceSerialNo = in.readInt(); long classNameID = readID();
Long classIdI = new Long(classID);
Long classIdI = classID; String nm = getNameFromID(classNameID).replace('/', '.'); classNameFromObjectID.put(classIdI, nm); if (classNameFromSerialNo != null) {
classNameFromSerialNo.put(new Integer(serialNo), nm);
classNameFromSerialNo.put(serialNo, nm); } break; }
@@ -297,13 +297,13 @@ String methodSig = getNameFromID(readID()); String sourceFile = getNameFromID(readID()); int classSer = in.readInt();
String className = classNameFromSerialNo.get(new Integer(classSer));
String className = classNameFromSerialNo.get(classSer); int lineNumber = in.readInt(); if (lineNumber < StackFrame.LINE_NUMBER_NATIVE) { warn("Weird stack frame line number: " + lineNumber); lineNumber = StackFrame.LINE_NUMBER_UNKNOWN; }
stackFrames.put(new Long(id),
stackFrames.put(id, new StackFrame(methodName, methodSig, className, sourceFile, lineNumber));
@@ -319,13 +319,12 @@ StackFrame[] frames = new StackFrame[in.readInt()]; for (int i = 0; i < frames.length; i++) { long fid = readID();
frames[i] = stackFrames.get(new Long(fid));
frames[i] = stackFrames.get(fid); if (frames[i] == null) { throw new IOException("Stack frame " + toHex(fid) + " not found"); } }
stackTraces.put(new Integer(serialNo),new StackTrace(frames));
stackTraces.put(serialNo, new StackTrace(frames)); } break; }
@@ -404,8 +403,7 @@ int threadSeq = in.readInt(); int stackSeq = in.readInt(); bytesLeft -= identifierSize + 8;
threadObjects.put(new Integer(threadSeq),new ThreadObject(id, stackSeq));
threadObjects.put(threadSeq, new ThreadObject(id, stackSeq)); break; } case HPROF_GC_ROOT_JNI_GLOBAL: {
@@ -610,7 +608,7 @@
private ThreadObject getThreadObjectFromSequence(int threadSeq)
throws IOException {ThreadObject to = threadObjects.get(new Integer(threadSeq));
ThreadObject to = threadObjects.get(threadSeq); if (to == null) { throw new IOException("Thread " + threadSeq + " not found for JNI local ref");
@@ -619,7 +617,7 @@ }
private String getNameFromID(long id) throws IOException {return getNameFromID(new Long(id));
return getNameFromID(id);}
private String getNameFromID(Long id) throws IOException {
@@ -638,7 +636,7 @@ if (stackTraces == null) { return null; }
StackTrace result = stackTraces.get(new Integer(ser));
StackTrace result = stackTraces.get(ser); if (result == null) { warn("Stack trace not found for serial # " + ser); }
@@ -703,7 +701,7 @@ String signature = "" + ((char) type); fields[i] = new JavaField(fieldName, signature); }
String name = classNameFromObjectID.get(new Long(id));
String name = classNameFromObjectID.get(id); if (name == null) { warn("Class name not found for " + toHex(id)); name = "unknown-name@" + toHex(id);
diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java --- a/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java Fri Jun 20 09:57:16 2014 -0300 @@ -99,7 +99,7 @@ final JavaField[] fields = obj.getClazz().getFieldsForInstance(); Integer[] hack = new Integer[things.length]; for (int i = 0; i < things.length; i++) {
hack[i] = new Integer(i);
hack[i] = i; } ArraySorter.sort(hack, new Comparer() { public int compare(Object lhs, Object rhs) {
diff -r d02b062bc827 src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java --- a/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java Fri Jun 20 09:57:16 2014 -0300 @@ -63,9 +63,9 @@ } Long count = referrersStat.get(cl); if (count == null) {
count = new Long(1);
count = 1L; } else {
count = new Long(count.longValue() + 1);
count = count + 1L; } referrersStat.put(cl, count); }
@@ -75,9 +75,9 @@ JavaClass cl = obj.getClazz(); Long count = refereesStat.get(cl); if (count == null) {
count = new Long(1);
count = 1L; } else {
count = new Long(count.longValue() + 1);
count = count + 1L; } refereesStat.put(cl, count); }
diff -r d02b062bc827 src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java --- a/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -143,7 +143,7 @@ * Find the locations which match the line number * passed in. */
List<Location> list = info.lineMapper.get(new Integer(lineNumber));
List<Location> list = info.lineMapper.get(lineNumber); if (list == null) { list = new ArrayList<Location>(0);
@@ -329,7 +329,7 @@ lineLocations.add(loc);
// Add to the line -> locations mapInteger key = new Integer(lineNumber);
Integer key = lineNumber; List<Location> mappedLocs = lineMapper.get(key); if (mappedLocs == null) { mappedLocs = new ArrayList<Location>(1);
@@ -399,7 +399,7 @@ lineLocations.add(loc);
// Add to the line -> locations mapInteger key = new Integer(lineNumber);
Integer key = lineNumber; List<Location> mappedLocs = lineMapper.get(key); if (mappedLocs == null) { mappedLocs = new ArrayList<Location>(1);
diff -r d02b062bc827 src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java --- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -781,7 +781,7 @@ type.setSignature(signature); }
typesByID.put(new Long(id), type);
typesByID.put(id, type); typesBySignature.add(type); if ((vm.traceFlags & VirtualMachine.TRACE_REFTYPES) != 0) {
@@ -809,7 +809,7 @@ if (comp == 0) { matches++; iter.remove();
typesByID.remove(new Long(type.ref()));
typesByID.remove(type.ref()); if ((vm.traceFlags & VirtualMachine.TRACE_REFTYPES) != 0) { vm.printTrace("Uncaching ReferenceType, sig=" + signature + ", id=" + type.ref());
@@ -895,7 +895,7 @@ ReferenceTypeImpl retType = null; synchronized (this) { if (typesByID != null) {
retType = (ReferenceTypeImpl)typesByID.get(new Long(id));
retType = (ReferenceTypeImpl)typesByID.get(id); } if (retType == null) { retType = addReferenceType(id, tag, signature);
@@ -1247,7 +1247,7 @@ return null; } ObjectReferenceImpl object = null;
Long key = new Long(id);
Long key = id; /* * Attempt to retrieve an existing object object reference
@@ -1313,7 +1313,7 @@ // Handle any queue elements that are not strongly reachable processQueue();
SoftObjectReference ref = objectsByID.remove(new Long(object.ref()));
SoftObjectReference ref = objectsByID.remove(object.ref()); if (ref != null) { batchForDispose(ref); } else {
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java --- a/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java Fri Jun 20 09:57:16 2014 -0300 @@ -110,7 +110,7 @@ * */ public SolarisNumericGroupPrincipal(long name, boolean primaryGroup) {
this.name = (new Long(name)).toString();
}this.name = Long.valueOf(name).toString(); this.primaryGroup = primaryGroup;
@@ -137,7 +137,7 @@
* SolarisNumericGroupPrincipal as a long.
*/
public long longValue() {
return ((new Long(name)).longValue());
return Long.valueOf(name);}
/**
diff -r d02b062bc827 src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java --- a/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java Fri Jun 20 09:57:16 2014 -0300 @@ -96,7 +96,7 @@ * represented as a long. */ public SolarisNumericUserPrincipal(long name) {
this.name = (new Long(name)).toString();
this.name = Long.valueOf(name).toString();}
/**
@@ -122,7 +122,7 @@
* SolarisNumericUserPrincipal as a long.
*/
public long longValue() {
return ((new Long(name)).longValue());
return Long.valueOf(name);}
/**
diff -r d02b062bc827 src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java --- a/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java Fri Jun 20 09:57:16 2014 -0300 @@ -102,7 +102,7 @@ * */ public UnixNumericGroupPrincipal(long name, boolean primaryGroup) {
this.name = (new Long(name)).toString();
}this.name = Long.valueOf(name).toString(); this.primaryGroup = primaryGroup;
@@ -129,7 +129,7 @@
* UnixNumericGroupPrincipal as a long.
*/
public long longValue() {
return ((new Long(name)).longValue());
return Long.valueOf(name);}
/**
diff -r d02b062bc827 src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java --- a/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java Fri Jun 20 09:57:16 2014 -0300 @@ -87,7 +87,7 @@ * represented as a long. */ public UnixNumericUserPrincipal(long name) {
this.name = (new Long(name)).toString();
this.name = Long.valueOf(name).toString();}
/**
@@ -113,7 +113,7 @@
* UnixNumericUserPrincipal as a long.
*/
public long longValue() {
return ((new Long(name)).longValue());
return Long.valueOf(name);}
/**
diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java --- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java Fri Jun 20 09:57:16 2014 -0300 @@ -1410,7 +1410,7 @@ if (logger.isLoggable(Level.FINEST)) { logger.log(Level.FINEST, "DIGEST33:Expecting sequence num: {0}",
new Integer(peerSeqNum));
peerSeqNum); traceOutput(DP_CLASS_NAME, "unwrap", "DIGEST34📨 ", encryptedMsg); }
@@ -1460,7 +1460,7 @@ if (logger.isLoggable(Level.INFO)) { logger.log(Level.INFO, "DIGEST39:Incorrect padding: {0}",
new Byte(msgWithPadding[msgWithPadding.length - 1]));
msgWithPadding[msgWithPadding.length - 1]); } return EMPTY_BYTE_ARRAY; }
diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java --- a/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java Fri Jun 20 09:57:16 2014 -0300 @@ -439,7 +439,7 @@
if (logger.isLoggable(Level.FINE)) {
logger.log(Level.FINE, "DIGEST61:Raw send size: {0}",new Integer(rawSendSize));
rawSendSize); } }
diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java --- a/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java Fri Jun 20 09:57:16 2014 -0300 @@ -241,7 +241,7 @@ "KRB5CLNT05:Challenge [unwrapped]:", gssOutToken); } logger.log(Level.FINE, "KRB5CLNT06:Server protections: {0}",
new Byte(gssOutToken[0]));
gssOutToken[0]); } // Client selects preferred protection
@@ -275,9 +275,8 @@ if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "KRB5CLNT07:Client max recv size: {0}; server max recv size: {1}; rawSendSize: {2}",
new Object[] {new Integer(recvMaxBufSize),new Integer(srvMaxBufSize),new Integer(rawSendSize)});
new Object[] { recvMaxBufSize, srvMaxBufSize,rawSendSize }); } // Construct negotiated security layers and client's max
@@ -293,7 +292,7 @@ if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "KRB5CLNT08:Selected protection: {0}; privacy: {1}; integrity: {2}",
new Object[]{new Byte(selectedQop),
new Object[]{selectedQop, Boolean.valueOf(privacy), Boolean.valueOf(integrity)}); }
diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java --- a/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java Fri Jun 20 09:57:16 2014 -0300 @@ -221,8 +221,7 @@ if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "KRB5SRV06:Supported protections: {0}; recv max buf size: {1}",
new Object[]{new Byte(allQop),new Integer(recvMaxBufSize)});
new Object[]{allQop, recvMaxBufSize}); } handshakeStage = 2; // progress to next stage
@@ -288,14 +287,12 @@ if (logger.isLoggable(Level.FINE)) { logger.log(Level.FINE, "KRB5SRV10:Selected protection: {0}; privacy: {1}; integrity: {2}",
new Object[]{new Byte(selectedQop),
new Object[]{selectedQop, Boolean.valueOf(privacy), Boolean.valueOf(integrity)}); logger.log(Level.FINE,
"KRB5SRV11:Client max recv size: {0}; server max send size: {1}; rawSendSize: {2}",
new Object[] {new Integer(clntMaxBufSize),new Integer(sendMaxBufSize),new Integer(rawSendSize)});
new Object[] {clntMaxBufSize, sendMaxBufSize, rawSendSize}); } // Get authorization identity, if any
diff -r d02b062bc827 src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java --- a/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java Fri Jun 20 09:57:16 2014 -0300 @@ -77,7 +77,7 @@
if (logger.isLoggable(Level.FINE)) {
logger.logp(Level.FINE, myClassName, "constructor","SASLIMPL02:Preferred qop mask: {0}", new Byte(allQop));
"SASLIMPL02:Preferred qop mask: {0}", allQop); if (qop.length > 0) { StringBuffer qopbuf = new StringBuffer();
@@ -286,7 +286,7 @@
// Message id supplied by caller as part of traceTag
logger.logp(lev, srcClass, srcMethod, "{0} ( {1} ): {2}",new Object[] {traceTag, new Integer(origlen), content});
new Object[] {traceTag, origlen, content}); } catch (Exception e) { logger.logp(Level.WARNING, srcClass, srcMethod, "SASLIMPL09:Error generating trace output: {0}", e);
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/jndi/ldap/Connection.java --- a/src/share/classes/com/sun/jndi/ldap/Connection.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jndi/ldap/Connection.java Fri Jun 20 09:57:15 2014 -0300 @@ -249,7 +249,7 @@ String.class, int.class});
return inetSocketAddressCons.newInstance(new Object[]{host, new Integer(port)});
host, port}); } catch (ClassNotFoundException | InstantiationException |
@@ -309,7 +309,7 @@
// connected socket
connect.invoke(socket, new Object[]{endpoint, new Integer(connectTimeout)});
endpoint, connectTimeout}); } catch (NoSuchMethodException e) { // continue (but ignore connectTimeout)
@@ -326,7 +326,7 @@ } // connected socket socket = (Socket) createSocket.invoke(factory,
new Object[]{host, new Integer(port)});
new Object[]{host, port}); } } else {
@@ -348,7 +348,7 @@ "a timeout"); } connect.invoke(socket, new Object[]{
endpoint, new Integer(connectTimeout)});
endpoint, connectTimeout}); } catch (NoSuchMethodException e) { // continue (but ignore connectTimeout)
diff -r d02b062bc827 src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java --- a/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java Fri Jun 20 09:57:15 2014 -0300 @@ -406,7 +406,7 @@ try { return Integer.getInteger(propName, defVal); } catch (SecurityException e) {
return new Integer(defVal);
return defVal; } } });
@@ -421,7 +421,7 @@ try { return Long.getLong(propName, defVal); } catch (SecurityException e) {
return new Long(defVal);
return defVal; } } });
diff -r d02b062bc827 src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java --- a/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java Fri Jun 20 09:57:15 2014 -0300 @@ -221,7 +221,7 @@ return;
NamingEvent e = new NamingEvent(eventSrc, NamingEvent.OBJECT_ADDED,newBd, null, new Long(changeID));
}newBd, null, changeID); support.queueEvent(e, namingListeners);
@@ -233,7 +233,7 @@ return;
NamingEvent e = new NamingEvent(eventSrc, NamingEvent.OBJECT_REMOVED,null, oldBd, new Long(changeID));
}null, oldBd, changeID); support.queueEvent(e, namingListeners);
@@ -248,7 +248,7 @@ Binding oldBd = new Binding(newBd.getName(), null, newBd.isRelative());
NamingEvent e = new NamingEvent(eventSrc, NamingEvent.OBJECT_CHANGED, newBd, oldBd, new Long(changeID));
}eventSrc, NamingEvent.OBJECT_CHANGED, newBd, oldBd, changeID); support.queueEvent(e, namingListeners);
@@ -273,7 +273,7 @@ }
NamingEvent e = new NamingEvent(eventSrc, NamingEvent.OBJECT_RENAMED, newBd, oldBd, new Long(changeID));
}eventSrc, NamingEvent.OBJECT_RENAMED, newBd, oldBd, changeID); support.queueEvent(e, namingListeners);
diff -r d02b062bc827 src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java --- a/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java Fri Jun 20 09:57:15 2014 -0300 @@ -379,7 +379,7 @@ // used for substring comparisons (where proto has "" wildcards private boolean substringMatch(String proto, String value) { // simple case 1: "" means attribute presence is being tested
if(proto.equals(new Character(WILDCARD_TOKEN).toString())) {
if(proto.equals(Character.valueOf(WILDCARD_TOKEN).toString())) { if(debug) {System.out.println("simple presence assertion");} return true; }
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java --- a/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java Fri Jun 20 09:57:15 2014 -0300 @@ -284,20 +284,20 @@ final static Hashtable<Integer, String> intTable = new Hashtable<>(); final static Hashtable<String, Integer> stringTable = new Hashtable<>(); static {
intTable.put(new Integer(0), "unspecified");intTable.put(new Integer(3), "notReady");intTable.put(new Integer(6), "destroy");intTable.put(new Integer(2), "notInService");intTable.put(new Integer(5), "createAndWait");intTable.put(new Integer(1), "active");intTable.put(new Integer(4), "createAndGo");stringTable.put("unspecified", new Integer(0));stringTable.put("notReady", new Integer(3));stringTable.put("destroy", new Integer(6));stringTable.put("notInService", new Integer(2));stringTable.put("createAndWait", new Integer(5));stringTable.put("active", new Integer(1));stringTable.put("createAndGo", new Integer(4));
intTable.put(0, "unspecified");intTable.put(3, "notReady");intTable.put(6, "destroy");intTable.put(2, "notInService");intTable.put(5, "createAndWait");intTable.put(1, "active");intTable.put(4, "createAndGo");stringTable.put("unspecified", 0);stringTable.put("notReady", 3);stringTable.put("destroy", 6);stringTable.put("notInService", 2);stringTable.put("createAndWait", 5);stringTable.put("active", 1);
}stringTable.put("createAndGo", 4);
diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/Enumerated.java --- a/src/share/classes/com/sun/jmx/snmp/Enumerated.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/Enumerated.java Fri Jun 20 09:57:15 2014 -0300 @@ -71,7 +71,7 @@ * the method is illegal or inappropriate. */ public Enumerated(int valueIndex) throws IllegalArgumentException {
- if (getIntTable().get(new Integer(valueIndex)) == null) {
- if (getIntTable().get(valueIndex) == null) { throw new IllegalArgumentException() ; } value = valueIndex ; @@ -181,7 +181,7 @@ */ @Override public String toString() {
- return getIntTable().get(new Integer(value)) ;
- return getIntTable().get(value);
}
diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java --- a/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java Fri Jun 20 09:57:15 2014 -0300 @@ -100,7 +100,7 @@
void openNodeScope(Node n) {
- marks.push(new Integer(mk));
- marks.push(mk);
mk = sp;
n.jjtOpen();
}
diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java Fri Jun 13 11:21:30 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java Fri Jun 20 09:57:15 2014 -0300
@@ -84,7 +84,7 @@
- @return The
Longrepresentation of the value. */ public Long toLong() {
- @return The
return new Long(value) ;
return value;}
/**
@@ -100,7 +100,7 @@
* @return The Integer representation of the value.
*/
public Integer toInteger() {
return new Integer((int)value) ;
return (int)value;}
/**
diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/SnmpInt.java
--- a/src/share/classes/com/sun/jmx/snmp/SnmpInt.java Fri Jun 13 11:21:30 2014 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/SnmpInt.java Fri Jun 20 09:57:15 2014 -0300
@@ -130,7 +130,7 @@
* @return The Long representation of the value.
*/
public Long toLong() {
return new Long(value) ;
return value;}
/**
@@ -146,7 +146,7 @@
* @return The Integer representation of the value.
*/
public Integer toInteger() {
return new Integer((int)value) ;
return (int)value;}
/**
diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/SnmpString.java --- a/src/share/classes/com/sun/jmx/snmp/SnmpString.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/SnmpString.java Fri Jun 20 09:57:15 2014 -0300 @@ -140,7 +140,7 @@ public Byte[] toByte() { Byte[] result = new Byte[value.length] ; for (int i = 0 ; i < value.length ; i++) {
result[i] = new Byte(value[i]) ;
} diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java --- a/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java Fri Jun 20 09:57:15 2014 -0300 @@ -136,7 +136,7 @@ */ public boolean isNestedArc(long arc) { if (subgroups == null) return false;result[i] = value[i]; } return result ;
Object obj = subgroups.get(new Long(arc));
Object obj = subgroups.get(arc); // if the arc is registered in the hashtable, // it leads to a subgroup. return (obj != null);
@@ -260,7 +260,7 @@ * */ void registerNestedArc(long arc) {
Long obj = new Long(arc);
Long obj = arc; if (subgroups == null) subgroups = new Hashtable<>(); // registers the arc in the hashtable. subgroups.put(obj,obj);
diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java --- a/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java Fri Jun 20 09:57:15 2014 -0300 @@ -1272,8 +1272,8 @@ message, // message "State", // attribute name "int", // attribute type
new Integer(oldState), // old valuenew Integer(newState) ); // new value
oldState, // old valuenewState); // new value if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINEST)) { SNMP_ADAPTOR_LOGGER.logp(Level.FINEST, dbgTag, "sendStateChangeNotification","Sending AttributeChangeNotification #"
diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java --- a/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java Fri Jun 20 09:57:15 2014 -0300 @@ -569,7 +569,7 @@ */ @Override public Integer getTrapPort() {
return new Integer(trapPort) ;
return trapPort;}
/**
@@ -639,7 +639,7 @@ */ @Override public Integer getBufferSize() {
return new Integer(bufferSize) ;
return bufferSize;}
/**
@@ -858,7 +858,7 @@ */ @Override public Long getSnmpOutTraps() {
return new Long(snmpOutTraps);
return (long)snmpOutTraps;}
/**
@@ -868,7 +868,7 @@ */ @Override public Long getSnmpOutGetResponses() {
return new Long(snmpOutGetResponses);
return (long)snmpOutGetResponses;}
/**
@@ -878,7 +878,7 @@ */ @Override public Long getSnmpOutGenErrs() {
return new Long(snmpOutGenErrs);
return (long) snmpOutGenErrs; } /**
@@ -888,7 +888,7 @@ */ @Override public Long getSnmpOutBadValues() {
return new Long(snmpOutBadValues);
return (long)snmpOutBadValues;}
/**
@@ -898,7 +898,7 @@ */ @Override public Long getSnmpOutNoSuchNames() {
return new Long(snmpOutNoSuchNames);
return (long)snmpOutNoSuchNames;}
/**
@@ -908,7 +908,7 @@ */ @Override public Long getSnmpOutTooBigs() {
return new Long(snmpOutTooBigs);
return (long)snmpOutTooBigs;}
/**
@@ -918,7 +918,7 @@ */ @Override public Long getSnmpInASNParseErrs() {
return new Long(snmpInASNParseErrs);
return (long)snmpInASNParseErrs;}
/**
@@ -928,7 +928,7 @@ */ @Override public Long getSnmpInBadCommunityUses() {
return new Long(snmpInBadCommunityUses);
return (long)snmpInBadCommunityUses;}
/**
@@ -939,7 +939,7 @@ */ @Override public Long getSnmpInBadCommunityNames() {
return new Long(snmpInBadCommunityNames);
return (long)snmpInBadCommunityNames;}
/**
@@ -949,7 +949,7 @@ */ @Override public Long getSnmpInBadVersions() {
return new Long(snmpInBadVersions);
return (long)snmpInBadVersions;}
/**
@@ -959,7 +959,7 @@ */ @Override public Long getSnmpOutPkts() {
return new Long(snmpOutPkts);
return (long)snmpOutPkts;}
/**
@@ -969,7 +969,7 @@ */ @Override public Long getSnmpInPkts() {
return new Long(snmpInPkts);
return (long)snmpInPkts;}
/**
@@ -979,7 +979,7 @@ */ @Override public Long getSnmpInGetRequests() {
return new Long(snmpInGetRequests);
return (long)snmpInGetRequests;}
/**
@@ -989,7 +989,7 @@ */ @Override public Long getSnmpInGetNexts() {
return new Long(snmpInGetNexts);
return (long)snmpInGetNexts;}
/**
@@ -999,7 +999,7 @@ */ @Override public Long getSnmpInSetRequests() {
return new Long(snmpInSetRequests);
return (long)snmpInSetRequests;}
/**
@@ -1009,7 +1009,7 @@ */ @Override public Long getSnmpInTotalSetVars() {
return new Long(snmpInTotalSetVars);
return (long)snmpInTotalSetVars;}
/**
@@ -1019,7 +1019,7 @@ */ @Override public Long getSnmpInTotalReqVars() {
return new Long(snmpInTotalReqVars);
return (long)snmpInTotalReqVars;}
/**
@@ -1032,7 +1032,7 @@ */ @Override public Long getSnmpSilentDrops() {
return new Long(snmpSilentDrops);
return (long)snmpSilentDrops;}
/**
@@ -1045,7 +1045,7 @@ */ @Override public Long getSnmpProxyDrops() {
return new Long(0);
}return 0L;
diff -r d02b062bc827 src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java --- a/src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java Fri Jun 20 09:57:15 2014 -0300 @@ -43,15 +43,15 @@
public void addModelLcd(int id,
SnmpModelLcd usmlcd) {models.put(new Integer(id), usmlcd);
models.put(id, usmlcd); } public SnmpModelLcd getModelLcd(int id) {
return models.get(new Integer(id));
return models.get(id); } public SnmpModelLcd removeModelLcd(int id) {
return models.remove(new Integer(id));
}return models.remove(id); }
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java --- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Fri Jun 20 09:57:15 2014 -0300 @@ -812,12 +812,12 @@
"OptionPane.setButtonMargin", Boolean.FALSE,
"OptionPane.sameSizeButtons", Boolean.TRUE,"OptionPane.buttonOrientation", new Integer(SwingConstants.RIGHT),
"OptionPane.buttonOrientation", SwingConstants.RIGHT, "OptionPane.minimumSize", new DimensionUIResource(262, 90),
"OptionPane.buttonPadding", new Integer(10),
"OptionPane.buttonPadding", 10, "OptionPane.windowBindings", new Object[] { "ESCAPE", "close" },
"OptionPane.buttonClickThreshhold", new Integer(500),
"OptionPane.buttonClickThreshhold", 500, "OptionPane.isYesLast", Boolean.TRUE, "OptionPane.font", new FontLazyValue(Region.OPTION_PANE),
diff -r d02b062bc827 src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java --- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Fri Jun 20 09:57:15 2014 -0300 @@ -567,7 +567,7 @@ "ProgressBar.selectionForeground", table.get("control"), "ProgressBar.selectionBackground", table.get("controlText"), "ProgressBar.border", loweredBevelBorder,
"ProgressBar.cellLength", new Integer(6),
"ProgressBar.cellLength", 6, "ProgressBar.cellSpacing", Integer.valueOf(0), // Buttons
@@ -582,7 +582,7 @@ "released SPACE", "released" }),
"CheckBox.textIconGap", new Integer(8),
"CheckBox.textIconGap", 8, "CheckBox.margin", new InsetsUIResource(4, 2, 4, 2), "CheckBox.icon", checkBoxIcon, "CheckBox.focus", table.get("activeCaptionBorder"),
@@ -593,7 +593,7 @@ }),
"RadioButton.margin", new InsetsUIResource(4, 2, 4, 2),"RadioButton.textIconGap", new Integer(8),
"RadioButton.textIconGap", 8, "RadioButton.background", table.get("control"), "RadioButton.foreground", table.get("controlText"), "RadioButton.icon", radioButtonIcon,
@@ -627,10 +627,10 @@ "Menu.selectionBackground", menuItemPressedBackground, "Menu.checkIcon", menuItemCheckIcon, "Menu.arrowIcon", menuArrowIcon,
"Menu.menuPopupOffsetX", new Integer(0),"Menu.menuPopupOffsetY", new Integer(0),"Menu.submenuPopupOffsetX", new Integer(-2),"Menu.submenuPopupOffsetY", new Integer(3),
"Menu.menuPopupOffsetX", 0,"Menu.menuPopupOffsetY", 0,"Menu.submenuPopupOffsetX", -2,"Menu.submenuPopupOffsetY", 3, "Menu.shortcutKeys", new int[]{ SwingUtilities2.getSystemMnemonicKeyMask(), KeyEvent.META_MASK
@@ -938,7 +938,7 @@ "Tree.collapsedIcon", treeCollapsedIcon, "Tree.editorBorder", focusBorder, "Tree.editorBorderSelectionColor", table.get("activeCaptionBorder"),
"Tree.rowHeight", new Integer(18),
"Tree.rowHeight", 18, "Tree.drawsFocusBorderAroundIcon", Boolean.TRUE, "Tree.focusInputMap", new UIDefaults.LazyInputMap(new Object[] { "COPY", "copy",
diff -r d02b062bc827 src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java --- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Fri Jun 20 09:57:15 2014 -0300 @@ -1102,8 +1102,7 @@ "PasswordField.selectionBackground", SelectionBackgroundColor, "PasswordField.selectionForeground", SelectionTextColor, "PasswordField.caretForeground",WindowTextColor,
"PasswordField.echoChar", new XPValue(new Character((char)0x25CF),new Character('*')),
"PasswordField.echoChar", new XPValue((char)0x25CF,'*'), // *** ProgressBar "ProgressBar.font", ControlFont,
-------------- next part -------------- diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java --- a/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java Fri Jun 20 09:57:15 2014 -0300 @@ -126,18 +126,18 @@ new IIOMetadataNode(nativeMetadataFormatName);
addChildNode(root, "BMPVersion", bmpVersion);addChildNode(root, "Width", new Integer(width));addChildNode(root, "Height", new Integer(height));addChildNode(root, "BitsPerPixel", new Short(bitsPerPixel));addChildNode(root, "Compression", new Integer(compression));addChildNode(root, "ImageSize", new Integer(imageSize));
addChildNode(root, "Width", width);addChildNode(root, "Height", height);addChildNode(root, "BitsPerPixel", bitsPerPixel);addChildNode(root, "Compression", compression);addChildNode(root, "ImageSize", imageSize); IIOMetadataNode node = addChildNode(root, "PixelsPerMeter", null);
addChildNode(node, "X", new Integer(xPixelsPerMeter));addChildNode(node, "Y", new Integer(yPixelsPerMeter));
addChildNode(node, "X", xPixelsPerMeter);addChildNode(node, "Y", yPixelsPerMeter);
addChildNode(root, "ColorsUsed", new Integer(colorsUsed));addChildNode(root, "ColorsImportant", new Integer(colorsImportant));
addChildNode(root, "ColorsUsed", colorsUsed);addChildNode(root, "ColorsImportant", colorsImportant); int version = 0; for (int i = 0; i < bmpVersion.length(); i++)
@@ -146,19 +146,19 @@
if (version >= 4) {
node = addChildNode(root, "Mask", null);addChildNode(node, "Red", new Integer(redMask));addChildNode(node, "Green", new Integer(greenMask));addChildNode(node, "Blue", new Integer(blueMask));addChildNode(node, "Alpha", new Integer(alphaMask));
addChildNode(node, "Red", redMask);addChildNode(node, "Green", greenMask);addChildNode(node, "Blue", blueMask);addChildNode(node, "Alpha", alphaMask);
addChildNode(root, "ColorSpaceType", new Integer(colorSpace));
addChildNode(root, "ColorSpaceType", colorSpace); node = addChildNode(root, "CIEXYZEndPoints", null); addXYZPoints(node, "Red", redX, redY, redZ); addXYZPoints(node, "Green", greenX, greenY, greenZ); addXYZPoints(node, "Blue", blueX, blueY, blueZ);
node = addChildNode(root, "Intent", new Integer(intent));
node = addChildNode(root, "Intent", intent); } // Palette
@@ -172,12 +172,12 @@ red = palette[j++] & 0xff; green = palette[j++] & 0xff; blue = palette[j++] & 0xff;
addChildNode(entry, "Red", new Byte((byte)red));addChildNode(entry, "Green", new Byte((byte)green));addChildNode(entry, "Blue", new Byte((byte)blue));
addChildNode(entry, "Red", (byte)red);addChildNode(entry, "Green", (byte)green);addChildNode(entry, "Blue", (byte)blue); if (numComps == 4) addChildNode(entry, "Alpha",
new Byte((byte)(palette[j++] & 0xff)));
(byte)(palette[j++] & 0xff)); } }
diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java --- a/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Fri Jun 20 09:57:15 2014 -0300 @@ -616,7 +616,7 @@ return index; }
Long l1 = new Long(stream.getStreamPosition());
Long l1 = stream.getStreamPosition(); imageStartPosition.add(l1); ++index; }
diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java --- a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Fri Jun 20 09:57:15 2014 -0300 @@ -367,10 +367,10 @@ // Now we are at the first image if there are any, so add it // to the list if (hasNextImage()) {
imagePositions.add(new Long(iis.getStreamPosition()));
imagePositions.add(iis.getStreamPosition()); } } else { // Not tables only, so add original pos to the list
imagePositions.add(new Long(savePos));
imagePositions.add(savePos); // And set current image since we've read it now currentImage = 0; }
@@ -498,7 +498,7 @@ if (!hasNextImage()) { throw new IndexOutOfBoundsException(); }
pos = new Long(iis.getStreamPosition());
pos = iis.getStreamPosition(); imagePositions.add(pos); if (seekForwardOnly) { iis.flushBefore(pos.longValue());
diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java --- a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Fri Jun 20 09:57:15 2014 -0300 @@ -2323,7 +2323,7 @@ SOSMarkerSegment sos = (SOSMarkerSegment) seg; SOSMarkerSegment.ScanComponentSpec [] specs = sos.componentSpecs; for (int i = 0; i < specs.length; i++) {
Integer id = new Integer(specs[i].componentSelector);
Integer id = specs[i].componentSelector; if (!ids.contains(id)) { ids.add(id); }
diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java --- a/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java Fri Jun 20 09:57:15 2014 -0300 @@ -639,7 +639,7 @@ metadata.zTXt_keyword.add(keyword);
int method = stream.readUnsignedByte();metadata.zTXt_compressionMethod.add(new Integer(method));
metadata.zTXt_compressionMethod.add(method); byte[] b = new byte[chunkLength - keyword.length() - 2]; stream.readFully(b);
diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java --- a/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Fri Jun 20 09:57:15 2014 -0300 @@ -1644,7 +1644,7 @@ int compressionMethod = getEnumeratedAttribute(zTXt_node, "compressionMethod", zTXt_compressionMethodNames);
zTXt_compressionMethod.add(new Integer(compressionMethod));
zTXt_compressionMethod.add(compressionMethod); String text = getAttribute(zTXt_node, "text"); zTXt_text.add(text);
diff -r d02b062bc827 src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java --- a/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java Fri Jun 13 11:21:30 2014 -0700 +++ b/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java Fri Jun 20 09:57:15 2014 -0300 @@ -75,9 +75,9 @@ IIOMetadataNode root = new IIOMetadataNode(nativeMetadataFormatName);
addChildNode(root, "WBMPType", new Integer(wbmpType));addChildNode(root, "Width", new Integer(width));addChildNode(root, "Height", new Integer(height));
addChildNode(root, "WBMPType", wbmpType);addChildNode(root, "Width", width);
}addChildNode(root, "Height", height); return root;
- Previous message: RFR 8035490: move xml jaxp unit tests in bugxxx dir into jaxp repo
- Next message: Please review: (JDK-8044866) Fix raw and unchecked lint warnings in asm
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]