From 3b09edb2224f8bd396a96a4d60690998c7fdc74b Mon Sep 17 00:00:00 2001 From: xiqiu Date: Fri, 25 Jun 2021 17:54:30 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-54354=20=20=E5=8E=BB=E6=8E=89=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabledatapane/ClassTableDataPane.java | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java index b454ddd89f..e2f7efc70b 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java @@ -4,7 +4,6 @@ import com.fr.base.Parameter; import com.fr.data.impl.ClassTableData; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; -import com.fr.design.formula.JavaEditorPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itableeditorpane.ParameterTableModel; @@ -15,14 +14,18 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.IOUtils; - import com.fr.script.Calculator; import com.fr.stable.ParameterProvider; import com.fr.stable.StableUtils; import com.fr.stable.project.ProjectConstants; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dialog; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -65,30 +68,6 @@ public class ClassTableDataPane extends AbstractTableDataPane { dlg.setVisible(true); } }); - UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); - editButton.setPreferredSize(new Dimension( - editButton.getPreferredSize().width, - classNameTextField.getPreferredSize().height)); - reportletNamePane.add(editButton); - editButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - final JavaEditorPane javaEditorPane = new JavaEditorPane(classNameTextField.getText(), JavaEditorPane.DEFAULT_TABLEDATA_STRING); - final BasicDialog dlg = javaEditorPane.showMediumWindow(SwingUtilities.getWindowAncestor(ClassTableDataPane.this), - new DialogActionAdapter() { - public void doOk() { - classNameTextField.setText(javaEditorPane.getClassText()); - } - }); - - javaEditorPane.addSaveActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - dlg.doOK(); - } - }); - dlg.setVisible(true); - } - }); Component[][] components = { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane},