Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
- Timestamp:
- 2017-08-22T22:26:32+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
r12292 r12620 72 72 import org.openstreetmap.josm.tools.GBC; 73 73 import org.openstreetmap.josm.tools.ImageProvider; 74 import org.openstreetmap.josm.tools.Logging; 74 75 import org.openstreetmap.josm.tools.Shortcut; 75 76 … … 662 663 return true; 663 664 } catch (IOException | UnsupportedFlavorException e) { 664 Main.error(e);665 Logging.error(e); 665 666 } 666 667 return false; … … 681 682 } 682 683 } catch (IOException | UnsupportedFlavorException e) { 683 Main.error(e);684 Logging.error(e); 684 685 } 685 686 movingComponent = ""; … … 1022 1023 Object tb = action.getValue("toolbar"); 1023 1024 if (tb == null) { 1024 Main.info(tr("Toolbar action without name: {0}",1025 Logging.info(tr("Toolbar action without name: {0}", 1025 1026 action.getClass().getName())); 1026 1027 continue; 1027 1028 } else if (!(tb instanceof String)) { 1028 1029 if (!(tb instanceof Boolean) || (Boolean) tb) { 1029 Main.info(tr("Strange toolbar value: {0}",1030 Logging.info(tr("Strange toolbar value: {0}", 1030 1031 action.getClass().getName())); 1031 1032 } … … 1035 1036 Action r = actions.get(toolbar); 1036 1037 if (r != null && r != action && !toolbar.startsWith(IMAGERY_PREFIX)) { 1037 Main.info(tr("Toolbar action {0} overwritten: {1} gets {2}",1038 Logging.info(tr("Toolbar action {0} overwritten: {1} gets {2}", 1038 1039 toolbar, r.getClass().getName(), action.getClass().getName())); 1039 1040 } … … 1096 1097 result.add(a); 1097 1098 } else { 1098 Main.info("Could not load tool definition "+s);1099 Logging.info("Could not load tool definition "+s); 1099 1100 } 1100 1101 } … … 1112 1113 String toolbar = (String) action.getValue("toolbar"); 1113 1114 if (toolbar == null) { 1114 Main.info(tr("Registered toolbar action without name: {0}",1115 Logging.info(tr("Registered toolbar action without name: {0}", 1115 1116 action.getClass().getName())); 1116 1117 } else { 1117 1118 Action r = regactions.get(toolbar); 1118 1119 if (r != null) { 1119 Main.info(tr("Registered toolbar action {0} overwritten: {1} gets {2}",1120 Logging.info(tr("Registered toolbar action {0} overwritten: {1} gets {2}", 1120 1121 toolbar, r.getClass().getName(), action.getClass().getName())); 1121 1122 }
Note:
See TracChangeset
for help on using the changeset viewer.