Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

    r7025 r7082  
    2626import java.net.MalformedURLException;
    2727import java.net.URL;
     28import java.nio.charset.StandardCharsets;
    2829import java.util.ArrayList;
    2930import java.util.Arrays;
     
    124125        this.sourceType = sourceType;
    125126        this.canEnable = sourceType.equals(SourceType.MAP_PAINT_STYLE) || sourceType.equals(SourceType.TAGCHECKER_RULE);
    126        
     127
    127128        DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
    128129        this.availableSourcesModel = new AvailableSourcesListModel(selectionModel);
     
    718719            fileChooser.setMargin(new Insets(0, 0, 0, 0));
    719720            p.add(fileChooser, GBC.eol().insets(0, 0, 5, 5));
    720            
     721
    721722            if (e != null) {
    722723                if (e.title != null) {
     
    12121213    static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer<ExtendedSourceEntry> {
    12131214        @Override
    1214         public Component getListCellRendererComponent(JList<? extends ExtendedSourceEntry> list, ExtendedSourceEntry value, 
     1215        public Component getListCellRendererComponent(JList<? extends ExtendedSourceEntry> list, ExtendedSourceEntry value,
    12151216                int index, boolean isSelected, boolean cellHasFocus) {
    12161217            String s = value.toString();
     
    12801281
    12811282                MirroredInputStream stream = new MirroredInputStream(url);
    1282                 reader = new BufferedReader(new InputStreamReader(stream, Utils.UTF_8));
     1283                reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
    12831284
    12841285                String line;
     
    16051606        }
    16061607    }
    1607    
     1608
    16081609    /**
    16091610     * Defers loading of sources to the first time the adequate tab is selected.
Note: See TracChangeset for help on using the changeset viewer.