Changeset 7001 in josm for trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

Timestamp:

2014-04-26T03:53:35+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - switch core to Java 7

File:

• trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -36 +36 @@
  * @since 6340
  */
-public class BookmarkList extends JList {
+public class BookmarkList extends JList<BookmarkList.Bookmark> {
 
     /**
@@ -153 +153 @@
      */
     public BookmarkList() {
-        setModel(new DefaultListModel());
+        setModel(new DefaultListModel<Bookmark>());
         load();
         setVisibleRowCount(7);
@@ -163 +163 @@
      */
     public final void load() {
-        DefaultListModel model = (DefaultListModel)getModel();
+        DefaultListModel<Bookmark> model = (DefaultListModel<Bookmark>)getModel();
         model.removeAllElements();
         Collection<Collection<String>> args = Main.pref.getArray("bookmarks", null);
@@ -241 +241 @@
     public final void save() {
         LinkedList<Collection<String>> coll = new LinkedList<Collection<String>>();
-        for (Object o : ((DefaultListModel)getModel()).toArray()) {
+        for (Object o : ((DefaultListModel<Bookmark>)getModel()).toArray()) {
             String[] array = new String[5];
-            Bookmark b = (Bookmark)o;
+            Bookmark b = (Bookmark) o;
             array[0] = b.getName();
             Bounds area = b.getArea();
@@ -255 +255 @@
     }
 
-    static class BookmarkCellRenderer extends JLabel implements ListCellRenderer {
+    static class BookmarkCellRenderer extends JLabel implements ListCellRenderer<BookmarkList.Bookmark> {
 
         private ImageIcon icon;
@@ -287 +287 @@
 
         }
-        @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
-                boolean cellHasFocus) {
-
-            Bookmark b = (Bookmark) value;
+
+        @Override
+        public Component getListCellRendererComponent(JList<? extends Bookmark> list, Bookmark value, int index, boolean isSelected, boolean cellHasFocus) {
             renderColor(isSelected);
-            setText(b.getName());
-            setToolTipText(buildToolTipText(b));
+            setText(value.getName());
+            setToolTipText(buildToolTipText(value));
             return this;
         }