Changeset 10755 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-08-07T14:46:57+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - various fixes

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (1 diff)
• MapView.java (modified) (2 diffs)
• SideButton.java (modified) (1 diff)
• bbox/SlippyMapBBoxChooser.java (modified) (1 diff)
• dialogs/properties/TagEditHelper.java (modified) (1 diff)
• dialogs/relation/MemberTransferHandler.java (modified) (1 diff)
• history/SelectionSynchronizer.java (modified) (1 diff)
• history/TagInfoTransferHandler.java (modified) (1 diff)
• layer/GpxLayer.java (modified) (1 diff)
• layer/gpx/ChooseTrackVisibilityAction.java (modified) (1 diff)
• layer/imagery/SharpenImageProcessor.java (modified) (1 diff)
• widgets/ButtonColumn.java (modified) (1 diff)

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

@@ -683 +683 @@
         }
 
-        private boolean handleNetworkErrors() {
+        private static boolean handleNetworkErrors() {
             boolean condition = !NETWORK_ERRORS.isEmpty();
             if (condition) {

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

@@ -267 +267 @@
     /**
      * This class is an adapter for the old layer change interface.
-     * <p>
-     * New implementations should use {@link org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener}
      * @author Michael Zangl
      * @since 10271
-     */
+     * @deprecated New implementations should use {@link org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener}
+     */
+    @Deprecated
     protected static class EditLayerChangeAdapter implements ActiveLayerChangeListener {
 
@@ -326 +326 @@
      */
     private static class WarningLayerPainter implements LayerPainter {
-        boolean warningPrinted = false;
+        boolean warningPrinted;
         private final Layer layer;
 

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

@@ -85 +85 @@
         if (action != null) {
             propertyChangeListener = evt -> {
-                if (javax.swing.Action.SMALL_ICON.equals(evt.getPropertyName())) {
+                if (Action.SMALL_ICON.equals(evt.getPropertyName())) {
                     fixIcon(null);
                 }

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

@@ -173 +173 @@
     }
 
-    private List<TileSource> getAllTileSources() {
+    private static List<TileSource> getAllTileSources() {
         List<TileSource> tileSources = new ArrayList<>();
         for (TileSourceProvider provider: providers) {

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

@@ -468 +468 @@
         public void performTagEdit() {
             String value = Tag.removeWhiteSpaces(values.getEditor().getItem().toString());
-            value = Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
+            value = Normalizer.normalize(value, Normalizer.Form.NFC);
             if (value.isEmpty()) {
                 value = null; // delete the key
             }
             String newkey = Tag.removeWhiteSpaces(keys.getEditor().getItem().toString());
-            newkey = Normalizer.normalize(newkey, java.text.Normalizer.Form.NFC);
+            newkey = Normalizer.normalize(newkey, Normalizer.Form.NFC);
             if (newkey.isEmpty()) {
                 newkey = key;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java

@@ -58 +58 @@
     }
 
-    private int computeInsertionRow(TransferSupport support, MemberTable destination) {
+    private static int computeInsertionRow(TransferSupport support, MemberTable destination) {
         final int insertRow;
         if (support.isDrop()) {

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

@@ -13 +13 @@
 
     private final Set<ListSelectionModel> participants;
-    private boolean preventRecursion = false;
+    private boolean preventRecursion;
 
     /**

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

@@ -23 +23 @@
 
     @Override
-    public void exportToClipboard(JComponent comp, Clipboard clip, int action) throws IllegalStateException {
+    public void exportToClipboard(JComponent comp, Clipboard clip, int action) {
         if (comp instanceof JTable) {
             TableModel model = ((JTable) comp).getModel();

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

@@ -177 +177 @@
 
         info.append(tr("Length: {0}", SystemOfMeasurement.getSystemOfMeasurement().getDistText(data.length()))).append("<br>")
-            .append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())).append(
-                trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br>")
-            .append("</html>");
+            .append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size()))
+            .append(trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br></html>");
 
         final JScrollPane sp = new JScrollPane(new HtmlPanel(info.toString()));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -128 +128 @@
      * @return non-editable table
      */
-    private JTable buildTable(Object[]... content) {
+    private static JTable buildTable(Object[]... content) {
         final String[] headers = {tr("Name"), tr("Description"), tr("Timespan"), tr("Length"), tr("URL")};
         DefaultTableModel model = new DefaultTableModel(content, headers);

trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java

@@ -68 +68 @@
     }
 
-    private ConvolveOp generateMixed(float aFactor, float[] a, float[] b) {
+    private static ConvolveOp generateMixed(float aFactor, float[] a, float[] b) {
         if (a.length != 9 || b.length != 9) {
             throw new IllegalArgumentException("Illegal kernel array length.");

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

@@ -29 +29 @@
     private final JButton editButton;
     private Object editorValue;
-    private String buttonName = null;
+    private String buttonName;
 
     /**