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

标签创建方式重构还原-designer-base部分

persist/11.0-arabic
obo 8 months ago
parent
64bf604d1d
commit
b7de6b1e30
18 changed files with 43 additions and 56 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/condition/LiteConditionPane.java
  2. 3
      designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java
  3. 12
      designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
  4. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
  5. 10
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java
  6. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java
  7. 5
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  8. 10
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
  9. 4
      designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
  10. 4
      designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java
  11. 19
      designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
  12. 2
      designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java
  13. 5
      designer-base/src/main/java/com/fr/design/javascript/EmailPane.java
  14. 5
      designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java
  15. 2
      designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java
  16. 5
      designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java
  17. 5
      designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java
  18. 2
      designer-base/src/main/java/com/fr/env/LocalEnvPane.java

2
designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
Unescape View File

@ -495,7 +495,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
this.add(conditonTypePane, BorderLayout.NORTH); this.add(conditonTypePane, BorderLayout.NORTH);
conditonTypePane.setBorder(new ModLineBorder(ModLineBorder.BOTTOM)); conditonTypePane.setBorder(new ModLineBorder(ModLineBorder.BOTTOM));
UILabel conditionTypeLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type"), ":")); UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type") + ":");
conditonTypePane.add(conditionTypeLabel, BorderLayout.LINE_START); conditonTypePane.add(conditionTypeLabel, BorderLayout.LINE_START);
conditionTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0)); conditionTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0));

3
designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java
Unescape View File

@ -5,7 +5,6 @@ import java.awt.Component;
import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultComboBoxModel;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import javax.swing.JList; import javax.swing.JList;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -81,7 +80,7 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPaneWithGlobalListener(); conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPaneWithGlobalListener();
Component[][] components = { { new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Operator"), ":")), new UILabel() }, Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Operator") + ":"), new UILabel() },
{ conditionOPComboBox, conditionValuePane } }; { conditionOPComboBox, conditionValuePane } };
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;

12
designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
Unescape View File

@ -1,6 +1,5 @@
package com.fr.design.data.datapane.connect; package com.fr.design.data.datapane.connect;
import com.fr.base.i18n.BidiUtils;
import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.impl.JDBCDatabaseConnection;
import com.fr.data.pool.DBCPConnectionPoolAttr; import com.fr.data.pool.DBCPConnectionPoolAttr;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
@ -42,10 +41,10 @@ public class AdvancePane extends BasicPane {
double[] rowSizeDbcp = {p, p, p, p}; double[] rowSizeDbcp = {p, p, p, p};
double[] columnDbcp = {190, p}; double[] columnDbcp = {190, p};
Component[][] comps = { Component[][] comps = {
{createUILabel("Fine-Design_Basic_Dbcp_Max_Active"), DBCP_MAX_ACTIVE}, {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.TRAILING), DBCP_MAX_ACTIVE},
{createUILabel("Fine-Design_Basic_Dbcp_Validation_Query"), DBCP_VALIDATION_QUERY}, {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.TRAILING), DBCP_VALIDATION_QUERY},
{createUILabel("Fine-Design_Basic_Dbcp_Test_On_Borrow"), DBCP_TESTONBORROW}, {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.TRAILING), DBCP_TESTONBORROW},
{createUILabel("Fine-Design_Basic_Connection_Pool_Max_Wait_Time"), DBCP_MAX_WAIT} {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.TRAILING), DBCP_MAX_WAIT}
}; };
JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSizeDbcp, columnDbcp, 11, 11); JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSizeDbcp, columnDbcp, 11, 11);
@ -53,9 +52,6 @@ public class AdvancePane extends BasicPane {
this.add(jPanel); this.add(jPanel);
} }
private UILabel createUILabel(String i18nKey) {
return new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText(i18nKey), ":"), SwingConstants.TRAILING);
}
public void populate(JDBCDatabaseConnection jdbcDatabase) { public void populate(JDBCDatabaseConnection jdbcDatabase) {
DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr(); DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
Unescape View File

@ -279,7 +279,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")}; String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")};
charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY)); charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
JPanel chartSetPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); JPanel chartSetPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, Toolkit.i18nText(BidiUtils.reverseConcatenateStrings("Fine-Design_Basic_Datasource_Charset"), ":"))); chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":"));
advancedPanel.add(chartSetPane); advancedPanel.add(chartSetPane);
} }
BidiUtils.applyOrientationByLocale(advancedPanel); BidiUtils.applyOrientationByLocale(advancedPanel);

10
designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java
Unescape View File

@ -3,7 +3,6 @@ package com.fr.design.data.datapane.connect;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.HashMap; import java.util.HashMap;
@ -77,7 +76,7 @@ public class JNDIDefPane extends JPanel {
JPanel nContentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); JPanel nContentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
innerthis.add(nContentPane); innerthis.add(nContentPane);
nContentPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_Name"), ":"))); nContentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_Name") + ":"));
jndiNameTextField = new UITextField(20); jndiNameTextField = new UITextField(20);
nContentPane.add(jndiNameTextField, BorderLayout.NORTH); nContentPane.add(jndiNameTextField, BorderLayout.NORTH);
BidiUtils.applyOrientationByLocale(nContentPane); BidiUtils.applyOrientationByLocale(nContentPane);
@ -100,10 +99,9 @@ public class JNDIDefPane extends JPanel {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double[] rowSize = { p, p, p, p }; double[] rowSize = { p, p, p, p };
double[] columnSize = { f, f }; double[] columnSize = { f, f };
Component[][] comps = { { new UILabel(BidiUtils.reverseConcatenateStrings("INITIAL_CONTEXT_FACTORY", ":"), SwingConstants.TRAILING), JNDIFactoryComboBox }, Component[][] comps = { { new UILabel("INITIAL_CONTEXT_FACTORY:", SwingConstants.TRAILING), JNDIFactoryComboBox },
{ new UILabel(BidiUtils.reverseConcatenateStrings("PROVIDER_URL", ":"), SwingConstants.TRAILING), PROVIDER_URL_TF }, { new UILabel("PROVIDER_URL:", SwingConstants.TRAILING), PROVIDER_URL_TF }, { new UILabel("SECURITY_PRINCIPAL:", SwingConstants.TRAILING), SECURITY_PRINCIPAL_TF },
{ new UILabel(BidiUtils.reverseConcatenateStrings("SECURITY_PRINCIPAL", ":"), SwingConstants.TRAILING), SECURITY_PRINCIPAL_TF }, { new UILabel("SECURITY_CREDENTIALS:", SwingConstants.TRAILING), SECURITY_CREDENTIALS_TF } };
{ new UILabel(BidiUtils.reverseConcatenateStrings("SECURITY_CREDENTIALS", ":"), SwingConstants.TRAILING), SECURITY_CREDENTIALS_TF } };
centerPane.add(TableLayoutHelper.createCommonTableLayoutPane(comps, rowSize, columnSize, 2)); centerPane.add(TableLayoutHelper.createCommonTableLayoutPane(comps, rowSize, columnSize, 2));
// ActionLabel // ActionLabel

2
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java
Unescape View File

@ -21,7 +21,7 @@ public class ClassNameSelectPane extends BasicPane {
this.add(webDirectoryPane, BorderLayout.NORTH); this.add(webDirectoryPane, BorderLayout.NORTH);
webDirectoryPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); webDirectoryPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
webDirectoryPane.add(new UILabel( webDirectoryPane.add(new UILabel(
BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Choose_Function_Class"), ":"))); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Choose_Function_Class") + ":"));
classFileTree = new ClassFileTree(); classFileTree = new ClassFileTree();
classFileTree.refreshEnv(); classFileTree.refreshEnv();

5
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
Unescape View File

@ -138,7 +138,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
this.setLayout(new BorderLayout(gap, 0)); this.setLayout(new BorderLayout(gap, 0));
JPanel northPanel = new JPanel(new BorderLayout()); JPanel northPanel = new JPanel(new BorderLayout());
JPanel type = new JPanel(); JPanel type = new JPanel();
type.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type"), ":"))); type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"));
String[] item = {"TXT", "Excel", "XML"}; String[] item = {"TXT", "Excel", "XML"};
fileTypeComboBox = new UIComboBox(item); fileTypeComboBox = new UIComboBox(item);
fileTypeComboBox.setPreferredSize(new Dimension(100, 20)); fileTypeComboBox.setPreferredSize(new Dimension(100, 20));
@ -274,8 +274,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
controlPane.setLayout(new BorderLayout(8, 8)); controlPane.setLayout(new BorderLayout(8, 8));
controlPane.setPreferredSize(new Dimension(width, height)); controlPane.setPreferredSize(new Dimension(width, height));
JPanel comboboxPanel = new JPanel(new BorderLayout(8, 8)); JPanel comboboxPanel = new JPanel(new BorderLayout(8, 8));
encodeLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type"), ":") encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":");
);
encodingComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY); encodingComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
encodingComboBox.setSelectedIndex(4); encodingComboBox.setSelectedIndex(4);
encodingComboBox.setPreferredSize(new Dimension(90, 20)); encodingComboBox.setPreferredSize(new Dimension(90, 20));

10
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
Unescape View File

@ -269,7 +269,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Search")); UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Search"));
UILabel formulaLabel = new UILabel( UILabel formulaLabel = new UILabel(
BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below"), ":")); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":");
formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
labelPane.add(formulaLabel, BorderLayout.LINE_START); labelPane.add(formulaLabel, BorderLayout.LINE_START);
@ -1076,7 +1076,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList); UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList);
functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
functionTypeScrollPane.setPreferredSize(new Dimension(140, 200)); functionTypeScrollPane.setPreferredSize(new Dimension(140, 200));
functionPane.add(this.createNamePane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Category"), ":"), functionTypeScrollPane), BorderLayout.WEST); functionPane.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Category") + ":", functionTypeScrollPane), BorderLayout.WEST);
initTypeListCellRenderer(); initTypeListCellRenderer();
initGroupTypeModel(); initGroupTypeModel();
initTypeListSelectionListener(); initTypeListSelectionListener();
@ -1191,7 +1191,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList); UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList);
functionNameScrollPane.setPreferredSize(new Dimension(140, 200)); functionNameScrollPane.setPreferredSize(new Dimension(140, 200));
functionPane.add( functionPane.add(
this.createNamePane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Name"), ":"), functionNameScrollPane), this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Name") + ":", functionNameScrollPane),
BorderLayout.CENTER); BorderLayout.CENTER);
functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
initFunctionNameListCellRenderer(); initFunctionNameListCellRenderer();
@ -1275,7 +1275,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
UIScrollPane variablesTreePane = new UIScrollPane(variablesTree); UIScrollPane variablesTreePane = new UIScrollPane(variablesTree);
variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
panel.add(this.createNamePane( panel.add(this.createNamePane(
BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables"), ":"), variablesTreePane), BorderLayout.WEST); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.WEST);
variablesTree.setRootVisible(false); variablesTree.setRootVisible(false);
variablesTree.setShowsRootHandles(true); variablesTree.setShowsRootHandles(true);
variablesTree.addMouseListener(applyTextMouseListener); variablesTree.addMouseListener(applyTextMouseListener);
@ -1285,7 +1285,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea); UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea);
desScrollPane.setBorder(null); desScrollPane.setBorder(null);
panel.add(this.createNamePane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description"), ":"), desScrollPane), BorderLayout.CENTER); panel.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.CENTER);
initVariablesTreeSelectionListener(); initVariablesTreeSelectionListener();
this.add(panel, BorderLayout.CENTER); this.add(panel, BorderLayout.CENTER);
} }

4
designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
Unescape View File

@ -144,7 +144,7 @@ public class FunctionManagerPane extends BasicPane {
reportletNamePane.add(editorButton); reportletNamePane.add(editorButton);
editorButton.addActionListener(createEditorButtonActionListener()); editorButton.addActionListener(createEditorButtonActionListener());
JPanel classNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel classNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
classNamePane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name"), ":")), BorderLayout.NORTH); classNamePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), BorderLayout.NORTH);
classNamePane.add(reportletNamePane, BorderLayout.CENTER); classNamePane.add(reportletNamePane, BorderLayout.CENTER);
northPane.add(classNamePane); northPane.add(classNamePane);
DescriptionTextArea descriptionArea = new DescriptionTextArea(); DescriptionTextArea descriptionArea = new DescriptionTextArea();
@ -159,7 +159,7 @@ public class FunctionManagerPane extends BasicPane {
JPanel descriptionPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); //Description Pane JPanel descriptionPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); //Description Pane
this.add(descriptionPane, BorderLayout.SOUTH); this.add(descriptionPane, BorderLayout.SOUTH);
descriptionPane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); descriptionPane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
descriptionPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Description"), ":")), BorderLayout.NORTH); descriptionPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Description") + ":"), BorderLayout.NORTH);
this.descriptionTextArea = new UITextArea(6, 24); this.descriptionTextArea = new UITextArea(6, 24);
descriptionPane.add(new JScrollPane(this.descriptionTextArea), BorderLayout.CENTER); descriptionPane.add(new JScrollPane(this.descriptionTextArea), BorderLayout.CENTER);
BidiUtils.applyOrientationByLocale(this); BidiUtils.applyOrientationByLocale(this);

4
designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java
Unescape View File

@ -26,7 +26,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane {
this.add(pane, BorderLayout.NORTH); this.add(pane, BorderLayout.NORTH);
JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
colPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), ":"))); colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column") + ":"));
pane.add(colPane); pane.add(colPane);
initColSpinner(); initColSpinner();
@ -35,7 +35,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane {
JPanel rowPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel rowPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
pane.add(rowPane); pane.add(rowPane);
rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"), ":"))); rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") + ":"));
initRowSpinner(); initRowSpinner();
rowPane.add(rowSpinner); rowPane.add(rowSpinner);
BidiUtils.applyOrientationByLocale(colPane, rowPane); BidiUtils.applyOrientationByLocale(colPane, rowPane);

19
designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
Unescape View File

@ -1,7 +1,6 @@
package com.fr.design.hyperlink; package com.fr.design.hyperlink;
import com.fr.base.BaseFormula; import com.fr.base.BaseFormula;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
@ -325,7 +324,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
// 是否有重命名属性 // 是否有重命名属性
if (this.needRenamePane) { if (this.needRenamePane) {
itemNameTextField = new UITextField(); itemNameTextField = new UITextField();
Component[] renameComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name"), ":")), itemNameTextField}; Component[] renameComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), itemNameTextField};
dialogComponents.add(renameComponents); dialogComponents.add(renameComponents);
othersComponents.add(renameComponents); othersComponents.add(renameComponents);
} }
@ -334,7 +333,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
private void initHeaderPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) { private void initHeaderPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) {
//最上方位置的面板 //最上方位置的面板
JPanel headerPane = this.setHeaderPanel(); JPanel headerPane = this.setHeaderPanel();
Component[] headerComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet"), ":")), headerPane}; Component[] headerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet") + ":"), headerPane};
dialogComponents.add(headerComponents); dialogComponents.add(headerComponents);
othersComponents.add(headerComponents); othersComponents.add(headerComponents);
} }
@ -347,7 +346,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
targetFrameComboBox.setPreferredSize(new Dimension(100, 20)); targetFrameComboBox.setPreferredSize(new Dimension(100, 20));
JPanel targetFramePanel = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0)); JPanel targetFramePanel = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0));
targetFramePanel.add(targetFrameComboBox); targetFramePanel.add(targetFrameComboBox);
Component[] targetComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Link_Opened_In"), ":")), targetFramePanel}; Component[] targetComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Link_Opened_In") + ":"), targetFramePanel};
dialogComponents.add(targetComponents); dialogComponents.add(targetComponents);
othersComponents.add(targetComponents); othersComponents.add(targetComponents);
} }
@ -358,13 +357,13 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
titleFiled.getUITextField().setColumns(15); titleFiled.getUITextField().setColumns(15);
final JPanel titlePanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); final JPanel titlePanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
titlePanel.add(titleFiled); titlePanel.add(titleFiled);
Component[] titleComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Title"), ":")), titlePanel}; Component[] titleComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Title") + ":"), titlePanel};
dialogComponents.add(titleComponents); dialogComponents.add(titleComponents);
} }
private void initDialogSizePanel(List<Component[]> dialogComponents) {// 对话框大小 private void initDialogSizePanel(List<Component[]> dialogComponents) {// 对话框大小
final JPanel sizeJPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); final JPanel sizeJPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
UILabel heightLabel = new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Chart_Height"), ":")); UILabel heightLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height") + ":");
heightLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10)); heightLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
sizeJPanel.add(heightLabel); sizeJPanel.add(heightLabel);
UINumberField heightTextFiled = new UINumberField(); UINumberField heightTextFiled = new UINumberField();
@ -374,7 +373,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
heightTextFiled.setPreferredSize(new Dimension(40, 20)); heightTextFiled.setPreferredSize(new Dimension(40, 20));
sizeJPanel.add(heightTextFiled); sizeJPanel.add(heightTextFiled);
this.setHeightTextFiled(heightTextFiled); this.setHeightTextFiled(heightTextFiled);
UILabel widthLabel = new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Designer_Width"), ":")); UILabel widthLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":");
widthLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10)); widthLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
sizeJPanel.add(widthLabel); sizeJPanel.add(widthLabel);
UINumberField widthTextFiled = new UINumberField(); UINumberField widthTextFiled = new UINumberField();
@ -385,7 +384,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
sizeJPanel.add(widthTextFiled); sizeJPanel.add(widthTextFiled);
this.setWidthTextFiled(widthTextFiled); this.setWidthTextFiled(widthTextFiled);
sizeJPanel.setVisible(true); sizeJPanel.setVisible(true);
dialogComponents.add(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size"), ":")), sizeJPanel}); dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size") + ":"), sizeJPanel});
} }
private void initDialogLocationPanel(List<Component[]> dialogComponents) { private void initDialogLocationPanel(List<Component[]> dialogComponents) {
@ -440,13 +439,13 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
center.addChangeListener(actionListener); center.addChangeListener(actionListener);
custom.addChangeListener(actionListener); custom.addChangeListener(actionListener);
dialogComponents.add(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Show_Position"), ":")), locationPanel}); dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Show_Position") + ":"), locationPanel});
} }
private void initFooterPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) { private void initFooterPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) {
// 最下方的配置面板 // 最下方的配置面板
// 参数传递方式 // 参数传递方式
Component[] footerComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type"), ":")), this.setFootPanel()}; Component[] footerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type") + ":"), this.setFootPanel()};
dialogComponents.add(footerComponents); dialogComponents.add(footerComponents);
othersComponents.add(footerComponents); othersComponents.add(footerComponents);
} }

2
designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java
Unescape View File

@ -16,7 +16,7 @@ public class MobilePopupUIUtils {
JPanel jp = new JPanel(); JPanel jp = new JPanel();
jp.setBorder(BorderFactory.createEmptyBorder(0,0,0, 30)); jp.setBorder(BorderFactory.createEmptyBorder(0,0,0, 30));
jp.setLayout(new BorderLayout(10,0)); jp.setLayout(new BorderLayout(10,0));
UILabel titleLabel = new UILabel(BidiUtils.reverseConcatenateStrings(title, ":")); UILabel titleLabel = new UILabel(title + ":");
titleLabel.setPreferredSize(new Dimension(MobilePopupUIUtils.Left_Title_width, Line_Height)); titleLabel.setPreferredSize(new Dimension(MobilePopupUIUtils.Left_Title_width, Line_Height));
titleLabel.setHorizontalAlignment(SwingConstants.TRAILING); titleLabel.setHorizontalAlignment(SwingConstants.TRAILING);
jp.add(titleLabel, BorderLayout.LINE_START); jp.add(titleLabel, BorderLayout.LINE_START);

5
designer-base/src/main/java/com/fr/design/javascript/EmailPane.java
Unescape View File

@ -1,6 +1,5 @@
package com.fr.design.javascript; package com.fr.design.javascript;
import com.fr.base.i18n.BidiUtils;
import com.fr.config.EmailServerConfig; import com.fr.config.EmailServerConfig;
import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
@ -42,7 +41,7 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
tipsPane1.setForeground(Color.pink); tipsPane1.setForeground(Color.pink);
tipsPane2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Tips")); tipsPane2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Tips"));
UILabel mainTextLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Content"), ":")); UILabel mainTextLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Content") + ":");
mainTextLabel.setHorizontalAlignment(SwingConstants.RIGHT); mainTextLabel.setHorizontalAlignment(SwingConstants.RIGHT);
mainTextLabel.setVerticalAlignment(SwingConstants.TOP); mainTextLabel.setVerticalAlignment(SwingConstants.TOP);
JScrollPane scrollPane = new JScrollPane(mainTextEditor = new JTextArea()); JScrollPane scrollPane = new JScrollPane(mainTextEditor = new JTextArea());
@ -75,7 +74,7 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
} }
protected JComponent[] createLinePane(String string, JTextComponent textComp) { protected JComponent[] createLinePane(String string, JTextComponent textComp) {
UILabel label = new UILabel(BidiUtils.reverseConcatenateStrings(string, ":")); UILabel label = new UILabel(string + ":");
label.setPreferredSize(new Dimension(70, label.getPreferredSize().height)); label.setPreferredSize(new Dimension(70, label.getPreferredSize().height));
label.setHorizontalAlignment(SwingConstants.RIGHT); label.setHorizontalAlignment(SwingConstants.RIGHT);
return new JComponent[] { label, textComp }; return new JComponent[] { label, textComp };

5
designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java
Unescape View File

@ -1,7 +1,6 @@
package com.fr.design.parameter; package com.fr.design.parameter;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.editor.ValueEditorPaneFactory;
@ -46,8 +45,8 @@ public class ParameterPane extends BasicBeanPane<Parameter> {
// richer:要排列显示的控件 // richer:要排列显示的控件
Component[][] components = {{null}, Component[][] components = {{null},
{ null, new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"), ":")),textFieldPanel }, { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"),textFieldPanel },
{ null, new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Default_Value"), ":")),valueEditor } { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Default_Value") + ":"),valueEditor }
}; };
double p =TableLayout.PREFERRED; double p =TableLayout.PREFERRED;
double f =TableLayout.FILL; double f =TableLayout.FILL;

2
designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java
Unescape View File

@ -56,7 +56,7 @@ public class GradientBackgroundPane extends BackgroundDetailPane {
JPanel innercenterPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel innercenterPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
centerPane.add(new UILabel(" ")); centerPane.add(new UILabel(" "));
centerPane.add(innercenterPane); centerPane.add(innercenterPane);
innercenterPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction"), ":"))); innercenterPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction") + ":"));
left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Horizontal")); left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Horizontal"));
innercenterPane.add(left2right); innercenterPane.add(left2right);

5
designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java
Unescape View File

@ -2,7 +2,6 @@ package com.fr.design.style.background.impl;
import com.fr.base.GraphHelper; import com.fr.base.GraphHelper;
import com.fr.base.background.PatternBackground; import com.fr.base.background.PatternBackground;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.style.color.ColorSelectBox; import com.fr.design.style.color.ColorSelectBox;
@ -73,11 +72,11 @@ public class PatternBackgroundPane extends BPane {
backgroundColorPane.setSelectObject(Color.black); backgroundColorPane.setSelectObject(Color.black);
colorPane.add(Box.createHorizontalStrut(2)); colorPane.add(Box.createHorizontalStrut(2));
colorPane.add(this.createLabelColorPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground"), ":"), foregroundColorPane)); colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":", foregroundColorPane));
colorPane.add(Box.createHorizontalStrut(8)); colorPane.add(Box.createHorizontalStrut(8));
colorPane.add(this.createLabelColorPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), ":"), backgroundColorPane)); colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":", backgroundColorPane));
} }
private JPanel createLabelColorPane(String text, private JPanel createLabelColorPane(String text,

5
designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java
Unescape View File

@ -1,7 +1,6 @@
package com.fr.design.style.background.pattern; package com.fr.design.style.background.pattern;
import com.fr.base.background.PatternBackground; import com.fr.base.background.PatternBackground;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.style.background.BackgroundPane4BoxChange; import com.fr.design.style.background.BackgroundPane4BoxChange;
@ -30,9 +29,9 @@ public class PatternUIComboBoxPane extends BackgroundPane4BoxChange {
this.add(pane, BorderLayout.NORTH); this.add(pane, BorderLayout.NORTH);
pane.add(patternBox = new PatternSelectBox(80)); pane.add(patternBox = new PatternSelectBox(80));
pane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground"), ":"))); pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":"));
pane.add(foreColor = new ColorSelectBox(80)); pane.add(foreColor = new ColorSelectBox(80));
pane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), ":"))); pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":"));
pane.add(backColor = new ColorSelectBox(80)); pane.add(backColor = new ColorSelectBox(80));
} }

2
designer-base/src/main/java/com/fr/env/LocalEnvPane.java vendored
Unescape View File

@ -34,7 +34,7 @@ public class LocalEnvPane extends BasicBeanPane<LocalDesignerWorkspaceInfo> {
JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.add(northPane, BorderLayout.NORTH); this.add(northPane, BorderLayout.NORTH);
northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Location"), ":")), BorderLayout.LINE_START); northPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Location") + ":"), BorderLayout.LINE_START);
pathTextField = new UITextField(); pathTextField = new UITextField();
northPane.add(pathTextField, BorderLayout.CENTER); northPane.add(pathTextField, BorderLayout.CENTER);

Write Preview
Loading…
Cancel
Save