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

Merge pull request #847 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0 

* commit '0d0f540bc5fa28cd6f86511b1f23f9bb7ba3f02c':
  代码质量
  CHART-8970 旧版本图表 国际化+优先级问题
bugfix/10.0
zheng 5 years ago
parent
a44549b557 0d0f540bc5
commit
d7c430aa82
20 changed files with 121 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
  2. 3
      designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
  3. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java
  4. 16
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java
  5. 7
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java
  6. 16
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java
  7. 7
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java
  8. 13
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java
  9. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java
  10. 7
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java
  11. 13
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
  12. 7
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java
  13. 3
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
  14. 20
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java
  15. 14
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java
  16. 7
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java
  17. 7
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java
  18. 7
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java
  19. 8
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java
  20. 3
      designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java

44
designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
Unescape View File

@ -41,6 +41,7 @@ import com.fr.design.module.DesignModuleFactory;
import com.fr.form.ui.ChartEditor;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.locale.InterProviderFactory;
import com.fr.plugin.chart.PiePlot4VanChart;
import com.fr.plugin.chart.area.VanChartAreaPlot;
import com.fr.plugin.chart.bubble.VanChartBubblePlot;
@ -99,7 +100,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static com.fr.chart.charttypes.ChartTypeManager.CHART_PRIORITY;
import static com.fr.chart.charttypes.ChartTypeManager.DEFAULT_PRIORITY;
import static com.fr.chart.charttypes.ChartTypeManager.DEPRECATED_CHART_PRIORITY;
import static com.fr.chart.charttypes.ChartTypeManager.VAN_CHART_PRIORITY;
/**
@ -165,7 +167,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
Icon icon = IOUtils.readIcon(iconPath);
child[index] = new ChartWidgetOption(com.fr.design.i18n.Toolkit.i18nText(bean.getName()), icon, ChartEditor.class, plotID);
child[index] = new ChartWidgetOption(InterProviderFactory.getProvider().getLocText(bean.getName()), icon, ChartEditor.class, plotID);
index++;
}
@ -198,23 +200,23 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
private static void readDefault() {
addChartTypeInterface(CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.LINE_CHART, new LineIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.BAR_CHART, new BarIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.PIE_CHART, new PieIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.METER_CHART, new MeterIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.MAP_CHART, new MapIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface());
addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface());
}
private static void addChartTypeInterface(String priority, String plotID, IndependentChartUIProvider provider) {
@ -462,7 +464,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
public void mount(PluginSingleInjection injection) {
if (isIndependentChartUIProvider(injection)) {
String priority = injection.getAttribute("priority", CHART_PRIORITY);
String priority = injection.getAttribute("priority", DEFAULT_PRIORITY);
String plotID = injection.getAttribute("plotID");
IndependentChartUIProvider instance = (IndependentChartUIProvider) injection.getObject();
addChartTypeInterface(priority, plotID, instance);
@ -474,7 +476,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
public void demount(PluginSingleInjection injection) {
if (isIndependentChartUIProvider(injection)) {
String priority = injection.getAttribute("priority", CHART_PRIORITY);
String priority = injection.getAttribute("priority", DEFAULT_PRIORITY);
String plotID = injection.getAttribute("plotID");
removeChartTypeInterface(priority, plotID);
}

3
designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
Unescape View File

@ -16,6 +16,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.license.exception.RegistEditionException;
import com.fr.license.function.VT4FR;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import javax.swing.BorderFactory;
@ -67,7 +68,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
mainTypeList = new JList(defaultListModel);
for (int i = 0; i < typeName.length; i++) {
defaultListModel.insertElementAt(com.fr.design.i18n.Toolkit.i18nText(typeName[i].getName()), i);
defaultListModel.insertElementAt(InterProviderFactory.getProvider().getLocText(typeName[i].getName()), i);
}
mainTypeList.addListSelectionListener(listSelectionListener);

12
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java
Unescape View File

@ -8,6 +8,8 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.AreaIndependentChart;
import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
/**
@ -33,10 +35,10 @@ public class AreaPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
String area = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area");
String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D");
String area = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area");
String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = Toolkit.i18nText("Fine-Design_Chart_3D");
return new String[]{
stack + area,
percent + stack + area,
@ -139,7 +141,7 @@ public class AreaPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area");
}
public Chart getDefaultChart() {

16
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java
Unescape View File

@ -6,6 +6,8 @@ import com.fr.chart.chartattr.BarPlot;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.BarIndependentChart;
import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@ -31,16 +33,16 @@ public class BarPlotPane extends AbstractBarPane{
@Override
protected String[] getTypeTipName() {
String bar = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar");
String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D");
String bar = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar");
String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = Toolkit.i18nText("Fine-Design_Chart_3D");
return new String[]{
bar,
stack + bar,
percent + stack + bar,
td + bar,
td + bar + "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")",
td + bar + "(" + Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")",
td + stack + bar,
td + percent + stack + bar
};
@ -65,8 +67,8 @@ public class BarPlotPane extends AbstractBarPane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar");
}
protected Plot getSelectedClonedPlot(){
Chart[] barChart = BarIndependentChart.barChartTypes;

7
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java
Unescape View File

@ -4,6 +4,7 @@ import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.BubblePlot;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.BubbleIndependentChart;
import com.fr.locale.InterProviderFactory;
/**
@ -25,9 +26,9 @@ public class BubblePlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart")
};
}
}
@Override
protected String[] getTypeLayoutPath() {
@ -44,7 +45,7 @@ public class BubblePlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart");
}
/**

16
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java
Unescape View File

@ -5,6 +5,8 @@ import com.fr.chart.chartattr.BarPlot;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.ColumnIndependentChart;
import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@ -30,16 +32,16 @@ public class ColumnPlotPane extends AbstractBarPane{
@Override
protected String[] getTypeTipName() {
String column = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column");
String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D");
String column = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column");
String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = Toolkit.i18nText("Fine-Design_Chart_3D");
return new String[]{
column,
stack + column,
percent + stack + column,
td + column,
td + column + "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")",
td + column + "(" + Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")",
td + stack + column,
td + percent + stack + column
};
@ -63,8 +65,8 @@ public class ColumnPlotPane extends AbstractBarPane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column");
}
protected Plot getSelectedClonedPlot(){
Chart[] barChart = ColumnIndependentChart.columnChartTypes;

7
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java
Unescape View File

@ -3,6 +3,7 @@ package com.fr.design.mainframe.chart.gui.type;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.CustomIndependentChart;
import com.fr.locale.InterProviderFactory;
/**
@ -26,9 +27,9 @@ public class CustomPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Chart")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine")
};
}
}
@Override
protected String[] getTypeLayoutPath() {
@ -45,7 +46,7 @@ public class CustomPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Chart");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine");
}
/**

13
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java
Unescape View File

@ -10,10 +10,11 @@ import com.fr.chart.chartattr.Donut3DPlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.DonutIndependentChart;
import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
import java.awt.*;
import java.awt.Color;
import java.text.DecimalFormat;
/**
@ -35,10 +36,10 @@ public class DonutPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
String donut = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Donut_Chart");
String donut = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut");
return new String[]{
donut,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + donut
Toolkit.i18nText("Fine-Design_Chart_3D") + donut
};
}
@ -103,8 +104,8 @@ public class DonutPlotPane extends AbstractChartTypePane{
* @return 标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Donut_Chart");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut");
}
/**
* 是否有坐标轴

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java
Unescape View File

@ -7,7 +7,7 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.FunnelPlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.FunnelIndependentChart;
import com.fr.locale.InterProviderFactory;
import java.text.DecimalFormat;
@ -31,7 +31,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel")
};
}
@ -50,7 +50,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel");
}
/**

7
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java
Unescape View File

@ -3,6 +3,7 @@ package com.fr.design.mainframe.chart.gui.type;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.GanttIndependentChart;
import com.fr.locale.InterProviderFactory;
/**
@ -24,9 +25,9 @@ public class GanttPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt")
};
}
}
@Override
protected String getPlotTypeID() {
@ -47,7 +48,7 @@ public class GanttPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt");
}
/**

13
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
Unescape View File

@ -11,11 +11,12 @@ import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import javax.swing.*;
import java.awt.*;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Component;
public class GisMapPlotPane extends AbstractChartTypePane{
@ -72,9 +73,9 @@ public class GisMapPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
"gis"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map")
};
}
}
@Override
protected String getPlotTypeID() {
@ -172,7 +173,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{
* @return 标题
*/
public String title4PopupWindow() {
return "gis"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map");
}
/**

7
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java
Unescape View File

@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.LinePlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.charttypes.LineIndependentChart;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@ -21,9 +22,9 @@ public class LinePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line")
};
}
}
@Override
protected String[] getTypeLayoutPath() {
@ -83,7 +84,7 @@ public class LinePlotPane extends AbstractChartTypePane{
}
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line");
}
public Chart getDefaultChart() {

3
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
Unescape View File

@ -10,6 +10,7 @@ import com.fr.chart.charttypes.MapIndependentChart;
import com.fr.design.chart.series.PlotSeries.MapGroupExtensionPane;
import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import javax.swing.JPanel;
@ -71,7 +72,7 @@ public class MapPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP");
}
/**

20
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java
Unescape View File

@ -6,6 +6,8 @@ import com.fr.chart.chartattr.MeterPlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.MeterStyle;
import com.fr.chart.charttypes.MeterIndependentChart;
import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@ -31,9 +33,9 @@ public class MeterPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
String meter = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge");
String meter = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter");
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter,
Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter,
meter + "1",
meter + "2"
};
@ -77,13 +79,13 @@ public class MeterPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge");
}
/**
* 保存界面属性
*/
public void updateBean(Chart chart) {
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter");
}
/**
* 保存界面属性
*/
public void updateBean(Chart chart) {
if(needsResetChart(chart)){
resetChart(chart);
}

14
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java
Unescape View File

@ -10,10 +10,10 @@ import com.fr.chart.chartattr.PiePlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionCollection;
import com.fr.chart.charttypes.PieIndependentChart;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
import java.awt.*;
import java.awt.Color;
import java.text.DecimalFormat;
/**
@ -36,11 +36,11 @@ public class PiePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
String pie = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie");
String pie = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie");
return new String[]{
pie,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie
};
pie,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie
};
}
@Override
@ -63,7 +63,7 @@ public class PiePlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie");
}
private void createPieCondition(Plot plot) {

7
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java
Unescape View File

@ -3,6 +3,7 @@ package com.fr.design.mainframe.chart.gui.type;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.RadarIndependentChart;
import com.fr.locale.InterProviderFactory;
/**
@ -24,9 +25,9 @@ public class RadarPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar")
};
}
}
@Override
protected String getPlotTypeID() {
@ -48,7 +49,7 @@ public class RadarPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar");
}
/**

7
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java
Unescape View File

@ -4,6 +4,7 @@ import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.RangePlot;
import com.fr.chart.charttypes.RangeIndependentChart;
import com.fr.locale.InterProviderFactory;
/**
@ -25,9 +26,9 @@ public class RangePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Chart")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range")
};
}
}
@Override
protected String getPlotTypeID() {
@ -49,7 +50,7 @@ public class RangePlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Chart");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range");
}
/**

7
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java
Unescape View File

@ -3,6 +3,7 @@ package com.fr.design.mainframe.chart.gui.type;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.charttypes.StockIndependentChart;
import com.fr.locale.InterProviderFactory;
/**
@ -24,9 +25,9 @@ public class StockPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Chart")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock")
};
}
}
@Override
protected String getPlotTypeID() {
@ -48,7 +49,7 @@ public class StockPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Chart");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock");
}
/**

8
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java
Unescape View File

@ -6,7 +6,7 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.XYScatterPlot;
import com.fr.chart.chartglyph.ConditionAttr;
import com.fr.chart.charttypes.XYScatterIndependentChart;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
/**
@ -28,9 +28,9 @@ public class XYScatterPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_I_XYScatterStyle_Marker")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter")
};
}
}
@Override
protected String[] getTypeLayoutPath() {
@ -47,7 +47,7 @@ public class XYScatterPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_I_XYScatterStyle_Marker");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter");
}
/**

3
designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java
Unescape View File

@ -12,6 +12,7 @@ import com.fr.design.gui.itooltip.MultiLineToolTip;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.dnd.SerializableTransferable;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import com.fr.report.poly.PolyECBlock;
import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
@ -65,7 +66,7 @@ public class PolyComponentsBar extends JToolBar {
for (int i = 0; i < typeLen; i++) {
BaseChart[] rowChart = BaseChartGetter.getStaticChartTypes(typeName[i].getPlotID());
String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(typeName[i].getPlotID());
serIcons[i + 1] = new SerIcon(rowChart[0], Toolkit.i18nText(typeName[i].getName()), iconPath);
serIcons[i + 1] = new SerIcon(rowChart[0], InterProviderFactory.getProvider().getLocText(typeName[i].getName()), iconPath);
this.add(serIcons[i + 1]);
}

Write Preview
Loading…
Cancel
Save