Skip to content

Commit 026b738

Browse files
rememberberrememberber
authored
Merge pull request #120 from rememberber/develop
Develop
2 parents 5fff01a + 7f7408a commit 026b738

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1533
-306
lines changed

‎download_links.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"windows": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.6.2/MooTool-1.6.2-windows.exe",
3-
"mac": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.6.2/MooTool_1.6.2.dmg",
4-
"macSilicon": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.6.2/MooTool_1.6.2-AppleSilicon.dmg",
5-
"linux": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.6.2/MooTool_1.6.2.deb"
2+
"windows": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.6.5/MooTool-1.6.5-windows.exe",
3+
"mac": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.6.5/MooTool_1.6.5.dmg",
4+
"macSilicon": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.6.5/MooTool_1.6.5-AppleSilicon.dmg",
5+
"linux": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.6.5/MooTool_1.6.5.deb"
66
}

‎pom.xml

+91-19
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.luoboduner.moo.tool</groupId>
88
<artifactId>MooTool</artifactId>
9-
<version>1.6.3</version>
9+
<version>1.6.5</version>
1010
<packaging>jar</packaging>
1111

1212
<name>MooTool</name>
@@ -39,7 +39,7 @@
3939
<flatlaf-fonts-inter.version>4.0</flatlaf-fonts-inter.version>
4040
<rsyntaxtextarea.version>3.5.2</rsyntaxtextarea.version>
4141
<sql-formatter.version>2.0.4</sql-formatter.version>
42-
<google-java-format.version>1.18.1</google-java-format.version>
42+
<javaparser-core.version>3.26.2</javaparser-core.version>
4343
<!-- <jSystemThemeDetector.version>3.8</jSystemThemeDetector.version>-->
4444
<cron-utils.version>9.2.1</cron-utils.version>
4545
<jna.version>5.13.0</jna.version>
@@ -51,6 +51,10 @@
5151
<jalopy.version>1.5rc3</jalopy.version>
5252
<itextpdf.version>5.5.1</itextpdf.version>
5353
<snakeyaml.version>1.23</snakeyaml.version>
54+
<javafaker.version>1.0.2</javafaker.version>
55+
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
56+
<tika.version>3.0.0</tika.version>
57+
<jackson-databind.version>2.13.3</jackson-databind.version>
5458
</properties>
5559

5660
<repositories>
@@ -157,6 +161,10 @@
157161
<artifactId>kotlin-stdlib-common</artifactId>
158162
<groupId>org.jetbrains.kotlin</groupId>
159163
</exclusion>
164+
<!-- <exclusion>-->
165+
<!-- <artifactId>annotations</artifactId>-->
166+
<!-- <groupId>org.jetbrains</groupId>-->
167+
<!-- </exclusion>-->
160168
</exclusions>
161169
</dependency>
162170

@@ -188,13 +196,25 @@
188196
<groupId>com.formdev</groupId>
189197
<artifactId>flatlaf-fonts-jetbrains-mono</artifactId>
190198
<version>${flatlaf-fonts-jetbrains-mono.version}</version>
199+
<exclusions>
200+
<exclusion>
201+
<artifactId>flatlaf</artifactId>
202+
<groupId>com.formdev</groupId>
203+
</exclusion>
204+
</exclusions>
191205
</dependency>
192206

193-
<dependency>
194-
<groupId>com.formdev</groupId>
195-
<artifactId>flatlaf-fonts-inter</artifactId>
196-
<version>${flatlaf-fonts-inter.version}</version>
197-
</dependency>
207+
<!-- <dependency>-->
208+
<!-- <groupId>com.formdev</groupId>-->
209+
<!-- <artifactId>flatlaf-fonts-inter</artifactId>-->
210+
<!-- <version>${flatlaf-fonts-inter.version}</version>-->
211+
<!-- <exclusions>-->
212+
<!-- <exclusion>-->
213+
<!-- <artifactId>flatlaf</artifactId>-->
214+
<!-- <groupId>com.formdev</groupId>-->
215+
<!-- </exclusion>-->
216+
<!-- </exclusions>-->
217+
<!-- </dependency>-->
198218

199219
<!-- https://mvnrepository.com/artifact/com.fifesoft/rsyntaxtextarea -->
200220
<dependency>
@@ -209,18 +229,6 @@
209229
<version>${sql-formatter.version}</version>
210230
</dependency>
211231

212-
<!-- <dependency>-->
213-
<!-- <groupId>com.google.googlejavaformat</groupId>-->
214-
<!-- <artifactId>google-java-format</artifactId>-->
215-
<!-- <version>${google-java-format.version}</version>-->
216-
<!-- <exclusions>-->
217-
<!-- <exclusion>-->
218-
<!-- <artifactId>guava</artifactId>-->
219-
<!-- <groupId>com.google.guava</groupId>-->
220-
<!-- </exclusion>-->
221-
<!-- </exclusions>-->
222-
<!-- </dependency>-->
223-
224232
<dependency>
225233
<groupId>com.jayway.jsonpath</groupId>
226234
<artifactId>json-path</artifactId>
@@ -261,6 +269,12 @@
261269
<groupId>com.github.oshi</groupId>
262270
<artifactId>oshi-core</artifactId>
263271
<version>${oshi-core.version}</version>
272+
<exclusions>
273+
<exclusion>
274+
<artifactId>slf4j-api</artifactId>
275+
<groupId>org.slf4j</groupId>
276+
</exclusion>
277+
</exclusions>
264278
</dependency>
265279

266280
<dependency>
@@ -312,6 +326,64 @@
312326
<version>5.1.0</version>
313327
</dependency>-->
314328

329+
<dependency>
330+
<groupId>com.github.javaparser</groupId>
331+
<artifactId>javaparser-core</artifactId>
332+
<version>${javaparser-core.version}</version>
333+
</dependency>
334+
335+
<dependency>
336+
<groupId>com.github.javafaker</groupId>
337+
<artifactId>javafaker</artifactId>
338+
<version>${javafaker.version}</version>
339+
<exclusions>
340+
<exclusion>
341+
<artifactId>commons-lang3</artifactId>
342+
<groupId>org.apache.commons</groupId>
343+
</exclusion>
344+
</exclusions>
345+
</dependency>
346+
347+
<!-- <dependency>-->
348+
<!-- <groupId>org.bouncycastle</groupId>-->
349+
<!-- <artifactId>bcprov-jdk15on</artifactId>-->
350+
<!-- <version>${bcprov-jdk15on.version}</version>-->
351+
<!-- </dependency>-->
352+
353+
<!-- <dependency>-->
354+
<!-- <groupId>org.apache.tika</groupId>-->
355+
<!-- <artifactId>tika-core</artifactId>-->
356+
<!-- <version>${tika.version}</version>-->
357+
<!-- <exclusions>-->
358+
<!-- <exclusion>-->
359+
<!-- <artifactId>slf4j-api</artifactId>-->
360+
<!-- <groupId>org.slf4j</groupId>-->
361+
<!-- </exclusion>-->
362+
<!-- </exclusions>-->
363+
<!-- </dependency>-->
364+
365+
<!-- <dependency>-->
366+
<!-- <groupId>org.apache.tika</groupId>-->
367+
<!-- <artifactId>tika-langdetect-optimaize</artifactId>-->
368+
<!-- <version>${tika.version}</version>-->
369+
<!-- <exclusions>-->
370+
<!-- <exclusion>-->
371+
<!-- <artifactId>guava</artifactId>-->
372+
<!-- <groupId>com.google.guava</groupId>-->
373+
<!-- </exclusion>-->
374+
<!-- <exclusion>-->
375+
<!-- <artifactId>slf4j-api</artifactId>-->
376+
<!-- <groupId>org.slf4j</groupId>-->
377+
<!-- </exclusion>-->
378+
<!-- </exclusions>-->
379+
<!-- </dependency>-->
380+
381+
<!-- <dependency>-->
382+
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
383+
<!-- <artifactId>jackson-databind</artifactId>-->
384+
<!-- <version>${jackson-databind.version}</version>-->
385+
<!-- </dependency>-->
386+
315387
</dependencies>
316388

317389
<build>

‎src/main/java/com/luoboduner/moo/tool/App.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import cn.hutool.core.io.FileUtil;
44
import com.formdev.flatlaf.FlatLaf;
55
import com.formdev.flatlaf.extras.FlatDesktop;
6-
import com.formdev.flatlaf.extras.FlatInspector;
7-
import com.formdev.flatlaf.extras.FlatUIDefaultsInspector;
86
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
97
import com.formdev.flatlaf.util.SystemInfo;
108
import com.luoboduner.moo.tool.ui.Init;
@@ -91,8 +89,8 @@ public static void main(String[] args) {
9189
Init.initTheme();
9290

9391
// install inspectors
94-
FlatInspector.install("ctrl shift alt X");
95-
FlatUIDefaultsInspector.install("ctrl shift alt Y");
92+
// FlatInspector.install("ctrl shift alt X");
93+
// FlatUIDefaultsInspector.install("ctrl shift alt Y");
9694

9795
mainFrame = new MainFrame();
9896
mainFrame.init();

‎src/main/java/com/luoboduner/moo/tool/domain/TQuickNote.java

+10
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public class TQuickNote {
2121

2222
private String syntax;
2323

24+
private String lineWrap;
25+
2426
public Integer getId() {
2527
return id;
2628
}
@@ -100,4 +102,12 @@ public String getSyntax() {
100102
public void setSyntax(String syntax) {
101103
this.syntax = syntax == null ? null : syntax.trim();
102104
}
105+
106+
public String getLineWrap() {
107+
return lineWrap;
108+
}
109+
110+
public void setLineWrap(String lineWrap) {
111+
this.lineWrap = lineWrap == null ? null : lineWrap.trim();
112+
}
103113
}

‎src/main/java/com/luoboduner/moo/tool/ui/Init.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static void initGlobalFont() {
6666

6767
// Mac等高分辨率屏幕字号初始化
6868
if (SystemUtil.isMacOs()) {
69-
fontSize = 14;
69+
fontSize = 12;
7070
} else {
7171
// fontSize = (int) (UIUtil.getScreenScale() * fontSize);
7272
}
@@ -214,6 +214,7 @@ public static void initAllTab() {
214214
ThreadUtil.execute(ImageForm::init);
215215
ThreadUtil.execute(VariablesForm::init);
216216
ThreadUtil.execute(YmlPropertiesForm::init);
217+
ThreadUtil.execute(FileReformattingForm::init);
217218

218219
// 检查新版版
219220
if (App.config.isAutoCheckUpdate()) {

‎src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class UiConsts {
1919
* 软件名称,版本
2020
*/
2121
public static final String APP_NAME = "MooTool";
22-
public static final String APP_VERSION = "v1.6.3";
22+
public static final String APP_VERSION = "v1.6.5";
2323

2424
public static final int TABLE_ROW_HEIGHT = 30;
2525

‎src/main/java/com/luoboduner/moo/tool/ui/component/textviewer/QuickNoteRSyntaxTextViewer.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.luoboduner.moo.tool.ui.component.textviewer;
22

33
import com.formdev.flatlaf.FlatLaf;
4-
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
54
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
65
import com.formdev.flatlaf.util.FontUtils;
76
import com.formdev.flatlaf.util.StringUtils;
@@ -157,9 +156,11 @@ public void updateTheme() {
157156
Font font;
158157
if (FlatJetBrainsMonoFont.FAMILY.equals(fontName)) {
159158
font = FontUtils.getCompositeFont(FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, fontSize);
160-
} else if (FlatInterFont.FAMILY.equals(fontName)) {
161-
font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, fontSize);
162-
} else {
159+
}
160+
// else if (FlatInterFont.FAMILY.equals(fontName)) {
161+
// font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, fontSize);
162+
// }
163+
else {
163164
font = new Font(fontName, Font.PLAIN, fontSize);
164165
}
165166
setFont(font);

‎src/main/java/com/luoboduner/moo/tool/ui/component/textviewer/QuickNoteRSyntaxTextViewerManager.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.luoboduner.moo.tool.ui.component.textviewer;
22

33
import com.formdev.flatlaf.FlatLaf;
4-
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
54
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
65
import com.formdev.flatlaf.util.FontUtils;
76
import com.luoboduner.moo.tool.App;
@@ -47,9 +46,11 @@ public RTextScrollPane getRTextScrollPane(String name) {
4746
Font font;
4847
if (FlatJetBrainsMonoFont.FAMILY.equals(tQuickNote.getFontName())) {
4948
font = FontUtils.getCompositeFont(FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
50-
} else if (FlatInterFont.FAMILY.equals(tQuickNote.getFontName())) {
51-
font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
52-
} else {
49+
}
50+
// else if (FlatInterFont.FAMILY.equals(tQuickNote.getFontName())) {
51+
// font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
52+
// }
53+
else {
5354
font = new Font(tQuickNote.getFontName(), Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
5455
}
5556
plainTextViewer.setFont(font);
@@ -78,9 +79,11 @@ public void updateFont(String name) {
7879
Font font;
7980
if (FlatJetBrainsMonoFont.FAMILY.equals(tQuickNote.getFontName())) {
8081
font = FontUtils.getCompositeFont(FlatJetBrainsMonoFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
81-
} else if (FlatInterFont.FAMILY.equals(tQuickNote.getFontName())) {
82-
font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
83-
} else {
82+
}
83+
// else if (FlatInterFont.FAMILY.equals(tQuickNote.getFontName())) {
84+
// font = FontUtils.getCompositeFont(FlatInterFont.FAMILY, Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
85+
// }
86+
else {
8487
font = new Font(tQuickNote.getFontName(), Font.PLAIN, Integer.parseInt(tQuickNote.getFontSize()));
8588
}
8689
plainTextViewer.setFont(font);

‎src/main/java/com/luoboduner/moo/tool/ui/dialog/JsonResultDialog.form

+34-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.luoboduner.moo.tool.ui.dialog.JsonResultDialog">
3-
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
3+
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="0" left="0" bottom="0" right="0"/>
55
<constraints>
66
<xy x="48" y="54" width="436" height="297"/>
@@ -9,9 +9,9 @@
99
<border type="none"/>
1010
<children>
1111
<grid id="94766" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
12-
<margin top="0" left="10" bottom="10" right="10"/>
12+
<margin top="10" left="10" bottom="10" right="10"/>
1313
<constraints>
14-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
14+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
1515
</constraints>
1616
<properties/>
1717
<border type="none"/>
@@ -41,13 +41,41 @@
4141
</grid>
4242
</children>
4343
</grid>
44-
<grid id="e3588" binding="mainPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
44+
<grid id="749aa" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
45+
<margin top="10" left="10" bottom="10" right="10"/>
4546
<constraints>
46-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
47+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
4748
</constraints>
4849
<properties/>
4950
<border type="none"/>
50-
<children/>
51+
<children>
52+
<component id="52917" class="javax.swing.JLabel" binding="tipsLabel">
53+
<constraints>
54+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
55+
</constraints>
56+
<properties>
57+
<text value=""/>
58+
</properties>
59+
</component>
60+
</children>
61+
</grid>
62+
<grid id="b4d96" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
63+
<margin top="0" left="10" bottom="0" right="10"/>
64+
<constraints>
65+
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
66+
</constraints>
67+
<properties/>
68+
<border type="none"/>
69+
<children>
70+
<grid id="e3588" binding="mainPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
71+
<constraints>
72+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
73+
</constraints>
74+
<properties/>
75+
<border type="none"/>
76+
<children/>
77+
</grid>
78+
</children>
5179
</grid>
5280
</children>
5381
</grid>

0 commit comments

Comments
 (0)