From 25f6edc3ed7ed4b2291e942cacfc0bec959dc339 Mon Sep 17 00:00:00 2001
From: rememberber <rememberber@163.com>
Date: Fri, 22 Nov 2024 17:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9A=8F=E6=89=8B=E8=AE=B0?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84java=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 13 -------------
 .../java/com/luoboduner/moo/tool/App.java     |  6 ++----
 .../ui/listener/func/QuickNoteListener.java   | 19 ++-----------------
 3 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 10568b04..bf2fbfd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
         <flatlaf-fonts-inter.version>4.0</flatlaf-fonts-inter.version>
         <rsyntaxtextarea.version>3.5.2</rsyntaxtextarea.version>
         <sql-formatter.version>2.0.4</sql-formatter.version>
-        <google-java-format.version>1.18.1</google-java-format.version>
         <javaparser-core.version>3.26.2</javaparser-core.version>
         <!--        <jSystemThemeDetector.version>3.8</jSystemThemeDetector.version>-->
         <cron-utils.version>9.2.1</cron-utils.version>
@@ -210,18 +209,6 @@
             <version>${sql-formatter.version}</version>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>com.google.googlejavaformat</groupId>-->
-        <!--            <artifactId>google-java-format</artifactId>-->
-        <!--            <version>${google-java-format.version}</version>-->
-        <!--            <exclusions>-->
-        <!--                <exclusion>-->
-        <!--                    <artifactId>guava</artifactId>-->
-        <!--                    <groupId>com.google.guava</groupId>-->
-        <!--                </exclusion>-->
-        <!--            </exclusions>-->
-        <!--        </dependency>-->
-
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
diff --git a/src/main/java/com/luoboduner/moo/tool/App.java b/src/main/java/com/luoboduner/moo/tool/App.java
index aa54e33e..7e239e9a 100644
--- a/src/main/java/com/luoboduner/moo/tool/App.java
+++ b/src/main/java/com/luoboduner/moo/tool/App.java
@@ -3,8 +3,6 @@ package com.luoboduner.moo.tool;
 import cn.hutool.core.io.FileUtil;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.extras.FlatDesktop;
-import com.formdev.flatlaf.extras.FlatInspector;
-import com.formdev.flatlaf.extras.FlatUIDefaultsInspector;
 import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.luoboduner.moo.tool.ui.Init;
@@ -91,8 +89,8 @@ public class App {
         Init.initTheme();
 
         // install inspectors
-        FlatInspector.install("ctrl shift alt X");
-        FlatUIDefaultsInspector.install("ctrl shift alt Y");
+//        FlatInspector.install("ctrl shift alt X");
+//        FlatUIDefaultsInspector.install("ctrl shift alt Y");
 
         mainFrame = new MainFrame();
         mainFrame.init();
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/listener/func/QuickNoteListener.java b/src/main/java/com/luoboduner/moo/tool/ui/listener/func/QuickNoteListener.java
index 083a7a87..cfdcfceb 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/listener/func/QuickNoteListener.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/listener/func/QuickNoteListener.java
@@ -19,7 +19,7 @@ import com.luoboduner.moo.tool.util.ListUtils;
 import com.luoboduner.moo.tool.util.MybatisUtil;
 import com.luoboduner.moo.tool.util.QuickNoteIndicatorTools;
 import com.luoboduner.moo.tool.util.SqliteUtil;
-import de.hunsicker.jalopy.Jalopy;
+import com.luoboduner.moo.tool.util.codeformatter.CodeFormatterFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,7 +36,6 @@ import javax.swing.table.DefaultTableModel;
 import java.awt.*;
 import java.awt.event.*;
 import java.io.File;
-import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.Arrays;
@@ -871,22 +870,8 @@ public class QuickNoteListener {
                     break;
 
                 case SyntaxConstants.SYNTAX_STYLE_JAVA:
-//                    format = new Formatter().formatSource(text);
-                    Jalopy jalopy = new Jalopy();
-
-                    StringWriter stringWriter = new StringWriter();
-                    File tempFile = FileUtil.touch(App.tempDir + File.separator + "temp.java");
-                    FileUtil.writeUtf8String(text, tempFile);
-                    jalopy.setInput(tempFile);
-                    jalopy.setOutput(stringWriter);
-                    boolean result = jalopy.format();
-                    if (!result) {
-                        throw new Exception("格式化失败！");
-                    }
-
-                    format = stringWriter.toString();
+                    format = CodeFormatterFactory.getFormatter(CodeFormatterFactory.FormatterType.JAVA).format(text);
                     break;
-
                 default:
                     JOptionPane.showMessageDialog(App.mainFrame, "尚不支持对该语言格式化！\n", "不支持该语言",
                             JOptionPane.INFORMATION_MESSAGE);