Browse Source

Merge remote-tracking branch 'origin/release/10.0' into release/10.0

research/10.0
richie 6 years ago
parent
commit
2d17669ec5
  1. 2
      designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java
  2. 2
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  3. 30
      designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
  4. 6
      designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
  5. 4
      designer-base/src/main/java/com/fr/design/constants/UIConstants.java
  6. 2
      designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
  7. 2
      designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java
  8. 4
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
  9. 6
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
  10. 2
      designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
  11. 3
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  12. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  13. 11
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/OneListTableModel.java
  14. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java
  15. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
  16. 2
      designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java
  17. 2
      designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
  18. 2
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
  19. 2
      designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java
  20. 6
      designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java
  21. 2
      designer-base/src/main/java/com/fr/design/gui/NameInspector.java
  22. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java
  23. 2
      designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java
  24. 2
      designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java
  25. 2
      designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java
  26. 2
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
  27. 3
      designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java
  28. 2
      designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java
  29. 2
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
  30. 2
      designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java
  31. 2
      designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java
  32. 6
      designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
  33. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java
  34. 6
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  35. 4
      designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java
  36. 14
      designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java
  37. 2
      designer-base/src/main/java/com/fr/design/style/BorderPane.java
  38. 2
      designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java
  39. 4
      designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
  40. 2
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
  41. 2
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  42. 2
      designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
  43. 2
      designer-base/src/main/java/com/fr/start/BaseDesigner.java
  44. 14
      designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java
  45. 4
      designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java
  46. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  47. 8
      designer-form/src/main/java/com/fr/design/designer/creator/XButton.java
  48. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java
  49. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java
  50. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java
  51. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java
  52. 4
      designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java
  53. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/MultiFileEditorPane.java
  54. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java
  55. 4
      designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java
  56. 6
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  57. 21
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java
  58. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
  59. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
  60. 2
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  61. 4
      designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java
  62. 8
      designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
  63. 2
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  64. 53
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
  65. 2
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  66. 2
      designer-realize/src/main/java/com/fr/start/Designer.java

2
designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java

@ -18,7 +18,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction {
public ExitAuthorityEditAction(TargetComponent t) { public ExitAuthorityEditAction(TargetComponent t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status_Exit")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status_Exit"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit.png")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit.png"));
} }

2
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -198,7 +198,7 @@ public class PreferencePane extends BasicPane {
private void createEditPane(JPanel generalPane) { private void createEditPane(JPanel generalPane) {
//samuel:编辑器设置 //samuel:编辑器设置
JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Editor_Preference")); JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Editor_Preference"));
generalPane.add(editPane); generalPane.add(editPane);
//设置是否支持将字符串编辑为公式 //设置是否支持将字符串编辑为公式

30
designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java

@ -1,13 +1,10 @@
package com.fr.design.actions.help; package com.fr.design.actions.help;
import java.awt.BorderLayout; import com.fr.design.gui.frpane.UITabbedPane;
import java.awt.Dimension; import com.fr.design.gui.ibutton.UIButton;
import java.awt.Frame; import com.fr.design.layout.FRGUIPaneFactory;
import java.awt.event.ActionEvent; import com.fr.design.utils.gui.GUICoreUtils;
import java.awt.event.ActionListener; import com.fr.stable.ProductConstants;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
import javax.swing.ActionMap; import javax.swing.ActionMap;
@ -16,13 +13,14 @@ import javax.swing.JComponent;
import javax.swing.JDialog; import javax.swing.JDialog;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import java.awt.BorderLayout;
import com.fr.design.gui.frpane.UITabbedPane; import java.awt.Dimension;
import com.fr.design.gui.ibutton.UIButton; import java.awt.Frame;
import com.fr.design.layout.FRGUIPaneFactory; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import com.fr.stable.ProductConstants; import java.awt.event.KeyEvent;
import com.fr.design.utils.gui.GUICoreUtils; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
/** /**
* Dialog displaying information about the application. * Dialog displaying information about the application.
@ -48,7 +46,7 @@ public class AboutDialog extends JDialog implements ActionListener {
tabbedPane = new UITabbedPane(); tabbedPane = new UITabbedPane();
sysPane = new SystemInfoPane(); sysPane = new SystemInfoPane();
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("About"), aboutPanel); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane);
buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();

6
designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java

@ -96,7 +96,7 @@ public class FeedBackPane extends BasicPane {
public FeedBackPane() { public FeedBackPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
initDetailArea(); initDetailArea();
UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("feedback_info")); UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Info"));
tip.setBorder(TIP_BORDER); tip.setBorder(TIP_BORDER);
this.add(tip, BorderLayout.NORTH); this.add(tip, BorderLayout.NORTH);
UIScrollPane scrollPane = new UIScrollPane(initDetailPane()); UIScrollPane scrollPane = new UIScrollPane(initDetailPane());
@ -135,7 +135,7 @@ public class FeedBackPane extends BasicPane {
} }
}; };
this.detailField.setForeground(Color.gray); this.detailField.setForeground(Color.gray);
this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("feedback_tip")); this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip"));
detailField.addKeyListener(new KeyAdapter() { detailField.addKeyListener(new KeyAdapter() {
@Override @Override
@ -156,7 +156,7 @@ public class FeedBackPane extends BasicPane {
detailField.setForeground(Color.black); detailField.setForeground(Color.black);
String text = detailField.getText(); String text = detailField.getText();
// 判断在中文输入状态是否还包含提示符 要删掉 // 判断在中文输入状态是否还包含提示符 要删掉
String tip = com.fr.design.i18n.Toolkit.i18nText("feedback_tip"); String tip = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip");
if (text.contains(tip)) { if (text.contains(tip)) {
text = text.substring(0, text.indexOf(tip)); text = text.substring(0, text.indexOf(tip));
detailField.setText(text); detailField.setText(text);

4
designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@ -219,7 +219,7 @@ public interface UIConstants {
@Override @Override
public String toString() { public String toString() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."; return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "...";
} }
}; };
/** /**
@ -228,7 +228,7 @@ public interface UIConstants {
public static final Object CONNECTION_FAILED = new Object() { public static final Object CONNECTION_FAILED = new Object() {
public String toString() { public String toString() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed") + "!"; return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed") + "!";
} }
}; };

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

@ -455,7 +455,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
} }
if (!connect) { if (!connect) {
DesignerFrame designerFrame = DesignerContext.getDesignerFrame(); DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"), JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE); com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE);
failedToFindTable(); failedToFindTable();
return null; return null;

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

@ -40,7 +40,7 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean {
rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER)); rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER));
UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database"), UILabel.LEFT); UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database"), UILabel.LEFT);
UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model"), UILabel.LEFT); UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model"), UILabel.LEFT);
UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Select_Table"), UILabel.LEFT); UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), UILabel.LEFT);
if (labelSize > 0) { if (labelSize > 0) {
Dimension pSize = new Dimension(labelSize, 20); Dimension pSize = new Dimension(labelSize, 20);

4
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@ -43,7 +43,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
String tempName = getEditingName(); String tempName = getEditingName();
if (StringUtils.isEmpty(tempName)) { if (StringUtils.isEmpty(tempName)) {
nameableList.stopEditing(); nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Empty_Name")); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"));
setIllegalIndex(editingIndex); setIllegalIndex(editingIndex);
isNamePermitted = false; isNamePermitted = false;
return; return;
@ -52,7 +52,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
&& isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) { && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) {
isNamePermitted = false; isNamePermitted = false;
nameableList.stopEditing(); nameableList.stopEditing();
String message = Toolkit.i18nText("Fine-Design_Connection_Duplicate_Name", tempName); String message = Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", tempName);
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
setIllegalIndex(editingIndex); setIllegalIndex(editingIndex);
} }

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

@ -335,15 +335,15 @@ public class JDBCDefPane extends JPanel {
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_ACTIVE") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_ACTIVE") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_IDLE") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_IDLE") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MIN_IDLE") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MIN_IDLE") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_BORROW") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_BORROW") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_RETURN") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_RETURN") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_WHILE_IDLE") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_WHILE_IDLE") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT), {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
DBCP_TIMEBETWEENEVICTIONRUNSMILLS}, DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_NUM_TEST_PER_EVCTION_RUN") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_NUM_TEST_PER_EVCTION_RUN") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT), {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT),
DBCP_MINEVICTABLEIDLETIMEMILLIS}}; DBCP_MINEVICTABLEIDLETIMEMILLIS}};
JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4); JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);

2
designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@ -362,7 +362,7 @@ public class PreviewTablePane extends BasicPane {
boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase()); boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase());
if (!status) { if (!status) {
connectionBar.close(); connectionBar.close();
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
} }
} }
connectionBar.close(); connectionBar.close();

3
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java

@ -25,7 +25,6 @@ import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.io.File;
public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> { public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
private UITextField classNameTextField; private UITextField classNameTextField;
@ -93,7 +92,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")},
{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))}
}; };
JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
this.add(northPane, BorderLayout.NORTH); this.add(northPane, BorderLayout.NORTH);

2
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@ -221,7 +221,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
FRContext.getLogger().error(e.getMessage(), e); FRContext.getLogger().error(e.getMessage(), e);
} }
if (in == null) { if (in == null) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"), JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
null, 0, UIManager.getIcon("OptionPane.errorIcon")); null, 0, UIManager.getIcon("OptionPane.errorIcon"));
} else { } else {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully")); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully"));

11
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/OneListTableModel.java

@ -1,17 +1,16 @@
package com.fr.design.data.tabledata.tabledatapane; package com.fr.design.data.tabledata.tabledatapane;
import java.awt.Component;
import java.awt.event.ActionEvent;
import com.fr.design.gui.itableeditorpane.UITableEditAction; import com.fr.design.gui.itableeditorpane.UITableEditAction;
import com.fr.design.gui.itableeditorpane.UITableModelAdapter; import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.file.FILEChooserPane; import com.fr.file.FILEChooserPane;
import com.fr.file.filter.ChooseFileFilter; import com.fr.file.filter.ChooseFileFilter;
import com.fr.stable.CoreConstants; import com.fr.stable.CoreConstants;
import java.awt.Component;
import java.awt.event.ActionEvent;
//august:按理说,这个只有一列 就不该用jtable。不过这样总比之前用ArrayTableModel好 //august:按理说,这个只有一列 就不该用jtable。不过这样总比之前用ArrayTableModel好
public abstract class OneListTableModel<T> extends UITableModelAdapter<T> { public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
@ -64,7 +63,7 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
super.actionPerformed(e); super.actionPerformed(e);
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File"))); FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();
if(file == null) { if(file == null) {
@ -90,7 +89,7 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
super.actionPerformed(e); super.actionPerformed(e);
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File"))); FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();
if(file == null) { if(file == null) {

4
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java

@ -196,7 +196,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
warningLabel.setText(StringUtils.EMPTY); warningLabel.setText(StringUtils.EMPTY);
} catch (Exception ex) { } catch (Exception ex) {
if (ex instanceof SQLException) { if (ex instanceof SQLException) {
warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
} else { } else {
warningLabel.setText(ex.getMessage()); warningLabel.setText(ex.getMessage());
} }
@ -319,7 +319,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
storeProcedureContext.setText(procedureText); storeProcedureContext.setText(procedureText);
warningLabel.setText(""); warningLabel.setText("");
} catch (Exception e) { } catch (Exception e) {
warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
storeProcedureContext.setText(""); storeProcedureContext.setText("");
editorPane.populate(new StoreProcedureParameter[0]); editorPane.populate(new StoreProcedureParameter[0]);
} }

2
designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java

@ -194,7 +194,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
connectionBar.close(); connectionBar.close();
// bug 61345 预览失败时,关闭窗口 // bug 61345 预览失败时,关闭窗口
dialog.setVisible(false); dialog.setVisible(false);
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
} }
connectionBar.close(); connectionBar.close();
storeProcedure.resetDataModelList(); storeProcedure.resetDataModelList();

2
designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java

@ -28,7 +28,7 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
protected String[] columnNames; protected String[] columnNames;
public ColumnSelectedEditor() { public ColumnSelectedEditor() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DS_Column")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Column"));
this.setLayout(FRGUIPaneFactory.createLeftZeroLayout()); this.setLayout(FRGUIPaneFactory.createLeftZeroLayout());
tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
columnNames = new String[0]; columnNames = new String[0];

2
designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@ -175,7 +175,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
FileNodeFILE nodeFile = new FileNodeFILE(new FileNode(StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath), false)); FileNodeFILE nodeFile = new FileNodeFILE(new FileNode(StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath), false));
if (nodeFile.isLocked()) { if (nodeFile.isLocked()) {
if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("fileLocked_undeleted"), if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FileLocked_Undeleted"),
com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) { com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) {
refreshDockingView(); refreshDockingView();
} }

2
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@ -933,7 +933,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"), BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"),
variableResolver.resolveCurReportVariables()).createMutableTreeNode()); variableResolver.resolveCurReportVariables()).createMutableTreeNode());
rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Tabledata"), rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Tabledata"),
BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"),
variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode()); variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode());

2
designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java

@ -129,7 +129,7 @@ public abstract class FunctionConstants {
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY), new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY),
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT), new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT),
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Other"), Function.OTHER), new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Other"), Function.OTHER),
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Function_Type_Hierarchy"), Function.HA) new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA)
}; };
public static FunctionGroup ALL = new FunctionGroup() { public static FunctionGroup ALL = new FunctionGroup() {

6
designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java

@ -90,7 +90,7 @@ public class JavaEditorPane extends BasicPane {
this.add(jt, BorderLayout.CENTER); this.add(jt, BorderLayout.CENTER);
UILabel label = new UILabel(); UILabel label = new UILabel();
label.setText("<html><font color='red'>" + label.setText("<html><font color='red'>" +
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Compile_Save_Attention") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Save_Attention") +
"</font></html>"); "</font></html>");
label.setPreferredSize(new Dimension(label.getWidth(),label.getHeight() + 20)); label.setPreferredSize(new Dimension(label.getWidth(),label.getHeight() + 20));
this.add(label, BorderLayout.SOUTH); this.add(label, BorderLayout.SOUTH);
@ -157,11 +157,11 @@ public class JavaEditorPane extends BasicPane {
} }
try { try {
WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8)); WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8));
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Successfully") + "!"); JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "!");
fireSaveActionListener(); fireSaveActionListener();
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Failed") + "!"); JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "!");
} }
} }

2
designer-base/src/main/java/com/fr/design/gui/NameInspector.java

@ -4,5 +4,5 @@ import com.fr.design.i18n.Toolkit;
public class NameInspector { public class NameInspector {
public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Illegal_Name_Tips"); public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Basic_Illegal_Name_Tips");
} }

2
designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java

@ -55,7 +55,7 @@ public abstract class LoadingBasicPane extends BasicPane {
card = new CardLayout(); card = new CardLayout();
setLayout(card); setLayout(card);
JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading_And_Waiting") , SwingConstants.CENTER); UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting") , SwingConstants.CENTER);
loadingDisPane.add(loadingPane, BorderLayout.CENTER); loadingDisPane.add(loadingPane, BorderLayout.CENTER);
progressBar = new JProgressBar(); progressBar = new JProgressBar();
progressBar.setIndeterminate(true); progressBar.setIndeterminate(true);

2
designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java

@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException;
public abstract class LazyComboBox extends UIComboBox implements PopupMenuListener { public abstract class LazyComboBox extends UIComboBox implements PopupMenuListener {
private static final int NUM = 80; private static final int NUM = 80;
private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."}; private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."};
/** /**
* 是否加载完成 * 是否加载完成

2
designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java

@ -99,7 +99,7 @@ public class TableViewList extends UIList {
count--; count--;
} }
if (!status) { if (!status) {
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
} }
TableViewList.this.setModel(processDataInAnotherThread(databaseName, searchFilter, typesFilter)); TableViewList.this.setModel(processDataInAnotherThread(databaseName, searchFilter, typesFilter));
return null; return null;

2
designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java

@ -16,7 +16,7 @@ public class UIScrollMenuDemo extends JFrame {
UIMenuBar menuBar = new UIMenuBar(); UIMenuBar menuBar = new UIMenuBar();
// File Menu, F - Mnemonic // File Menu, F - Mnemonic
JMenu fileMenu = new JMenu("File"); JMenu fileMenu = new JMenu("Fine-Design_Basic_File");
fileMenu.setMnemonic(KeyEvent.VK_F); fileMenu.setMnemonic(KeyEvent.VK_F);
menuBar.add(fileMenu); menuBar.add(fileMenu);

2
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@ -235,7 +235,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int[] selectedRow = table.getSelectedRows(); int[] selectedRow = table.getSelectedRows();
if (ismultiSelected()) { if (ismultiSelected()) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Multiple_Select_Warn_Text")); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multiple_Select_Warn_Text"));
return; return;
} }
if (table.getCellEditor() != null) { if (table.getCellEditor() != null) {

3
designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java

@ -6,7 +6,6 @@ import com.fr.design.gui.itree.checkboxtree.CheckBoxTree;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.NameObject; import com.fr.general.NameObject;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import javax.swing.Icon; import javax.swing.Icon;
@ -37,7 +36,7 @@ public abstract class RefreshableJTree extends CheckBoxTree {
@Override @Override
public String toString() { public String toString() {
return Toolkit.i18nText("Fine-Design_Loading") + "..."; return Toolkit.i18nText("Fine-Design_Basic_Loading") + "...";
} }
}; };

2
designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java

@ -164,7 +164,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double[] rowSize = {p, p, p}; double[] rowSize = {p, p, p};
double[] columnSize = {p, TableLayout.FILL}; double[] columnSize = {p, TableLayout.FILL};
showParameterInterface = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_UI_Display")); showParameterInterface = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_UI_Display"));
JPanel showParameterPanel = new JPanel(); JPanel showParameterPanel = new JPanel();
showParameterPanel.add(new UILabel()); showParameterPanel.add(new UILabel());
showParameterPanel.add(showParameterInterface); showParameterPanel.add(showParameterInterface);

2
designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@ -62,7 +62,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
} }
if (tempSet.contains(list.get(i).toString())) { if (tempSet.contains(list.get(i).toString())) {
list.remove(i); list.remove(i);
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Duplicate_Name") + "!"); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Duplicate_Name") + "!");
parameterChanger(list); parameterChanger(list);
return; return;
} }

2
designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java

@ -22,7 +22,7 @@ public class AuthorityPropertyPane extends JPanel {
public AuthorityPropertyPane(TargetComponent t) { public AuthorityPropertyPane(TargetComponent t) {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(null); this.setBorder(null);
UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) { UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);

2
designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java

@ -22,7 +22,7 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane {
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(null); this.setBorder(null);
UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) { UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);

6
designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@ -86,11 +86,11 @@ public class DesignerLogHandler {
caption.clearMessage(); caption.clearMessage();
} }
}; };
showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Info"), true); showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Info"), true);
showInfo.addItemListener(itemlistener); showInfo.addItemListener(itemlistener);
showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Warn"), true); showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Warn"), true);
showError.addItemListener(itemlistener); showError.addItemListener(itemlistener);
showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Error"), true); showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Error"), true);
showServer.addItemListener(itemlistener); showServer.addItemListener(itemlistener);
caption.addSetListener(new ActionListener() { caption.addSetListener(new ActionListener() {

2
designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java

@ -24,7 +24,7 @@ public class DataTableEditor extends Editor<DataTableConfig> {
public DataTableEditor() { public DataTableEditor() {
this.initCompontents(); this.initCompontents();
this.setName(com.fr.design.i18n.Toolkit.i18nText("FieldBinding")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FieldBinding"));
} }
private void initCompontents() { private void initCompontents() {

6
designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java

@ -4,13 +4,9 @@
package com.fr.design.menu; package com.fr.design.menu;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
import javax.swing.*; import javax.swing.*;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.Locale;
import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
@ -678,7 +674,7 @@ public class KeySetUtils {
@Override @Override
public String getMenuName() { public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status");
} }
@Override @Override

4
designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java

@ -36,7 +36,7 @@ public class ParameterArrayPane extends JListControlPane {
String tempName = getEditingName(); String tempName = getEditingName();
if (StringUtils.isEmpty(tempName)) { if (StringUtils.isEmpty(tempName)) {
nameableList.stopEditing(); nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Empty_Parameter_Name")); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name"));
setIllegalIndex(editingIndex); setIllegalIndex(editingIndex);
return; return;
} }
@ -44,7 +44,7 @@ public class ParameterArrayPane extends JListControlPane {
&& isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) { && isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) {
nameableList.stopEditing(); nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Duplicate_Parameter_Name")); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name"));
setIllegalIndex(editingIndex); setIllegalIndex(editingIndex);
} }
} }

14
designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java

@ -142,7 +142,7 @@ public class UserManagerPane extends BasicPane {
sync2AddedMembersFormAdded(); sync2AddedMembersFormAdded();
// 不需要重复更新右侧列表显示 但是更新一下计数显示 // 不需要重复更新右侧列表显示 但是更新一下计数显示
countLabel.setText( countLabel.setText(
Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
String.valueOf(addedMembers.size()) String.valueOf(addedMembers.size())
) )
); );
@ -211,7 +211,7 @@ public class UserManagerPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return Toolkit.i18nText("Fine-Design_Remote_Design_Add_Member"); return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Add_Member");
} }
private JPanel createLeftPanel() { private JPanel createLeftPanel() {
@ -221,7 +221,7 @@ public class UserManagerPane extends BasicPane {
BorderFactory.createCompoundBorder( BorderFactory.createCompoundBorder(
new EmptyBorder(6, 0, 0, 0), new EmptyBorder(6, 0, 0, 0),
UITitledBorder.createBorderWithTitle( UITitledBorder.createBorderWithTitle(
Toolkit.i18nText("Fine-Design_Remote_Design_Decision_Member") Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member")
) )
) )
); );
@ -233,7 +233,7 @@ public class UserManagerPane extends BasicPane {
keyField.requestFocus(); keyField.requestFocus();
keyField.addKeyListener(keyFieldKeyListener); keyField.addKeyListener(keyFieldKeyListener);
keyField.getDocument().addDocumentListener(documentListener); keyField.getDocument().addDocumentListener(documentListener);
keyButton.setText(Toolkit.i18nText("Fine-Design_Remote_Design_Search")); keyButton.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search"));
keyButton.addActionListener(keyButtonActionListener); keyButton.addActionListener(keyButtonActionListener);
searchPanel.add(keyField); searchPanel.add(keyField);
searchPanel.add(keyButton); searchPanel.add(keyButton);
@ -279,14 +279,14 @@ public class UserManagerPane extends BasicPane {
content.setBorder( content.setBorder(
BorderFactory.createCompoundBorder( BorderFactory.createCompoundBorder(
new EmptyBorder(6, 0, 0, 0), new EmptyBorder(6, 0, 0, 0),
UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member") UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member")
) )
) )
); );
// 计数 // 计数
countLabel.setText( countLabel.setText(
Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
String.valueOf(addedMembers.size())) String.valueOf(addedMembers.size()))
); );
countLabel.setBorder(BorderFactory.createEmptyBorder(7, 12, 8, 0)); countLabel.setBorder(BorderFactory.createEmptyBorder(7, 12, 8, 0));
@ -332,7 +332,7 @@ public class UserManagerPane extends BasicPane {
addedList.revalidate(); addedList.revalidate();
addedList.repaint(); addedList.repaint();
countLabel.setText( countLabel.setText(
Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
String.valueOf(addedMembers.size()) String.valueOf(addedMembers.size())
)); ));
} }

2
designer-base/src/main/java/com/fr/design/style/BorderPane.java

@ -106,7 +106,7 @@ public class BorderPane extends BasicPane {
borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("No"))); borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("No")));
// Button setting all borders to active with // Button setting all borders to active with
// current color and current style excepting inside borders // current color and current style excepting inside borders
borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External"))); borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External")));
borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside"))); borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside")));

2
designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java

@ -32,7 +32,7 @@ public class ButtonConstants {
com.fr.design.i18n.Toolkit.i18nText("Custom"), com.fr.design.i18n.Toolkit.i18nText("Custom"),
com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"), com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"),
com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"), com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Type_Parameter_Submit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Widget-TreeNode") com.fr.design.i18n.Toolkit.i18nText("Widget-TreeNode")
}; };

4
designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

@ -3,7 +3,6 @@ package com.fr.design.widget.component;
import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
@ -16,7 +15,6 @@ import com.fr.stable.StringUtils;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import javax.swing.text.DefaultFormatter;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -77,7 +75,7 @@ public class NumberEditorValidatePane extends JPanel {
JPanel errorMsgBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel errorMsgBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
errorMsgBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0)); errorMsgBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0));
errorMsgBorderPane.add(errorMsgTextFieldPane, BorderLayout.CENTER); errorMsgBorderPane.add(errorMsgTextFieldPane, BorderLayout.CENTER);
UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits")); UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits"));
limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0)); limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
double f = TableLayout.FILL; double f = TableLayout.FILL;

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

@ -93,7 +93,7 @@ public abstract class CustomJobPane extends BasicBeanPane {
this.add(objectProperiesPane, BorderLayout.CENTER); this.add(objectProperiesPane, BorderLayout.CENTER);
UITextArea area = new UITextArea(2, 1); UITextArea area = new UITextArea(2, 1);
area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Extend_Class", "com.fr.data.AbstractSubmitTask")); area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask"));
JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
dsPane.add(area); dsPane.add(area);
dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null)); dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null));

2
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@ -477,7 +477,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) {
Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") };
returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this, returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Cover_Tips", keyColumnNameValueList.get(j).cn.name), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name),
"", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]); "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]);
// Richie:全部覆盖 // Richie:全部覆盖
if (returnValue == 0) { if (returnValue == 0) {

2
designer-base/src/main/java/com/fr/env/RemoteEnvPane.java vendored

@ -66,7 +66,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
private JDialog dialog; private JDialog dialog;
private UILabel message = new UILabel(); private UILabel message = new UILabel();
private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_Cancel")); private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));
private UILabel uiLabel = new UILabel(); private UILabel uiLabel = new UILabel();
/** /**

2
designer-base/src/main/java/com/fr/start/BaseDesigner.java

@ -41,7 +41,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
private void init(String[] args) { private void init(String[] args) {
//初始化 //初始化
EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Initializing")); EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Basic_Initializing"));
// 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西,预加载时也要用到 // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西,预加载时也要用到
DesignUtils.initLookAndFeel(); DesignUtils.initLookAndFeel();
// 初始化Log Handler // 初始化Log Handler

14
designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java

@ -88,7 +88,7 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
JPanel lineStylePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel lineStylePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
alertLinePane.add(lineStylePane); alertLinePane.add(lineStylePane);
lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Line_Style") + ":")); lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style") + ":"));
lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
lineStylePane.add(lineCombo); lineStylePane.add(lineCombo);
@ -130,10 +130,10 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
double[] rowSize = {t, t, t, t, t}; double[] rowSize = {t, t, t, t, t};
double[] columnSize = {0.1, 0.2, 0.5, 0.2}; double[] columnSize = {0.1, 0.2, 0.5, 0.2};
Component[][] components= { Component[][] components= {
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Content") + ":"), contentField = new UITextField(3)}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content") + ":"), contentField = new UITextField(3)},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font") + ":"), fontNameBox}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font") + ":"), fontNameBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font_Size") + ":"), fontSizeBox}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size") + ":"), fontSizeBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
{null, null, rightButton = new UIRadioButton(getRightName())}, {null, null, rightButton = new UIRadioButton(getRightName())},
}; };
@ -148,11 +148,11 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
} }
protected String getLeftName() {// 居左 居右 protected String getLeftName() {// 居左 居右
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Left"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Left");
} }
protected String getRightName() { protected String getRightName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Right"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Right");
} }
@Override @Override

4
designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java

@ -31,9 +31,9 @@ public class MinMaxValuePane extends JPanel {
protected UITextField secUnitField; protected UITextField secUnitField;
public MinMaxValuePane() { public MinMaxValuePane() {
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Min_Value")); minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value"));
minValueField = new UITextField(6); minValueField = new UITextField(6);
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Max_Value")); maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value"));
maxValueField = new UITextField(6); maxValueField = new UITextField(6);
isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Graduation_Unit")); isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Graduation_Unit"));
mainUnitField = new UITextField(6); mainUnitField = new UITextField(6);

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java

@ -33,7 +33,7 @@ public class ChartAxisLineStylePane extends BasicPane{
axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS);
axisLineColor = new ColorSelectBox(100); axisLineColor = new ColorSelectBox(100);
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")}; String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")};
Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE}; Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE};
Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"), Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"),
BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"),

8
designer-form/src/main/java/com/fr/design/designer/creator/XButton.java

@ -90,9 +90,9 @@ public class XButton extends XWidgetCreator {
protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{ protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{
CRPropertyDescriptor[] crPropertyDescriptors = { CRPropertyDescriptor[] crPropertyDescriptors = {
new CRPropertyDescriptor("text", this.data.getClass()).setI18NName( new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue(
@ -162,7 +162,7 @@ public class XButton extends XWidgetCreator {
protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException { protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException {
return new CRPropertyDescriptor[]{ return new CRPropertyDescriptor[]{
new CRPropertyDescriptor("text", this.data.getClass()) new CRPropertyDescriptor("text", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {
@ -172,7 +172,7 @@ public class XButton extends XWidgetCreator {
} }
}), }),
new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {

2
designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java

@ -33,7 +33,7 @@ public class XFileUploader extends XFieldEditor {
super.supportedDescriptor(), super.supportedDescriptor(),
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("allowTypes", this.data.getClass()) new CRPropertyDescriptor("allowTypes", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
}); });
} }

4
designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java

@ -40,10 +40,10 @@ public class XMultiFileUploader extends XFieldEditor {
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("SINGLE_FILE_UPLOAD")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("SINGLE_FILE_UPLOAD"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("accept", this.data.getClass()) new CRPropertyDescriptor("accept", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("maxSize", this.data.getClass()) new CRPropertyDescriptor("maxSize", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
}); });
} }

2
designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java

@ -53,7 +53,7 @@ public class XNumberEditor extends XWrapperedFieldEditor {
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Decimals")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Decimals"))
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass()) CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits"))
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, ((NumberEditor)this.data).isAllowDecimals() ? sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, ((NumberEditor)this.data).isAllowDecimals() ?
new CRPropertyDescriptor[] {allowDecimal, decimalLength} : new CRPropertyDescriptor[] {allowDecimal}); new CRPropertyDescriptor[] {allowDecimal, decimalLength} : new CRPropertyDescriptor[] {allowDecimal});

4
designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java

@ -40,10 +40,10 @@ public class FormWebWidgetConstants {
Next.class); Next.class);
// 导出成Excel 分页导出 // 导出成Excel 分页导出
public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"), public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page"),
IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class); IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class);
// 导出成Excel 原样导出 // 导出成Excel 原样导出
public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"), public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Simple"),
IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class);
// 导出 // 导出
public static final WidgetOption EXPORT = WidgetOptionFactory public static final WidgetOption EXPORT = WidgetOptionFactory

4
designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java

@ -26,10 +26,10 @@ public class HyperlinkGroupWrapper implements Encoder, Decoder {
@Override @Override
public String encode(Object v) { public String encode(Object v) {
if (v == null) { if (v == null) {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Undefined"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hyperlink_Undefined");
} }
NameJavaScriptGroup group = (NameJavaScriptGroup)v; NameJavaScriptGroup group = (NameJavaScriptGroup)v;
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Group_Count", group.size()); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hyperlink_Group_Count", group.size());
} }
@Override @Override

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/MultiFileEditorPane.java

@ -54,8 +54,8 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{singleFileCheckBox, null }, new Component[]{singleFileCheckBox, null },
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")), acceptType}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")), acceptType},
new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit")), fileSizePane}, new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit")), fileSizePane},
new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizeField} new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizeField}
}; };
double[] rowSize = {p, p, p, p}; double[] rowSize = {p, p, p, p};

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java

@ -169,7 +169,7 @@ public class ParameterTreeComboBox extends FRTreeComboBox {
} }
} }
if (!ArrayUtils.isEmpty(parameters)) { if (!ArrayUtils.isEmpty(parameters)) {
groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Server"), parameters)); groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Server"), parameters));
} }
return groupList.toArray(new ParameterGroup[0]); return groupList.toArray(new ParameterGroup[0]);

4
designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java

@ -20,14 +20,14 @@ public class DSColumnConditionAction extends AbstractCellElementAction {
public DSColumnConditionAction() { public DSColumnConditionAction() {
super(); super();
this.setName(com.fr.design.i18n.Toolkit.i18nText("Filter")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"));
this.setMnemonic('E'); this.setMnemonic('E');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif"));
} }
public DSColumnConditionAction(ElementCasePane t) { public DSColumnConditionAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Filter")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"));
this.setMnemonic('E'); this.setMnemonic('E');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif"));
} }

6
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@ -80,7 +80,7 @@ public class DSColumnAdvancedPane extends BasicPane {
JPanel multiNumPane = null; JPanel multiNumPane = null;
if (setting > DSColumnPane.SETTING_DSRELATED) { if (setting > DSColumnPane.SETTING_DSRELATED) {
multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fill_blank_Data")); multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data"));
useMultiplyNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Column_Multiple")); useMultiplyNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Column_Multiple"));
multiNumPane.add(useMultiplyNumCheckBox); multiNumPane.add(useMultiplyNumCheckBox);
multiNumPane.add(new UILabel(InsetText)); multiNumPane.add(new UILabel(InsetText));
@ -338,10 +338,10 @@ public class DSColumnAdvancedPane extends BasicPane {
+ " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT); + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT);
JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{ JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{
serialTextField, new UILabel( serialTextField, new UILabel(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__")
) )
}, FlowLayout.LEFT); }, FlowLayout.LEFT);
serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")"); serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")");
selectCountCardPane.add(undefinedPane, "UNDEFINE"); selectCountCardPane.add(undefinedPane, "UNDEFINE");
selectCountCardPane.add(topFormulaPane, "TOP"); selectCountCardPane.add(topFormulaPane, "TOP");
selectCountCardPane.add(bottomFormulaPane, "BOTTOM"); selectCountCardPane.add(bottomFormulaPane, "BOTTOM");

21
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java

@ -1,24 +1,21 @@
package com.fr.design.dscolumn; package com.fr.design.dscolumn;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import com.fr.design.data.DesignTableDataManager;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.design.condition.DSColumnLiteConditionPane; import com.fr.design.condition.DSColumnLiteConditionPane;
import com.fr.design.condition.DSColumnSimpleLiteConditionPane; import com.fr.design.condition.DSColumnSimpleLiteConditionPane;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicPane; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.data.Condition; import com.fr.general.data.Condition;
import com.fr.report.cell.CellElement; import com.fr.report.cell.CellElement;
import com.fr.report.cell.cellattr.core.group.DSColumn; import com.fr.report.cell.cellattr.core.group.DSColumn;
import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
public class DSColumnConditionsPane extends BasicPane { public class DSColumnConditionsPane extends BasicPane {
//peter: Lite Condition. //peter: Lite Condition.
@ -65,7 +62,7 @@ public class DSColumnConditionsPane extends BasicPane {
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Filter"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter");
} }
public void populate(TableDataSource tds, CellElement cellElement) { public void populate(TableDataSource tds, CellElement cellElement) {

2
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java

@ -101,7 +101,7 @@ public class DSColumnPane extends BasicPane {
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Basic"), basicPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Basic"), basicPane);
conditionPane = new DSColumnConditionsPane(setting); conditionPane = new DSColumnConditionsPane(setting);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Filter"), conditionPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane);
advancedPane = new DSColumnAdvancedPane(setting); advancedPane = new DSColumnAdvancedPane(setting);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane);

2
designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@ -116,7 +116,7 @@ class CptApp extends AbstractWorkBookApp {
} }
}); });
UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No")); UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No"));
noButton.addActionListener(new ActionListener() { noButton.addActionListener(new ActionListener() {
@Override @Override

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

@ -878,7 +878,7 @@ public class PageSetupPane extends BasicPane {
this.add(defaultPane, BorderLayout.NORTH); this.add(defaultPane, BorderLayout.NORTH);
// page order // page order
JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Page_Order")); JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Order"));
JPanel pageOrderPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); JPanel pageOrderPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
outpageOrderPane.add(pageOrderPane); outpageOrderPane.add(pageOrderPane);
defaultPane.add(outpageOrderPane); defaultPane.add(outpageOrderPane);

4
designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java

@ -18,8 +18,8 @@ import java.awt.*;
public class ValueVerifierEditPane extends JPanel { public class ValueVerifierEditPane extends JPanel {
private UITableEditorPane<Object[]> tableEditorPane; private UITableEditorPane<Object[]> tableEditorPane;
private final String[] columnNames = new String[] { private final String[] columnNames = new String[] {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Verify"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify_Warn_Text") }; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Verify_Warn_Text") };
public ValueVerifierEditPane() { public ValueVerifierEditPane() {
// ben:UITableEditorPane; // ben:UITableEditorPane;

8
designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java

@ -89,17 +89,17 @@ public class ReportWebWidgetConstants {
// 导出成Excel 分页导出 // 导出成Excel 分页导出
public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"), public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class); BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class);
// 导出成Excel 原样导出 // 导出成Excel 原样导出
public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"), public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Simple"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class);
// 导出成Excel 分页分Sheet导出 // 导出成Excel 分页分Sheet导出
public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page_To_Sheet"), public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page_To_Sheet"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class); BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class);
// 导出成Word // 导出成Word
public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class); public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class);
// 页面设置 // 页面设置
public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class); public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class);
// 导出 // 导出

2
designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java

@ -72,7 +72,7 @@ public class WebCssPane extends BasicPane {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File"))); new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();

53
designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

@ -1,40 +1,41 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.*;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.EditingStringListPane;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.gui.frpane.EditingStringListPane;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.dialog.BasicPane;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.file.FILEChooserPane; import com.fr.file.FILEChooserPane;
import com.fr.file.filter.ChooseFileFilter; import com.fr.file.filter.ChooseFileFilter;
import com.fr.stable.CoreConstants; import com.fr.stable.CoreConstants;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.web.attr.ReportWebAttr; import com.fr.web.attr.ReportWebAttr;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
public class WebJsPane extends BasicPane { public class WebJsPane extends BasicPane {
private UITextField localText; private UITextField localText;
private UITextField urlText; private UITextField urlText;
@ -160,7 +161,7 @@ public class WebJsPane extends BasicPane {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File"))); new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();
@ -197,7 +198,7 @@ public class WebJsPane extends BasicPane {
FRContext.getLogger().error(e.getMessage(), e); FRContext.getLogger().error(e.getMessage(), e);
} }
if (in == null) { if (in == null) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
} else { } else {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully")); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully"));
try { try {

2
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -575,7 +575,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
//补充空白数据 //补充空白数据
JPanel multiNumPane = FRGUIPaneFactory.createYBoxEmptyBorderPane(); JPanel multiNumPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
useMultiNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fill_blank_Data")); useMultiNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data"));
JPanel checkBoxPane = new JPanel(new BorderLayout()); JPanel checkBoxPane = new JPanel(new BorderLayout());
checkBoxPane.add(useMultiNumCheckBox, BorderLayout.WEST); checkBoxPane.add(useMultiNumCheckBox, BorderLayout.WEST);
multiNumPane.add(checkBoxPane); multiNumPane.add(checkBoxPane);

2
designer-realize/src/main/java/com/fr/start/Designer.java

@ -391,7 +391,7 @@ public class Designer extends BaseDesigner {
if (DesignerMode.isAuthorityEditing()) { if (DesignerMode.isAuthorityEditing()) {
if (plus instanceof JWorkBook && plus.toolbars4Target() == null) { if (plus instanceof JWorkBook && plus.toolbars4Target() == null) {
//聚合块编辑 //聚合块编辑
return super.polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Poly_Block_Edit")); return super.polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Privilege_Poly_Block_Edit"));
} else { } else {
return plus.toolBar4Authority(); return plus.toolBar4Authority();
} }

Loading…
Cancel
Save