Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/tools
- Timestamp:
- 2015-05-02T00:55:19+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/tools
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java
r7937 r8308 23 23 * 24 24 */ 25 import java.io.Serializable; 25 26 import java.text.Collator; 26 27 import java.util.Comparator; … … 38 39 * 39 40 */ 40 public class AlphanumComparator implements Comparator<String> { 41 public class AlphanumComparator implements Comparator<String>, Serializable { 42 43 private static final long serialVersionUID = 1L; 41 44 42 45 private static final AlphanumComparator INSTANCE = new AlphanumComparator(); -
trunk/src/org/openstreetmap/josm/tools/FontsManager.java
r7402 r8308 39 39 String url = "resource://data/fonts/"+fontFile; 40 40 try (InputStream i = new CachedFile(url).getInputStream()) { 41 Font f = Font.createFont(Font.TRUETYPE_FONT, i); 42 if (f == null) { 43 throw new RuntimeException("unable to load font: "+fontFile); 44 } 45 ge.registerFont(f); 41 ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, i)); 46 42 } catch (IOException | FontFormatException ex) { 47 43 throw new RuntimeException(ex); -
trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
r8285 r8308 67 67 private class MyAction extends AbstractAction { 68 68 69 private final MultikeyShortcutAction action; 70 private final Shortcut shortcut; 69 private final transient MultikeyShortcutAction action; 70 private final transient Shortcut shortcut; 71 71 72 72 MyAction(MultikeyShortcutAction action) { -
trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
r8099 r8308 318 318 try (DirectoryStream<Path> ds = Files.newDirectoryStream(fontPath)) { 319 319 for (Path p : ds) { 320 fontsAvail.add(p.getFileName().toString().toUpperCase()); 320 Path filename = p.getFileName(); 321 if (filename != null) { 322 fontsAvail.add(filename.toString().toUpperCase()); 323 } 321 324 } 322 325 fontsAvail.add(""); // for devanagari -
trunk/src/org/openstreetmap/josm/tools/Utils.java
r8304 r8308 378 378 Main.warn("Unable to create directory "+out.getPath()); 379 379 } 380 for (File f : in.listFiles()) { 381 File target = new File(out, f.getName()); 382 if (f.isDirectory()) { 383 copyDirectory(f, target); 384 } else { 385 copyFile(f, target); 380 File[] files = in.listFiles(); 381 if (files != null) { 382 for (File f : files) { 383 File target = new File(out, f.getName()); 384 if (f.isDirectory()) { 385 copyDirectory(f, target); 386 } else { 387 copyFile(f, target); 388 } 386 389 } 387 390 } … … 415 418 if( path.exists() ) { 416 419 File[] files = path.listFiles(); 417 for (File file : files) { 418 if (file.isDirectory()) { 419 deleteDirectory(file); 420 } else if (!file.delete()) { 421 Main.warn("Unable to delete file: "+file.getPath()); 420 if (files != null) { 421 for (File file : files) { 422 if (file.isDirectory()) { 423 deleteDirectory(file); 424 } else if (!file.delete()) { 425 Main.warn("Unable to delete file: "+file.getPath()); 426 } 422 427 } 423 428 } -
trunk/src/org/openstreetmap/josm/tools/template_engine/ParseError.java
r7937 r8308 9 9 public class ParseError extends Exception { 10 10 11 private final Token unexpectedToken; 11 private final transient Token unexpectedToken; 12 12 13 13 public ParseError(Token unexpectedToken) {
Note:
See TracChangeset
for help on using the changeset viewer.