Browse Source

Merge pull request #260 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0

* commit 'fbb8ce52bc895594d978f684f7795a6504d61cdf':
  继续改改改
  继续改改改
  继续改改改
  CORE-116 继续改国际化,改一点是一点
master
richie 6 years ago
parent
commit
7f842a65ab
  1. 63
      designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertLinePane.java
  2. 24
      designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java
  3. 2
      designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java
  4. 8
      designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java
  5. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAnalysisLineStyleAction.java
  6. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAxisStyleAction.java
  7. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
  8. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java
  9. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java
  10. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java
  11. 2
      designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
  12. 4
      designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java
  13. 5
      designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java
  14. 5
      designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java
  15. 5
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java
  16. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java
  17. 5
      designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java

63
designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertLinePane.java

@ -1,63 +0,0 @@
package com.fr.design.chart.axis;
import com.fr.general.NameObject;
import com.fr.stable.Nameable;
import com.fr.chart.chartattr.ChartAlertValue;
import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator;
import java.util.ArrayList;
import java.util.List;
public class ChartAlertLinePane extends JListControlPane {
public NameableCreator[] createNameableCreators() {
return new NameableCreator[]{
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"),
ChartAlertValue.class, ChartAlertValuePane.class)
};
}
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "ChartF-Alert-Line"});
}
public void populate(ChartAlertValue[] alertList) {
if (alertList == null) {
alertList = new ChartAlertValue[0];
}
List<NameObject> nameObjectList = new ArrayList<NameObject>();
for (int i = 0; i < alertList.length; i++) {
ChartAlertValue value = alertList[i];
nameObjectList.add(new NameObject(value.getAlertPaneSelectName(), value));
}
if (!nameObjectList.isEmpty()) {
populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
}
}
public ChartAlertValue[] updateAlertValues() {
Nameable[] res = update();
NameObject[] res_array = new NameObject[res.length];
java.util.Arrays.asList(res).toArray(res_array);
if (res_array.length < 1) {
return new ChartAlertValue[0];
}
List alertValueList = new ArrayList();
for (int i = 0; i < res_array.length; i++) {
NameObject nameObject = res_array[i];
ChartAlertValue chartAlertValue = (ChartAlertValue) nameObject.getObject();
chartAlertValue.setAlertPaneSelectName(nameObject.getName());
alertValueList.add(chartAlertValue);
}
return (ChartAlertValue[]) alertValueList.toArray(new ChartAlertValue[alertValueList.size()]);
}
}

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

@ -61,12 +61,12 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
JPanel alertLinePane =FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
pane.add(alertLinePane);
alertLinePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Alert-Line", "Set"})));
alertLinePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line_Setting")));
JPanel valuePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
alertLinePane.add(valuePane);
valuePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF_Alert", "Value"}) + ":"));
valuePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Value") + ":"));
textField = new UITextField();
textField.setColumns(4);
@ -88,14 +88,14 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
JPanel lineStylePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
alertLinePane.add(lineStylePane);
lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style") + ":"));
lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Line_Style") + ":"));
lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
lineStylePane.add(lineCombo);
JPanel lineColorPane =FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
alertLinePane.add(lineColorPane);
lineColorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Alert-Line", "Color"}) + ":"));
lineColorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line_Color") + ":"));
colorBox = new ColorSelectBox(80);
lineColorPane.add(colorBox);
@ -105,7 +105,7 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
JPanel tipPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
pane.add(tipPane);
tipPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Tip") + ":", null));
tipPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Tip") + ":", null));
JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
tipPane.add(centerPane);
@ -130,10 +130,10 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
double[] rowSize = {t, t, t, t, t};
double[] columnSize = {0.1, 0.2, 0.5, 0.2};
Component[][] components= {
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Content") + ":"), contentField = new UITextField(3)},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FRFont") + ":"), fontNameBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FRFont-Size") + ":"), fontSizeBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Content") + ":"), contentField = new UITextField(3)},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font") + ":"), fontNameBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font_Size") + ":"), fontSizeBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
{null, null, rightButton = new UIRadioButton(getRightName())},
};
@ -148,16 +148,16 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
}
protected String getLeftName() {// 居左 居右
return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Left");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Left");
}
protected String getRightName() {
return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Right");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Right");
}
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line");
}
private void showFormulaPane() {

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

@ -27,7 +27,7 @@ import com.fr.design.dialog.BasicPane;
public abstract class ChartStyleAxisPane extends BasicPane implements ListSelectionListener {
protected static final String CATE_AXIS = com.fr.design.i18n.Toolkit.i18nText("ChartF-Category_Axis");
protected static final String VALUE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Chart_F_Radar_Axis");
protected static final String SECOND_AXIS = com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Second", "Chart_F_Radar_Axis"});
protected static final String SECOND_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Value_Axis");
private JList mainList;
private CardLayout cardLayout;
private JPanel cardDisplayPane = null;

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

@ -31,13 +31,13 @@ public class MinMaxValuePane extends JPanel {
protected UITextField secUnitField;
public MinMaxValuePane() {
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Min_Value"}));
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Min_Value"));
minValueField = new UITextField(6);
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Max_Value"}));
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Max_Value"));
maxValueField = new UITextField(6);
isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "FR-Chart_MainGraduationUnit"}));
isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Graduation_Unit"));
mainUnitField = new UITextField(6);
isCustomSecUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "FR-Chart_SecondGraduationUnit"}));
isCustomSecUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Second_Graduation_Unit"));
secUnitField = new UITextField(6);
double p = TableLayout.PREFERRED;

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

@ -11,7 +11,7 @@ public class SetAnalysisLineStyleAction extends ChartComponentAction{
public SetAnalysisLineStyleAction(ChartComponent chartComponent) {
super(chartComponent);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "AnalysisLine"}));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Analysis_Line"));
}
@Override

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

@ -18,7 +18,7 @@ import com.fr.stable.StringUtils;
public class SetAxisStyleAction extends ChartComponentAction {
public SetAxisStyleAction(ChartComponent chartComponent) {
super(chartComponent);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "ChartF-Axis", "Format"}));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Axis_Format"));
}
public void actionPerformed(ActionEvent e) {

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.i18nTextArray(new String[]{"DashBoard-ChartFloat", "Style"}));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"));
}
public void actionPerformed(ActionEvent e) {

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

@ -11,7 +11,7 @@ public class SetDataLabelStyleAction extends ChartComponentAction{
public SetDataLabelStyleAction(ChartComponent chartComponent) {
super(chartComponent);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Data-Label"}));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Data_Label"));
}
@Override

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

@ -19,7 +19,7 @@ public class SetPlotStyleAction extends ChartComponentAction {
public SetPlotStyleAction(ChartComponent chartComponent) {
super(chartComponent);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "ChartF-Plot"}));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Plot"));
}
public void actionPerformed(ActionEvent e) {

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

@ -19,7 +19,7 @@ public class SetTitleStyleAction extends ChartComponentAction {
public SetTitleStyleAction(ChartComponent chartComponent) {
super(chartComponent);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Title", "Style"}));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Title_Style"));
}
public void actionPerformed(ActionEvent e) {

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

@ -84,7 +84,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
this.add(northPane, BorderLayout.NORTH);
String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
seriesPane = new UICorrelationPane(columnNames) {
public UITableEditor createUITableEditor() {
return new InnerTableEditor();

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

@ -99,7 +99,7 @@ public class MapDataPane extends DataContentsPane {
return list;
}
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart-Map", "Data"});
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data");
}
};
pane.add(mainPane, BorderLayout.CENTER);
@ -127,7 +127,7 @@ public class MapDataPane extends DataContentsPane {
* @return 标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart-Map", "Data"});
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data");
}
@Override

5
designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java

@ -52,13 +52,14 @@ public class MapMoreReportIndexPane extends BasicBeanPane<MapSingleLayerReportDe
this.add(northPane, BorderLayout.NORTH);
northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Area_Name") + ":"));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"));
areaNamePane = new TinyFormulaPane();
areaNamePane.setPreferredSize(new Dimension(120, 20));
northPane.add(areaNamePane);
tabPane = new UICorrelationPane(new String[]{com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")}){
tabPane = new UICorrelationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")){
public UITableEditor createUITableEditor() {
return new InnerTableEditor();
}

5
designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java

@ -63,13 +63,14 @@ public class MapMoreTableIndexPane extends BasicBeanPane<MapSingleLayerTableDefi
this.add(northPane, BorderLayout.NORTH);
northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Area_Name") + ":"));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"));
areaNameBox = new UIComboBox();
areaNameBox.setPreferredSize(new Dimension(120, 20));
northPane.add(areaNameBox);
tabPane = new UICorrelationPane(new String[]{com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")}){
tabPane = new UICorrelationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")){
public UITableEditor createUITableEditor() {
return new InnerTableEditor();
}

5
designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java

@ -50,12 +50,13 @@ public class MapReportDataSinglePane extends FurtherBasicBeanPane<MapSingleLayer
northPane.setLayout(new FlowLayout(FlowLayout.CENTER));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Area_Name") + ":", SwingConstants.RIGHT));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":", SwingConstants.RIGHT));
areaNamePane = new TinyFormulaPane();
areaNamePane.setPreferredSize(new Dimension(120, 20));
northPane.add(areaNamePane);
String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")};
seriesPane = new UICorrelationPane(columnNames) {
public UITableEditor createUITableEditor() {
return new InnerTableEditor();

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

@ -80,7 +80,7 @@ public class MapSinglePane extends FurtherBasicBeanPane<TopDefinitionProvider> {
* 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"SingleLayer", "Chart-Map"});
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Single_Layer_Map");
}
/**

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

@ -65,7 +65,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
fromTableData.setPreferredSize(new Dimension(180, 20));
northPane.add(fromTableData);
UILabel nameLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Area_Name") + ":", SwingConstants.RIGHT);
UILabel nameLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":", SwingConstants.RIGHT);
areaNameBox = new UIComboBox();
areaNameBox.setPreferredSize(new Dimension(80, 20));
@ -81,7 +81,8 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
pane.add(areaNamePane, BorderLayout.NORTH);
String[] titles = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Title"}), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
String[] titles = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")};
titleValuePane = new UICorrelationPane(titles){
public UITableEditor createUITableEditor() {
return new InnerTableEditor();

Loading…
Cancel
Save