Changeset 11651 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-03-03T01:31:34+01:00 (8 years ago)

Author:

Don-vip

Message:

FindBugs - MS_MUTABLE_COLLECTION

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/OffsetBookmark.java (modified) (2 diffs)
• gui/layer/ImageryLayer.java (modified) (2 diffs)
• gui/preferences/imagery/ImageryPreference.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

@@ -17 +17 @@
 
 public class OffsetBookmark {
-    public static final List<OffsetBookmark> allBookmarks = new ArrayList<>();
+    private static final List<OffsetBookmark> allBookmarks = new ArrayList<>();
 
     public String projectionCode;
@@ -94 +94 @@
     }
 
+    /**
+     * Returns all bookmarks.
+     * @return all bookmarks (unmodifiable collection)
+     * @since 11651
+     */
+    public static List<OffsetBookmark> getBookmarks() {
+        return Collections.unmodifiableList(allBookmarks);
+    }
+
+    /**
+     * Returns the number of bookmarks.
+     * @return the number of bookmarks
+     * @since 11651
+     */
+    public static int getBookmarksSize() {
+        return allBookmarks.size();
+    }
+
+    /**
+     * Adds a bookmark.
+     * @param ob bookmark to add
+     * @return {@code true}
+     * @since 11651
+     */
+    public static boolean addBookmark(OffsetBookmark ob) {
+        return allBookmarks.add(ob);
+    }
+
+    /**
+     * Removes a bookmark.
+     * @param ob bookmark to remove
+     * @return {@code true} if this list contained the specified element
+     * @since 11651
+     */
+    public static boolean removeBookmark(OffsetBookmark ob) {
+        return allBookmarks.remove(ob);
+    }
+
+    /**
+     * Returns the bookmark at the given index.
+     * @param index bookmark index
+     * @return the bookmark at the given index
+     * @throws IndexOutOfBoundsException if the index is out of range
+     *         (<tt>index &lt; 0 || index &gt;= size()</tt>)
+     * @since 11651
+     */
+    public static OffsetBookmark getBookmarkByIndex(int index) {
+        return allBookmarks.get(index);
+    }
+
     public static OffsetBookmark getBookmarkByName(ImageryLayer layer, String name) {
         for (OffsetBookmark b : allBookmarks) {

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -231 +231 @@
     public JComponent getOffsetMenuItem(JComponent subMenu) {
         JMenuItem adjustMenuItem = new JMenuItem(getAdjustAction());
-        if (OffsetBookmark.allBookmarks.isEmpty()) return adjustMenuItem;
+        List<OffsetBookmark> allBookmarks = OffsetBookmark.getBookmarks();
+        if (allBookmarks.isEmpty()) return adjustMenuItem;
 
         subMenu.add(adjustMenuItem);
@@ -237 +238 @@
         boolean hasBookmarks = false;
         int menuItemHeight = 0;
-        for (OffsetBookmark b : OffsetBookmark.allBookmarks) {
+        for (OffsetBookmark b : allBookmarks) {
             if (!b.isUsable(this)) {
                 continue;

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -806 +806 @@
 
     static class OffsetBookmarksPanel extends JPanel {
-        private final transient List<OffsetBookmark> bookmarks = OffsetBookmark.allBookmarks;
         private final OffsetsBookmarksModel model = new OffsetsBookmarksModel();
 
@@ -868 +867 @@
 
             private OffsetBookmark getRow(int row) {
-                return bookmarks.get(row);
+                return OffsetBookmark.getBookmarkByIndex(row);
             }
 
             private void addRow(OffsetBookmark i) {
-                bookmarks.add(i);
+                OffsetBookmark.addBookmark(i);
                 int p = getRowCount() - 1;
                 fireTableRowsInserted(p, p);
@@ -879 +878 @@
             @Override
             public void removeRow(int i) {
-                bookmarks.remove(getRow(i));
+                OffsetBookmark.removeBookmark(getRow(i));
                 fireTableRowsDeleted(i, i);
             }
@@ -885 +884 @@
             @Override
             public int getRowCount() {
-                return bookmarks.size();
+                return OffsetBookmark.getBookmarksSize();
             }
 
             @Override
             public Object getValueAt(int row, int column) {
-                OffsetBookmark info = bookmarks.get(row);
+                OffsetBookmark info = OffsetBookmark.getBookmarkByIndex(row);
                 switch (column) {
                 case 0:
@@ -910 +909 @@
             @Override
             public void setValueAt(Object o, int row, int column) {
-                OffsetBookmark info = bookmarks.get(row);
+                OffsetBookmark info = OffsetBookmark.getBookmarkByIndex(row);
                 switch (column) {
                 case 1: