Changeset 33265 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

Timestamp:

2017-04-17T19:27:17+02:00 (9 years ago)

Author:

donvip

Message:

fix #josm14386 - StackOverflowError

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (modified) (4 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -24 +24 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -438 +439 @@
         ClassLoader classLoader = RelContextDialog.class.getClassLoader();
         try (InputStream possibleRolesStream = classLoader.getResourceAsStream(POSSIBLE_ROLES_FILE);
-                BufferedReader r = new BufferedReader(new InputStreamReader(possibleRolesStream));
+                BufferedReader r = new BufferedReader(new InputStreamReader(possibleRolesStream, StandardCharsets.UTF_8));
                 ) {
             while (r.ready()) {
@@ -530 +531 @@
     }
 
-    private class ChosenRelationPopupMenu extends JPopupMenu {
+    private static class ChosenRelationPopupMenu extends JPopupMenu {
         ChosenRelationPopupMenu(ChosenRelation chosenRelation) {
             add(new SelectMembersAction(chosenRelation));
@@ -578 +579 @@
     }
 
-    private class MultipolygonSettingsPopup extends JPopupMenu implements ActionListener {
+    private static class MultipolygonSettingsPopup extends JPopupMenu implements ActionListener {
         MultipolygonSettingsPopup() {
             addMenuItem("boundary", tr("Create administrative boundary relations"));