Changeset 6151 in josm
- Timestamp:
- 2013-08-16T10:13:47+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
r6148 r6151 159 159 /** 160 160 * Returns the parent directory of the resource inside the zip file. 161 * @return null, if zipEntryPath is null, otherwise the parent directory of162 * the resource inside the zip file161 * @return the parent directory of the resource inside the zip file, 162 * "." if zipEntryPath is a top level file; null, if zipEntryPath is null 163 163 */ 164 164 public String getZipEntryDirName() { 165 165 if (zipEntryPath == null) return null; 166 return new File(zipEntryPath).getParent().toString(); 166 File file = new File(zipEntryPath); 167 File dir = file.getParentFile(); 168 if (dir == null) return "."; 169 return dir.getPath(); 167 170 } 168 171 } -
trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
r6148 r6151 539 539 { 540 540 zipFile = new ZipFile(archive); 541 String entry_name; 542 if (inArchiveDir != null) { 543 File dir = new File(inArchiveDir); 544 entry_name = new File(dir, full_name).getPath(); 545 } else { 546 entry_name = full_name; 547 } 541 if (inArchiveDir == null || inArchiveDir.equals(".")) { 542 inArchiveDir = ""; 543 } else if (!inArchiveDir.isEmpty()) { 544 inArchiveDir += "/"; 545 } 546 String entry_name = inArchiveDir + full_name; 548 547 ZipEntry entry = zipFile.getEntry(entry_name); 549 548 if(entry != null)
Note:
See TracChangeset
for help on using the changeset viewer.