Skip to content

Commit 57a814a

Browse files
committed
Some automatic code cleanups
1 parent d708a3d commit 57a814a

33 files changed

+205
-205
lines changed

src/main/java/org/codehaus/classworlds/BytesURLConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
@Deprecated
2727
public class BytesURLConnection extends URLConnection {
28-
protected byte[] content;
28+
protected final byte[] content;
2929

3030
protected int offset;
3131

src/main/java/org/codehaus/classworlds/BytesURLStreamHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
@Deprecated
2929
public class BytesURLStreamHandler extends URLStreamHandler {
30-
byte[] content;
30+
final byte[] content;
3131

3232
int offset;
3333

src/main/java/org/codehaus/classworlds/ClassRealm.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
6060
* @author <a href="mailto:[email protected]">bob mcwhirter</a>
6161
* @author <a href="mailto:[email protected]">Jason van Zyl</a>
6262
*/
63+
@SuppressWarnings("rawtypes")
6364
@Deprecated
6465
public interface ClassRealm {
6566
String getId();

src/main/java/org/codehaus/classworlds/ClassRealmAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
*
2727
* @author Andrew Williams
2828
*/
29+
@SuppressWarnings({"UnnecessaryLocalVariable", "DeprecatedIsStillUsed", "rawtypes"})
2930
@Deprecated
3031
public class ClassRealmAdapter implements ClassRealm {
3132

@@ -35,7 +36,7 @@ public static ClassRealmAdapter getInstance(org.codehaus.plexus.classworlds.real
3536
return adapter;
3637
}
3738

38-
private org.codehaus.plexus.classworlds.realm.ClassRealm realm;
39+
private final org.codehaus.plexus.classworlds.realm.ClassRealm realm;
3940

4041
private ClassRealmAdapter(org.codehaus.plexus.classworlds.realm.ClassRealm newRealm) {
4142
this.realm = newRealm;

src/main/java/org/codehaus/classworlds/ClassRealmReverseAdapter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
*
2727
* @author Andrew Williams
2828
*/
29+
@SuppressWarnings({"UnnecessaryLocalVariable", "rawtypes"})
2930
@Deprecated
3031
public class ClassRealmReverseAdapter extends org.codehaus.plexus.classworlds.realm.ClassRealm {
3132

@@ -35,7 +36,7 @@ public static ClassRealmReverseAdapter getInstance(ClassRealm oldRealm) {
3536
return adapter;
3637
}
3738

38-
private ClassRealm realm;
39+
private final ClassRealm realm;
3940

4041
private ClassRealmReverseAdapter(ClassRealm oldRealm) {
4142
super(ClassWorldReverseAdapter.getInstance(oldRealm.getWorld()), oldRealm.getId(), oldRealm.getClassLoader());
@@ -100,6 +101,7 @@ public URL getResource(String name) {
100101
return realm.getResource(name);
101102
}
102103

104+
@SuppressWarnings("unchecked")
103105
public Enumeration findResources(String name) throws IOException {
104106
return realm.findResources(name);
105107
}

src/main/java/org/codehaus/classworlds/ClassWorld.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*
2525
* @author Andrew Williams
2626
*/
27+
@SuppressWarnings("rawtypes")
2728
@Deprecated
2829
public class ClassWorld {
2930
private ClassWorldAdapter adapter;

src/main/java/org/codehaus/classworlds/ClassWorldAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@
2424
*
2525
* @author Andrew Williams
2626
*/
27+
@SuppressWarnings("rawtypes")
2728
@Deprecated
2829
public class ClassWorldAdapter extends ClassWorld {
2930

3031
public static ClassWorldAdapter getInstance(org.codehaus.plexus.classworlds.ClassWorld newWorld) {
3132
return new ClassWorldAdapter(newWorld);
3233
}
3334

34-
private org.codehaus.plexus.classworlds.ClassWorld world;
35+
private final org.codehaus.plexus.classworlds.ClassWorld world;
3536

3637
private ClassWorldAdapter(org.codehaus.plexus.classworlds.ClassWorld newWorld) {
3738
super(false);

src/main/java/org/codehaus/classworlds/ClassWorldException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class ClassWorldException extends Exception {
5959
/**
6060
* The world.
6161
*/
62-
private ClassWorld world;
62+
private final ClassWorld world;
6363

6464
// ------------------------------------------------------------
6565
// Constructors

src/main/java/org/codehaus/classworlds/ClassWorldReverseAdapter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
*
2626
* @author Andrew Williams
2727
*/
28+
@SuppressWarnings({"unchecked", "rawtypes"})
2829
@Deprecated
2930
public class ClassWorldReverseAdapter extends org.codehaus.plexus.classworlds.ClassWorld {
30-
private static HashMap instances = new HashMap();
31+
private static final HashMap instances = new HashMap();
3132

3233
public static ClassWorldReverseAdapter getInstance(ClassWorld oldWorld) {
3334
if (instances.containsKey(oldWorld)) return (ClassWorldReverseAdapter) instances.get(oldWorld);
@@ -38,7 +39,7 @@ public static ClassWorldReverseAdapter getInstance(ClassWorld oldWorld) {
3839
return adapter;
3940
}
4041

41-
private ClassWorld world;
42+
private final ClassWorld world;
4243

4344
private ClassWorldReverseAdapter(ClassWorld newWorld) {
4445
super();

src/main/java/org/codehaus/classworlds/Configurator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*/
3030
@Deprecated
3131
public class Configurator {
32-
private ConfiguratorAdapter config;
32+
private final ConfiguratorAdapter config;
3333

3434
/** Construct.
3535
*
@@ -108,6 +108,7 @@ protected void loadGlob(String line, ClassRealm realm) throws MalformedURLExcept
108108
* @throws FileNotFoundException If the line does not represent
109109
* a valid path element in the filesystem.
110110
*/
111+
@SuppressWarnings("RedundantThrows")
111112
protected void loadGlob(String line, ClassRealm realm, boolean optionally)
112113
throws MalformedURLException, FileNotFoundException {
113114
config.loadGlob(line, realm, optionally);
@@ -121,6 +122,7 @@ protected void loadGlob(String line, ClassRealm realm, boolean optionally)
121122
* @throws ConfigurationException If the property does not
122123
* exist or if there is a syntax error.
123124
*/
125+
@SuppressWarnings("RedundantThrows")
124126
protected String filter(String text) throws ConfigurationException {
125127
return config.filter(text);
126128
}

0 commit comments

Comments
 (0)