Browse Source

Remove compile time warnings.

pull/29/head
Greg Holmes 9 years ago
parent
commit
c4499517d3

+ 1
- 1
src/com/dmdirc/util/collections/ListenerList.java View File

140
     @SuppressWarnings("unchecked")
140
     @SuppressWarnings("unchecked")
141
     public <T> T getCallable(final Class<T> listenerType) {
141
     public <T> T getCallable(final Class<T> listenerType) {
142
         return (T) Proxy.newProxyInstance(listenerType.getClassLoader(),
142
         return (T) Proxy.newProxyInstance(listenerType.getClassLoader(),
143
-                new Class[] { listenerType }, new CallHandler<>(listenerType));
143
+                new Class<?>[] { listenerType }, new CallHandler<>(listenerType));
144
     }
144
     }
145
 
145
 
146
     /**
146
     /**

+ 3
- 3
src/com/dmdirc/util/collections/WeakList.java View File

80
         final Collection<WeakReference<T>> res = new ArrayList<>();
80
         final Collection<WeakReference<T>> res = new ArrayList<>();
81
 
81
 
82
         for (Object item : c) {
82
         for (Object item : c) {
83
-            res.add(new EquatableWeakReference(item));
83
+            res.add(new EquatableWeakReference<>((T) item));
84
         }
84
         }
85
 
85
 
86
         return res;
86
         return res;
103
     @Override
103
     @Override
104
     @SuppressWarnings("unchecked")
104
     @SuppressWarnings("unchecked")
105
     public boolean contains(final Object o) {
105
     public boolean contains(final Object o) {
106
-        return list.contains(new EquatableWeakReference(o));
106
+        return list.contains(new EquatableWeakReference<>((T) o));
107
     }
107
     }
108
 
108
 
109
     @Nonnull
109
     @Nonnull
132
     @Override
132
     @Override
133
     @SuppressWarnings("unchecked")
133
     @SuppressWarnings("unchecked")
134
     public boolean remove(final Object o) {
134
     public boolean remove(final Object o) {
135
-        return list.remove(new EquatableWeakReference(o));
135
+        return list.remove(new EquatableWeakReference<>((T) o));
136
     }
136
     }
137
 
137
 
138
     @Override
138
     @Override

+ 6
- 0
test/com/dmdirc/util/SimpleInjectorTest.java View File

102
 
102
 
103
     static class TestObject implements Serializable {
103
     static class TestObject implements Serializable {
104
 
104
 
105
+        private static final long serialVersionUID = 1L;
106
+
105
         public TestObject(final String test) { // NOPMD
107
         public TestObject(final String test) { // NOPMD
106
         }
108
         }
107
     }
109
     }
108
 
110
 
109
     static class PrivateObject implements Serializable {
111
     static class PrivateObject implements Serializable {
110
 
112
 
113
+        private static final long serialVersionUID = 1L;
114
+
111
         private PrivateObject() {
115
         private PrivateObject() {
112
         }
116
         }
113
     }
117
     }
114
 
118
 
115
     static class ExceptionObject implements Serializable {
119
     static class ExceptionObject implements Serializable {
116
 
120
 
121
+        private static final long serialVersionUID = 1L;
122
+
117
         public ExceptionObject() {
123
         public ExceptionObject() {
118
             throw new IndexOutOfBoundsException();
124
             throw new IndexOutOfBoundsException();
119
         }
125
         }

+ 4
- 5
test/com/dmdirc/util/collections/WeakListTest.java View File

148
         list.add("test2");
148
         list.add("test2");
149
         final List<String> instance = new WeakList<>();
149
         final List<String> instance = new WeakList<>();
150
         instance.add("test3");
150
         instance.add("test3");
151
-        System.out.println(instance);
152
         assertEquals("test3", instance.get(0));
151
         assertEquals("test3", instance.get(0));
153
         assertFalse(instance.containsAll(list));
152
         assertFalse(instance.containsAll(list));
154
         instance.addAll(0, list);
153
         instance.addAll(0, list);
230
     @Test
229
     @Test
231
     public void testIterator() {
230
     public void testIterator() {
232
         final List<String> instance = new WeakList<>();
231
         final List<String> instance = new WeakList<>();
233
-        Iterator result = instance.iterator();
232
+        Iterator<String> result = instance.iterator();
234
         assertFalse(result.hasNext());
233
         assertFalse(result.hasNext());
235
         instance.add("test1");
234
         instance.add("test1");
236
         instance.add("test2");
235
         instance.add("test2");
243
     @Test
242
     @Test
244
     public void testListIterator0args() {
243
     public void testListIterator0args() {
245
         final List<String> instance = new WeakList<>();
244
         final List<String> instance = new WeakList<>();
246
-        ListIterator result = instance.listIterator();
245
+        Iterator<String> result = instance.listIterator();
247
         assertFalse(result.hasNext());
246
         assertFalse(result.hasNext());
248
         instance.add("test1");
247
         instance.add("test1");
249
         instance.add("test2");
248
         instance.add("test2");
256
     @Test(expected=IndexOutOfBoundsException.class)
255
     @Test(expected=IndexOutOfBoundsException.class)
257
     public void testListIteratorInt() {
256
     public void testListIteratorInt() {
258
         final List<String> instance = new WeakList<>();
257
         final List<String> instance = new WeakList<>();
259
-        ListIterator result = instance.listIterator(1);
258
+        ListIterator<String> result = instance.listIterator(1);
260
         assertFalse(result.hasNext());
259
         assertFalse(result.hasNext());
261
         instance.add("test1");
260
         instance.add("test1");
262
         instance.add("test2");
261
         instance.add("test2");
275
         instance.add("test2");
274
         instance.add("test2");
276
         instance.add("test3");
275
         instance.add("test3");
277
         instance.add("test4");
276
         instance.add("test4");
278
-        final List result = instance.subList(1, 3);
277
+        final List<String> result = instance.subList(1, 3);
279
         assertEquals(2, result.size());
278
         assertEquals(2, result.size());
280
         assertTrue(result.contains("test2"));
279
         assertTrue(result.contains("test2"));
281
         assertTrue(result.contains("test3"));
280
         assertTrue(result.contains("test3"));

Loading…
Cancel
Save