Browse Source

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

research/10.0
richie 6 years ago
parent
commit
97d8a2f869
  1. 6
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
  2. 4
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  3. 2
      designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
  4. 2
      designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
  5. 2
      designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
  6. 6
      designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
  7. 24
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java
  8. 10
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
  9. 4
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  10. 4
      designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java
  11. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
  12. 2
      designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
  13. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java
  14. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
  15. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  16. 6
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
  17. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TreeTableDataPane.java
  18. 2
      designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java
  19. 2
      designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
  20. 5
      designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java
  21. 2
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
  22. 2
      designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
  23. 2
      designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
  24. 32
      designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java
  25. 2
      designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
  26. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java
  27. 6
      designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
  28. 4
      designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java
  29. 5
      designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java
  30. 2
      designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java
  31. 4
      designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java
  32. 2
      designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java
  33. 4
      designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
  34. 2
      designer-base/src/main/java/com/fr/design/javascript/CustomActionPane.java
  35. 2
      designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java
  36. 6
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  37. 2
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  38. 7
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  39. 4
      designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java
  40. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java
  41. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java
  42. 6
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  43. 6
      designer-base/src/main/java/com/fr/design/style/AlignmentPane.java
  44. 2
      designer-base/src/main/java/com/fr/design/style/AlphaPane.java
  45. 2
      designer-base/src/main/java/com/fr/design/style/BorderPane.java
  46. 12
      designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java
  47. 6
      designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java
  48. 4
      designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java
  49. 22
      designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundSelectPane.java
  50. 34
      designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java
  51. 4
      designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java
  52. 2
      designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java
  53. 2
      designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java
  54. 5
      designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
  55. 6
      designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java
  56. 12
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  57. 6
      designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java
  58. 6
      designer-base/src/main/java/com/fr/env/EnvListPane.java
  59. 4
      designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
  60. 2
      designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
  61. 4
      designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java
  62. 2
      designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java
  63. 2
      designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java
  64. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
  65. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java
  66. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java
  67. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java
  68. 4
      designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java
  69. 6
      designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
  70. 4
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java
  71. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
  72. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java
  73. 10
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
  74. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java
  75. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java
  76. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java
  77. 8
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
  78. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/PieDataLabelPane.java
  79. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java
  80. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
  81. 2
      designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java
  82. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
  83. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
  84. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java
  85. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java
  86. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  87. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java
  88. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java
  89. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
  90. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  91. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java
  92. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java
  93. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java
  94. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java
  95. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java
  96. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java
  97. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java
  98. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java
  99. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java
  100. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java
  101. Some files were not shown because too many files have changed in this diff Show More

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

@ -511,7 +511,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
return env;
}
}
String name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Default");
String name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Default");
LocalDesignerWorkspaceInfo newDefaultEnv = LocalDesignerWorkspaceInfo.create(name, defaultenvPath);
this.putEnv(name, newDefaultEnv);
return newDefaultEnv;
@ -534,7 +534,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
}
}
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Default");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Default");
}
@ -1893,4 +1893,4 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
.end();
}
}
}

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

@ -154,7 +154,7 @@ public class PreferencePane extends BasicPane {
createJdkHomePane(advancePane);
JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Oracle_All_Tables"));
oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Show_All_Oracle_Tables"));
oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_All_Oracle_Tables"));
oraclePane.add(oracleSpace);
JPanel improvePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Product_improve"));
@ -202,7 +202,7 @@ public class PreferencePane extends BasicPane {
generalPane.add(editPane);
//设置是否支持将字符串编辑为公式
supportStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Support_String_To_Formula"));
supportStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Support_String_To_Formula"));
editPane.add(supportStringToFormulaBox);
//是否默认转化

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

@ -95,7 +95,7 @@ public class SwitchExistEnv extends MenuDef {
workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
boolean checkValid = workspace == null ? false : selectedEnv.checkValid();
if (!checkValid) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"),
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
null, 0, UIManager.getIcon("OptionPane.errorIcon"));
return;
}

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

@ -40,7 +40,7 @@ public class AboutDialog extends JDialog implements ActionListener {
JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane();
this.setContentPane(defaultPane);
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
okButton.addActionListener(this);
tabbedPane = new UITabbedPane();

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

@ -68,7 +68,7 @@ public class FeedBackPane extends BasicPane {
private static final String ALLOWED_INTEGER_TYPE = "0123456789";
private SwingWorker worker;
private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true);
private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
private int ifHasBeenWriten = 0;
private UITextArea detailField;

6
designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@ -121,14 +121,14 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
dg.setButtonEnabled(true);
String tempName = nPanel.getObjectName();
if (StringUtils.isBlank(tempName)) {
nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips"));
nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"));
dg.setButtonEnabled(false);
} else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) {
nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", tempName));
nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
dg.setButtonEnabled(false);
} else if (isProcedureName(oldName)) {
if (isIncludeUnderline(tempName)) {
nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips"));
nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
dg.setButtonEnabled(false);
}
} else {

24
designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java

@ -34,22 +34,22 @@ public class TableDataCreatorProducer {
TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("DS-Database_Query"),
"ds",
"/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class);
TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Class"),
TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
"/com/fr/design/images/data/source/classTableData.png", ClassTableData.class, ClassTableDataPane.class);
TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Embedded"),
TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
"Embedded",
"/com/fr/design/images/data/dataTable.png", EmbeddedTableData.class, EmbeddedTableDataPane.class);
TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Relation"),
TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"),
"Multi",
"/com/fr/design/images/data/multi.png", ConditionTableData.class, MultiTDTableDataPane.class) {
public boolean isNeedParameterWhenPopulateJControlPane() {
return true;
}
};
TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"),
TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"),
"File",
"/com/fr/design/images/data/file.png", FileTableData.class, FileTableDataSmallHeightPane.class);
TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"),
TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
"Tree",
"/com/fr/design/images/data/tree.png", RecursionTableData.class, TreeTableDataPane.class) {
public boolean isNeedParameterWhenPopulateJControlPane() {
@ -69,28 +69,28 @@ public class TableDataCreatorProducer {
}
public TableDataNameObjectCreator[] createServerTableDataCreator() {
TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class,
TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class,
DBTableDataPane.class);
TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class,
TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class,
ClassTableDataPane.class);
TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Embedded"), "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class,
TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"), "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class,
EmbeddedTableDataPane.class);
TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"), "/com/fr/design/images/data/file.png", FileTableData.class,
TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"), "/com/fr/design/images/data/file.png", FileTableData.class,
FileTableDataSmallPane.class);
TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"), "/com/fr/design/images/data/tree.png",
TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"), "/com/fr/design/images/data/tree.png",
RecursionTableData.class, GlobalTreeTableDataPane.class) {
public boolean isNeedParameterWhenPopulateJControlPane() {
return true;
}
};
TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Relation"), "/com/fr/design/images/data/multi.png",
TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"), "/com/fr/design/images/data/multi.png",
ConditionTableData.class, GlobalMultiTDTableDataPane.class) {
public boolean isNeedParameterWhenPopulateJControlPane() {
return true;
}
};
TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Stored_Procedure"), "/com/fr/design/images/data/store_procedure.png",
TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Stored_Procedure"), "/com/fr/design/images/data/store_procedure.png",
StoreProcedure.class, ProcedureDataPane.class) {
public boolean shouldInsertSeparator() {
return true;

10
designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@ -49,7 +49,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
if (StringUtils.isEmpty(tempName)) {
isNamePermitted = false;
nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips"));
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"));
setIllegalIndex(editingIndex);
return;
}
@ -58,12 +58,12 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
&& isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) {
isNamePermitted = false;
nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", tempName));
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
setIllegalIndex(editingIndex);
} else if (editingType instanceof StoreProcedure && isIncludeUnderline(tempName)) {
isNamePermitted = false;
nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips"));
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
setIllegalIndex(editingIndex);
}
if (nameableList.getSelectedValue() instanceof ListModelElement) {
@ -247,7 +247,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
NameObject nameObject = (NameObject) tableDataArray[i];
if (exsitTableDataNameList.contains(nameObject.getName())) {
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", nameObject.getName()));
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", nameObject.getName()));
}
exsitTableDataNameList.add(nameObject.getName());
@ -275,4 +275,4 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
public JPanel getPanel() {
return this;
}
}
}

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

@ -162,7 +162,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
protected void initbuttonGroup() {
// Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/data/datasource.png"), BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png")};
final Integer[] modeArray = {TEMPLATE_TABLE_DATA, SERVER_TABLE_DATA};
String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")};
String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")};
buttonGroup = new UIHeadGroup(textArray) {
public void tabChanged(int index) {
if (op != null) {
@ -324,4 +324,4 @@ public class TableDataTreePane extends BasicTableDataTreePane {
dataTree.refresh();
return Collections.unmodifiableMap(tdNameMap);
}
}
}

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

@ -53,7 +53,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
public TreeTableDataDictPane(String treeName) {
this.setLayout(new BorderLayout(5, 30));
this.setBorder(BorderFactory.createEmptyBorder(20, 20, 0, 0));
selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_TableData_Select_One") + " :");
selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One") + " :");
setTableDataNameComboBox(treeName);
tableDataNameComboBox.setPreferredSize(new Dimension(180, 20));
JPanel tableFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
@ -306,4 +306,4 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
treeDataFieldLabel2.setEnabled(true);
originFieldDependsOnLengthPane.setEnabled(true);
}
}
}

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

@ -48,7 +48,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
newCharSetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
message = new UILabel();
uiLabel = new UILabel();
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();

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

@ -295,7 +295,7 @@ public class PreviewTablePane extends BasicPane {
try {
int choiceColumn = Integer.parseInt(columnErrMessage.trim());
int tatalColumn = Integer.parseInt(tatolColumnErrMessage.trim());
columnErrMessage = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Preview_Warn_Text", choiceColumn + 1, tatalColumn);
columnErrMessage = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Preview_Warn_Text", choiceColumn + 1, tatalColumn);
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
return;

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

@ -93,7 +93,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Embedded_Column_Setting");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Embedded_Column_Setting");
}
public void checkValid() throws Exception {
@ -318,4 +318,4 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
embeddedTableData.clear();
}
}
}
}

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

@ -107,7 +107,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
private void initOtherNorthPaneComponents(JPanel northPane) {
// 表结构设置
columnSetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Embedded_Table_Design"));
columnSetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Embedded_Table_Design"));
columnSetButton.setMnemonic('C');
northPane.add(columnSetButton);
columnSetButton.addActionListener(new ActionListener() {
@ -352,4 +352,4 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
}
selectedChanged();
}
}
}

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

@ -759,7 +759,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File");
}
private void preview() {

6
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java

@ -66,7 +66,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
jpanel.setLayout(new BorderLayout());
JPanel northPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
UILabel chooseTableData = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Select_To_Merge"));
UILabel chooseTableData = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Select_To_Merge"));
UIButton previewButton = new UIButton();
previewButton.setIcon(BaseUtils.readIcon("/com/fr/web/images/preview.png"));
previewButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@ -131,7 +131,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
public UITableEditAction[] createAction() {
return new UITableEditAction[]{new RefreshAction()};
}
}, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Default_Parameter"));
}, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Default_Parameter"));
jpanel.add(editorPane, BorderLayout.CENTER);
@ -402,4 +402,4 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
};
}
}
}
}

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

@ -39,7 +39,7 @@ public class TreeTableDataPane extends AbstractTableDataPane<RecursionTableData>
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree");
}
}
}

2
designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java

@ -149,7 +149,7 @@ public class InformationWarnPane extends JPanel{
private JPanel createControlButtonPane() {
controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
okButton = new UIButton("<html><font FACE='MicroSoft YaHei'>" + com.fr.design.i18n.Toolkit.i18nText("OK") + "</font></html>") {
okButton = new UIButton("<html><font FACE='MicroSoft YaHei'>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK") + "</font></html>") {
@Override
public Dimension getPreferredSize() {
// TODO Auto-generated method stub

2
designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@ -113,7 +113,7 @@ public abstract class UIDialog extends JDialog {
}
private void addOkButton(JPanel buttonsPane) {
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
okButton.setName(OK_BUTTON);
okButton.setMnemonic('O');
buttonsPane.add(okButton);

5
designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java

@ -16,7 +16,6 @@ import com.fr.design.module.DesignModuleFactory;
import com.fr.design.utils.gui.GUIPaintUtils;
import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.log.FineLoggerFactory;
@ -122,7 +121,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
try {
historyList.remove(contains(selected));
selected.getEditingFILE().closeTemplate();
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Closed_Warn_Text", selected.getEditingFILE().getName()));
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Closed_Warn_Text", selected.getEditingFILE().getName()));
MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
@ -441,4 +440,4 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
return isNameAreadyExist;
}
}
}

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

@ -738,7 +738,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) {
specifiedTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
}
}
HistoryTemplateListPane.getInstance().closeSelectedReport(specifiedTemplate);

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

File diff suppressed because one or more lines are too long

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

@ -156,7 +156,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
@Override
public void refresh() {
reportletsTree.refresh();
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_File_Tree_Refresh_Successfully") + "!");
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_File_Tree_Refresh_Successfully") + "!");
}
/**

32
designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java

@ -126,7 +126,7 @@ public abstract class WidgetOption implements Serializable {
NUMBEREDITOR, TREECOMBOBOX, RADIOGROUP, CHECKBOXGROUP, TEXTAREA, PASSWORD, CHECKBOX, TREE, MULTI_FILEEDITOR};
}
public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Date"),
public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"),
DateEditor.class);
@ -137,62 +137,62 @@ public abstract class WidgetOption implements Serializable {
TreeComboBoxEditor.class);
public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Checkbox_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class);
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class);
public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Radio_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"),
RadioGroup.class);
public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Number"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class);
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class);
public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Label"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"),
Label.class);
public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"),
Button.class);
public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"),
FreeButton.class);
public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_File"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"),
MultiFileEditor.class);
public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Combo_Box"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"),
ComboBox.class);
public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Combo_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"),
ComboCheckBox.class);
public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"),
CheckBox.class);
public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_List"), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_List"), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"),
ListEditor.class);
public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Text")
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Text")
, BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16.png"),
TextEditor.class);
public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Textarea"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"),
TextArea.class);
public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Password"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class);
public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
IframeEditor.class);
}
}

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

@ -213,7 +213,7 @@ public class UICalendarPanel extends JPanel {
gap.setPreferredSize(new Dimension(26,1));
sPane.add(gap);
UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")) {
UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")) {
public Dimension getPreferredSize() {
return new Dimension(32,18);
}

4
designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java

@ -46,7 +46,7 @@ public class ImgChoosePane extends BasicPane {
if (image == null) {
imgSizeLabel.setText("");
} else {
imgSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Size_Detail",
imgSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Size_Detail",
image.getWidth(null) + "x" + image.getHeight(null)));
}
}
@ -117,4 +117,4 @@ public class ImgChoosePane extends BasicPane {
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Image");
}
}
}

6
designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java

@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
this.add(selectTreeDataPanel, BorderLayout.NORTH);
valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
formulaEditor.setEnabled(true);
textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
Component[][] coms = {
@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
String[] columnNames = new String[namelist.size()];
namelist.toArray(columnNames);
valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]);
} catch (Exception e) {
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
}

4
designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java

@ -17,7 +17,7 @@ public class DictionaryConstants {
"^\\d{6}$" };
public final static String[] regexpsDisplays = new String[] {
com.fr.design.i18n.Toolkit.i18nText("None"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
com.fr.design.i18n.Toolkit.i18nText("Required"),
com.fr.design.i18n.Toolkit.i18nText("Length"),
com.fr.design.i18n.Toolkit.i18nText("Float"),
@ -55,7 +55,7 @@ public class DictionaryConstants {
};
public static final String[] symbolDisplays = new String[]{
com.fr.design.i18n.Toolkit.i18nText("None"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"),
com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes")
};

5
designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java

@ -10,7 +10,6 @@ import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D;
import java.awt.geom.Point2D;
import javax.swing.DefaultComboBoxModel;
@ -20,8 +19,6 @@ import javax.swing.JList;
import com.fr.base.FRContext;
import com.fr.base.GraphHelper;
import com.fr.base.ScreenResolution;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.general.FRFont;
import com.fr.stable.Constants;
@ -91,7 +88,7 @@ public class LineComboBox extends UIComboBox {
FontMetrics fm = GraphHelper.getFontMetrics(rfont);
if (style == Constants.LINE_NONE) {
//draw "none" string
GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
} else {
GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style);
}

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

@ -106,7 +106,7 @@ public class UISBChooser extends JDialog {
JButton b = new JButton("Cancel");
b.addActionListener(new CancelAction());
p3.add(b);
b = new JButton("OK");
b = new JButton("Fine-Design_Report_OK");
getRootPane().setDefaultButton(b);
b.addActionListener(new OKAction());
p3.add(b);

4
designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java

@ -68,7 +68,7 @@ public class EnvFileTree extends RefreshableJTree {
String name = node.getName();
if (treeNode.hasFullAuthority()) {
if (lock != null && !node.getUserID().equals(lock)) {
name = name + Toolkit.i18nText("Fine-Design_Template_Status_Locked", "(", ")");
name = name + Toolkit.i18nText("Fine-Design_Basic_Template_Status_Locked", "(", ")");
this.setIcon(FileTreeIcon.getIcon(node));
} else {
this.setIcon(FileTreeIcon.getIcon(node, false));
@ -360,4 +360,4 @@ public class EnvFileTree extends RefreshableJTree {
return false;
}
}
}

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

@ -151,7 +151,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
private class FakeTipAction extends UpdateAction {
public FakeTipAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Select"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Select"));
}
public void actionPerformed(ActionEvent e) {

4
designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@ -96,7 +96,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
protected class HyperlinkParametersAction extends UITableEditAction {
public HyperlinkParametersAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Parameter"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Parameter"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"));
}
@ -153,4 +153,4 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
public void setExtendParametersCheckBox(UICheckBox extendParametersCheckBox) {
this.extendParametersCheckBox = extendParametersCheckBox;
}
}
}

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

@ -1 +1 @@
package com.fr.design.javascript; import com.fr.data.ClassSubmitJob; import com.fr.design.write.submit.CustomSubmitJobPane; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.js.CustomActionJavaScript; import java.awt.*; /** * Author : Shockway * Date: 13-8-12 * Time: 下午7:47 */ public class CustomActionPane extends FurtherBasicBeanPane<CustomActionJavaScript> { CustomSubmitJobPane classPane = new CustomSubmitJobPane(); public CustomActionPane() { this.setLayout(new BorderLayout()); this.add(classPane, BorderLayout.CENTER); } /** * 判断界面是否为js 传入 * @param ob 对象是否为js * @return 是否是js对象 */ @Override public boolean accept(Object ob) { return ob instanceof CustomActionJavaScript; } /** * 标题 * @return 标题 */ @Override public String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Submit_Type_Custom"); } /** * 重置 */ @Override public void reset() { this.classPane.reset(); } @Override public void populateBean(CustomActionJavaScript ob) { classPane.populateBean(ob.getJob()); } @Override public CustomActionJavaScript updateBean() { CustomActionJavaScript cs = new CustomActionJavaScript(); cs.setJob((ClassSubmitJob)classPane.updateBean()); return cs; } }
package com.fr.design.javascript; import com.fr.data.ClassSubmitJob; import com.fr.design.write.submit.CustomSubmitJobPane; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.js.CustomActionJavaScript; import java.awt.*; /** * Author : Shockway * Date: 13-8-12 * Time: 下午7:47 */ public class CustomActionPane extends FurtherBasicBeanPane<CustomActionJavaScript> { CustomSubmitJobPane classPane = new CustomSubmitJobPane(); public CustomActionPane() { this.setLayout(new BorderLayout()); this.add(classPane, BorderLayout.CENTER); } /** * 判断界面是否为js 传入 * @param ob 对象是否为js * @return 是否是js对象 */ @Override public boolean accept(Object ob) { return ob instanceof CustomActionJavaScript; } /** * 标题 * @return 标题 */ @Override public String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Submit_Type_Custom"); } /** * 重置 */ @Override public void reset() { this.classPane.reset(); } @Override public void populateBean(CustomActionJavaScript ob) { classPane.populateBean(ob.getJob()); } @Override public CustomActionJavaScript updateBean() { CustomActionJavaScript cs = new CustomActionJavaScript(); cs.setJob((ClassSubmitJob)classPane.updateBean()); return cs; } }

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

@ -57,7 +57,7 @@ public class TableLayoutTest extends JFrame
UITextField textfieldState = new UITextField(2);
UITextField textfieldZip = new UITextField(5);
UIButton buttonOk = new UIButton("OK");
UIButton buttonOk = new UIButton("Fine-Design_Report_OK");
UIButton buttonCancel = new UIButton("Cancel");
JPanel panelButton = new JPanel();
panelButton.add(buttonOk);

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

@ -40,7 +40,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.file.FILE;
import com.fr.file.FILEFactory;
import com.fr.file.FileFILE;
import com.fr.file.FileNodeFILE;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
@ -53,7 +52,6 @@ import com.fr.plugin.observer.PluginEventListener;
import com.fr.stable.CoreConstants;
import com.fr.stable.OperatingSystem;
import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.image4j.codec.ico.ICODecoder;
import com.fr.stable.project.ProjectConstants;
@ -846,13 +844,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
editingTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved",
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
editingTemplate.getEditingFILE().getName()));
}
} else {
if (editingTemplate.saveTemplate()) {
editingTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved",
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
editingTemplate.getEditingFILE().getName()));
}
}

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

@ -578,7 +578,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
if (selectedOperation.isNameAlreadyExist(userInput, oldName, suffix)) {
jt.selectAll();
// 如果文件名已存在,则灰掉确认按钮
hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_File_Name_Duplicate", userInput));
hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_File_Name_Duplicate", userInput));
hintsLabel.setVisible(true);
confirmButton.setEnabled(false);
} else {

7
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -1,6 +1,5 @@
package com.fr.design.mainframe;
import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.Parameter;
import com.fr.base.ScreenResolution;
@ -537,7 +536,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
if (!access) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
return false;
}
collectInfo();
@ -587,7 +586,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
if (!access) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
return false;
}
editingFILE = fileChooser.getSelectedFILE();
@ -883,7 +882,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
public boolean isOldDesigner() {
String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
if (isHigherThanCurrent(xmlDesignerVersion)) {
String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
String moreInfo = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Server-version-tip-moreInfo");
new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips")).show();
return true;

4
designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java

@ -13,14 +13,12 @@ import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.utils.DesignUtils;
import com.fr.env.EnvListPane;
import com.fr.event.EventDispatcher;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.stable.EnvChangedListener;
import com.fr.workspace.WorkContext;
import com.fr.workspace.WorkContextCallback;
import com.fr.workspace.Workspace;
import com.fr.workspace.WorkspaceEvent;
import com.fr.workspace.connect.AuthException;
import javax.swing.BorderFactory;
@ -149,7 +147,7 @@ public class TemplatePane extends JPanel implements MouseListener {
Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
boolean checkValid = workspace == null ? false : selectedEnv.checkValid();
if (!checkValid) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"),
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
null, 0, UIManager.getIcon("OptionPane.errorIcon"));
return false;
}

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

@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor {
case DataControl.TYPE_NUMBER:
return new DoubleEditor();
case DataControl.TYPE_FORMULA:
return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
case DataControl.TYPE_DATABINDING:
return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor();
case DataControl.TYPE_STRING:

2
designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java

@ -35,7 +35,7 @@ public class BackgroundWrapper implements Encoder, Decoder {
} else if (v instanceof GradientBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
} else {
return com.fr.design.i18n.Toolkit.i18nText("None");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
}
}

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

@ -657,7 +657,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Attribute");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Attribute");
}
@Override
@ -879,7 +879,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink");
}
@Override
@ -990,7 +990,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float");
}
@Override

6
designer-base/src/main/java/com/fr/design/style/AlignmentPane.java

@ -158,12 +158,12 @@ public class AlignmentPane extends BasicPane {
leftIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1)));
leftIndentSpinner.addChangeListener(changeListener);
GUICoreUtils.setColumnForSpinner(leftIndentSpinner, 3);
indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Indent_Left"), leftIndentSpinner));
indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Indent_Left"), leftIndentSpinner));
rightIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1)));
rightIndentSpinner.addChangeListener(changeListener);
GUICoreUtils.setColumnForSpinner(rightIndentSpinner, 3);
indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Indent_Right") , rightIndentSpinner));
indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Indent_Right") , rightIndentSpinner));
return indentPane;
}
@ -383,4 +383,4 @@ public class AlignmentPane extends BasicPane {
public static class Alignment {
}
}
}

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

@ -50,7 +50,7 @@ public class AlphaPane extends JPanel {
alphaPane.setBorder(BorderFactory.createEmptyBorder());
this.add(alphaPane, BorderLayout.CENTER);
alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha") + ":"));
alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha") + ":"));
alphaPane.add(alphaSlider = new UISlider(UISlider.HORIZONTAL, 0, ALPHA_FLOAT, START_VALUE));
alphaSlider.setPreferredSize(new Dimension(80, 20));

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

@ -108,7 +108,7 @@ public class BorderPane extends BasicPane {
// current color and current style excepting inside borders
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("Fine-Design_Report_Inner")));
// Control
JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();

12
designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java

@ -32,13 +32,13 @@ public class FontSizeStylePane extends JPanel {
this.add(fontVSizPane);
// fontVSizPane.setLayout(new BoxLayout(fontVSizPane, BoxLayout.X_AXIS));
fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size"), null));
fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"), null));
String[] styles = {
com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")};
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")};
styleField = new UITextField();
styleField.setEditable(false);
@ -103,4 +103,4 @@ public class FontSizeStylePane extends JPanel {
sizeList.setSelectedValue(new Integer(frFont.getSize()), true);
sizeField.setValue(frFont.getSize2D());
}
}
}

6
designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java

@ -61,7 +61,7 @@ public class BackgroundUIComboBoxPane extends BasicPane {
JPanel northPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
labelPane.add(northPane, BorderLayout.NORTH);
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Setting") + ":"));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Setting") + ":"));
northPane.add(selectBox);
cardLayout = new CardLayout();
@ -161,6 +161,6 @@ public class BackgroundUIComboBoxPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Setting");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Setting");
}
}
}

4
designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java

@ -34,7 +34,7 @@ public class GradientBackgroundPane extends BackgroundDetailPane {
public GradientBackgroundPane() {
// bug 5452 简化GradientPane
JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color"));
JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color"));
jpanel.setPreferredSize(new Dimension(450, 320));
jpanel.setLayout(new BorderLayout());
@ -132,4 +132,4 @@ public class GradientBackgroundPane extends BackgroundDetailPane {
this.changeListener.stateChanged(evt);
}
}
}
}

22
designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundSelectPane.java

@ -1,19 +1,17 @@
package com.fr.design.style.background.gradient;
import java.awt.BorderLayout;
import java.awt.Dimension;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import com.fr.base.background.GradientBackground;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Background;
import com.fr.design.style.AlphaPane;
import com.fr.design.style.background.BackgroundPane4BoxChange;
import com.fr.general.Background;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Dimension;
/**
* @author kunsnat E-mail:kunsnat@gmail.com
@ -58,12 +56,12 @@ public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange {
JPanel secondFloorPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
mainPane.add(secondFloorPane);
secondFloorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Area") + ":"));
secondFloorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Area") + ":"));
changeBox = new GradientChangeBoxPane();
secondFloorPane.add(changeBox);
secondFloorPane.add(repeatShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Repeat_Show")));
secondFloorPane.add(repeatShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Repeat_Show")));
}
public void populate(Background background) {
@ -112,7 +110,7 @@ public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color");
}
}
}

34
designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java

@ -1,28 +1,26 @@
package com.fr.design.style.background.gradient;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import com.fr.base.background.GradientBackground;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicPane;
import com.fr.stable.Constants;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/**
* @author kunsnat E-mail:kunsnat@gmail.com
* @version 创建时间2011-11-29 上午10:42:43
@ -30,8 +28,8 @@ import com.fr.stable.Constants;
*/
public class GradientChangeBoxPane extends BasicPane {
private static final long serialVersionUID = -6747468244414651602L;
private static final String CURRENT = Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Current_Area");
private static final String CUSTOM = Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Custom_Area");
private static final String CURRENT = Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Current_Area");
private static final String CUSTOM = Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Custom_Area");
private JPanel cardPane;
private CardLayout cardLayout;
@ -124,7 +122,7 @@ public class GradientChangeBoxPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color");
}
}
}

4
designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java

@ -61,7 +61,7 @@ public class GradientFromToPixPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color");
}
}
}

2
designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java

@ -220,7 +220,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
if (image == null) {
imageSizeLabel.setText("");
} else {
imageSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Size_Detail", image.getWidth(null) + "x" + image.getHeight(null)));
imageSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Size_Detail", image.getWidth(null) + "x" + image.getHeight(null)));
}
}
};

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

@ -98,7 +98,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
buttonPane.add(ok);
buttonPane.add(cancel);
ok.setActionCommand("OK");
ok.setActionCommand("Fine-Design_Report_OK");
ok.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
seletePane.setColor(okListener.getColor());

5
designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@ -4,7 +4,6 @@ import com.fr.base.BaseUtils;
import com.fr.base.GraphHelper;
import com.fr.base.Icon;
import com.fr.base.IconManager;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ibutton.UIButton;
@ -454,7 +453,7 @@ IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB);
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Add_Icon");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Add_Icon");
}
// 用户自定义的只有name 和 imgae两属性, path不要去管
@ -478,4 +477,4 @@ IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB);
return new Icon(nameTextField.getText(), iconImage);
}
}
}
}

6
designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java

@ -21,9 +21,9 @@ import java.awt.*;
public class DateValuePane extends JPanel {
private UIButtonGroup widgetValueHead;
private Editor[] editor;
private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("None");
private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date");
private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula");
private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula");
public DateValuePane() {
@ -45,7 +45,7 @@ public class DateValuePane extends JPanel {
@Override
public void stateChanged(ChangeEvent e) {
int index = widgetValueHead.getSelectedIndex();
if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("None"))) {
if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"))) {
customPane.setVisible(false);
} else {
customPane.setVisible(true);

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

@ -106,10 +106,10 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
private String subMitName;
private static final String[] DML_CONFIG_TYPES = new String[] {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Smart_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Delete_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Smart_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Update_Submit")};
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Delete_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Update_Submit")};
/**
* 无单元格没有智能添加单元格等按钮
@ -128,9 +128,9 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
dmlConfigComboBox = new UIComboBox(DML_CONFIG_TYPES);
JPanel typePane = GUICoreUtils.createFlowPane(new Component[] { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox },
JPanel typePane = GUICoreUtils.createFlowPane(new Component[] { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox },
FlowLayout.LEFT, 10);
typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Type")));
typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type")));
northPane.add(typePane, BorderLayout.NORTH);
chooseTable = new ChoosePaneSupportFormula();

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

@ -28,12 +28,12 @@ public class SubmitJobListPane extends ObjectJControlPane {
public NameableCreator[] createNameableCreators() {
return new NameableCreator[] {
new NameObjectCreator(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Event"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Submit_Event"),
"/com/fr/web/images/reportlet.png",
DMLConfigJob.class,
DMLJobPane.class),
new NameObjectCreator(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Custom_Event"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Custom_Event"),
"/com/fr/web/images/reportlet.png",
ClassSubmitJob.class,
CustomSubmitJobPane.class)
@ -59,4 +59,4 @@ public class SubmitJobListPane extends ObjectJControlPane {
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Set_Submit_Event");
}
}
}

6
designer-base/src/main/java/com/fr/env/EnvListPane.java vendored

@ -33,13 +33,13 @@ public class EnvListPane extends JListControlPane {
allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
if (StringUtils.isEmpty(tempName)) {
nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Empty_Name_Warn_Text"));
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Empty_Name_Warn_Text"));
setIllegalIndex(editingIndex);
return;
}
if (!ComparatorUtils.equals(tempName, selectedName) && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) {
nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Duplicate_Name_Warn_Text", tempName));
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text", tempName));
setIllegalIndex(editingIndex);
}
}
@ -108,4 +108,4 @@ public class EnvListPane extends JListControlPane {
protected boolean filterNameableCreator(NameableCreator creator) {
return false;
}
}
}

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

@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog {
this.setModal(true);
this.setLayout(new BorderLayout());
final ChartTypePane chartTypePane = new ChartTypePane();
setTitle(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType"));
setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"));
this.applyClosingAction();
this.applyEscapeAction();
@ -55,7 +55,7 @@ public class ChartDialog extends MiddleChartDialog {
this.add(buttonPane, BorderLayout.SOUTH);
ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
buttonPane.add(ok);

2
designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java

@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane);
spane.setDividerLocation(120);
spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType")));
spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type")));
this.add(spane);
iconViewList.setSelectedIndex(0);

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

@ -131,8 +131,8 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
double[] columnSize = {0.1, 0.2, 0.5, 0.2};
Component[][] components= {
{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_Chart_Font") + ":"), fontNameBox},
{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_Report_Font") + ":"), fontNameBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size") + ":"), fontSizeBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
{null, null, rightButton = new UIRadioButton(getRightName())},

2
designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java

@ -10,7 +10,7 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane {
}
protected String getValueAxisName() {
return com.fr.design.i18n.Toolkit.i18nText("Main_Axis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis");
}
protected String getSecondValueAxisName() {

2
designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java

@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane {
private ColorSelectBox colorSelectBox;
public BorderAttriPane() {
this(com.fr.design.i18n.Toolkit.i18nText("Line-Style"), com.fr.design.i18n.Toolkit.i18nText("Color"));
this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color"));
}
public BorderAttriPane(String lineString, String colorSting) {

2
designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java

@ -18,7 +18,7 @@ public class SetChartStyleAciton extends ChartComponentAction {
public SetChartStyleAciton(ChartComponent chartComponent) {
super(chartComponent);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"));
}
public void actionPerformed(ActionEvent e) {

2
designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java

@ -45,7 +45,7 @@ public class MapCubeDataPane extends UIComboBoxPane<TopDefinitionProvider> {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("LayerData");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Data");
}
/**

2
designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java

@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit
TextEditor textEidtor = new TextEditor();
initListeners(textEidtor);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
initListeners(formulaEditor);
Editor[] editors = new Editor[]{textEidtor, formulaEditor};

2
designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java

@ -21,7 +21,7 @@ public class MapReportRenderer extends DefaultTableCellRenderer {
private ValueEditorPane cellEditor;
public MapReportRenderer() {
Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"))};
Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"))};
cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors);
}

4
designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java

@ -33,7 +33,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane<MapMoreLayerTable
pane.setLayout(new FlowLayout(FlowLayout.LEFT));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Select") + ":", SwingConstants.RIGHT);
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata_Select") + ":", SwingConstants.RIGHT);
dataFromBox = new DatabaseTableDataPane(label) {
protected void userEvent() {
@ -107,4 +107,4 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane<MapMoreLayerTable
return tableDefinition;
}
}
}

6
designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java

@ -50,7 +50,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Select") + ":", SwingConstants.RIGHT);
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata_Select") + ":", SwingConstants.RIGHT);
northPane.add(fromTableData = new DatabaseTableDataPane(label) {
@Override
@ -127,7 +127,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
* 界面弹出标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata");
}
private void stopEditing() {
@ -266,4 +266,4 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
return this.editorComponent;
}
}
}
}

4
designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java

@ -122,7 +122,7 @@ public class MapImageEditPane extends BasicBeanPane<String> {
UIScrollPane pane = new UIScrollPane(recordTable);
pane.setPreferredSize(new Dimension(150, 320));
pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "WF-Name"})));
pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name")));
this.add(pane, BorderLayout.EAST);
}
@ -480,7 +480,7 @@ public class MapImageEditPane extends BasicBeanPane<String> {
});
bg.setSize(NAME_EDIT_PANE_WIDTH, NAME_EDIT_PANE_HEIGHT);
bg.setLocation((int) (e.getLocationOnScreen().getX()) + LOCATIONOFFSET, (int) e.getLocationOnScreen().getY());
bg.setTitle(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Filed", "WF-Name"}));
bg.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name_Edit"));
bg.setVisible(true);
}

6
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java

@ -53,12 +53,12 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
pane.add(namePane);
namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_TrendLine" , "WF-Name"}), null));
namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "WF-Name"})));
namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trendline_Name"), null));
namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Define_Name")));
namePane.add(nameLabel = new UITextField("", 6));
pane.add(linePane = new BorderAttriPane());
linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Line-Style"}), null));
linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Line_Style"), null));
JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
pane.add(typePane);

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

@ -25,7 +25,7 @@ public class DataLabelContentsPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return "Label";
return "Fine-Design_Chart_Label";
}
/**

10
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java

@ -40,10 +40,10 @@ public class DataLabelStylePane extends BasicPane {
nameBox.setPreferredSize(new Dimension(80, 20));
String[] styles = {
com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")};
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")};
this.add(fontStyleBox = new UIComboBox(styles));
fontStyleBox.setPreferredSize(new Dimension(80, 20));
@ -66,7 +66,7 @@ public class DataLabelStylePane extends BasicPane {
@Override
protected String title4PopupWindow() {
return "Label";
return "Fine-Design_Chart_Label";
}
public void populate(AttrContents seriesAttrContents) {

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java

@ -29,7 +29,7 @@ public class LabelLineStylePane extends ConditionAttrSingleConditionPane<DataSer
super(conditionAttributesPane, isRemove);
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style") + ":");
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style") + ":");
if (isRemove) {
this.add(nameLabel);
}
@ -40,7 +40,7 @@ public class LabelLineStylePane extends ConditionAttrSingleConditionPane<DataSer
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("Line-Style");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style");
}
@Override

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java

@ -37,7 +37,7 @@ public class Bar2DDataLabelPane extends DataLabelPane {
outSideButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(outSideButton);
buttonPane.add(insideButton);
buttonPane.add(centerButton);

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java

@ -32,7 +32,7 @@ public class BubbleDataLabelPane extends DataLabelPane {
outSideButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(outSideButton);
buttonPane.add(insideButton);

8
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java

@ -69,7 +69,7 @@ public class DataLabelPane extends TooltipContentsPane {
protected Component[] createComponents4ShowSeriesName() {
if (showSeriesNameCB == null) {
showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Series", "WF-Name"}));
showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
}
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Include"}) + ":"), showSeriesNameCB};
}
@ -82,7 +82,7 @@ public class DataLabelPane extends TooltipContentsPane {
}
protected String getCategoryString(){
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"StyleFormat-Category", "WF-Name"});
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name");
}
@ -105,7 +105,7 @@ public class DataLabelPane extends TooltipContentsPane {
JPanel labelStylePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
JPanel westPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
labelStylePane.add(westPane, BorderLayout.WEST);
westPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "FRFont"}) + ":"));
westPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Font") + ":"));
labelStylePane.add(stylePane = new DataLabelStylePane(), BorderLayout.CENTER);
return labelStylePane;
}
@ -127,7 +127,7 @@ public class DataLabelPane extends TooltipContentsPane {
topButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(bottomButton);
buttonPane.add(leftButton);
buttonPane.add(rigtButton);

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/PieDataLabelPane.java

@ -66,7 +66,7 @@ public class PieDataLabelPane extends DataLabelPane {
insideButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(insideButton);
buttonPane.add(outSideButton);

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java

@ -32,7 +32,7 @@ public class RangeDataLabelPane extends DataLabelPane {
topButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(topButton);
buttonPane.add(bottomButton);
buttonPane.add(centerButton);

6
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java

@ -59,12 +59,12 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
floatNameBox.setPreferredSize(new Dimension(90, 20));
JPanel pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float") + ":"));
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float") + ":"));
pane.add(floatNameBox);
Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);
Font font = null;
TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Related", "M_Insert-Float"}), 4, 2, font, new Color(1, 159, 222));
TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Float_Related"), 4, 2, font, new Color(1, 159, 222));
// 圆角不行
centerPane.setBorder(border);
@ -144,7 +144,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Related", "M_Insert-Float"});
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Float_Related");
}
public static class ChartNoRename extends ChartHyperRelateFloatLinkPane {

2
designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java

@ -73,7 +73,7 @@ public class MarkerComboBox extends UIComboBox {
g2d.setFont(rfont);
FontMetrics fm = GraphHelper.getFontMetrics(rfont);
GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 12, (d.height - fm.getHeight()) / 2 + fm.getAscent());
GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 12, (d.height - fm.getHeight()) / 2 + fm.getAscent());
} else {
if (marker.getBackground() == null) {
marker.setBackground(ColorBackground.getInstance(Color.black));

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

@ -119,7 +119,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
}
private JPanel createTitleStylePane() {
final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
styleAttrPane = new ChartTextAttrPane() {
protected JPanel getContentPane(JPanel buttonPane) {
double p = TableLayout.PREFERRED;

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java

@ -81,7 +81,7 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
* @return 返回标题.
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata");
}
@ -171,4 +171,4 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
return null;
}
}
}

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java

@ -38,7 +38,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"),
com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"),
com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"),
com.fr.design.i18n.Toolkit.i18nText("FRFont-Size")
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size")
};
}

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java

@ -42,14 +42,14 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
private static final int TICK_HEIGHT = 20;
private static final int COM_GAP =5;
private static final String YEAR = com.fr.design.i18n.Toolkit.i18nText("Year");
private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Month");
private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month");
private static final String DAY =com.fr.design.i18n.Toolkit.i18nText("Sun");
private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Sche-Hour");
private static final String MINUTE = com.fr.design.i18n.Toolkit.i18nText("Sche-Minute");
private static final String SECOND = com.fr.design.i18n.Toolkit.i18nText("Sche-Second");
private static String[] TYPES = new String[]{
com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"),
com.fr.design.i18n.Toolkit.i18nText("Sche-Second")
};
@ -67,7 +67,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
private static Map<Integer, String> INTS = new HashMap<Integer, String>();
static {
INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year"));
INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Month"));
INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"));
INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun"));
INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"));
INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"));

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

@ -33,7 +33,9 @@ public class ChartAxisLineStylePane extends BasicPane{
axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS);
axisLineColor = new ColorSelectBox(100);
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")};
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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"),
BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"),
@ -55,7 +57,7 @@ public class ChartAxisLineStylePane extends BasicPane{
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Type")),axisLineStyle} ,
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("MainGraduationLine")),null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null},
new Component[]{null, mainTickPosition},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("SecondGraduationLine")),null},
new Component[]{null,secondTickPosition}

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

@ -17,7 +17,7 @@ public class ChartBeautyPane extends BasicBeanPane<Integer>{
public ChartBeautyPane() {
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"),
com.fr.design.i18n.Toolkit.i18nText("Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"),
com.fr.design.i18n.Toolkit.i18nText("TopDownShade"),com.fr.design.i18n.Toolkit.i18nText("Transparent") //新加的两种风格,注意兼容处理
};

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

@ -34,7 +34,7 @@ public class ChartBorderPane extends BasicPane{
double[] columnSize = { p,f };
double[] rowSize = {p, p, p, p};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")+":"),currentLineCombo},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")+":"),currentLineCombo},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane},
new Component[]{null,isRoundBorder}
} ;

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

@ -165,7 +165,7 @@ public class ChartTextAttrPane extends BasicPane {
}
protected Component[][] getComponents(JPanel buttonPane) {
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
return new Component[][]{
new Component[]{null, null},
new Component[]{text, fontNameComboBox},

12
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java

@ -48,7 +48,7 @@ import java.util.regex.Pattern;
public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private static String[] TYPES = new String[]{
com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"),
com.fr.design.i18n.Toolkit.i18nText("Sche-Second")
};
@ -56,7 +56,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private static Map<String, Integer> VALUES = new HashMap<String, Integer>();
static {
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Year"), ChartConstants.YEAR_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Month"), ChartConstants.MONTH_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), ChartConstants.MONTH_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sun"), ChartConstants.DAY_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), ChartConstants.HOUR_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"), ChartConstants.MINUTE_TYPE);
@ -66,7 +66,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private static Map<Integer, String> INTS = new HashMap<Integer, String>();
static {
INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year"));
INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Month"));
INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"));
INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun"));
INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"));
INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"));
@ -97,7 +97,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value"));
Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
Editor[] editor = new Editor[]{dateEditor, formulaEditor};
minValueField = new ValueEditorPane(editor);
minValueField.setEnabled(false);
@ -113,7 +113,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value"));
Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
Editor[] editor = new Editor[]{dateEditor, formulaEditor};
maxValueField = new ValueEditorPane(editor);
maxValueField.setEnabled(false);
@ -126,7 +126,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private void initMain() {
// 主要刻度单位
mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("MainGraduationUnit"));
mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Unit"));
mainUnitField = new UITextField();
mainUnitField.setPreferredSize(new Dimension(30, 20));
mainUnitField.setEditable(false);

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

@ -41,6 +41,6 @@ public class ChartSecondValueNoFormulaPane extends ChartValueNoFormulaPane{
* @return 第二值轴
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecondValueAxis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Value_Axis");
}
}

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java

@ -87,12 +87,12 @@ public class ChartLabelFontPane extends BasicScrollPane<Chart> {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Label");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label");
}
private class ContentPane extends JPanel {
private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value"));
private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units"));
private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units"));
public ContentPane() {
this.initComponents();

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

@ -78,7 +78,7 @@ public class ChartLegendPane extends BasicScrollPane<Chart>{
Component[][] components = new Component[][]{
new Component[]{null,textAttrPane},
new Component[]{new JSeparator(),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Layout")),location} ,
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")),location} ,
new Component[]{new JSeparator(),null},
new Component[]{borderPane,null},
new Component[]{backgroundPane,null}

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

@ -30,7 +30,7 @@ public class Area3DSeriesPane extends AbstractPlotSeriesPane {
JPanel pane = new JPanel();
pane.setLayout(new BorderLayout());
pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pitch_Percentage") + ":"), BorderLayout.WEST);
pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pitch_Percentage") + ":"), BorderLayout.WEST);
pane.add(gapPane = new UINumberDragPane(0, 500), BorderLayout.CENTER);
gapPane.populateBean(100.0);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java

@ -249,9 +249,9 @@ public class CustomDefaultSeriesPane extends BasicPane{
double[] rowSize = { p,p,p,p};
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
};
this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.NORTH);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java

@ -458,9 +458,9 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane<CustomAttr>{
Component[][] components = new Component[][]{
new Component[]{positionPane, null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
};
this.setLayout(new BorderLayout());

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java

@ -58,9 +58,9 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{
double[] rowSize = { p,p,p,p,p,p,p};
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
};
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java

@ -78,7 +78,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane {
JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize);
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit},
new Component[]{new JSeparator(), null},
new Component[]{orderPane, null},
new Component[]{colorPickerPane, null},
@ -90,7 +90,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane {
return components;
} else {
components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit},
new Component[]{new JSeparator(), null},
new Component[]{orderPane, null},
new Component[]{colorPickerPane, null},

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

@ -36,7 +36,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane {
protected void initCom() {
stylePane = new ChartBeautyPane();
isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot"));
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")};
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")};
Integer[] valueArray = {0, 1};
secondPlotType = new UIButtonGroup<Integer>(nameArray, valueArray);
smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1));

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

@ -57,7 +57,7 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle },
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")),isNullValueBreak}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak}
} ;
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save