Changeset 13277 in josm for trunk/geticons.pl

Timestamp:

2018-01-04T16:00:01+01:00 (5 years ago)

Author:

stoecker

Message:

see #15734 - fix icon detection

File:

• trunk/geticons.pl (modified) (3 diffs)

trunk/geticons.pl

@@ -23 +23 @@
   for my $file (glob($arg))
   {
+    my @defs;
     open(FILE,"<",$file) or die "Could not open $file\n";
     #print "Read file $file\n";
@@ -29 +30 @@
     while(my $l = <FILE>)
     {
+      if($l =~ /private static final String ([A-Z_]+) = ("[^"]+")/)
+      {
+        push(@defs, [$1, $2]);
+      }
       next if $l =~ /NO-ICON/;
+      for my $d (@defs)
+      {
+        $l =~ s/$d->[0]/$d->[1]/g;
+      }
       if($l =~ /icon\s*[:=]\s*["']([^"'+]+?)["']/)
       {
@@ -122 +131 @@
         ++$icons{$i};
       }
-      if($l =~ /setButtonIcons.*\{(.*)\}/)
+      if($l =~ /setButtonIcons.*\{(.*)\}/ || $l =~ /setButtonIcons\((.*)\)/ )
       {
         my $t = $1;