移除过时api

Author: bestv5

build.gradle

@@ -17,12 +17,13 @@ repositories {
 }
 
 dependencies {
+    implementation 'org.apache.commons:commons-text:1.12.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }
 
 group 'com.haojiyou'
-version '1.6.0'
+version '1.6.1'
 
 apply plugin: 'org.kordamp.gradle.markdown'
 apply plugin: 'java'
@@ -39,7 +40,7 @@ intellij {
 //    version = 'IC-2021.1.3'
     version = 'IC-2020.3'
     pluginName = 'CharAutoReplace'
-    updateSinceUntilBuild = false
+    updateSinceUntilBuild = true
 
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11

docs/CHANGELOG.html

@@ -1,4 +1,8 @@
 <p>---</p>
+<h1>1.6.1</h1>
+<ul>
+  <li>移除过时的api</li>
+</ul>
 <h1>1.6.0</h1>
 <ul>
   <li>add auto replace in comment area config  (default config will not be replaced in comment).<br/> (settings - Tools - CharAutoReplace).</li>

docs/CHANGELOG.md

@@ -1,4 +1,7 @@
 ---
+# 1.6.1
+* 移除过时的api
+
 # 1.6.0
 * add auto replace in comment area  config
   (default config will not be replaced in comment).  

src/main/java/com/haojiyou/cnchar/CnCharSettingComponent.java

@@ -13,7 +13,8 @@
 import java.awt.event.MouseListener;
 
 public class CnCharSettingComponent implements Configurable {
-    public static final int LENGTH = 45;
+    public static final int LENGTH = 30;
+    public static final int ROW = 10;
     public static final String DEFAULT_STRING = "， , 。 . ： : ； ; ！ ! ？ ? “ \" ” \" ‘ ' ’ ' 【 [ 】 ] （ ( ） ) 「 { 」 } 《 < 》 > 、 /".replace(" ",
             "\n");
     public static final String KEY = "cnchar_config_string";
@@ -29,6 +30,8 @@ public class CnCharSettingComponent implements Configurable {
     private JCheckBox isReplaceMsgHit;
     private JCheckBox replaceInCommentCheckBox;
 
+    private JTextArea extensionWhitelist;
+
     public static void main(String[] args) {
         String[] a = DEFAULT_STRING.split("\n");
         for (int i = 0; i < a.length; i += 2) {
@@ -56,6 +59,7 @@ public JComponent createComponent() {
             settingPanel.repaint();
             return settingPanel;
         }
+
         settingPanel = new JPanel();
         settingPanel.setLayout(null);
         text1 = new JTextField[LENGTH];
@@ -67,10 +71,10 @@ public JComponent createComponent() {
             text2[i] = new JTextField();
             labels1[i] = new JLabel();
             labels2[i] = new JLabel();
-            text1[i].setBounds(35 + (i / 15) * 200, 32 * (i % 15), 60, 32);
-            text2[i].setBounds(120 + (i / 15) * 200, 32 * (i % 15), 60, 32);
-            labels1[i].setBounds(5 + (i / 15) * 200, 32 * (i % 15), 30, 32);
-            labels2[i].setBounds(95 + (i / 15) * 200, 32 * (i % 15), 25, 32);
+            text1[i].setBounds(35 + (i / ROW) * 200, 32 * (i % ROW), 60, 32);
+            text2[i].setBounds(120 + (i / ROW) * 200, 32 * (i % ROW), 60, 32);
+            labels1[i].setBounds(5 + (i / ROW) * 200, 32 * (i % ROW), 30, 32);
+            labels2[i].setBounds(95 + (i / ROW) * 200, 32 * (i % ROW), 25, 32);
             labels1[i].setText((i + 1) + ".");
             labels2[i].setText("->");
             labels1[i].setHorizontalAlignment(JLabel.CENTER);
@@ -94,7 +98,16 @@ public JComponent createComponent() {
         replaceInCommentCheckBox.setBounds(30, 34 * 15, 250, 32);
         replaceInCommentCheckBox.setSelected(ReplaceCharConfig.replaceInComment);
         settingPanel.add(replaceInCommentCheckBox);
-
+        //JLabel text = new JLabel();
+        //text.setText("不进行替换的文件扩展名配置。格式:.java");
+        //text.setForeground(JBColor.BLUE);
+        //text.setBounds(30, 36 * 15, 60, 32);
+        ////替换白名单
+        //extensionWhitelist = new JTextArea();
+        //extensionWhitelist.setEditable(true);
+        //extensionWhitelist.setText("fsfs");
+        //extensionWhitelist.setBounds(30, 25*15, 250,32);
+        //settingPanel.add(extensionWhitelist);
 
         btnDefault = new JLabel();
         btnDefault.setText("恢复默认");

src/main/java/com/haojiyou/cnchar/service/HintService.java

@@ -10,7 +10,7 @@
 import com.intellij.openapi.editor.impl.EditorImpl;
 import com.intellij.ui.LightweightHint;
 import com.intellij.util.ui.accessibility.AccessibleContextUtil;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import javax.swing.*;
 import javax.swing.event.HyperlinkListener;
@@ -62,8 +62,8 @@ public void showHint(EditorImpl editor, int logicalPositionLine,int logicalPosit
 
 
     public String createHint(String original, String replacement) {
-        original = originalHtml(StringEscapeUtils.escapeHtml(original));
-        replacement = replacement(StringEscapeUtils.escapeHtml(replacement));
+        original = originalHtml(StringEscapeUtils.escapeHtml4(original));
+        replacement = replacement(StringEscapeUtils.escapeHtml4(replacement));
         String title = "提示: ";
         String content = original + "已被改为" + replacement;
         String apply = "如果不需要替换，请按[撤回]的快捷键还原.";