Browse Source

Merge pull request #373 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0

* commit '514f78cc2fa9380588d5781c93733a5090723de9':
  d0814
  fine0814
final/10.0
Wim.Zhai 6 years ago
parent
commit
e4c88f4b48
  1. 2
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  3. 2
      designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java
  4. 4
      designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java
  5. 2
      designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
  6. 4
      designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java
  7. 4
      designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java
  8. 2
      designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java
  9. 4
      designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java
  10. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java
  11. 4
      designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java
  12. 10
      designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
  13. 20
      designer-chart/src/main/java/com/fr/design/chart/report/GisMapTableDataContentPane.java
  14. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java
  15. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java
  16. 4
      designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java
  17. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java
  18. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java
  19. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java
  20. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java
  21. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java
  22. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java
  23. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
  24. 4
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java
  25. 6
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java
  26. 16
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
  27. 2
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java
  28. 18
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
  29. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java
  30. 3
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java
  31. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAlphaPane.java
  32. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAxisPositionPane.java
  33. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java
  34. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelColorPane.java
  35. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java
  36. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TrendLineControlPane.java
  37. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TrendLinePane.java
  38. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java
  39. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java
  40. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/GanttDataLabelPane.java
  41. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java
  42. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/PieDataLabelPane.java
  43. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
  44. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java
  45. 4
      designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java
  46. 4
      designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java
  47. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java
  48. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java
  49. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java
  50. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
  51. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
  52. 18
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java
  53. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java
  54. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java
  55. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
  56. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java
  57. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java
  58. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
  59. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java
  60. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java
  61. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java
  62. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java
  63. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java
  64. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java
  65. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java
  66. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java
  67. 14
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java
  68. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java
  69. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
  70. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
  71. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java
  72. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java
  73. 14
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java
  74. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java
  75. 64
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
  76. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java
  77. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java
  78. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  79. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java
  80. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java
  81. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java
  82. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java
  83. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java
  84. 18
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java
  85. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  86. 8
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java
  87. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java
  88. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java
  89. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java
  90. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java
  91. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java
  92. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java
  93. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
  94. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java
  95. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java
  96. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java
  97. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java
  98. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java
  99. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java
  100. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java
  101. Some files were not shown because too many files have changed in this diff Show More

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

@ -196,7 +196,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
itemNameTextField = new UITextField();
JPanel topPane = GUICoreUtils.createBorderLayoutPane(
GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Name") + ":"), BorderLayout.NORTH,
GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH,
importedJsPane, BorderLayout.CENTER,
parameterPane, BorderLayout.EAST
);

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

@ -776,7 +776,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present");
}
@Override

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

@ -28,7 +28,7 @@ public abstract class TransparentPane extends BasicPane {
// richer:能否拖动
if (isSupportTransparent) {
UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Transparency"));
UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
transparentButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
transparentButton.addActionListener(new TransparentActionListener());

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

@ -30,13 +30,13 @@ public class ChartControlPane extends JListControlPane {
@Override
public NameableCreator[] createNameableCreators() {
return new NameableCreator[] {
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Chart"), Chart.class, ChartTypeUpdatePane.class)
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Chart"), Chart.class, ChartTypeUpdatePane.class)
};
}
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Manage_Chart_Type");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Manage_Chart_Type");
}
public void populate(ChartCollection cc) {

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

@ -157,7 +157,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
Chart chart = ChartTypeManager.getInstance().getChartTypes(plotID)[iconViewList.getSelectedIndex()];
if(chart.getPlot() != null){
if(chart.getPlot() instanceof MapPlot && !supportMap()){
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Not_Supported"));
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Not_Supported"));
throw new RegistEditionException(VT4FR.ChartMap);
}

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

@ -11,10 +11,10 @@ package com.fr.design.chart.axis;
public class ChartAlertValueInTopBottomPane extends ChartAlertValuePane {
protected String getLeftName() {
return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Bottom");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Bottom");
}
protected String getRightName() {
return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Top");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Top");
}
}

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

@ -25,8 +25,8 @@ import com.fr.design.dialog.BasicPane;
* Time : 上午8:48
*/
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 CATE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Category");
protected static final String VALUE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Value_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;

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

@ -19,7 +19,7 @@ public class GanntChartStyleAxisPane extends BinaryChartStyleAxisPane {
protected AxisStyleObject getXAxisPane(Plot plot) {
ChartCategoryPane categoryPane = new ChartCategoryPane();
categoryPane.getAxisValueTypePane().removeTextAxisPane();
return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Chart_Date_Axis"), categoryPane);
return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Date_Time_Axis"), categoryPane);
}
protected AxisStyleObject getYAxisPane(Plot plot) {

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

@ -17,10 +17,10 @@ public class XYChartStyleAxisPane extends BinaryChartStyleAxisPane {
}
protected AxisStyleObject getXAxisPane(Plot plot) {
return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), new ChartValuePane());
return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), new ChartValuePane());
}
protected AxisStyleObject getYAxisPane(Plot plot) {
return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), new ChartValuePane());
return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis"), new ChartValuePane());
}
}

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

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

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

@ -58,7 +58,7 @@ public class GisMapDataPane extends DataContentsPane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ChartF-Gis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Map");
}
public void setSupportCellData(boolean surpportCellData) {
@ -109,7 +109,7 @@ public class GisMapDataPane extends DataContentsPane{
double[] columnSize = { p,f };
double[] rowSize = { p};
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":"), jcb},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":"), jcb},
} ;
JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 0);

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

@ -51,8 +51,8 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
private void initCom() {
this.setLayout(new BorderLayout(0, 0));
addressType = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Address"), com.fr.design.i18n.Toolkit.i18nText("Chart-LngLat")});
lnglatOrder = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-LngFirst"), com.fr.design.i18n.Toolkit.i18nText("Chart-LatFirst")});
addressType = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng")});
lnglatOrder = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude_First"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude_First")});
addressPane = new TinyFormulaPane();
addressNamePane = new TinyFormulaPane();
double p = TableLayout.PREFERRED;
@ -70,7 +70,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
}
}
};
orderPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-LatLngOrder")), BorderLayout.WEST);
orderPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng_Order")), BorderLayout.WEST);
orderPane.add(lnglatOrder, BorderLayout.CENTER);
orderPane.setVisible(false);
lnglatOrder.setSelectedIndex(0);
@ -78,13 +78,13 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
Component[][] components = new Component[][]{
new Component[]{addressType, addressPane},
new Component[]{orderPane, null},
new Component[]{new UILabel(" " +com.fr.design.i18n.Toolkit.i18nText("Chart-Address-Name")+":", SwingConstants.RIGHT), addressNamePane},
new Component[]{new UILabel(" " +com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address_Name")+":", SwingConstants.RIGHT), addressNamePane},
};
JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
this.add(northPane, BorderLayout.NORTH);
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")};
String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value")};
seriesPane = new UICorrelationPane(columnNames) {
public UITableEditor createUITableEditor() {
return new InnerTableEditor();

20
designer-chart/src/main/java/com/fr/design/chart/report/GisMapTableDataContentPane.java

@ -61,7 +61,7 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Select_Data_Set") + ":", SwingConstants.LEFT);
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Select_Dataset") + ":", SwingConstants.LEFT);
northPane.add(fromTableData = new DatabaseTableDataPane(label) {
@Override
@ -72,8 +72,8 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
fromTableData.setPreferredSize(new Dimension(218, 20));
northPane.add(fromTableData);
addressType = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address"), com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_LatLng")});
lnglatOrder = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Lng_First"),com.fr.design.i18n.Toolkit.i18nText("Chart-Lat_First")});
addressType = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng")});
lnglatOrder = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude_First"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude_First")});
addressType.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
@ -96,19 +96,19 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
}
}
};
orderPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-LatLng_Order")), BorderLayout.WEST);
orderPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng_Order")), BorderLayout.WEST);
orderPane.add(lnglatOrder, BorderLayout.CENTER);
orderPane.setVisible(false);
lnglatOrder.setSelectedIndex(0);
addressType.setSelectedIndex(0);
addressNameBox.removeAllItems();
addressNameBox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
addressNameBox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
Component[][] components = new Component[][]{
new Component[]{addressType, addressBox},
new Component[]{orderPane,null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name") + ":", SwingConstants.RIGHT), addressNameBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address_Name") + ":", SwingConstants.RIGHT), addressNameBox},
};
JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
@ -118,7 +118,7 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
pane.add(centerPane, BorderLayout.NORTH);
String[] titles = {com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Value")};
String[] titles = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value")};
titleValuePane = new UICorrelationPane(titles){
public UITableEditor createUITableEditor() {
return new InnerTableEditor();
@ -138,7 +138,7 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
addressBox.removeAllItems();
addressNameBox.removeAllItems();
addressNameBox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
addressNameBox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
for(int i = 0, size = initNames.length; i < size; i++) {
addressBox.addItem(initNames[i]);
@ -171,7 +171,7 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
* @return 标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData");
}
private void stopEditing() {
@ -201,7 +201,7 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
addressBox.setSelectedItem(mapDefinition.getAddress());
if(StringUtils.isEmpty(mapDefinition.getAddressName())) {
addressNameBox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
addressNameBox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
} else {
addressNameBox.setSelectedItem(mapDefinition.getAddressName());
}

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

@ -26,7 +26,7 @@ public class MapCubeDataPane extends UIComboBoxPane<TopDefinitionProvider> {
protected void initLayout() {
this.setLayout(new BorderLayout(0, 0));
JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":"));
northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":"));
northPane.add(jcb);
this.add(northPane, BorderLayout.NORTH);

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

@ -303,7 +303,7 @@ public class MapCubeLayerPane extends BasicBeanPane<String>{
* 返回界面标题.
*/
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Drill");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Drill_Level");
}
}

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

@ -36,7 +36,7 @@ public class MapCubeSetDataPane extends BasicBeanPane<List>{
private void initCom() {
this.setLayout(new BorderLayout(0, 0));
UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Map")}, new int[] {}) {
UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Map")}, new int[] {}) {
public boolean isCellEditable(int row, int col) {
return col != 0;
}
@ -77,7 +77,7 @@ public class MapCubeSetDataPane extends BasicBeanPane<List>{
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Setting");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Setting");
}
/**

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

@ -87,7 +87,7 @@ public class MapDataPane extends DataContentsPane {
protected void initLayout() {
this.setLayout(new BorderLayout(0, 6));
JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ShowWay") + ":"));
northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Show_Way") + ":"));
northPane.add(jcb);
this.add(northPane, BorderLayout.NORTH);
this.add(cardPane, BorderLayout.CENTER);

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

@ -87,7 +87,7 @@ public class MapMoreCubeLayerPane extends MultiTabPane<ChartCollection>{
* @return 返回标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Muiti_In");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Muiti_In");
}
/**

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

@ -59,7 +59,7 @@ public class MapMoreReportIndexPane extends BasicBeanPane<MapSingleLayerReportDe
northPane.add(areaNamePane);
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")){
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value")){
public UITableEditor createUITableEditor() {
return new InnerTableEditor();
}

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

@ -70,7 +70,7 @@ public class MapMoreTableIndexPane extends BasicBeanPane<MapSingleLayerTableDefi
northPane.add(areaNameBox);
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")){
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value")){
public UITableEditor createUITableEditor() {
return new InnerTableEditor();
}

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

@ -56,7 +56,7 @@ public class MapReportDataSinglePane extends FurtherBasicBeanPane<MapSingleLayer
northPane.add(areaNamePane);
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")};
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value")};
seriesPane = new UICorrelationPane(columnNames) {
public UITableEditor createUITableEditor() {
return new InnerTableEditor();

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

@ -38,7 +38,7 @@ public class MapSinglePane extends FurtherBasicBeanPane<TopDefinitionProvider> {
protected void initLayout() {
this.setLayout(new BorderLayout(0, 6));
JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":"));
northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":"));
northPane.add(jcb);
this.add(northPane, BorderLayout.NORTH);

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

@ -82,7 +82,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
pane.add(areaNamePane, BorderLayout.NORTH);
String[] titles = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")};
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value")};
titleValuePane = new UICorrelationPane(titles){
public UITableEditor createUITableEditor() {
return new InnerTableEditor();

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

@ -74,14 +74,14 @@ public class MapCustomPane extends BasicBeanPane<String> implements AbstrctMapAt
northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
UIButton loadMap = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Import_Map"));
UIButton loadMap = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Import_Map"));
loadMap.setPreferredSize(new Dimension(160, 20));
northPane.add(loadMap);
loadMap.addActionListener(selectPictureActionListener);
if(isNeedDataSource){
UILabel label =new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Table_Data") + ":", SwingConstants.RIGHT) ;
UILabel label =new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":", SwingConstants.RIGHT) ;
tableDataNameBox = new DatabaseTableDataPane(label) {
protected void userEvent() {

6
designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java

@ -67,7 +67,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane<String> implements Abstrc
northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
UILabel lable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData") + ":", SwingConstants.RIGHT);
UILabel lable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData") + ":", SwingConstants.RIGHT);
// 数据集, 字段, 数据列表, 使用该数据进行自动命名
tableDataBox = new DatabaseTableDataPane(lable) {
@ -83,10 +83,10 @@ public class MapDefiAreaNamePane extends BasicBeanPane<String> implements Abstrc
columnBox.setPreferredSize(new Dimension(40, 20));
columnBox.addItemListener(columnChange);
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Field")+":"));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Field")+":"));
northPane.add(columnBox);
tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")}, new int[]{}) {
tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")}, new int[]{}) {
public boolean isCellEditable(int row, int col) {
return col != 0;
}

16
designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java

@ -55,10 +55,10 @@ import java.util.ArrayList;
*/
public class MapGroupExtensionPane extends BasicPane implements UIObserver {
private static final String[] TYPE_NAMES = new String[]{
com.fr.design.i18n.Toolkit.i18nText("FR-Chart-World_Map"),
com.fr.design.i18n.Toolkit.i18nText("FR-Chart-State_Map"),
com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Province_Map"),
com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Custom_Map")};
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_World_Map"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_State_Map"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Province_Map"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Map")};
private static final int WORD = 0;
private static final int NATION = 1;
private static final int STATE = 2;
@ -300,7 +300,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
}
private JMenuItem createLayerItem(final String oldName) {
JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Corresponding_Fields"));
JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Corresponding_Fields"));
corrItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane();
@ -332,11 +332,11 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
}
private JMenuItem createRenameItem() {
JMenuItem renameItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Rename"));
JMenuItem renameItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Rename"));
renameItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(),
com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject());
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Rename"), groupExtensionPane.getSelectedObject());
if (StringUtils.isNotBlank(newName)) {
String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
if(ComparatorUtils.equals(oldName, newName)){
@ -407,7 +407,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
@Override
protected void done() {
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Saved")); // 地图已经保存.
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Saved")); // 地图已经保存.
}
};

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

@ -523,7 +523,7 @@ public class MapImageEditPane extends BasicBeanPane<String> {
private int editViewRow = -1;// 所对应的view的index行 , 确定当前正在编辑的viewList的行, 然后改变值
private UILabel namedLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Pre_Defined") + "------");
private UILabel namedLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pre_Defined") + "------");
private JPanel listPane = new JPanel();
public EditNamePane() {

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

@ -68,16 +68,16 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
JPanel buttonPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
typePane.add(buttonPane);
buttonPane.add(exponentButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Exponent")));
buttonPane.add(linearButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Linear")));
buttonPane.add(logButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Log")));
buttonPane.add(polynomialButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Polynomial")));
buttonPane.add(powerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Power")));
buttonPane.add(exponentButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Exponent")));
buttonPane.add(linearButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Linear")));
buttonPane.add(logButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Log")));
buttonPane.add(polynomialButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Polynomial")));
buttonPane.add(powerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Power")));
JPanel maPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
typePane.add(maPane);
maPane.add(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Move_Average")));
maPane.add(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Move_Average")));
maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle") + ":"));
maPane.add(maSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 999, 1)));
maSpinner.setEnabled(false);
@ -99,10 +99,10 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
JPanel extendsPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); // 前推倒推设置
extendsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Forecast"), null));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":"));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine_Forward") + ":"));
extendsPane.add(forwardLabel = new UITextField("0", 5));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Backward") + ":"));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine_Backward") + ":"));
extendsPane.add(backwardLabel = new UITextField("0", 5));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")));
@ -127,7 +127,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine");
}
ActionListener listener = new ActionListener() {

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

@ -43,7 +43,7 @@ public class DataSeriesAttrPane extends JListControlPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Display");
}
public void populate(Plot plot) {

3
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java

@ -5,7 +5,6 @@ import com.fr.chart.base.AttrAlpha;
import com.fr.chart.base.AttrBackground;
import com.fr.chart.base.AttrContents;
import com.fr.chart.base.DataSeriesCondition;
import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionAttr;
import com.fr.data.condition.AbstractCondition;
@ -166,7 +165,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAt
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Display");
}
/**

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

@ -30,8 +30,8 @@ public class LabelAlphaPane extends ConditionAttrSingleConditionPane<DataSeriesC
public LabelAlphaPane(ConditionAttributesPane conditionAttributesPane) {
super(conditionAttributesPane, true);
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alpha"));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alpha") + ":");
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha") + ":");
alphaPane = new UINumberDragPane(0, ALPHASIZE);
JPanel panel = new JPanel(new BorderLayout());
@ -46,7 +46,7 @@ public class LabelAlphaPane extends ConditionAttrSingleConditionPane<DataSeriesC
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("ChartF-Alpha");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha");
}
@Override

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

@ -34,7 +34,7 @@ public class LabelAxisPositionPane extends ConditionAttrSingleConditionPane<Data
this.add(nameLabel);
}
String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")};
String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")};
String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()};
positionGroup = new UIButtonGroup<String>(names, values);

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

@ -61,7 +61,7 @@ public class LabelBackgroundPane extends ConditionAttrSingleConditionPane<DataSe
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("ChartF-Background_Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background_Color");
}
@Override

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

@ -25,7 +25,7 @@ public class LabelColorPane extends ConditionAttrSingleConditionPane<DataSeriesC
public LabelColorPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) {
super(conditionAttributesPane, isRemove);
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Background_Color"));
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background_Color"));
colorSelectionPane = new ColorSelectBox(80);
if (isRemove) {

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

@ -76,7 +76,7 @@ public class TooltipContentsPane extends BasicPane{
protected Component[] createComponents4PercentValue() {
if (showPercent == null) {
showPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_ValueIntPercent"));
showPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percentage"));
}
JPanel percentValuePane = new JPanel();

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

@ -17,7 +17,7 @@ public class TrendLineControlPane extends JListControlPane {
public NameableCreator[] createNameableCreators() {
return new NameableCreator[] {
new NameObjectCreator(
com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"),
ConditionTrendLine.class,
ConditionTrendLinePane.class
)

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

@ -32,7 +32,7 @@ public class TrendLinePane extends ConditionAttrSingleConditionPane<DataSeriesCo
public TrendLinePane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) {
super(conditionAttributesPane, isRemove);
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"));
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"));
editTrendLineButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Trendline"));
editTrendLineButton.addActionListener(new ActionListener() {
@ -58,7 +58,7 @@ public class TrendLinePane extends ConditionAttrSingleConditionPane<DataSeriesCo
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine");
}
public void populate(DataSeriesCondition condition) {

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

@ -26,8 +26,8 @@ public class Bar2DDataLabelPane extends DataLabelPane {
protected JPanel createJPanel4Position() {
centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StyleAlignment_Center"));
insideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelInside"));
outSideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelOutSide"));
insideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label_Inside"));
outSideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label_OutSide"));
ButtonGroup bg = new ButtonGroup();
bg.add(insideButton);

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

@ -22,8 +22,8 @@ public class BubbleDataLabelPane extends DataLabelPane {
private UIButton outSideButton;
protected JPanel createJPanel4Position() {
insideButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Inside"));
outSideButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Outside"));
insideButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Inside"));
outSideButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Outside"));
ButtonGroup bg = new ButtonGroup();
bg.add(insideButton);

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

@ -19,7 +19,7 @@ public class GanttDataLabelPane extends DataLabelPane {
protected Component[] createComponents4ShowCategoryName() {
if (showCategoryNameCB == null) {
showCategoryNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Step_Name"));
showCategoryNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Step_Name"));
}
return new Component[]{null, showCategoryNameCB};
}

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

@ -28,7 +28,7 @@ public class MapDataLabelPane extends DataLabelPane {
@Override
protected String getValueString() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Value");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value");
}
protected JPanel createJPanel4Position() {

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

@ -25,7 +25,7 @@ public class PieDataLabelPane extends DataLabelPane {
protected Component[] createComponents4ShowGuidLine() {
if (showGuidLine == null) {
showGuidLine = new JCheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Show_GuidLine"));
showGuidLine = new JCheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
}
return new Component[]{null, showGuidLine};
}
@ -51,8 +51,8 @@ public class PieDataLabelPane extends DataLabelPane {
}
protected JPanel createJPanel4Position() {
insideButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"));
outSideButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie"));
insideButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pie_Inside"));
outSideButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pie_Outside"));
outSideButton.addActionListener(getPositionListener());
insideButton.addActionListener(getPositionListener());
showPercent.addActionListener(getPieLeadActionListener());

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

@ -43,7 +43,7 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPopli
if (this.needRenamePane()) {
itemNameTextField = new UITextField();
this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Name") + ":"), BorderLayout.NORTH);
this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Name") + ":"), BorderLayout.NORTH);
}
hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
@ -82,7 +82,7 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPopli
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Pop_Chart");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pop_Chart");
}
@Override

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

@ -56,13 +56,13 @@ public class FormHyperlinkNorthPane extends BasicBeanPane<FormHyperlinkProvider>
Component[][] components;
if (!this.needRenamePane) {
components = new Component[][]{
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Object")), targetFrameComboBox},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Form_Object")), targetFrameComboBox},
};
} else {
itemNameTextField = new UITextField();
components = new Component[][]{
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name_has_Colon")), itemNameTextField},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Object")), targetFrameComboBox},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Name_Has_Colon")), itemNameTextField},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Form_Object")), targetFrameComboBox},
};
}
JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

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

@ -60,9 +60,9 @@ public class MapEditPane extends BasicBeanPane<MapSvgAttr>{
namedPane= new MapDefiAreaNamePane(false);
areaPane.setImageSelectType(MapShapeValue.AREA);
// pointPane.setImageSelectType(MapShapeValue.POINT);
tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ImageArea"),areaPane);
tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Image_Area"),areaPane);
// tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ImagePoint"),pointPane);
tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Corresponding_Fields"),namedPane);
tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Corresponding_Fields"),namedPane);
editingPane = areaPane;
}

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

@ -65,7 +65,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
chartEditPane.setContainer(container);
chartEditPane.addTitleChangeListener(titleListener);
String tabname = chartEditPane.getSelectedTabName();
nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : ""));
nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : ""));
resetChartEditPane();
}
@ -81,7 +81,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
@Override
public void fireTitleChange(String addName) {
nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Property_Table") + '-' + addName);
nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Property_Table") + '-' + addName);
}
};

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

@ -215,7 +215,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Property_Table");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Property_Table");
}
public void populate(ChartCollection collection) {

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

@ -12,7 +12,7 @@ import javax.swing.*;
*/
public abstract class ChartsConfigPane <T extends Charts> extends AbstractChartAttrPane {
public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name");
public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name");
public abstract Class<? extends Charts> acceptType();

12
designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java

@ -9,17 +9,17 @@ public class PaneTitleConstants {
public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Special");
public final static String CHART_STYLE_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title");
public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Legend");
public final static String CHART_STYLE_SERIES_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Series");
public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Axis");
public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend");
public final static String CHART_STYLE_SERIES_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series");
public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis");
public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background");
public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart_Data_Sheet");
public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet");
public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label");
public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Analysis_Line");
public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_D_Chart_Area");
public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot");
public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plot_Region");
public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Chart-Switch");
public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart");
}

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

@ -111,7 +111,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second"))},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Second"))},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")),colorSelectBox4carousel, null}
};
@ -227,6 +227,6 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Config_Attributes");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Config_Attributes");
}
}

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

@ -110,7 +110,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
}
private void initConfigCreator() {
configCreator = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class);
configCreator = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class);
}
private void initAddButton() {
@ -183,7 +183,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
private String getNewChartName() {
int count = indexList.size() + 1;
while (true) {
String name_test = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Module_Name") + count;
String name_test = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Module_Name") + count;
boolean repeated = false;
for (int i = 0, len = indexList.size(); i < len; i++) {
ChartChangeButton nameable = indexList.get(i);
@ -261,7 +261,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Types_Switch");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart");
}
private void changeCollectionSelected(String name) {

18
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java

@ -109,7 +109,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
* @return 返回标题.
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter");
}
/**
@ -228,7 +228,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
panel1.add(onlyPreData, BorderLayout.NORTH);
preDataNum = new UITextField();
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther"));
combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
combineOther.setSelected(true);
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
@ -244,7 +244,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
//默认不显示
preDataNumPane.setVisible(false);
panel1.add(preDataNumPane, BorderLayout.CENTER);
notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_NotShowCate"));
notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Cate"));
panel2.add(notShowNull, BorderLayout.NORTH);
onlyPreData.addChangeListener(new ChangeListener() {
@ -258,7 +258,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
fire();
}
};
presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present") ,present);
presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present);
panel2.add(presentPane, BorderLayout.SOUTH);
double[] column = {f};
@ -281,7 +281,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
* 界面标题 "分类"
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Category");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category");
}
/**
@ -403,7 +403,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
panel1.add(onlyPreData, BorderLayout.NORTH);
preDataNum = new UITextField();
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther"));
combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
combineOther.setSelected(true);
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
@ -419,7 +419,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
//默认不显示
preDataNumPane.setVisible(false);
panel1.add(preDataNumPane, BorderLayout.CENTER);
notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_NotShowSeries"));
notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Series"));
panel2.add(notShowNull, BorderLayout.NORTH);
onlyPreData.addChangeListener(new ChangeListener() {
@ -433,7 +433,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
fire();
}
};
presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present") ,present);
presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present);
panel2.add(presentPane, BorderLayout.SOUTH);
double[] column = {f};
@ -457,7 +457,7 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
* 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Series");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series");
}
/**

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

@ -64,7 +64,7 @@ public class NormalChartDataPane extends DataContentsPane {
this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6));
JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0));
northPane.add(jcb, BorderLayout.CENTER);
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Resource"));
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT));
northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8));

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

@ -36,7 +36,7 @@ public class ReportDataPane extends FurtherBasicBeanPane<ChartCollection>{
* @return 界面的标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Cell_Data");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell_Data");
}
/**

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

@ -36,7 +36,7 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
}
private void initDataPane() {
UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData")) ;
UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData")) ;
label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT));
tableDataPane = new DatabaseTableDataPane(label) {
@Override

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

@ -26,7 +26,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
public BubblePlotReportDataContentPane(ChartDataPane parent) {
initEveryPane();
filterPane = new ChartDataFilterPane(new BubblePlot(), parent);
JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane);
JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
panel.setBorder(getSidesBorder());
filterPane.setBorder(getFilterPaneBorder());
this.add(panel, "0,6,2,4");
@ -36,8 +36,8 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
protected String[] columnNames() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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("Fine-Design_Chart_X_Axis"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size")
};
}

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

@ -54,7 +54,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
public CategoryPlotMoreCateReportDataContentPane(ChartDataPane parent) {
initEveryPane();
categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name"));
categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
JPanel catePane = new JPanel();
catePane.setLayout(new BorderLayout(2, 2));
@ -76,7 +76,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
this.add(catePane, "0,0,2,0");
filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane);
JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
panel.setBorder(getSidesBorder());
filterPane.setBorder(getFilterPaneBorder());
this.add(panel, "0,6,2,4");

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@ -34,12 +34,12 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
public CategoryPlotReportDataContentPane(ChartDataPane parent) {
initEveryPane();
categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name"));
categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
categoryName.setPreferredSize(new Dimension(246,30));
categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7));
this.add(categoryName, "0,0,2,0");
filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane);
JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
panel.setBorder(getSidesBorder());
filterPane.setBorder(getFilterPaneBorder());
this.add(panel, "0,6,2,4"); }
@ -51,7 +51,7 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
this.setLayout(new BorderLayout(4, 0));
if(StringUtils.isNotEmpty(leftLabel)) {
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name"));
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
label1.setPreferredSize(new Dimension(75, 20));
this.add(label1, BorderLayout.WEST);
}
@ -91,8 +91,8 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
@Override
protected String[] columnNames() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"),
com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value")
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value")
};
}

12
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java

@ -21,14 +21,14 @@ import java.util.List;
*/
public class GanttPlotReportDataContentPane extends AbstractReportDataContentPane {
private static final String STEP = com.fr.design.i18n.Toolkit.i18nText("ChartF-Step");
private static final String START = com.fr.design.i18n.Toolkit.i18nText("ChartF-PlansToBegin");
private static final String END = com.fr.design.i18n.Toolkit.i18nText("ChartF-EndOfTheProject");
private static final String STEP = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Step");
private static final String START = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_Start");
private static final String END = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_End");
private static final String RESTART = com.fr.design.i18n.Toolkit.i18nText("ChartF-TheActualStart");
private static final String REEND = com.fr.design.i18n.Toolkit.i18nText("ChartF-TheActualEnd");
private static final String RESTART = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_Start");
private static final String REEND = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_End");
private static final String PERCENT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StyleFormat_Percent");
private static final String PRO = com.fr.design.i18n.Toolkit.i18nText("Chart_Project");
private static final String PRO = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project");
public GanttPlotReportDataContentPane(ChartDataPane parent) {
initEveryPane();

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

@ -26,7 +26,7 @@ import java.awt.Component;
public class MeterPlotReportDataContentPane extends AbstractReportDataContentPane {
private static final String CATENAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name");
private static final String NVALUE = com.fr.design.i18n.Toolkit.i18nText("Chart-Pointer_Value");
private static final String NVALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_Value");
private TinyFormulaPane singCatePane;
private TinyFormulaPane singValuePane;
@ -59,7 +59,7 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan
this.setLayout(new BorderLayout());
this.add(panel, BorderLayout.NORTH);
filterPane = new ChartDataFilterPane(new MeterPlot(), parent);
JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane);
JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
pane.setBorder(getSidesBorder());
filterPane.setBorder(getFilterPaneBorder());

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

@ -24,7 +24,7 @@ public class PiePlotReportDataContentPane extends AbstractReportDataContentPane
public PiePlotReportDataContentPane(ChartDataPane parent) {
initEveryPane();
this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter")), "0,4,2,4");
this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter")), "0,4,2,4");
this.add(filterPane = new ChartDataFilterPane(new PiePlot(), parent), "0,6,2,4");
}

12
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java

@ -38,12 +38,12 @@ import java.util.List;
* @version 创建时间2012-12-19 下午04:10:47
*/
public class StockPlotReportDataContentPane extends AbstractReportDataContentPane {
private static final String AXIS = com.fr.design.i18n.Toolkit.i18nText("Chart_HorialTimeAxis");
private static final String VOLUME = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Volume");
private static final String OPEN = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Open");
private static final String HIGHT = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_High");
private static final String LOW = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Low");
private static final String CLOSE = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Close");
private static final String AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horial_Time_Axis");
private static final String VOLUME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Volume");
private static final String OPEN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Open");
private static final String HIGHT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_High");
private static final String LOW = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Low");
private static final String CLOSE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Close");
private static final int PRE_WIDTH = 210;
private static final int VOLUMN_INDEX = 0;
private static final int OPEN_INDEX = 1;

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

@ -32,8 +32,8 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten
protected String[] columnNames() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
com.fr.design.i18n.Toolkit.i18nText("Chart_Scatter") + "x",
com.fr.design.i18n.Toolkit.i18nText("Chart_Scatter") + "y"
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter") + "x",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter") + "y"
};
}

12
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java

@ -45,7 +45,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
yCombox.setPreferredSize(new Dimension(100, 20));
bubbleSize.setPreferredSize(new Dimension(100, 20));
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
@ -58,14 +58,14 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName},
new Component[]{new UILabel("x"), xCombox},
new Component[]{new UILabel("y"), yCombox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), bubbleSize}
};
JPanel north = TableLayoutHelper.createTableLayoutPane(components_north,rowSize_north,columnSize_north);
north.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1));
Component[][] components = new Component[][]{
new Component[]{north},
new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),dataScreeningPane), null},
new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),dataScreeningPane), null},
};
@ -91,7 +91,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
protected void refreshBoxListWithSelectTableData(List list) {
refreshBoxItems(seriesName, list);
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
refreshBoxItems(xCombox, list);
refreshBoxItems(yCombox, list);
refreshBoxItems(bubbleSize, list);
@ -102,7 +102,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
*/
public void clearAllBoxList(){
clearBoxItems(seriesName);
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
clearBoxItems(xCombox);
clearBoxItems(yCombox);
clearBoxItems(bubbleSize);
@ -118,7 +118,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
BubbleTableDefinition definition = (BubbleTableDefinition) top;
if(definition.getSeriesName() == null || ComparatorUtils.equals(StringUtils.EMPTY, definition.getSeriesName())) {
seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
} else {
combineCustomEditValue(seriesName, definition.getSeriesName());
}

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java

@ -58,7 +58,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
JPanel categoryPane = new JPanel(new BorderLayout(4, 0));
categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name"));
UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT));
addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java

@ -41,11 +41,11 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
categoryCombox = new UIComboBox();
JPanel categoryPane = new JPanel(new BorderLayout(4,0));
categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")) ;
UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")) ;
label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT));
categoryCombox.setPreferredSize(new Dimension(100,20));
categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox,null,null,label1,null}));
categoryPane.setPreferredSize(new Dimension(246,30));
categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15));
@ -90,7 +90,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
protected void refreshBoxListWithSelectTableData(List list) {
refreshBoxItems(categoryCombox, list);
categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
seriesTypeComboxPane.refreshBoxListWithSelectTableData(list);
}
@ -100,7 +100,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
*/
public void clearAllBoxList(){
clearBoxItems(categoryCombox);
categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
seriesTypeComboxPane.clearAllBoxList();
}
@ -136,7 +136,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
NormalTableDataDefinition data = (NormalTableDataDefinition)top;
if(data == null || ComparatorUtils.equals(data.getCategoryName(), StringUtils.EMPTY)) {
categoryCombox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
categoryCombox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
} else if(data!= null && !this.boxItemsContainsObject(categoryCombox,data.getCategoryName())){
categoryCombox.setSelectedItem(null);
}else {

14
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java

@ -50,13 +50,13 @@ public class GanttPlotTableDataContentPane extends AbstractTableDataContentPane{
double[] rowSize = { p,p,p,p,p,p,p,p,p,p};
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Step_Name")),step},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Plan_Start")),planStart},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Plan_End")),planEnd},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Actual_Start")),finalStart},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Actual_End")),finalEnd},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Percent")),percent},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Items")),project},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Step_Name")),step},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_Start")),planStart},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_End")),planEnd},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_Start")),finalStart},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_End")),finalEnd},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent")),percent},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Items")),project},
} ;
JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
this.setLayout(new BorderLayout());

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java

@ -25,8 +25,8 @@ import java.util.List;
* @version 创建时间2012-12-21 下午04:51:50
*/
public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane {
private static final String METER_NAME = com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Use_Name");
private static final String METER_VALUE = com.fr.design.i18n.Toolkit.i18nText("Chart-Pointer_Value");
private static final String METER_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name");
private static final String METER_VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_Value");
private UIComboBox nameBox;
private UIComboBox valueBox;
@ -46,7 +46,7 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane
Component[][] components = createComponents();
JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane);
JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
filterPane.setBorder(BorderFactory.createEmptyBorder(0,10,0,15));

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

@ -40,8 +40,8 @@ import java.util.List;
* @version 创建时间2012-12-26 下午04:39:46
*/
public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollection> {
private static final String[] HEADS = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Field_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Summary")};
private static final String[] HEADS_NO_SUMMARY = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Field_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name")};
private static final String[] HEADS = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Field_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")};
private static final String[] HEADS_NO_SUMMARY = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Field_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")};
private UICorrelationPane seriesDataPane;
private List<String> field = new ArrayList<String>();
private JPanel centerPane;
@ -62,7 +62,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
return new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
String[] blank =heads.length == 3?new String[]{StringUtils.EMPTY, StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_None")}:
String[] blank =heads.length == 3?new String[]{StringUtils.EMPTY, StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")}:
new String[]{StringUtils.EMPTY, StringUtils.EMPTY};
tablePane.addLine(blank);
fireTargetChanged();

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@ -76,11 +76,11 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
double f = TableLayout.FILL;
double[] columnSize = {f};
double[] rowSize = {p, p, p, p, p};
UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"));
UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
Label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
UILabel Label2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value"));
UILabel Label2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
Label2.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
UILabel Label3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Summary_Method"));
UILabel Label3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
Label3.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
Component[][] components = getUseComponent(Label1, Label2, Label3);
@ -97,9 +97,9 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
double[] rowSize = {p, p, p, p};
UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
Label1.setPreferredSize(new Dimension(75, 20));
UILabel Label2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value"));
UILabel Label2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
Label2.setPreferredSize(new Dimension(75, 20));
UILabel Label3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Summary_Method"));
UILabel Label3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
Label3.setPreferredSize(new Dimension(75, 20));
Component[][] components = getUseComponentWithOutSummary(Label1, Label2, Label3);

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java

@ -48,7 +48,7 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
protected void initLayout() {
this.setLayout(new BorderLayout(4, LayoutConstants.VGAP_MEDIUM));
JPanel northPane = new JPanel(new BorderLayout(4, 0));
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Series_Name_From"));
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
northPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 0, 15));
@ -56,7 +56,7 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
this.add(northPane, BorderLayout.NORTH);
this.add(cardPane, BorderLayout.CENTER);
dataScreeningPane = new ChartDataFilterPane(this.initplot, parent);
JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"), 290, 24, dataScreeningPane);
JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane);
panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5));
this.add(panel, BorderLayout.SOUTH);
@ -94,7 +94,7 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
* @return 界面标题
*/
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ChartF-Series_Name_From");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From");
}
@Override

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java

@ -25,7 +25,7 @@ import java.util.List;
*/
public class StockPlotTableDataContentPane extends AbstractTableDataContentPane {
private static final String TIMEAXIS = com.fr.design.i18n.Toolkit.i18nText("Chart-Horizontal_TimeAxis");
private static final String TIMEAXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_TimeAxis");
private static final int LABEL_WIDTH = 105;
private UIComboBox axisBox;

14
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java

@ -39,7 +39,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP
yCombox = new UIComboBox();
dataScreeningPane = new ChartDataFilterPane(new XYScatterPlot(), parent);
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
seriesName.setPreferredSize(new Dimension(100, 20));
xCombox.setPreferredSize(new Dimension(100, 20));
@ -52,10 +52,10 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name") + ":"),seriesName},
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "x" + ":"), xCombox},
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "y" + ":"), yCombox},
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter_Name") + "x" + ":"), xCombox},
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter_Name") + "y" + ":"), yCombox},
new Component[]{new JSeparator(),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Filter"))},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"))},
new Component[]{dataScreeningPane,null}
};
@ -80,7 +80,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP
protected void refreshBoxListWithSelectTableData(List columnNameList) {
refreshBoxItems(seriesName, columnNameList);
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
refreshBoxItems(xCombox, columnNameList);
refreshBoxItems(yCombox, columnNameList);
}
@ -90,7 +90,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP
*/
public void clearAllBoxList(){
clearBoxItems(seriesName);
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
clearBoxItems(xCombox);
clearBoxItems(yCombox);
}
@ -133,7 +133,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP
ScatterTableDefinition definition = (ScatterTableDefinition)top;
if(definition.getSeriesName() == null || ComparatorUtils.equals(StringUtils.EMPTY, definition.getSeriesName())) {
seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"));
seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"));
} else {
combineCustomEditValue(seriesName, definition.getSeriesName());
}

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

@ -39,7 +39,7 @@ public class ChartConditionAttrPane extends BasicScrollPane<Chart> {
* @return 标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Display");
}
@Override
@ -49,9 +49,9 @@ public class ChartConditionAttrPane extends BasicScrollPane<Chart> {
List<UIMenuNameableCreator> list = new ArrayList<UIMenuNameableCreator>();
if(plot instanceof CustomPlot) {
list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Attributes"), new CustomAttr(), showPane));
list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Attributes"), new CustomAttr(), showPane));
} else {
list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Attributes"), new ConditionAttr(), showPane));
list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Attributes"), new ConditionAttr(), showPane));
}
conditionPane.refreshMenuAndAddMenuAction(list);

64
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java

@ -146,29 +146,29 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
* @return 返回标题.
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_Tab");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Tab");
}
@Override
protected JPanel createContentPane() {
isChartAnimation = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Animation_JSShow"));
isSeriesDragEnable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Drag"));
isChartAnimation = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Show"));
isSeriesDragEnable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Drag"));
isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
dataPointValueFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
isDatapointPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent"));
dataPointPercentFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
tooltipStyle = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-White_Black"), com.fr.design.i18n.Toolkit.i18nText("Chart-Black_White")});
tooltipStyleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"));
tooltipShowType = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Series_SingleData"), com.fr.design.i18n.Toolkit.i18nText("Chart-Series_AllData")});
tooltipShowTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"));
isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Title"));
isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address"));
isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name"));
isAxisShowToolTip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_AxisTooltip"));
isAxisZoom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Zoom"));
dataPointValueFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
isDatapointPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent"));
dataPointPercentFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
tooltipStyle = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Black_Font"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_White_Font")});
tooltipStyleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"));
tooltipShowType = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Single_Data"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_All_Data")});
tooltipShowTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"));
isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"));
isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address"));
isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address_Name"));
isAxisShowToolTip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Axis_Tooltip"));
isAxisZoom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Zoom"));
isAutoRefresh = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Enable_Auto_Refresh"));
autoRefreshTime = new UISpinner(1, Integer.MAX_VALUE, 1);
superLink = new UICorrelationComboBoxPane();
@ -179,7 +179,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
checkAutoRefresh();
}
});
timeSwitch = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Interactive_timeSwitch"));
timeSwitch = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Time_Switch"));
timeSwitchPane = new TimeSwitchPane();
initFormatListener();
return initPaneWithListener();
@ -326,7 +326,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
double[] rowSize = new double[]{p, p};
if (plot.isShowAllDataPointLabel()) {
isDatapointPercent.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion"));
isDatapointPercent.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Conversion"));
}
if (plot.isSupportAddress4Gis()) {
UIButton tmpButton = new UIButton(); //用来调整对齐
@ -408,11 +408,11 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
Component[][] components = new Component[][]{
new Component[]{isAutoRefresh, null},
new Component[]{GUICoreUtils.createFlowPane(new Component[]{
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Interval")),
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")),
autoRefreshTime,
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Seconds"))
}, 1)},
new Component[]{new UILabel("<html><font size='2' face='Microsoft Yahei' color='red'>" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-AutoRefresh_NotSupportIMGAndReportData") + "</font></html>"), null},
new Component[]{new UILabel("<html><font size='2' face='Microsoft Yahei' color='red'>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Support_Img_And_Cell") + "</font></html>"), null},
};
autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data-Check"}, components, rowSize, columnSize);
}
@ -568,9 +568,9 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
addressType = ((GisMapReportDefinition) definition).isAddress();
}
if (addressType) {
this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Address"));
this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Address"));
} else {
this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_LatLng"));
this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_LatLng"));
}
}
}
@ -859,24 +859,24 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
List<ChartUIMenuNameableCreator> list = new ArrayList<ChartUIMenuNameableCreator>();
java.util.HashMap<String, BaseFormula> hyperLinkEditorMap = plot.getHyperLinkEditorMap();
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Reportlet"),
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Reportlet"),
new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class)));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Mail"), new EmailJavaScript(), ChartEmailPane.class));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Web"),
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Mail"), new EmailJavaScript(), ChartEmailPane.class));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Web"),
new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Dynamic_Parameters"),
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Dynamic_Parameters"),
new ParameterJavaScript(), getUseMap(map, ParameterJavaScript.class)));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class)));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Float_Chart"),
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"),
new ChartHyperPoplink(), getUseMap(map, ChartHyperPoplink.class)));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Cell"),
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Cell"),
new ChartHyperRelateCellLink(), getUseMap(map, ChartHyperRelateCellLink.class)));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Float"),
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Float"),
new ChartHyperRelateFloatLink(), getUseMap(map, ChartHyperRelateFloatLink.class)));
FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Form"),
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Form"),
hyperlink, getUseMap(map, FormHyperlinkProvider.class)));
return list;

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

@ -84,7 +84,7 @@ public class ChartSwitchPane extends AbstractAttrNoScrollPane{
* @param 返回标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Switch");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart");
}
@Override

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

@ -85,10 +85,10 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"));
auto = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Axis_Label_Interval"));
custom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Axis_Label_Interval"));
showWay = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelInterval"),com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelWrap")});
showWay = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Interval"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Wrap")});
customLabelSamleTime = new UITextField();
String[] nameObjects = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart_All_Normal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Text_Vertical"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Text_Rotation")};
String[] nameObjects = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_All_Normal"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Text_Vertical"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Text_Rotation")};
labelOrientationChoose = new UIComboBox(nameObjects);
orientationBar = new NumberDragBar(-NUM90, NUM90);
orientationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM90, NUM90, 1));
@ -161,7 +161,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
double[] rowSize = {p, p, p, p};
Component[][] components = new Component[][]{
new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelShowway")), showWay, null},
new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show")), showWay, null},
new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null},
new Component[]{null, orientationSpinner, orientationBar, null},
new Component[]{null, textAttrPane, null, null},
@ -215,7 +215,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
double[] rowSize = {p};
Component[][] components = new Component[][]{
new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelShowway")), showWay, null}
new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show")), showWay, null}
};
return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
}
@ -289,7 +289,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
double[] rowSize = {p, p, p, p};
Component[][] components = new Component[][]{
new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelSampleChoose, customLabelSamleTime},
new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Interval")), labelSampleChoose, customLabelSamleTime},
new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null},
new Component[]{null,orientationSpinner, orientationBar, null},
new Component[]{null,textAttrPane, null, null},
@ -316,7 +316,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
* 界面标签
*/
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ChartF-Tick_Label");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tick_Label");
}
private int getLabelTextOrientationIndex(TextAttr textAttr) {

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

@ -34,7 +34,7 @@ public class ChartAxisLineStylePane extends BasicPane{
axisLineColor = new ColorSelectBox(100);
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")};
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("Fine-Design_Chart_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"),

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

@ -49,7 +49,7 @@ public class ChartAxisValueTypePane extends BasicPane {
* 界面标题.
*/
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("AxisValue");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Value");
}
/**
@ -110,7 +110,7 @@ public class ChartAxisValueTypePane extends BasicPane {
* 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart_Text_Axis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Text_Axis");
}
/**

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

@ -75,7 +75,7 @@ public class ChartBackgroundPane extends BasicPane{
Component[][] components = new Component[][]{
new Component[]{typeComboBox, null} ,
new Component[]{centerPane, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Alpha_Int")), null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha_Degree")), null},
new Component[]{null, transparent}
};
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Background"}, components,rowSize,columnSize);

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("Fine-Design_Report_Common"),
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("Fine-Design_Chart_Style_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Transparent") //新加的两种风格,注意兼容处理
};

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

@ -34,15 +34,15 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{
public ChartDataPointLabel4GisPane(ChartStylePane parent){
this.parent = parent;
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label"));
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"));
isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Title"));
isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address"));
isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"));
isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address"));
isAddress.setSelected(true);
isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name"));
isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address_Name"));
isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
divideComoBox = new UIComboBox(ChartConstants.DELIMITERS);
textFontPane = new ChartTextAttrPane();
@ -56,7 +56,7 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{
double[] rowSize = { p,p,p,p,p,p};
JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM));
delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST);
delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delimiter_Symbol")), BorderLayout.WEST);
delimiterPane.add(divideComoBox, BorderLayout.CENTER);
Component[][] components = new Component[][]{

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

@ -29,13 +29,13 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane {
public ChartDataPointLabel4MapPane(ChartStylePane parent) {
this.parent = parent;
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label"));
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"));
isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"));
isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Value"));
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value"));
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent"));
valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent"));
valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
divideComoBox = new UIComboBox(ChartConstants.DELIMITERS);
textFontPane = new ChartTextAttrPane();
@ -58,7 +58,7 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane {
components[4] = new Component[]{isValuePercent,valuePercentFormatButton} ;
JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM));
delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST);
delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delimiter_Symbol")), BorderLayout.WEST);
delimiterPane.add(divideComoBox, BorderLayout.CENTER);
components[5] = new Component[]{delimiterPane,null};

18
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java

@ -80,7 +80,7 @@ public class ChartDatapointLabelPane extends BasicPane{
public ChartDatapointLabelPane(String[] locationNameArray, Integer[] locationValueArray, Plot plot, ChartStylePane parent) {
this.parent = parent;
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label"));
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"));
if(locationNameArray != null && locationNameArray.length > 0
&& locationValueArray != null && locationValueArray.length > 0) {
nameValueMap.clear();
@ -96,18 +96,18 @@ public class ChartDatapointLabelPane extends BasicPane{
boolean isGuidline = plot.isSupportLeadLine();
if(plot.isSupportCategoryFilter()) {
isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name"));
isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"));
}
isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
isValue.setSelected(true);
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
if(plot.isSupportValuePercent()) {
isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent"));
valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent"));
valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
if (plot.isShowAllDataPointLabel()) {
isValuePercent.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion"));
isValuePercent.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Conversion"));
}
}
@ -117,7 +117,7 @@ public class ChartDatapointLabelPane extends BasicPane{
textFontPane = new ChartTextAttrPane();
if(isGuidline) {
isGuid = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Show_GuidLine"));
isGuid = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
}
if (plot.isShowAllDataPointLabel()) {
@ -140,7 +140,7 @@ public class ChartDatapointLabelPane extends BasicPane{
if(positionBox != null) {
JPanel positionPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM));
positionPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")), BorderLayout.WEST);
positionPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")), BorderLayout.WEST);
positionPane.add(positionBox, BorderLayout.CENTER);
components[0] = new Component[]{positionPane, null};
if(isGuidline) {
@ -166,7 +166,7 @@ public class ChartDatapointLabelPane extends BasicPane{
JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM));
if (plot.isSupportDelimiter()) {
delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST);
delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delimiter_Symbol")), BorderLayout.WEST);
delimiterPane.add(divideComoBox, BorderLayout.CENTER);
}

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

@ -238,7 +238,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Chart_Date_Axis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Date_Time_Axis");
}
private void checkBoxUse() {

8
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java

@ -109,7 +109,7 @@ public class ChartAnalysisLinePane extends BasicScrollPane<Chart>{
private JPanel createAlertLinePane(String[] title, boolean first){
List<UIMenuNameableCreator> list = new ArrayList<UIMenuNameableCreator>();
list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class));
list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), new ChartAlertValue(), ChartAlertValuePane.class));
if(first){
xAlertPane = new UICorrelationComboBoxPane(list);
}else{
@ -164,9 +164,9 @@ public class ChartAnalysisLinePane extends BasicScrollPane<Chart>{
boolean useLeftRight = numberAxis.getPosition() == Constants.LEFT || numberAxis.getPosition() == Constants.RIGHT;
List<UIMenuNameableCreator> menuList = new ArrayList<UIMenuNameableCreator>();
if(useLeftRight) {
menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class));
menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), new ChartAlertValue(), ChartAlertValuePane.class));
} else {
menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValueInTopBottomPane.class));
menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), new ChartAlertValue(), ChartAlertValueInTopBottomPane.class));
}
editAlertPane.refreshMenuAndAddMenuAction(menuList);
@ -274,7 +274,7 @@ public class ChartAnalysisLinePane extends BasicScrollPane<Chart>{
lineInfo.setAttrLineColor(new AttrColor(Color.gray));
trendLine.setLineStyleInfo(lineInfo);
conditionLine.setLine(trendLine);
list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"), conditionLine, ConditionTrendLinePane.class));
list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"), conditionLine, ConditionTrendLinePane.class));
trendLinePane = new UICorrelationComboBoxPane(list);
}

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

@ -18,7 +18,7 @@ public class Plot3DAxisAreaPane extends ChartAxisAreaPane {
private ColorSelectBox gridColorPane;
public Plot3DAxisAreaPane() {
gridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Grid_Line"));
gridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Grid_Line"));
gridColorPane = new ColorSelectBox(100);
double p = TableLayout.PREFERRED;

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

@ -24,7 +24,7 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane {
public RadarAxisAreaPane() {
horizontalColorPane = new ColorSelectBox(100);
isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid"));
isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Grid"));
gridColorPane = new ColorSelectBox(100);
double p = TableLayout.PREFERRED;
@ -33,9 +33,9 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane {
double[] rowSize = {p,p,p,p,p};
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back") + ":"),horizontalColorPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interval_Background") + ":"),horizontalColorPane},
new Component[]{new JSeparator(),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid")),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Grid")),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane,}
};
JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java

@ -52,7 +52,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
axisLineStylePane = new ChartAxisLineStylePane();
formatPane = new FormatPaneWithOutFont();
axisLabelPane = new ChartAxisLabelPane();
axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("AxisReversed"));
axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Reversed"));
this.setLayout(new BorderLayout());
this.add(isSupportLineStyle() ? getPaneWithLineStyle() : getPaneWithOutLineStyle(),BorderLayout.CENTER);
}
@ -123,7 +123,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
* @return 标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ChartF-Category_Axis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Category");
}
@Override

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

@ -27,7 +27,7 @@ public class ChartRadarPane extends ChartValuePane{
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
valuePane.add(buttonPane);
String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart_Axis_AutoCount"), com.fr.design.i18n.Toolkit.i18nText("Chart_Axis_UnitCount")};
String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Auto_Count"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count")};
Boolean[] values = new Boolean[]{Boolean.FALSE, Boolean.TRUE};
allMaxMin = new UIButtonGroup<Boolean>(names, values);
buttonPane.add(allMaxMin);

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

@ -17,7 +17,7 @@ public class ChartSecondValueNoFormulaPane extends ChartValueNoFormulaPane{
protected JPanel aliagnZero4Second() {// 添加 0值对齐
JPanel pane = new JPanel();
pane.setLayout(new FlowLayout(FlowLayout.RIGHT));
pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_AxisAlignZeroValueLine"), false));
pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Align_Origin"), false));
return pane;
}

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

@ -20,7 +20,7 @@ public class ChartSecondValuePane extends ChartValuePane {
protected JPanel aliagnZero4Second() {// 添加 0值对齐
JPanel pane = new JPanel();
pane.setLayout(new FlowLayout(FlowLayout.RIGHT));
pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_AxisAlignZeroValueLine"), false));
pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Align_Origin"), false));
return pane;
}

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

@ -226,7 +226,7 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
* @return 返回标题.
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Axis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Value_Axis");
}
@Override

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

@ -95,11 +95,11 @@ public class ChartDataLabelPane extends BasicScrollPane<Chart>{
if(plot instanceof BarPlot){
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Outside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")};
}else if(plot instanceof PiePlot){
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"), com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie")};
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pie_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pie_Outside")};
}else if(plot instanceof RangePlot){
return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")};
}else if(plot instanceof BubblePlot){
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Outside")};
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Outside")};
}else{
return new String[0];
}

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java

@ -46,13 +46,13 @@ public class ChartDatasheetPane extends BasicScrollPane<Chart>{
double f = TableLayout.FILL;
double[] columnSize = {LayoutConstants.CHART_ATTR_TOMARGIN,f};
double[] rowSize = { p, p, p, p};
isDatasheetVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Show_Data_Sheet"));
isDatasheetVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Data_Sheet"));
textAttrPane = new ChartTextAttrPane();
formatPane = new FormatPaneWithNormalType();
Component[][] components = new Component[][]{
new Component[]{null,textAttrPane},
new Component[]{new JSeparator(),null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Data_Type")), null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Type")), null},
new Component[]{null,formatPane},
};

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

@ -52,7 +52,7 @@ public class ChartLegendPane extends BasicScrollPane<Chart>{
}
private void initComponents(){
isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Legend_Is_Visible"));
isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Visible"));
textAttrPane = new ChartTextAttrPane();
borderPane = new ChartBorderPane();

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

@ -91,7 +91,7 @@ public abstract class AbstractPlotSeriesPane extends BasicBeanPane<Plot>{
* 界面标题.
*/
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Series");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series");
}
/**

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

@ -36,7 +36,7 @@ public class AreaSeriesPane extends AbstractPlotSeriesPane{
@Override
protected JPanel getContentInPlotType() {
stylePane = new ChartBeautyPane();
isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line"));
isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Line"));
markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray());
double p = TableLayout.PREFERRED;
@ -46,8 +46,8 @@ public class AreaSeriesPane extends AbstractPlotSeriesPane{
Component[][] components = new Component[][]{
new Component[]{stylePane, null},
new Component[]{new JSeparator(), null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Line_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}
} ;
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
}

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

@ -48,8 +48,8 @@ public class Bar2DSeriesPane extends AbstractPlotSeriesPane{
Component[][] components = new Component[][]{
new Component[]{stylePane, null},
new Component[]{new JSeparator(), null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Series")), seriesGap},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Category")), categoryGap}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Series")), seriesGap},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Category")), categoryGap}
};
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

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

@ -43,8 +43,8 @@ public class Bar3DSeriesPane extends AbstractPlotSeriesPane {
double[] columnSize = {p, f};
double[] rowSize = {p, p};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Series")), seriesGap},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Category")), categoryGap}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Series")), seriesGap},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Category")), categoryGap}
};
pane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

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

Loading…
Cancel
Save