Ticket #8686: patch_8686_1.diff

File patch_8686_1.diff, 1.3 KB (added by dommage, 13 years ago)

Patch to allow more lenient searching of style zip files for icons.

  • src/org/openstreetmap/josm/tools/ImageProvider.java

     
    2929import java.util.ArrayList;
    3030import java.util.Arrays;
    3131import java.util.Collection;
     32import java.util.Enumeration;
    3233import java.util.HashMap;
    3334import java.util.Map;
    3435import java.util.concurrent.ExecutorService;
     
    525526        try
    526527        {
    527528            zipFile = new ZipFile(archive);
    528             ZipEntry entry = zipFile.getEntry(full_name);
     529            //ZipEntry entry = zipFile.getEntry(full_name);
     530
     531            /// FIND NAME IN PATH RATHER THAN EXACT MATCH (use endsWith?)
     532            ZipEntry entry = null;
     533            Enumeration<? extends ZipEntry> entries = zipFile.entries();
     534            while (entries.hasMoreElements()) {
     535                ZipEntry testentry = entries.nextElement();
     536                if (testentry.getName().endsWith(full_name)) {
     537                    entry = testentry;
     538                    break;
     539                }
     540            }
     541            ///
     542
    529543            if(entry != null)
    530544            {
    531545                int size = (int)entry.getSize();