Changeset 3507 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2010-09-02T19:26:26+02:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r3451 r3507 382 382 383 383 updateSystemProperties(); 384 if(Main.applet) 385 return; 384 386 File prefFile = new File(getPreferencesDirFile(), "preferences"); 385 387 … … 434 436 public void load() throws IOException { 435 437 properties.clear(); 436 final BufferedReader in = new BufferedReader(new InputStreamReader( 437 new FileInputStream(getPreferencesDir()+"preferences"), "utf-8")); 438 int lineNumber = 0; 439 ArrayList<Integer> errLines = new ArrayList<Integer>(); 440 for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) { 441 final int i = line.indexOf('='); 442 if (i == -1 || i == 0) { 443 errLines.add(lineNumber); 444 continue; 445 } 446 properties.put(line.substring(0,i), line.substring(i+1)); 447 } 448 if (!errLines.isEmpty()) 449 throw new IOException(tr("Malformed config file at lines {0}", errLines)); 438 if(!Main.applet) { 439 final BufferedReader in = new BufferedReader(new InputStreamReader( 440 new FileInputStream(getPreferencesDir()+"preferences"), "utf-8")); 441 int lineNumber = 0; 442 ArrayList<Integer> errLines = new ArrayList<Integer>(); 443 for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) { 444 final int i = line.indexOf('='); 445 if (i == -1 || i == 0) { 446 errLines.add(lineNumber); 447 continue; 448 } 449 properties.put(line.substring(0,i), line.substring(i+1)); 450 } 451 if (!errLines.isEmpty()) 452 throw new IOException(tr("Malformed config file at lines {0}", errLines)); 453 } 450 454 updateSystemProperties(); 451 455 } 452 456 453 457 public void init(boolean reset){ 458 if(Main.applet) 459 return; 454 460 // get the preferences. 455 461 File prefDir = getPreferencesDirFile(); … … 525 531 } 526 532 533 /* TODO: Bookmarks should be stored in preferences */ 527 534 public File getBookmarksFile() { 528 535 return new File(getPreferencesDir(),"bookmarks"); -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
r3461 r3507 133 133 134 134 public void savePreferences() { 135 135 if(Main.applet) 136 return; 136 137 // create a task for downloading plugins if the user has activated, yet not downloaded, 137 138 // new plugins
Note:
See TracChangeset
for help on using the changeset viewer.