Browse Source

代码质量

bugfix/10.0
zheng 6 years ago
parent
commit
0d0f540bc5
  1. 4
      designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
  2. 4
      designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
  3. 15
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java
  4. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java
  5. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java
  6. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java
  7. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java
  8. 6
      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. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java
  11. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
  12. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java
  13. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
  14. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java
  15. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java
  16. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java
  17. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java
  18. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java
  19. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java
  20. 4
      designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java

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

@ -41,7 +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.general.Inter;
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;
@ -167,7 +167,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
Icon icon = IOUtils.readIcon(iconPath);
child[index] = new ChartWidgetOption(Inter.getLocText(bean.getName()), icon, ChartEditor.class, plotID);
child[index] = new ChartWidgetOption(InterProviderFactory.getProvider().getLocText(bean.getName()), icon, ChartEditor.class, plotID);
index++;
}

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

@ -14,9 +14,9 @@ import com.fr.chart.charttypes.ChartTypeManager;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
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;
@ -68,7 +68,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
mainTypeList = new JList(defaultListModel);
for (int i = 0; i < typeName.length; i++) {
defaultListModel.insertElementAt(Inter.getLocText(typeName[i].getName()), i);
defaultListModel.insertElementAt(InterProviderFactory.getProvider().getLocText(typeName[i].getName()), i);
}
mainTypeList.addListSelectionListener(listSelectionListener);

15
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java

@ -8,7 +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.general.Inter;
import com.fr.design.i18n.Toolkit;
import com.fr.locale.InterProviderFactory;
/**
@ -34,10 +35,10 @@ public class AreaPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
String area = Inter.getLocText("Fine-Engine_Chart_Type_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,
@ -140,8 +141,8 @@ public class AreaPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Area");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area");
}
public Chart getDefaultChart() {
return AreaIndependentChart.areaChartTypes[0];

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

@ -7,7 +7,7 @@ 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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@ -33,7 +33,7 @@ public class BarPlotPane extends AbstractBarPane{
@Override
protected String[] getTypeTipName() {
String bar = Inter.getLocText("Fine-Engine_Chart_Type_Bar");
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");
@ -67,7 +67,7 @@ public class BarPlotPane extends AbstractBarPane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Bar");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar");
}
protected Plot getSelectedClonedPlot(){

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java

@ -4,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
/**
@ -26,8 +26,8 @@ public class BubblePlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_Bubble_Chart")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart")
};
}
@Override
@ -45,8 +45,8 @@ public class BubblePlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Bubble_Chart");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart");
}
/**
* 保存界面属性

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

@ -6,7 +6,7 @@ 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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@ -32,7 +32,7 @@ public class ColumnPlotPane extends AbstractBarPane{
@Override
protected String[] getTypeTipName() {
String column = Inter.getLocText("Fine-Engine_Chart_Type_Column");
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");
@ -65,7 +65,7 @@ public class ColumnPlotPane extends AbstractBarPane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Column");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column");
}
protected Plot getSelectedClonedPlot(){

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java

@ -3,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
/**
@ -27,8 +27,8 @@ public class CustomPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_Type_Combine")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine")
};
}
@Override
@ -46,8 +46,8 @@ public class CustomPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Combine");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine");
}
/**
* 更新界面内容

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

@ -11,7 +11,7 @@ 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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
import java.awt.Color;
@ -36,7 +36,7 @@ public class DonutPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
String donut = Inter.getLocText("Fine-Engine_Chart_Type_Donut");
String donut = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut");
return new String[]{
donut,
Toolkit.i18nText("Fine-Design_Chart_3D") + donut
@ -104,7 +104,7 @@ public class DonutPlotPane extends AbstractChartTypePane{
* @return 标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Donut");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut");
}
/**

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

@ -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.general.Inter;
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[]{
Inter.getLocText("Fine-Engine_Chart_Type_Funnel")
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel")
};
}
@ -50,7 +50,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Funnel");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel");
}
/**

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java

@ -3,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
/**
@ -25,8 +25,8 @@ public class GanttPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_Type_Gantt")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt")
};
}
@Override
@ -48,8 +48,8 @@ public class GanttPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Gantt");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt");
}
/**
* 保存界面属性

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java

@ -11,7 +11,7 @@ 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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import javax.swing.JPanel;
@ -73,8 +73,8 @@ public class GisMapPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_GIS_Map")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map")
};
}
@Override
@ -173,8 +173,8 @@ public class GisMapPlotPane extends AbstractChartTypePane{
* @return 标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_GIS_Map");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map");
}
/**
* 是否有坐标轴

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java

@ -5,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@ -22,8 +22,8 @@ public class LinePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_Type_Line")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line")
};
}
@Override
@ -84,8 +84,8 @@ public class LinePlotPane extends AbstractChartTypePane{
}
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Line");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line");
}
public Chart getDefaultChart() {
return LineIndependentChart.lineChartTypes[0];

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

@ -10,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import javax.swing.JPanel;
@ -72,8 +72,8 @@ public class MapPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_SVG_MAP");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP");
}
/**
* 保存界面属性

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

@ -7,7 +7,7 @@ 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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
@ -33,7 +33,7 @@ public class MeterPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
String meter = Inter.getLocText("Fine-Engine_Chart_Type_Meter");
String meter = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter");
return new String[]{
Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter,
meter + "1",
@ -79,7 +79,7 @@ public class MeterPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Meter");
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter");
}
/**

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java

@ -10,7 +10,7 @@ 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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
import java.awt.Color;
@ -36,8 +36,8 @@ public class PiePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
String pie = Inter.getLocText("Fine-Engine_Chart_Type_Pie");
return new String[]{
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
};
@ -63,8 +63,8 @@ public class PiePlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Pie");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie");
}
private void createPieCondition(Plot plot) {
ConditionCollection collection = plot.getConditionCollection();

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java

@ -3,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
/**
@ -25,8 +25,8 @@ public class RadarPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_Type_Radar")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar")
};
}
@Override
@ -49,8 +49,8 @@ public class RadarPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Radar");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar");
}
/**
* 保存界面属性

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java

@ -4,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
/**
@ -26,8 +26,8 @@ public class RangePlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_Type_Range")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range")
};
}
@Override
@ -50,8 +50,8 @@ public class RangePlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Range");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range");
}
/**
* 保存界面属性

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java

@ -3,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
/**
@ -25,8 +25,8 @@ public class StockPlotPane extends AbstractChartTypePane {
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_Type_Stock")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock")
};
}
@Override
@ -49,8 +49,8 @@ public class StockPlotPane extends AbstractChartTypePane {
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_Stock");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock");
}
/**
* 保存界面属性

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java

@ -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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.Constants;
/**
@ -28,8 +28,8 @@ public class XYScatterPlotPane extends AbstractChartTypePane{
@Override
protected String[] getTypeTipName() {
return new String[]{
Inter.getLocText("Fine-Engine_Chart_Type_XYScatter")
};
InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter")
};
}
@Override
@ -47,8 +47,8 @@ public class XYScatterPlotPane extends AbstractChartTypePane{
* @return 界面标题
*/
public String title4PopupWindow() {
return Inter.getLocText("Fine-Engine_Chart_Type_XYScatter");
}
return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter");
}
/**
* 保存界面内容

4
designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java

@ -12,7 +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.general.Inter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import com.fr.report.poly.PolyECBlock;
import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
@ -66,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], Inter.getLocText(typeName[i].getName()), iconPath);
serIcons[i + 1] = new SerIcon(rowChart[0], InterProviderFactory.getProvider().getLocText(typeName[i].getName()), iconPath);
this.add(serIcons[i + 1]);
}

Loading…
Cancel
Save