diff --git a/pom.xml b/pom.xml index f3dbed9..e6864f7 100644 --- a/pom.xml +++ b/pom.xml @@ -18,20 +18,19 @@ 1.8 1.8 - 1.2.7 + 1.2.10 7.0.3 - 1.4 1.18.22 - 5.8.1 + 5.8.2 3.12.0 31.0.1-jre 4.9.3 2.0.1 2.0.1 2.0.1 - 5.7.16 - 1.2.78 - 6.1.2 + 5.7.21 + 1.2.79 + 6.1.3 1.5.3 @@ -56,12 +55,6 @@ ${forms_rt.version} - - com.apple - AppleJavaExtensions - ${AppleJavaExtensions.version} - - org.projectlombok lombok diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java index 3530087..b680f89 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java @@ -297,6 +297,7 @@ public class CpuForm { CentralProcessor processor = App.si.getHardware().getProcessor(); long[] currentFreq = processor.getCurrentFreq(); + BigDecimal totalFreq = BigDecimal.ZERO; for (int i = 0; i < currentFreq.length; i++) { @@ -305,9 +306,10 @@ public class CpuForm { String freqStr = divide + " GHz"; textField.setText(freqStr); - // TODO to fix - cpuForm.getFreqLabel().setText(freqStr); + totalFreq = divide.add(totalFreq); + } + cpuForm.getFreqLabel().setText(String.valueOf(totalFreq.divide(new BigDecimal(currentFreq.length), 2, RoundingMode.HALF_UP))); }