Changeset 10763 in josm

Timestamp:

2016-08-07T18:07:59+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2156 - "final" classes should not have "protected" members

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInCircleAction.java (modified) (1 diff)
• actions/CloseChangesetAction.java (modified) (1 diff)
• corrector/ReverseWayNoTagCorrector.java (modified) (1 diff)
• data/osm/ChangesetCache.java (modified) (3 diffs)
• data/osm/Node.java (modified) (1 diff)
• gui/bbox/TileSelectionBBoxChooser.java (modified) (1 diff)
• gui/dialogs/ChangesetDialog.java (modified) (1 diff)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/dialogs/LayerListDialog.java (modified) (5 diffs)
• gui/dialogs/layer/LayerVisibilityAction.java (modified) (2 diffs)
• gui/history/HistoryBrowserDialogManager.java (modified) (4 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (2 diffs)
• gui/layer/geoimage/ImageViewerDialog.java (modified) (1 diff)
• gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)
• gui/preferences/advanced/AbstractTableListEditor.java (modified) (1 diff)
• gui/preferences/plugin/PluginPreference.java (modified) (4 diffs)
• gui/preferences/server/ServerAccessPreference.java (modified) (2 diffs)
• gui/widgets/QuadStateCheckBox.java (modified) (1 diff)
• tools/TextTagParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -388 +388 @@
      * @return true if all ways can be joined into a polygon
      */
-    protected static boolean checkWaysArePolygon(Collection<Way> ways) {
+    private static boolean checkWaysArePolygon(Collection<Way> ways) {
         // For each way, nodes strictly between first and last should't be reference by an other way
         for (Way way: ways) {

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

@@ -109 +109 @@
 
         /**
-         * Fetch the user info from the server. This is necessary if we don't know
-         * the users id yet
+         * Fetch the user info from the server. This is necessary if we don't know the users id yet
          *
          * @return the user info
          * @throws OsmTransferException in case of any communication exception
          */
-        protected UserInfo fetchUserInfo() throws OsmTransferException {
-            OsmServerUserInfoReader reader = new OsmServerUserInfoReader();
-            return reader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
+        private UserInfo fetchUserInfo() throws OsmTransferException {
+            return new OsmServerUserInfoReader().fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
         }
 

trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java

@@ -75 +75 @@
     }
 
-    protected static boolean confirmReverseWay(Way way, TagCollection tags) {
+    private static boolean confirmReverseWay(Way way, TagCollection tags) {
         String msg = trn(
                 // Singular, if a single tag is impacted

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -68 +68 @@
     }
 
-    protected void fireChangesetCacheEvent(final ChangesetCacheEvent e) {
+    private void fireChangesetCacheEvent(final ChangesetCacheEvent e) {
         GuiHelper.runInEDT(() -> {
             for (ChangesetCacheListener l: listeners) {
@@ -76 +76 @@
     }
 
-    protected void update(Changeset cs, DefaultChangesetCacheEvent e) {
+    private void update(Changeset cs, DefaultChangesetCacheEvent e) {
         if (cs == null) return;
         if (cs.isNew()) return;
@@ -123 +123 @@
     }
 
-    protected void remove(int id, DefaultChangesetCacheEvent e) {
+    private void remove(int id, DefaultChangesetCacheEvent e) {
         if (id <= 0) return;
         Changeset cs = cache.get(id);

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -112 +112 @@
      * @param eastNorth east/north
      */
-    protected void setCoorInternal(LatLon coor, EastNorth eastNorth) {
+    void setCoorInternal(LatLon coor, EastNorth eastNorth) {
         if (coor != null) {
             this.lat = coor.lat();

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -684 +684 @@
         }
 
-        protected Point getTopLeftCoordinates() {
+        private Point getTopLeftCoordinates() {
             return new Point(center.x - (getWidth() / 2), center.y - (getHeight() / 2));
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -483 +483 @@
         }
 
-        protected static void launchChangesetManager(Collection<Integer> toSelect) {
+        private static void launchChangesetManager(Collection<Integer> toSelect) {
             ChangesetCacheManager cm = ChangesetCacheManager.getInstance();
             if (cm.isVisible()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -116 +116 @@
      * builds the GUI
      */
-    protected void build() {
+    private void build() {
         model = new ConflictListModel();
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -686 +686 @@
          * @see LayerListModelListener#makeVisible(int, Layer)
          */
-        protected void fireMakeVisible(int index, Layer layer) {
+        private void fireMakeVisible(int index, Layer layer) {
             for (LayerListModelListener listener : listeners) {
                 listener.makeVisible(index, layer);
@@ -697 +697 @@
          * @see LayerListModelListener#refresh()
          */
-        protected void fireRefresh() {
+        private void fireRefresh() {
             for (LayerListModelListener listener : listeners) {
                 listener.refresh();
@@ -892 +892 @@
          * Make sure the first of the selected layers is visible in the views of this model.
          */
-        protected void ensureSelectedIsVisible() {
+        private void ensureSelectedIsVisible() {
             int index = selectionModel.getMinSelectionIndex();
             if (index < 0)
@@ -941 +941 @@
          *
          */
-        protected void ensureActiveSelected() {
+        private void ensureActiveSelected() {
             List<Layer> layers = getLayers();
             if (layers.isEmpty())
@@ -963 +963 @@
          * @return the active layer. null, if no active layer is available
          */
-        protected Layer getActiveLayer() {
+        private Layer getActiveLayer() {
             return getLayerManager().getActiveLayer();
-        }
-
-        /**
-         * Replies the scale layer. null, if no active layer is available.
-         *
-         * @return the scale layer. null, if no active layer is available
-         * @deprecated Deprecated since it is unused in JOSM and does not really belong here. Can be removed soon (August 2016).
-         *             You can directly query MapView.
-         */
-        @Deprecated
-        protected NativeScaleLayer getNativeScaleLayer() {
-            return Main.isDisplayingMapView() ? Main.map.mapView.getNativeScaleLayer() : null;
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

@@ -83 +83 @@
     }
 
-    protected void setVisibleFlag(boolean visible) {
+    void setVisibleFlag(boolean visible) {
         for (Layer l : model.getSelectedLayers()) {
             l.setVisible(visible);
@@ -102 +102 @@
     }
 
-    protected void updateValues() {
+    void updateValues() {
         List<Layer> layers = model.getSelectedLayers();
 

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -68 +68 @@
     }
 
-    protected void show(long id, HistoryBrowserDialog dialog) {
+    private void show(long id, HistoryBrowserDialog dialog) {
         if (dialogs.values().contains(dialog)) {
             show(id);
@@ -78 +78 @@
     }
 
-    protected void show(long id) {
+    private void show(long id) {
         if (dialogs.keySet().contains(id)) {
             dialogs.get(id).toFront();
@@ -84 +84 @@
     }
 
-    protected boolean hasDialogWithCloseUpperLeftCorner(Point p) {
+    private boolean hasDialogWithCloseUpperLeftCorner(Point p) {
         for (HistoryBrowserDialog dialog: dialogs.values()) {
             Point corner = dialog.getLocation();
@@ -94 +94 @@
     }
 
-    protected void placeOnScreen(HistoryBrowserDialog dialog) {
+    private void placeOnScreen(HistoryBrowserDialog dialog) {
         WindowGeometry geometry = new WindowGeometry(WINDOW_GEOMETRY_PREF, WindowGeometry.centerOnScreen(new Dimension(850, 500)));
         geometry.applySafe(dialog);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -171 +171 @@
         }
 
-        protected void rememberError(String message) {
+        private void rememberError(String message) {
             this.errorMessages.add(message);
         }
@@ -261 +261 @@
         }
 
-        protected String formatErrorMessages() {
+        private String formatErrorMessages() {
             StringBuilder sb = new StringBuilder();
             sb.append("<html>");

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -84 +84 @@
     }
 
-    protected void build() {
+    private void build() {
         JPanel content = new JPanel(new BorderLayout());
 

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -209 +209 @@
         }
 
-        protected void buildPanel() {
+        private void buildPanel() {
             setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
             add(new JLabel(preferenceSetting.getTitle()), GBC.eol().insets(0, 5, 0, 10).anchor(GBC.NORTHWEST));

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AbstractTableListEditor.java

@@ -86 +86 @@
         }
 
-        protected void updateEnabledState() {
+        private void updateEnabledState() {
             setEnabled(entryList.getSelectedIndices().length == 1);
         }

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -160 +160 @@
     }
 
-    protected JPanel buildSearchFieldPanel() {
+    private JPanel buildSearchFieldPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
         pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -181 +181 @@
     }
 
-    protected JPanel buildActionPanel() {
+    private JPanel buildActionPanel() {
         JPanel pnl = new JPanel(new GridLayout(1, 3));
 
@@ -190 +190 @@
     }
 
-    protected JPanel buildPluginListPanel() {
+    private JPanel buildPluginListPanel() {
         JPanel pnl = new JPanel(new BorderLayout());
         pnl.add(buildSearchFieldPanel(), BorderLayout.NORTH);
@@ -215 +215 @@
     }
 
-    protected JTabbedPane buildContentPane() {
+    private JTabbedPane buildContentPane() {
         JTabbedPane pane = getTabPane();
         pnlPluginUpdatePolicy = new PluginUpdatePolicyPanel();

trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java

@@ -47 +47 @@
      * @return panel with server preferences tabs
      */
-    protected JPanel buildTabbedServerPreferences() {
+    private JPanel buildTabbedServerPreferences() {
         JPanel pnl = new JPanel(new BorderLayout());
         pnl.add(getTabPane(), BorderLayout.CENTER);
@@ -58 +58 @@
      * @return preferences panel for server settings
      */
-    protected JPanel buildContentPanel() {
+    private JPanel buildContentPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();

trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java

@@ -169 +169 @@
         }
 
-        protected void setPropertyText(String propertyText) {
+        private void setPropertyText(String propertyText) {
             this.propertyText = propertyText;
         }

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -151 +151 @@
     }
 
-    protected static String unescape(String k) {
+    static String unescape(String k) {
         if (!(k.startsWith("\"") && k.endsWith("\""))) {
             if (k.contains("=")) {