Skip to content

Commit 5217eaf

Browse files
tdrwenskitdrwenski
authored
Fix compiler warnings about using deprecated boxing constructors (#509)
1 parent 56cafaf commit 5217eaf

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

Diff for: ‎dap4/d4servlet/src/main/java/dap4/servlet/CDMWrap.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ protected DapEnumeration buildenum(EnumTypedef cdmenum) throws DapException {
394394
for (Map.Entry<Integer, String> entry : ecvalues.entrySet()) {
395395
String name = entry.getValue();
396396
assert (name != null);
397-
int value = (int) entry.getKey();
398-
dapenum.addEnumConst(dmrfactory.newEnumConst(name, new Long(value)));
397+
long value = entry.getKey();
398+
dapenum.addEnumConst(dmrfactory.newEnumConst(name, value));
399399
}
400400
return dapenum;
401401
}

Diff for: ‎opendap/dtswar/src/main/java/opendap/dts/Getopts.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public String getOption(Character sw) {
119119
* @param sw int value switch whose option is requested
120120
*/
121121
public String getOption(int sw) {
122-
Character opt = new Character((char) sw);
122+
Character opt = (char) sw;
123123
return getOption(opt);
124124
}
125125

@@ -192,7 +192,7 @@ protected void initialize(String progname, String flags, String args[]) throws I
192192
for (int i = 0; i < flags.length(); i++) {
193193
boolean found;
194194
int cc = flags.charAt(i);
195-
Character c = new Character((char) cc);
195+
Character c = (char) cc;
196196
char alpha[] = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
197197
't', 'u', 'v', 'w', 'x', 'y', 'z'};
198198

@@ -205,7 +205,7 @@ protected void initialize(String progname, String flags, String args[]) throws I
205205

206206
found = false;
207207
for (int j = 0; j < alpha.length; j++) {
208-
Character ch = new Character(alpha[j]);
208+
Character ch = alpha[j];
209209
char uc = Character.toUpperCase(ch.charValue());
210210
if (alpha[j] == cc || uc == cc) {
211211
found = true;
@@ -228,7 +228,7 @@ protected void initialize(String progname, String flags, String args[]) throws I
228228
if (prv == ':') {
229229
throw new InvalidSwitch(throwstring + "Can't have consecutive ':'\n" + usage + "\n");
230230
} else {
231-
Character cp = new Character((char) prv);
231+
Character cp = (char) prv;
232232
OptSwitch sw = (OptSwitch) switchtab.get(cp);
233233
sw.SetHasValue(OptSwitch.VAL);
234234
}
@@ -259,7 +259,7 @@ protected void initialize(String progname, String flags, String args[]) throws I
259259
// more options, iterate them
260260
for (int j = 1; j < args[i].length(); j++) {
261261
cc = args[i].charAt(j);
262-
Character fc = new Character(cc);
262+
Character fc = cc;
263263
OptSwitch cs = (OptSwitch) switchtab.get(fc);
264264
if (cs == null) {
265265
// The supplied switch wasn't recognised.

Diff for: ‎opendap/dtswar/src/main/java/opendap/dts/SDTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ public static void parse_options(String[] args) {
162162
String arg = null;
163163
try {
164164
opts = new Getopts("f:c:", args);
165-
if (opts.getSwitch(new Character('f')).set) {
166-
arg = opts.getSwitch(new Character('f')).val;
165+
if (opts.getSwitch('f').set) {
166+
arg = opts.getSwitch('f').val;
167167
if (Debug)
168168
// System.out.print("DDS File: " + ((arg != null) ? arg : "null") + "\n");
169169
DDSFile = arg;
170170
}
171-
if (opts.getSwitch(new Character('c')).set) {
171+
if (opts.getSwitch('c').set) {
172172
arg = g.getOptarg();
173173
if (Debug)
174174
// System.out.print("Constraint Expression: \"" + ((arg != null) ? arg : "null") + "\"\n");

Diff for: ‎opendap/server/src/main/java/opendap/servlet/AsciiWriter.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -105,19 +105,19 @@ public void showPrimitive(BaseType data, PrintWriter pw, boolean addName, String
105105
if (data instanceof DString) // covers DURL case
106106
showString(pw, ((DString) data).getValue());
107107
else if (data instanceof DFloat32)
108-
pw.print((new Float(((DFloat32) data).getValue())).toString());
108+
pw.print((Float.valueOf(((DFloat32) data).getValue())).toString());
109109
else if (data instanceof DFloat64)
110-
pw.print((new Double(((DFloat64) data).getValue())).toString());
110+
pw.print((Double.valueOf(((DFloat64) data).getValue())).toString());
111111
else if (data instanceof DUInt32)
112-
pw.print((new Long(((DUInt32) data).getValue() & ((long) 0xFFFFFFFF))).toString());
112+
pw.print((Long.valueOf(((DUInt32) data).getValue() & ((long) 0xFFFFFFFF))).toString());
113113
else if (data instanceof DUInt16)
114-
pw.print((new Integer(((DUInt16) data).getValue() & 0xFFFF)).toString());
114+
pw.print((Integer.valueOf(((DUInt16) data).getValue() & 0xFFFF)).toString());
115115
else if (data instanceof DInt32)
116-
pw.print((new Integer(((DInt32) data).getValue())).toString());
116+
pw.print((Integer.valueOf(((DInt32) data).getValue())).toString());
117117
else if (data instanceof DInt16)
118-
pw.print((new Short(((DInt16) data).getValue())).toString());
118+
pw.print((Short.valueOf(((DInt16) data).getValue())).toString());
119119
else if (data instanceof DByte)
120-
pw.print((new Integer(((DByte) data).getValue() & 0xFF)).toString());
120+
pw.print((Integer.valueOf(((DByte) data).getValue() & 0xFF)).toString());
121121
else
122122
pw.print("Not implemented type = " + data.getTypeName() + " " + data.getEncodedName() + "\n");
123123

Diff for: ‎opendap/server/src/main/java/opendap/servlet/ascii/asciiByte.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void toASCII(PrintWriter pw, boolean addName, String rootName, boolean ne
8484
if (addName)
8585
pw.print(", ");
8686

87-
pw.print((new Byte(getValue())).toString());
87+
pw.print((Byte.valueOf(getValue())).toString());
8888

8989
if (newLine)
9090
pw.print("\n");

Diff for: ‎opendap/server/src/main/java/opendap/servlet/ascii/asciiF32.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void toASCII(PrintWriter pw, boolean addName, String rootName, boolean ne
8383
pw.print(", ");
8484

8585

86-
pw.print((new Float(getValue())).toString());
86+
pw.print((Float.valueOf(getValue())).toString());
8787

8888
if (newLine)
8989
pw.print("\n");

Diff for: ‎opendap/server/src/main/java/opendap/servlet/ascii/asciiF64.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void toASCII(PrintWriter pw, boolean addName, String rootName, boolean ne
8383
if (addName)
8484
pw.print(", ");
8585

86-
pw.print((new Double(getValue())).toString());
86+
pw.print((Double.valueOf(getValue())).toString());
8787

8888
if (newLine)
8989
pw.print("\n");

Diff for: ‎opendap/server/src/main/java/opendap/servlet/ascii/asciiI16.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void toASCII(PrintWriter pw, boolean addName, String rootName, boolean ne
8383
if (addName)
8484
pw.print(", ");
8585

86-
pw.print((new Short(getValue())).toString());
86+
pw.print((Short.valueOf(getValue())).toString());
8787

8888
if (newLine)
8989
pw.print("\n");

Diff for: ‎opendap/server/src/main/java/opendap/servlet/ascii/asciiI32.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void toASCII(PrintWriter pw, boolean addName, String rootName, boolean ne
8484
if (addName)
8585
pw.print(", ");
8686

87-
pw.print((new Long(getValue())).toString());
87+
pw.print((Long.valueOf(getValue())).toString());
8888

8989
if (newLine)
9090
pw.print("\n");

Diff for: ‎opendap/server/src/main/java/opendap/servlet/ascii/asciiUI16.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void toASCII(PrintWriter pw, boolean addName, String rootName, boolean ne
8383
if (addName)
8484
pw.print(", ");
8585

86-
pw.print((new Integer(getValue() & 0xFFFF)).toString());
86+
pw.print((Integer.valueOf(getValue() & 0xFFFF)).toString());
8787

8888
if (newLine)
8989
pw.print("\n");

Diff for: ‎opendap/server/src/main/java/opendap/servlet/ascii/asciiUI32.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void toASCII(PrintWriter pw, boolean addName, String rootName, boolean ne
8383
if (addName)
8484
pw.print(", ");
8585

86-
pw.print((new Long(getValue() & ((long) 0xFFFFFFFF))).toString());
86+
pw.print((Long.valueOf(getValue() & ((long) 0xFFFFFFFF))).toString());
8787

8888
if (newLine)
8989
pw.print("\n");

0 commit comments

Comments
 (0)