I2P_Developers/i2p.i2p
3
1
Fork 11
Code Issues 340 Pull Requests 13 Actions 10 Packages Projects Releases Wiki Activity

Build: Patch msgfmt-generated ResourceBundle code to eliminate unchecked warnings

Browse Source 
Ancient msgfmt doesn't know about generics.
This change allows devs to set javac.compilerargs=-Xlint:unchecked
in override.properties without getting an
overwhelming number of false positives from the bundles.

If msgfmt ever adds a --java5 option, we can remove this,
but it's been almost 20 years.
For the same reason, while the sed script is fragile,
seems unlikely msgfmt will change the output without a new option.
If they do, we'll fix it then.
This commit is contained in:
zzz
2025-04-20 17:21:35 -04:00
parent 6b9fc436c3
commit f6e951e297
12 changed files with 72 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/desktopgui/bundle-messages.sh
View File

@ -138,7 +138,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/i2psnark/java/bundle-messages.sh
View File

@ -129,7 +129,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/i2ptunnel/java/bundle-messages-proxy.sh
View File

@ -131,7 +131,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/i2ptunnel/java/bundle-messages.sh
View File

@ -130,7 +130,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/ministreaming/java/bundle-messages.sh
View File

@ -129,7 +129,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/routerconsole/java/bundle-messages-countries.sh
View File

@ -145,7 +145,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/routerconsole/java/bundle-messages-news.sh
View File

@ -131,7 +131,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/routerconsole/java/bundle-messages.sh
View File

@ -161,7 +161,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/susidns/src/bundle-messages.sh
View File

@ -137,7 +137,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi

7
apps/susimail/bundle-messages.sh
View File

@ -129,7 +129,12 @@ do
RC=1
break
fi
mv $TDX/messages_$LG.java $TDY
# fixup Enumeration code for generics
sed -e 's/Enumeration/Enumeration<String>/g' \
-e 's/Object nextElement/String nextElement/g' \
-e 's/return key/return (String) key/g' \
$TDX/messages_$LG.java > $TDY/messages_$LG.java
rm -f $TDX/messages_$LG.java
rm -rf $TD
fi
fi