Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-26 01:51:42 +01:00
Code Issues Projects Releases Wiki Activity

Replace Reflection with setter implementation

Browse Source
This commit is contained in:
games647 2018-03-21 11:16:16 +01:00
parent d24fbc9f55
commit c7000846cd
No known key found for this signature in database
GPG Key ID: BFC68C8708713A88
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -16,8 +16,6 @@ import org.bukkit.event.EventPriority;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.io.File; import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.DecimalFormat; import java.text.DecimalFormat;
@ -1333,20 +1331,8 @@ public class Settings implements net.ess3.api.ISettings {
DecimalFormat currencyFormat = new DecimalFormat(currencyFormatString, decimalFormatSymbols); DecimalFormat currencyFormat = new DecimalFormat(currencyFormatString, decimalFormatSymbols);
currencyFormat.setRoundingMode(RoundingMode.FLOOR); currencyFormat.setRoundingMode(RoundingMode.FLOOR);
// Updates NumberUtil#PRETTY_FORMAT field so that all of Essentials // Updates NumberUtil#PRETTY_FORMAT field so that all of Essentials can follow a single format.
// can follow a single format. NumberUtil.internalSetPrettyFormat(currencyFormat);
try {
Field field = NumberUtil.class.getDeclaredField("PRETTY_FORMAT");
field.setAccessible(true);
field.set(null, currencyFormat);
field.setAccessible(false);
} catch (NoSuchFieldException | IllegalAccessException e) {
ess.getLogger().severe("Failed to apply custom currency format: " + e.getMessage());
if (isDebug()) {
e.printStackTrace();
}
}
return currencyFormat; return currencyFormat;
} }

7
Essentials/src/com/earth2me/essentials/utils/NumberUtil.java
View File

@ -11,8 +11,8 @@ import java.util.Locale;
import static com.earth2me.essentials.I18n.tl; import static com.earth2me.essentials.I18n.tl;
public class NumberUtil { public class NumberUtil {
private static DecimalFormat twoDPlaces = new DecimalFormat("#,###.##"); private static DecimalFormat twoDPlaces = new DecimalFormat("#,###.##");
private static DecimalFormat currencyFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US)); private static DecimalFormat currencyFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
@ -30,6 +30,11 @@ public class NumberUtil {
PRETTY_FORMAT.setMaximumFractionDigits(2); PRETTY_FORMAT.setMaximumFractionDigits(2);
} }
// this method should only be called by Essentials
public static void internalSetPrettyFormat(NumberFormat prettyFormat) {
PRETTY_FORMAT = prettyFormat;
}
public static String shortCurrency(final BigDecimal value, final IEssentials ess) { public static String shortCurrency(final BigDecimal value, final IEssentials ess) {
return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value); return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value);
} }