Browse Source

Fix some warnings

Change-Id: I74975a264d20824c70638f0c2a8b2818e9f2e482
Reviewed-on: http://gerrit.dmdirc.com/3137
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.8
Greg Holmes 10 years ago
parent
commit
f6f37f7aad

+ 8
- 6
src/com/dmdirc/addons/ui_swing/components/validating/NoDuplicatesInListValidator.java View File

@@ -30,13 +30,15 @@ import javax.swing.JList;
30 30
 
31 31
 /**
32 32
  * Validator to check for duplicate values in a list.
33
+ *
34
+ * @param <T> Type in the list to validate
33 35
  */
34
-public class NoDuplicatesInListValidator implements Validator<String> {
36
+public class NoDuplicatesInListValidator<T> implements Validator<String> {
35 37
 
36 38
     /** List. */
37
-    protected JList list;
39
+    protected JList<? super T> list;
38 40
     /** List to validate. */
39
-    protected DefaultListModel model;
41
+    protected DefaultListModel<? super T> model;
40 42
     /** Case sensitive. */
41 43
     protected boolean caseSensitive;
42 44
 
@@ -46,8 +48,8 @@ public class NoDuplicatesInListValidator implements Validator<String> {
46 48
      * @param list  List
47 49
      * @param model Model to validate
48 50
      */
49
-    public NoDuplicatesInListValidator(final JList list,
50
-            final DefaultListModel model) {
51
+    public NoDuplicatesInListValidator(final JList<? super T> list,
52
+            final DefaultListModel<? super T> model) {
51 53
         this(true, list, model);
52 54
     }
53 55
 
@@ -59,7 +61,7 @@ public class NoDuplicatesInListValidator implements Validator<String> {
59 61
      * @param model         Model to validate
60 62
      */
61 63
     public NoDuplicatesInListValidator(final boolean caseSensitive,
62
-            final JList list, final DefaultListModel model) {
64
+            final JList<? super T> list, final DefaultListModel<? super T> model) {
63 65
         this.model = model;
64 66
         this.list = list;
65 67
         this.caseSensitive = caseSensitive;

+ 3
- 1
src/com/dmdirc/addons/ui_swing/components/validating/ValidatableReorderableJList.java View File

@@ -34,8 +34,10 @@ import javax.swing.border.Border;
34 34
 /**
35 35
  * A re-orderable list with a setErorr method to add a visual distinction when there is an error
36 36
  * state.
37
+ *
38
+ * @param <T> Type contained in the list
37 39
  */
38
-public class ValidatableReorderableJList extends ReorderableJList implements Validatable {
40
+public class ValidatableReorderableJList<T> extends ReorderableJList<T> implements Validatable {
39 41
 
40 42
     /** Serial version UID. */
41 43
     private static final long serialVersionUID = 1L;

Loading…
Cancel
Save