fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

简化titleBorder生成方式

persist/11.0-arabic
obo 4 months ago
parent
042f0ff75d
commit
2431b21b67
6 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

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

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

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

@ -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); this.add(reportletNamePane, BorderLayout.NORTH);
objectProperiesPane = new ObjectProperiesPane(); 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); this.add(objectProperiesPane, BorderLayout.CENTER);
UITextArea area = new UITextArea(2, 1); UITextArea area = new UITextArea(2, 1);
@ -99,7 +99,7 @@ public abstract class CustomJobPane extends BasicBeanPane {
BidiUtils.setOrientationByLocale(area); BidiUtils.setOrientationByLocale(area);
JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
dsPane.add(area); 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); this.add(dsPane, BorderLayout.SOUTH);
checkAddButtonEnable(); checkAddButtonEnable();
} }

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

@ -50,7 +50,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
this.add(centerPane, BorderLayout.CENTER); 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(); colRowPane = new ColumnRowVerticalPane();
centerPane.add(colRowPane, BorderLayout.NORTH); centerPane.add(colRowPane, BorderLayout.NORTH);

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

@ -100,7 +100,7 @@ public class HeaderFooterEditPane extends JPanel {
JPanel hfPreviewContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel hfPreviewContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.add(hfPreviewContentPane, BorderLayout.CENTER); 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(); hfPreviewPane = new HFPreviewPane();
scrollPreviewPane = new JScrollPane(hfPreviewPane); scrollPreviewPane = new JScrollPane(hfPreviewPane);

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

@ -307,7 +307,7 @@ public class ReportColumnsPane extends BasicPane{
*/ */
private JPanel createRowPane() { private JPanel createRowPane() {
JPanel rowPane = new JPanel(); 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.setBorder(explainBorder);
rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13)); rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13));
rowPane.setPreferredSize(new Dimension(500,80)); rowPane.setPreferredSize(new Dimension(500,80));

Write Preview
Loading…
Cancel
Save