From d57aeae94a71ba4617bf14752ed3b52ba05f03fe Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Tue, 23 Nov 2021 17:26:36 +0800 Subject: [PATCH] detail form first step --- .../moo/info/ui/form/DetailForm.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java index a14d544..9fdb1fa 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java @@ -10,6 +10,7 @@ import com.luoboduner.moo.info.ui.Style; import com.luoboduner.moo.info.util.ScrollUtil; import lombok.Getter; import oshi.hardware.Baseboard; +import oshi.hardware.CentralProcessor; import oshi.hardware.ComputerSystem; import oshi.hardware.HardwareAbstractionLayer; import oshi.software.os.OperatingSystem; @@ -113,6 +114,8 @@ public class DetailForm { detailForm.getOsTextPane().setText(getOsInfo()); detailForm.getComputerTextPane().setText(getComputerInfo()); detailForm.getBaseBoardTextPane().setText(getBaseBoardInfo()); + detailForm.getCpuTextPane().setText(getCpuInfo()); + detailForm.getPowerSourceTextPane().setText(PowerSourceForm.getPowerInfoText(hardware.getPowerSources())); } @@ -154,6 +157,7 @@ public class DetailForm { private static String getBaseBoardInfo() { StringBuilder builder = new StringBuilder(); Baseboard baseboard = App.si.getHardware().getComputerSystem().getBaseboard(); + builder.append("Manufacturer: ").append(baseboard.getManufacturer()); builder.append("
Model: ").append(baseboard.getModel()); builder.append("
Version: ").append(baseboard.getVersion()); @@ -162,6 +166,25 @@ public class DetailForm { return builder.toString(); } + private static String getCpuInfo() { + StringBuilder builder = new StringBuilder(); + CentralProcessor processor = App.si.getHardware().getProcessor(); + + CentralProcessor.ProcessorIdentifier processorIdentifier = processor.getProcessorIdentifier(); + builder.append("Name: ").append(processorIdentifier.getName()); + builder.append("
Identifier: ").append(processorIdentifier.getIdentifier()); + builder.append("
Micro Architecture: ").append(processorIdentifier.getMicroarchitecture()); + builder.append("
Model: ").append(processorIdentifier.getModel()); + 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("
Stepping: ").append(processorIdentifier.getStepping()); + + return builder.toString(); + + } + { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<<