diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java index dbc7c54464..041f4db0c5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java @@ -15,7 +15,6 @@ import java.awt.CardLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import static com.fine.swing.ui.layout.Layouts.column; import static com.fine.swing.ui.layout.Layouts.row; import static com.fine.swing.ui.layout.Layouts.cell; @@ -37,7 +36,7 @@ public class ReportletPane extends BasicPane { UILabel tipLabel = new UILabel(); tipLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Schedule_The_Selected_File_Must_Be_End_With_Filter")); tipLabel.setForeground(FineUIUtils.getUIColor("Label.tipColor", "Label.tipColor")); - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + JPanel centerPane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(0, 6)); this.add(centerPane, BorderLayout.CENTER); switchButton = new UIButton("switch"); @@ -53,13 +52,14 @@ public class ReportletPane extends BasicPane { cardPane.setLayout(card = new CardLayout()); templateReportletTree = new TemplateFileTree(); templateReportletTree.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal")); - templateReportletTree.setBorder(FineBorderFactory.createWrappedRoundBorder()); IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form", ".cptx"}); templateReportletTree.setFileNodeFilter(filter); cardPane.add(t_panel = new JScrollPane(templateReportletTree), "TEMPLATE"); classReportletTree = new ClassFileTree(); cardPane.add(c_panel = new JScrollPane(classReportletTree), "CLASS"); - centerPane.add(column(6, cell(buttonPane), cell(cardPane)).getComponent()); + cardPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); + centerPane.add(buttonPane, BorderLayout.NORTH); + centerPane.add(cardPane, BorderLayout.CENTER); this.refreshEnv(); }