Changeset 10043 in josm

Timestamp:

2016-03-26T14:45:25+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S2325 - "private" methods that don't access instance data should be "static"

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CopyCoordinatesAction.java (modified) (1 diff)
• actions/CreateCircleAction.java (modified) (1 diff)
• actions/JoinAreasAction.java (modified) (3 diffs)
• actions/SplitWayAction.java (modified) (1 diff)
• actions/UnJoinNodeWayAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• data/AutosaveTask.java (modified) (1 diff)
• data/imagery/WMTSTileSource.java (modified) (1 diff)
• data/osm/event/DatasetEventManager.java (modified) (2 diffs)
• data/osm/event/SelectionEventManager.java (modified) (2 diffs)
• data/validation/tests/OpeningHourTest.java (modified) (1 diff)
• data/validation/tests/OverlappingWays.java (modified) (1 diff)
• data/validation/tests/RelationChecker.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (3 diffs)
• gui/dialogs/ToggleDialog.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesCellRenderer.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/relation/sort/RelationNodeMap.java (modified) (1 diff)
• gui/preferences/display/GPXSettingsPanel.java (modified) (2 diffs)
• gui/preferences/imagery/CacheContentsPanel.java (modified) (1 diff)
• gui/preferences/imagery/ImageryPreference.java (modified) (1 diff)
• gui/widgets/MultiSplitLayout.java (modified) (4 diffs)
• io/NMEAImporter.java (modified) (1 diff)
• plugins/ReadLocalPluginInformationTask.java (modified) (1 diff)
• plugins/ReadRemotePluginInformationTask.java (modified) (1 diff)
• tools/template_engine/ContextSwitchTemplate.java (modified) (1 diff)

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

@@ -47 +47 @@
     }
 
-    private Collection<Node> getSelectedNodes() {
+    private static Collection<Node> getSelectedNodes() {
         if (getCurrentDataSet() == null || getCurrentDataSet().getSelected() == null) {
             return Collections.emptyList();

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

@@ -69 +69 @@
      * @return Array of number of nodes to put in each arc
      */
-    private int[] distributeNodes(PolarNode[] angles, int nodesCount) {
+    private static int[] distributeNodes(PolarNode[] angles, int nodesCount) {
         int[] count = new int[angles.length];
         double[] width = new double[angles.length];

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

@@ -777 +777 @@
      * @throws IllegalArgumentException if parts is empty
      */
-    private List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
+    private static List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
 
         //prepare next map
@@ -1026 +1026 @@
      * @return the outermost Way.
      */
-    private List<PolygonLevel> findOuterWaysImpl(int level, Collection<AssembledPolygon> boundaryWays) {
+    private static List<PolygonLevel> findOuterWaysImpl(int level, Collection<AssembledPolygon> boundaryWays) {
 
         //TODO: bad performance for deep nestings...
@@ -1293 +1293 @@
      * @return list of polygons, or null if too complex relation encountered.
      */
-    private List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
+    private static List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
 
         List<Multipolygon> result = new ArrayList<>();

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

@@ -367 +367 @@
      * @return List of ways to split
      */
-    private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+    private static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
         if (selectedNodes.isEmpty())
             return null;

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

@@ -149 +149 @@
      * @return List of relevant ways
      */
-    private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+    private static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
         if (selectedNodes.isEmpty())
             return null;

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -869 +869 @@
     }
 
-    private boolean movesHiddenWay() {
+    private static boolean movesHiddenWay() {
         final Collection<OsmPrimitive> elementsToTest = new HashSet<>(getCurrentDataSet().getSelected());
         for (Way osm : Utils.filteredCollection(getCurrentDataSet().getSelected(), Way.class)) {

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -324 +324 @@
     }
 
-    private boolean jvmPerfDataFileExists(final String jvmId) {
+    private static boolean jvmPerfDataFileExists(final String jvmId) {
         File jvmDir = new File(System.getProperty("java.io.tmpdir") + File.separator + "hsperfdata_" + System.getProperty("user.name"));
         if (jvmDir.exists() && jvmDir.canRead()) {

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

@@ -261 +261 @@
     }
 
-    private Layer userSelectLayer(Collection<Layer> layers) {
+    private static Layer userSelectLayer(Collection<Layer> layers) {
         if (layers.size() == 1)
             return layers.iterator().next();

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -184 +184 @@
     }
 
-    private void fireEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
+    private static void fireEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
         for (ListenerInfo listener: listeners) {
             if (!listener.consolidate) {
@@ -192 +192 @@
     }
 
-    private void fireConsolidatedEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
+    private static void fireConsolidatedEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
         for (ListenerInfo listener: listeners) {
             if (listener.consolidate) {

trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

@@ -82 +82 @@
     }
 
-    private void fireEvents(List<ListenerInfo> listeners, Collection<? extends OsmPrimitive> newSelection) {
+    private static void fireEvents(List<ListenerInfo> listeners, Collection<? extends OsmPrimitive> newSelection) {
         for (ListenerInfo listener: listeners) {
             listener.listener.selectionChanged(newSelection);
@@ -96 +96 @@
         }
     };
-
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -231 +231 @@
      * @return translated/shortened error/warnign message
      */
-    private String getErrorMessage(String key, Object o) {
+    private static String getErrorMessage(String key, Object o) {
         String msg = o.toString().trim()
         .replace("Unexpected token:", tr("Unexpected token:"))

trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

@@ -67 +67 @@
     }
 
-    private boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
+    private static boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
         for (Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
             if (r.concernsArea()) {

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -126 +126 @@
     }
 
-    private Map<String, RoleInfo> buildRoleInfoMap(Relation n) {
+    private static Map<String, RoleInfo> buildRoleInfoMap(Relation n) {
         Map<String, RoleInfo> map = new HashMap<>();
         for (RelationMember m : n.getMembers()) {
@@ -141 +141 @@
 
     // return Roles grouped by key
-    private Map<String, RolePreset> buildAllRoles(Relation n) {
+    private static Map<String, RolePreset> buildAllRoles(Relation n) {
         Map<String, RolePreset> allroles = new HashMap<>();
 

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
 
 import java.awt.Dimension;
@@ -75 +73 @@
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Utils;
+
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
 
 /**
@@ -651 +652 @@
         }
 
-        private boolean handleNetworkOrProxyErrors(boolean hasErrors, String title, String message) {
+        private static boolean handleNetworkOrProxyErrors(boolean hasErrors, String title, String message) {
             if (hasErrors) {
                 ExtendedDialog ed = new ExtendedDialog(

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

@@ -446 +446 @@
     }
 
-    private void destroyComponents(Component component, boolean destroyItself) {
+    private static void destroyComponents(Component component, boolean destroyItself) {
         if (component instanceof Container) {
             for (Component c: ((Container) component).getComponents()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java

@@ -31 +31 @@
     private final Collection<TableCellRenderer> customRenderer = new CopyOnWriteArrayList<>();
 
-    private void setColors(Component c, String key, boolean isSelected) {
+    private static void setColors(Component c, String key, boolean isSelected) {
         UIDefaults defaults = javax.swing.UIManager.getDefaults();
         if (OsmPrimitive.getDiscardableKeys().contains(key)) {

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -566 +566 @@
     }
 
-    private int findViewRow(JTable table, TableModel model, Object value) {
+    private static int findViewRow(JTable table, TableModel model, Object value) {
         for (int i = 0; i < model.getRowCount(); i++) {
             if (model.getValueAt(i, 0).equals(value))

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

@@ -280 +280 @@
     }
 
-    private Integer findAdjacentWay(NodesWays nw, Node n) {
+    private static Integer findAdjacentWay(NodesWays nw, Node n) {
         Set<Integer> adj = nw.nodes.get(n);
         if (adj == null || adj.isEmpty()) return null;

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -446 +446 @@
     }
 
-    private void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) {
+    private static void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) {
         String labelPattern = property.getAsString();
         boolean found = false;
@@ -463 +463 @@
     }
 
-    private void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) {
+    private static void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) {
         if (cb.getSelectedIndex() == WAYPOINT_LABEL_CUSTOM) {
             tf.setEnabled(true);

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

@@ -228 +228 @@
     }
 
-    private JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) {
+    private static JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) {
         final JTable ret = new JTable(tableModel);
 

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

@@ -771 +771 @@
         }
 
-        private boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {
+        private static boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {
             URL url = null;
             try {

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

@@ -345 +345 @@
     }
 
-    private void minimizeSplitBounds(Split split, Rectangle bounds) {
+    private static void minimizeSplitBounds(Split split, Rectangle bounds) {
         Rectangle splitBounds = new Rectangle(bounds.x, bounds.y, 0, 0);
         List<Node> splitChildren = split.getChildren();
@@ -710 +710 @@
     }
 
-    private void throwInvalidLayout(String msg, Node node) {
+    private static void throwInvalidLayout(String msg, Node node) {
         throw new InvalidLayoutException(msg, node);
     }
@@ -759 +759 @@
     }
 
-    private Divider dividerAt(Node root, int x, int y) {
+    private static Divider dividerAt(Node root, int x, int y) {
         if (root instanceof Divider) {
             Divider divider = (Divider) root;
@@ -785 +785 @@
     }
 
-    private boolean nodeOverlapsRectangle(Node node, Rectangle r2) {
+    private static boolean nodeOverlapsRectangle(Node node, Rectangle r2) {
         Rectangle r1 = node.getBounds();
         return

trunk/src/org/openstreetmap/josm/io/NMEAImporter.java

@@ -67 +67 @@
     }
 
-    private void showNmeaInfobox(boolean success, NmeaReader r) {
+    private static void showNmeaInfobox(boolean success, NmeaReader r) {
         final StringBuilder msg = new StringBuilder(160).append("<html>");
         msg.append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates())).append("<br>")

trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

@@ -73 +73 @@
     }
 
-    private File[] listFiles(File pluginsDirectory, final String regex) {
+    private static File[] listFiles(File pluginsDirectory, final String regex) {
         return pluginsDirectory.listFiles(
                 new FilenameFilter() {

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -196 +196 @@
     }
 
-    private void displayErrorMessage(final ProgressMonitor monitor, final String msg, final String details, final String title,
+    private static void displayErrorMessage(final ProgressMonitor monitor, final String msg, final String details, final String title,
             final String firstMessage) {
         GuiHelper.runInEDTAndWait(new Runnable() {

trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java

@@ -185 +185 @@
     private final TemplateEntry template;
 
-    private Match transform(Match m, int searchExpressionPosition) throws ParseError {
+    private static Match transform(Match m, int searchExpressionPosition) throws ParseError {
         if (m instanceof Parent) {
             Match child = transform(((Parent) m).getOperand(), searchExpressionPosition);