Skip to content

Commit 62506e3

Browse files
authored
Merge pull request #719 from KevinStrong/master
Replace deprecated boxed primiative constructors with updated replacements
2 parents e6b8b51 + 0b79130 commit 62506e3

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

src/main/java/com/flickr4java/flickr/Parameter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public Parameter(String name, Object value) {
2727

2828
public Parameter(String name, long value) {
2929
this.name = name;
30-
this.value = new Long(value);
30+
this.value = value;
3131
}
3232

3333
public String getName() {

src/main/java/com/flickr4java/flickr/photos/Editability.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public boolean equals(Object obj) {
4545
@Override
4646
public int hashCode() {
4747
int hash = 1;
48-
hash += new Boolean(comment).hashCode();
49-
hash += new Boolean(addmeta).hashCode();
48+
hash += Boolean.hashCode(comment);
49+
hash += Boolean.hashCode(addmeta);
5050
return hash;
5151
}
5252

src/main/java/com/flickr4java/flickr/photos/GeoData.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ public boolean equals(Object obj) {
8181
@Override
8282
public int hashCode() {
8383
int hash = 1;
84-
hash += new Float(longitude).hashCode();
85-
hash += new Float(latitude).hashCode();
86-
hash += new Integer(accuracy).hashCode();
84+
hash += Float.hashCode(longitude);
85+
hash += Float.hashCode(latitude);
86+
hash += Integer.hashCode(accuracy);
8787
return hash;
8888
}
8989
}

src/main/java/com/flickr4java/flickr/photos/Permissions.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ public boolean equals(Object obj) {
103103
public int hashCode() {
104104
int hash = 87;
105105
hash += id.hashCode();
106-
hash += new Integer(comment).hashCode();
107-
hash += new Integer(addmeta).hashCode();
108-
hash += new Boolean(publicFlag).hashCode();
109-
hash += new Boolean(friendFlag).hashCode();
110-
hash += new Boolean(familyFlag).hashCode();
106+
hash += Integer.hashCode(comment);
107+
hash += Integer.hashCode(addmeta);
108+
hash += Boolean.hashCode(publicFlag);
109+
hash += Boolean.hashCode(friendFlag);
110+
hash += Boolean.hashCode(familyFlag);
111111
return hash;
112112
}
113113
}

src/main/java/com/flickr4java/flickr/photos/Size.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,9 @@ public boolean equals(Object obj) {
348348
public int hashCode() {
349349

350350
int hash = 1;
351-
hash += new Integer(label).hashCode();
352-
hash += new Integer(width).hashCode();
353-
hash += new Integer(height).hashCode();
351+
hash += Integer.hashCode(label);
352+
hash += Integer.hashCode(width);
353+
hash += Integer.hashCode(height);
354354
if (source != null) {
355355
hash += source.hashCode();
356356
}

src/main/java/com/flickr4java/flickr/stats/Domain.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void setViews(Long views) {
4949
public void setViews(String views) {
5050

5151
try {
52-
setViews(new Long(views));
52+
setViews(Long.valueOf(views));
5353
} catch (NumberFormatException e) {
5454
// ignore and set value as null
5555
}

src/main/java/com/flickr4java/flickr/stats/Referrer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void setViews(Long views) {
4949
public void setViews(String views) {
5050

5151
try {
52-
setViews(new Long(views));
52+
setViews(Long.valueOf(views));
5353
} catch (NumberFormatException e) {
5454
// ignore and set value as null
5555
}

src/main/java/com/flickr4java/flickr/tags/Tag.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public boolean equals(Object obj) {
9090
@Override
9191
public int hashCode() {
9292
int hash = 1;
93-
hash += new Integer(count).hashCode();
93+
hash += Integer.hashCode(count);
9494
if (value != null) {
9595
hash += value.hashCode();
9696
}

0 commit comments

Comments
 (0)