Changeset 12826 in josm for trunk/src/org/openstreetmap/josm/data/PreferencesUtils.java
- Timestamp:
- 2017-09-12T00:58:32+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/PreferencesUtils.java
r12634 r12826 23 23 import org.openstreetmap.josm.data.preferences.Setting; 24 24 import org.openstreetmap.josm.data.preferences.StringSetting; 25 import org.openstreetmap.josm.gui.io.CustomConfigurator;26 25 import org.openstreetmap.josm.tools.Logging; 27 26 import org.openstreetmap.josm.tools.Utils; … … 34 33 public final class PreferencesUtils { 35 34 35 private static StringBuilder summary = new StringBuilder(); 36 36 37 private PreferencesUtils() { 37 38 // Hide implicit public constructor for utility class 39 } 40 41 /** 42 * Log a formatted message. 43 * @param fmt format 44 * @param vars arguments 45 * @see String#format 46 * @since 12826 47 */ 48 public static void log(String fmt, Object... vars) { 49 summary.append(String.format(fmt, vars)); 50 } 51 52 /** 53 * Log a message. 54 * @param s message to log 55 * @since 12826 56 */ 57 public static void log(String s) { 58 summary.append(s).append('\n'); 59 } 60 61 /** 62 * Log an exception. 63 * @param e exception to log 64 * @param s message prefix 65 * @since 12826 66 */ 67 public static void log(Exception e, String s) { 68 summary.append(s).append(' ').append(Logging.getErrorMessage(e)).append('\n'); 69 } 70 71 /** 72 * Returns the log. 73 * @return the log 74 * @since 12826 75 */ 76 public static String getLog() { 77 return summary.toString(); 78 } 79 80 /** 81 * Resets the log. 82 * @since 12826 83 */ 84 public static void resetLog() { 85 summary = new StringBuilder(); 38 86 } 39 87 … … 112 160 // remove mentioned items from collection 113 161 for (String item : lSetting.getValue()) { 114 CustomConfigurator.log("Deleting preferences: from list %s: %s\n", key, item);162 log("Deleting preferences: from list %s: %s\n", key, item); 115 163 newItems.remove(item); 116 164 } … … 128 176 if (list.containsAll(removeList)) { 129 177 // remove current list, because it matches search criteria 130 CustomConfigurator.log("Deleting preferences: list from lists %s: %s\n", key, list);178 log("Deleting preferences: list from lists %s: %s\n", key, list); 131 179 listIterator.remove(); 132 180 } … … 146 194 if (map.entrySet().containsAll(removeMap.entrySet())) { 147 195 // the map contain all mentioned key-value pair, so it should be deleted from "maps" 148 CustomConfigurator.log("Deleting preferences: deleting map from maps %s: %s\n", key, map);196 log("Deleting preferences: deleting map from maps %s: %s\n", key, map); 149 197 mapIterator.remove(); 150 198 } … … 161 209 String key = entry.getKey(); 162 210 if (key.matches(pattern)) { 163 CustomConfigurator.log("Deleting preferences: deleting key from preferences: " + key);211 log("Deleting preferences: deleting key from preferences: " + key); 164 212 pref.putSetting(key, null); 165 213 } … … 170 218 Map<String, Setting<?>> allSettings = pref.getAllSettings(); 171 219 if (allSettings.containsKey(key)) { 172 CustomConfigurator.log("Deleting preferences: deleting key from preferences: " + key);220 log("Deleting preferences: deleting key from preferences: " + key); 173 221 pref.putSetting(key, null); 174 222 } … … 218 266 219 267 private static void defaultUnknownWarning(String key) { 220 CustomConfigurator.log("Warning: Unknown default value of %s , skipped\n", key);268 log("Warning: Unknown default value of %s , skipped\n", key); 221 269 JOptionPane.showMessageDialog( 222 270 Main.parent, … … 285 333 " listmapMap.put(key, l);"+ 286 334 " } else {" + 287 " " + CustomConfigurator.class.getName() + ".log('Unknown type:'+val.type+ '- use list, listlist or listmap'); }"+335 " " + PreferencesUtils.class.getName() + ".log('Unknown type:'+val.type+ '- use list, listlist or listmap'); }"+ 288 336 " }"; 289 337 engine.eval(finish);
Note:
See TracChangeset
for help on using the changeset viewer.