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 f3f52fd..2356c96 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 @@ -97,7 +97,7 @@ public class CpuForm { processorTextFields = new ArrayList<>(); for (int i = 0; i < logicalProcessorCount; i++) { JLabel label = new JLabel(); - label.setText("CPU" + i); + label.setText("CPU " + i); pcuProgressBarPanel.add(label, new GridConstraints(i, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); JProgressBar progressBar = new JProgressBar(); @@ -106,7 +106,7 @@ public class CpuForm { processorProgressBars.add(progressBar); JLabel labelPcf = new JLabel(); - labelPcf.setText("CPU" + i); + labelPcf.setText("CPU " + i); pcfPanel.add(labelPcf, new GridConstraints(i, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); JTextField textField = new JTextField(); @@ -138,13 +138,13 @@ public class CpuForm { builder.append("
Family: ").append(processorIdentifier.getFamily()); builder.append("
Processor ID: ").append(processorIdentifier.getProcessorID()); builder.append("
Vendor: ").append(processorIdentifier.getVendor()); - builder.append("
Vendor Freq: ").append(processorIdentifier.getVendorFreq()); + builder.append("
Vendor Freq: ").append(new BigDecimal(processorIdentifier.getVendorFreq()).divide(new BigDecimal(1000000000), 2, RoundingMode.HALF_UP)).append(" GHz"); builder.append("
Stepping: ").append(processorIdentifier.getStepping()); builder.append("
"); builder.append("
Physical Package Count: ").append(processor.getPhysicalPackageCount()); builder.append("
Physical Processor Count: ").append(processor.getPhysicalProcessorCount()); builder.append("
Logical Processor Count: ").append(processor.getLogicalProcessorCount()); - builder.append("
Max Freq: ").append(processor.getMaxFreq()); + builder.append("
Max Freq: ").append(new BigDecimal(processor.getMaxFreq()).divide(new BigDecimal(1000000000), 2, RoundingMode.HALF_UP)).append(" GHz"); builder.append("
Interrupts: ").append(processor.getInterrupts()); builder.append("
Context Switches: ").append(processor.getContextSwitches()); @@ -231,7 +231,7 @@ public class CpuForm { JTextField textField = processorTextFields.get(i); BigDecimal divide = new BigDecimal(currentFreq[i]).divide(new BigDecimal(1000000000), 2, RoundingMode.HALF_UP); - textField.setText(divide + " GHZ"); + textField.setText(divide + " GHz"); }