From fb08602d41fde5551cf91264cd90036b9175b92d Mon Sep 17 00:00:00 2001 From: rememberber Date: Sat, 27 Nov 2021 14:47:40 +0800 Subject: [PATCH] some codes optimization --- .../moo/info/ui/dialog/UpdateDialog.form | 6 +-- .../moo/info/ui/dialog/UpdateDialog.java | 6 +-- .../moo/info/ui/dialog/UpdateInfoDialog.form | 4 +- .../moo/info/ui/dialog/UpdateInfoDialog.java | 4 +- .../luoboduner/moo/info/ui/form/CpuForm.java | 4 ++ .../moo/info/ui/form/NetworkForm.java | 44 ++++++++++++++----- .../moo/info/ui/form/ProcessesForm.java | 15 +++++++ .../luoboduner/moo/info/ui/form/UsbForm.java | 6 +++ .../luoboduner/moo/info/util/ScrollUtil.java | 4 +- 9 files changed, 70 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.form b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.form index 084f7c4..6180000 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.form +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.form @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java index 46e6b11..9a7dfb6 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java @@ -158,13 +158,13 @@ public class UpdateDialog extends JDialog { panel2.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1)); panel1.add(panel2, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); buttonOK = new JButton(); - buttonOK.setText("立即安装"); + buttonOK.setText("Install Now"); panel2.add(buttonOK, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); buttonCancel = new JButton(); - buttonCancel.setText("取消"); + buttonCancel.setText("Cancel"); panel2.add(buttonCancel, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); buttonDownloadFromWeb = new JButton(); - buttonDownloadFromWeb.setText("打开下载页面"); + buttonDownloadFromWeb.setText("Open Download Page"); panel2.add(buttonDownloadFromWeb, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JPanel panel3 = new JPanel(); panel3.setLayout(new GridLayoutManager(4, 1, new Insets(0, 0, 0, 0), -1, -1)); diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.form b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.form index 479456c..2f8f921 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.form +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.form @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java index 948743e..1915900 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java @@ -128,10 +128,10 @@ public class UpdateInfoDialog extends JDialog { panel2.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1)); panel1.add(panel2, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); buttonOK = new JButton(); - buttonOK.setText("立即下载"); + buttonOK.setText("Download Now"); panel2.add(buttonOK, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); buttonCancel = new JButton(); - buttonCancel.setText("取消"); + buttonCancel.setText("Cancel"); panel2.add(buttonCancel, new GridConstraints(0, 1, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final Spacer spacer2 = new Spacer(); panel1.add(spacer2, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); 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 068547a..3251db4 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 @@ -178,6 +178,9 @@ public class CpuForm { } + /** + * Codes are copied from Hutool and have some modifications. + */ private static void initPcuInfo() { CentralProcessor processor = App.si.getHardware().getProcessor(); DecimalFormat format = new DecimalFormat("#.00"); @@ -278,6 +281,7 @@ public class CpuForm { Sensors sensors = App.si.getHardware().getSensors(); cpuForm.getTemperatureLabel().setText(String.format("%.1f°C", sensors.getCpuTemperature())); + // Tips are copied from oshi. cpuForm.getTemperatureLabel().setToolTipText("On Windows, if not running Open Hardware Monitor, \n" + "requires elevated permissions and hardware BIOS that supports publishing to WMI. \n" + "In this case, returns the temperature of the \"Thermal Zone\" \n" + diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/NetworkForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/NetworkForm.java index 95d31f6..9a6867a 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/NetworkForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/NetworkForm.java @@ -81,6 +81,9 @@ public class NetworkForm { serviceStartPerSecond.scheduleAtFixedRate(NetworkForm::initNetworkSpeed, 0, 1, TimeUnit.SECONDS); } + /** + * Codes are copied from oshi and have some modifications. + */ private static void initInterfaces() { JTable interfacesTable = getInstance().getInterfacesTable(); @@ -101,6 +104,8 @@ public class NetworkForm { JTextPane parametersTextPane = networkForm.getParametersTextPane(); parametersTextPane.setContentType("text/plain; charset=utf-8"); + String contentType = "text/html; charset=utf-8"; + parametersTextPane.setContentType(contentType); parametersTextPane.setText(buildParamsText(App.si.getOperatingSystem())); } @@ -161,19 +166,25 @@ public class NetworkForm { } private static String buildParamsText(OperatingSystem os) { - NetworkParams params = os.getNetworkParams(); - StringBuilder sb = new StringBuilder("Host Name: ").append(params.getHostName()); - if (!params.getDomainName().isEmpty()) { - sb.append("\nDomain Name: ").append(params.getDomainName()); - } - sb.append("\nIPv4 Default Gateway: ").append(params.getIpv4DefaultGateway()); - if (!params.getIpv6DefaultGateway().isEmpty()) { - sb.append("\nIPv6 Default Gateway: ").append(params.getIpv6DefaultGateway()); - } - sb.append("\nDNS Servers: ").append(getIPAddressesString(params.getDnsServers())); - return sb.toString(); + NetworkParams networkParams = os.getNetworkParams(); + StringBuilder builder = new StringBuilder(); + builder.append("
"); + builder.append("Domain Name: ").append(networkParams.getDomainName()); + builder.append("
Host Name: ").append(networkParams.getHostName()); + builder.append("
Ipv4 Default Gateway: ").append(networkParams.getIpv4DefaultGateway()); + builder.append("
Ipv6 Default Gateway: ").append(networkParams.getIpv6DefaultGateway()); + builder.append("
Dns Servers: ").append(Arrays.toString(networkParams.getDnsServers())); + builder.append("
"); + builder.append("
"); + return builder.toString(); } + /** + * Codes are copied from oshi and have some modifications. + * + * @param ipAddressArr + * @return + */ private static String getIPAddressesString(String[] ipAddressArr) { StringBuilder sb = new StringBuilder(); boolean first = true; @@ -190,6 +201,12 @@ public class NetworkForm { return sb.toString(); } + /** + * Codes are copied from oshi and have some modifications. + * + * @param list + * @return + */ private static Object[][] parseInterfaces(List list) { Map intfSortValueMap = new HashMap<>(INIT_HASH_SIZE); for (NetworkIF intf : list) { @@ -217,6 +234,11 @@ public class NetworkForm { return intfArr; } + /** + * Codes are copied from oshi and have some modifications. + * + * @param tableColumnModel + */ private static void resizeColumns(TableColumnModel tableColumnModel) { TableColumn column; int tW = tableColumnModel.getTotalColumnWidth(); diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/ProcessesForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/ProcessesForm.java index 34076f0..56ced76 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/ProcessesForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/ProcessesForm.java @@ -58,6 +58,9 @@ public class ProcessesForm { private static void initUi() { } + /** + * Codes are copied from oshi and have some modifications. + */ private static void initInfo() { OperatingSystem os = App.si.getOperatingSystem(); TableModel model = new DefaultTableModel(parseProcesses(os.getProcesses(null, null, 0), App.si), COLUMNS); @@ -94,6 +97,13 @@ public class ProcessesForm { timer.start(); } + /** + * Codes are copied from oshi and have some modifications. + * + * @param list + * @param si + * @return + */ private static Object[][] parseProcesses(List list, SystemInfo si) { long totalMem = si.getHardware().getMemory().getTotal(); int cpuCount = si.getHardware().getProcessor().getLogicalProcessorCount(); @@ -140,6 +150,11 @@ public class ProcessesForm { return procArr; } + /** + * Codes are copied from oshi and have some modifications. + * + * @param tableColumnModel + */ private static void resizeColumns(TableColumnModel tableColumnModel) { TableColumn column; int tW = tableColumnModel.getTotalColumnWidth(); diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/UsbForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/UsbForm.java index dca3ff3..736d21c 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/UsbForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/UsbForm.java @@ -49,6 +49,12 @@ public class UsbForm { infoPane.setText(getUsbString(App.si.getHardware())); } + /** + * Codes are copied from oshi and have some modifications. + * + * @param hal + * @return + */ private static String getUsbString(HardwareAbstractionLayer hal) { StringBuilder sb = new StringBuilder(); boolean first = true; diff --git a/src/main/java/com/luoboduner/moo/info/util/ScrollUtil.java b/src/main/java/com/luoboduner/moo/info/util/ScrollUtil.java index 3a3b63d..a5301cd 100644 --- a/src/main/java/com/luoboduner/moo/info/util/ScrollUtil.java +++ b/src/main/java/com/luoboduner/moo/info/util/ScrollUtil.java @@ -11,8 +11,8 @@ import javax.swing.*; public class ScrollUtil { public static void smoothPane(JScrollPane scrollPane) { - scrollPane.getVerticalScrollBar().setUnitIncrement(16); - scrollPane.getHorizontalScrollBar().setUnitIncrement(16); + scrollPane.getVerticalScrollBar().setUnitIncrement(14); + scrollPane.getHorizontalScrollBar().setUnitIncrement(14); scrollPane.getVerticalScrollBar().setDoubleBuffered(true); scrollPane.getHorizontalScrollBar().setDoubleBuffered(true); }