Changeset 7082 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

Timestamp:

2014-05-09T05:32:37+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - replace Utils.UTF_8 by StandardCharsets.UTF_8, new in Java 7

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (6 diffs)

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

@@ -26 +26 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -124 +125 @@
         this.sourceType = sourceType;
         this.canEnable = sourceType.equals(SourceType.MAP_PAINT_STYLE) || sourceType.equals(SourceType.TAGCHECKER_RULE);
-        
+
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
         this.availableSourcesModel = new AvailableSourcesListModel(selectionModel);
@@ -718 +719 @@
             fileChooser.setMargin(new Insets(0, 0, 0, 0));
             p.add(fileChooser, GBC.eol().insets(0, 0, 5, 5));
-            
+
             if (e != null) {
                 if (e.title != null) {
@@ -1212 +1213 @@
     static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer<ExtendedSourceEntry> {
         @Override
-        public Component getListCellRendererComponent(JList<? extends ExtendedSourceEntry> list, ExtendedSourceEntry value, 
+        public Component getListCellRendererComponent(JList<? extends ExtendedSourceEntry> list, ExtendedSourceEntry value,
                 int index, boolean isSelected, boolean cellHasFocus) {
             String s = value.toString();
@@ -1280 +1281 @@
 
                 MirroredInputStream stream = new MirroredInputStream(url);
-                reader = new BufferedReader(new InputStreamReader(stream, Utils.UTF_8));
+                reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
 
                 String line;
@@ -1605 +1606 @@
         }
     }
-    
+
     /**
      * Defers loading of sources to the first time the adequate tab is selected.