From a0a5863234fc344817336b70593d773e376d8d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=2EYing-=E5=BA=94=E5=BF=97=E6=B5=A9?=
 <John.Ying@fanruan.com>
Date: Sun, 23 Apr 2023 12:43:24 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-92628=20=E6=8E=A7=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2-=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=8E=A7=E4=BB=B6=E6=9C=AA=E5=AE=9E=E7=8E=B0=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE--=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ExtraButtonPane.java => AbstractExtraButtonPane.java}  | 2 +-
 .../fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java | 2 +-
 .../fr/design/widget/ui/btn/AppendRowButtonDefinePane.java  | 6 +++---
 .../fr/design/widget/ui/btn/DefaultButtonDetailPane.java    | 2 +-
 .../fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java  | 2 +-
 .../com/fr/design/widget/ui/btn/FreeButtonDetailPane.java   | 2 +-
 .../widget/ui/btn/TreeNodeToogleButtonDefinePane.java       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename designer-form/src/main/java/com/fr/design/widget/ui/btn/{ExtraButtonPane.java => AbstractExtraButtonPane.java} (97%)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/btn/ExtraButtonPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/btn/AbstractExtraButtonPane.java
similarity index 97%
rename from designer-form/src/main/java/com/fr/design/widget/ui/btn/ExtraButtonPane.java
rename to designer-form/src/main/java/com/fr/design/widget/ui/btn/AbstractExtraButtonPane.java
index d9d9e35b86..67b8e4d26c 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/btn/ExtraButtonPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/btn/AbstractExtraButtonPane.java
@@ -28,7 +28,7 @@ import java.util.Set;
  * @since 11.0
  * Created on 2023/4/19
  */
-public abstract class ExtraButtonPane<T extends Button> extends ButtonWithHotkeysDetailPane<T> {
+public abstract class AbstractExtraButtonPane<T extends Button> extends ButtonWithHotkeysDetailPane<T> {
     protected JPanel extraPane;
     protected boolean containsExtraPane;
     protected static double F = TableLayout.FILL;
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java
index 374a58ca5f..77a735df54 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java
@@ -11,7 +11,7 @@ import java.awt.*;
  * @since 11.0
  * Created on 2023/4/19
  */
-public class FormSubmitButtonDetailPane extends ExtraButtonPane<FormSubmitButton> {
+public class FormSubmitButtonDetailPane extends AbstractExtraButtonPane<FormSubmitButton> {
 
     @Override
     protected Component createCenterPane() {
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java
index 64faed484d..981295a1ee 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java
@@ -3,10 +3,10 @@ package com.fr.design.widget.ui.btn;
 import com.fr.base.IconManager;
 
 
-import com.fr.design.layout.TableLayoutHelper;
+
 
 import com.fr.report.web.button.write.AppendRowButton;
-import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane;
+
 
 import java.awt.*;
 
@@ -18,7 +18,7 @@ import java.awt.*;
  * @since 11.0
  * Created on 2023/4/19
  */
-public class AppendRowButtonDefinePane<T extends AppendRowButton> extends ExtraButtonPane<AppendRowButton> {
+public class AppendRowButtonDefinePane<T extends AppendRowButton> extends AbstractExtraButtonPane<AppendRowButton> {
     private DefineAppendColumnRowPane defineColumnRowPane;
 
 //	@Override
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java
index 2c92e92d9d..84239e9048 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java
@@ -15,7 +15,7 @@ import java.awt.*;
  * @since 11.0
  * Created on 2023/4/19
  */
-public class DefaultButtonDetailPane extends ExtraButtonPane<Button> {
+public class DefaultButtonDetailPane extends AbstractExtraButtonPane<Button> {
 
     @Override
     protected Component createCenterPane() {
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java
index 6c1d417677..7476657e4d 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java
@@ -13,7 +13,7 @@ import java.awt.*;
  * @since 11.0
  * Created on 2023/4/19
  */
-public class DeleteRowButtonDefinePane<T extends DeleteRowButton> extends ExtraButtonPane<DeleteRowButton> {
+public class DeleteRowButtonDefinePane<T extends DeleteRowButton> extends AbstractExtraButtonPane<DeleteRowButton> {
     private DefineDeleteColumnRowPane ddcp;
 
     @Override
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java
index 90ca76c482..c2f0ed4f34 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java
@@ -11,7 +11,7 @@ import com.fr.form.ui.FreeButton;
  * @since 11.0
  * Created on 2023/4/19
  */
-public class FreeButtonDetailPane extends ExtraButtonPane<FreeButton> {
+public class FreeButtonDetailPane extends AbstractExtraButtonPane<FreeButton> {
 	private ButtonSytleDefinedPane buttonSytleDefinedPane;
 
 	@Override
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
index eba53416e4..1796b3e054 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
@@ -20,7 +20,7 @@ import java.awt.*;
  * @since 11.0
  * Created on 2023/4/19
  */
-public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> extends ExtraButtonPane<Button> {
+public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> extends AbstractExtraButtonPane<Button> {
 
     public TreeNodeToogleButtonDefinePane() {
         initComponents();