Browse Source

简化titleBorder生成方式

persist/11.0-arabic
obo 4 months ago
parent
commit
2431b21b67
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
  3. 6
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
  4. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
  5. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java
  6. 2
      designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@ -163,7 +163,7 @@ public class JDBCDefPane extends JPanel {
public JDBCDefPane() {
initMap();
this.setBorder(BidiUtils.applyTitledBorderJustification(UITitledBorder.createBorderWithTitle("JDBC" + ":")));
this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
innerthis.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

2
designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@ -209,7 +209,7 @@ public class FRGUIPaneFactory {
*/
public static JPanel createTitledBorderPane(String string) {
JPanel jp = new JPanel();
UITitledBorder explainBorder = (UITitledBorder) BidiUtils.applyTitledBorderJustification(UITitledBorder.createBorderWithTitle(string));
UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(string);
jp.setBorder(explainBorder);
jp.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT));
return jp;

6
designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@ -87,11 +87,11 @@ public abstract class CustomJobPane extends BasicBeanPane {
}
});
reportletNamePane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null)));
reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null));
this.add(reportletNamePane, BorderLayout.NORTH);
objectProperiesPane = new ObjectProperiesPane();
objectProperiesPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null)));
objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null));
this.add(objectProperiesPane, BorderLayout.CENTER);
UITextArea area = new UITextArea(2, 1);
@ -99,7 +99,7 @@ public abstract class CustomJobPane extends BasicBeanPane {
BidiUtils.setOrientationByLocale(area);
JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
dsPane.add(area);
dsPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null)));
dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null));
this.add(dsPane, BorderLayout.SOUTH);
checkAddButtonEnable();
}

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java

@ -50,7 +50,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
this.add(centerPane, BorderLayout.CENTER);
centerPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell"))));
centerPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell")));
colRowPane = new ColumnRowVerticalPane();
centerPane.add(colRowPane, BorderLayout.NORTH);

2
designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java

@ -100,7 +100,7 @@ public class HeaderFooterEditPane extends JPanel {
JPanel hfPreviewContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.add(hfPreviewContentPane, BorderLayout.CENTER);
hfPreviewContentPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), null)));
hfPreviewContentPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), null));
hfPreviewPane = new HFPreviewPane();
scrollPreviewPane = new JScrollPane(hfPreviewPane);

2
designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java

@ -307,7 +307,7 @@ public class ReportColumnsPane extends BasicPane{
*/
private JPanel createRowPane() {
JPanel rowPane = new JPanel();
UITitledBorder explainBorder = (UITitledBorder) BidiUtils.applyTitledBorderJustification(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Area")));
UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Area"));
rowPane.setBorder(explainBorder);
rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13));
rowPane.setPreferredSize(new Dimension(500,80));

Loading…
Cancel
Save