Browse Source

工程编码整体改为UTF8

pull/1/head
richie 9 years ago
parent
commit
43505e1991
  1. 2
      src/com/fr/solution/plugin/chart/echarts/ChineseMap.java
  2. 2
      src/com/fr/solution/plugin/chart/echarts/ChineseMapUI.java
  3. 2
      src/com/fr/solution/plugin/chart/echarts/EChartsFileLoader.java
  4. 2
      src/com/fr/solution/plugin/chart/echarts/EChartsLocaleFinder.java
  5. 2
      src/com/fr/solution/plugin/chart/echarts/base/AbstractIndependentEChartsProvider.java
  6. 8
      src/com/fr/solution/plugin/chart/echarts/base/NewChart.java
  7. 10
      src/com/fr/solution/plugin/chart/echarts/base/NewGlyph.java
  8. 2
      src/com/fr/solution/plugin/chart/echarts/base/NewLegendGlyph.java
  9. 2
      src/com/fr/solution/plugin/chart/echarts/base/NewPlot.java
  10. 2
      src/com/fr/solution/plugin/chart/echarts/base/NewSeriesGlyph.java
  11. 6
      src/com/fr/solution/plugin/chart/echarts/base/NewTitleGlyph.java
  12. 2
      src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapFunctionProcessor.java
  13. 2
      src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapPlot.java
  14. 2
      src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapPlotGlyph.java
  15. 12
      src/com/fr/solution/plugin/chart/echarts/ui/map/ChineseChartTypePane.java
  16. 2
      src/com/fr/solution/plugin/chart/echarts/ui/map/ChineseMapReportDataContentPane.java
  17. 6
      src/com/fr/solution/plugin/chart/echarts/ui/map/ChineseMapTableDataContentPane.java
  18. 4
      src/com/fr/solution/plugin/chart/echarts/web/echarts.bridge.js

2
src/com/fr/solution/plugin/chart/echarts/ChineseMap.java

@ -46,4 +46,4 @@ public class ChineseMap extends AbstractIndependentEChartsProvider {
return "EChartsFactory"; return "EChartsFactory";
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/ChineseMapUI.java

@ -38,4 +38,4 @@ public class ChineseMapUI extends AbstractIndependentChartUI {
public boolean isUseDefaultPane() { public boolean isUseDefaultPane() {
return false; return false;
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/EChartsFileLoader.java

@ -18,4 +18,4 @@ public class EChartsFileLoader extends AbstractJavaScriptFileHandler {
public String encode() { public String encode() {
return EncodeConstants.ENCODING_UTF_8; return EncodeConstants.ENCODING_UTF_8;
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/EChartsLocaleFinder.java

@ -10,4 +10,4 @@ public class EChartsLocaleFinder extends AbstractLocaleFinder {
public String find() { public String find() {
return "com/fr/solution/plugin/chart/echarts/locale/echarts"; return "com/fr/solution/plugin/chart/echarts/locale/echarts";
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/base/AbstractIndependentEChartsProvider.java

@ -13,4 +13,4 @@ public abstract class AbstractIndependentEChartsProvider extends AbstractIndepen
"/com/fr/solution/plugin/chart/echarts/web/echarts.bridge.js" "/com/fr/solution/plugin/chart/echarts/web/echarts.bridge.js"
}; };
} }
} }

8
src/com/fr/solution/plugin/chart/echarts/base/NewChart.java

@ -38,11 +38,11 @@ public class NewChart extends Chart {
} }
/** /**
* 判断图表类型是否是obClass * 判断图表类型是否是obClass
* @param obClass 传入对象 * @param obClass 传入对象
* @return 是否是obClass对象 * @return 是否是obClass对象
*/ */
public boolean accept(Class<? extends Chart> obClass){ public boolean accept(Class<? extends Chart> obClass){
return ComparatorUtils.equals(NewChart.class, obClass); return ComparatorUtils.equals(NewChart.class, obClass);
} }
} }

10
src/com/fr/solution/plugin/chart/echarts/base/NewGlyph.java

@ -62,7 +62,7 @@ public class NewGlyph extends ChartGlyph {
.put("max", 2500) .put("max", 2500)
.put("x", "left") .put("x", "left")
.put("y", "bottom") .put("y", "bottom")
.put("text", JSONArray.create().put("高").put("低")); .put("text", JSONArray.create().put("高").put("低"));
} }
private JSONArray createSeries(Repository repo) throws JSONException { private JSONArray createSeries(Repository repo) throws JSONException {
@ -73,7 +73,7 @@ public class NewGlyph extends ChartGlyph {
.put("type", "map") .put("type", "map")
.put("mapType", "china") .put("mapType", "china")
.put("itemStyle", createItemStyle(repo)) .put("itemStyle", createItemStyle(repo))
.put("data", JSONArray.create().put(JSONObject.create().put("name", "北京").put("value", 20))) .put("data", JSONArray.create().put(JSONObject.create().put("name", "北京").put("value", 20)))
); );
series.put(JSONObject.create() series.put(JSONObject.create()
@ -81,7 +81,7 @@ public class NewGlyph extends ChartGlyph {
.put("type", "map") .put("type", "map")
.put("mapType", "china") .put("mapType", "china")
.put("itemStyle", createItemStyle(repo)) .put("itemStyle", createItemStyle(repo))
.put("data", JSONArray.create().put(JSONObject.create().put("name", "江苏").put("value", 20))) .put("data", JSONArray.create().put(JSONObject.create().put("name", "江苏").put("value", 20)))
); );
series.put(JSONObject.create() series.put(JSONObject.create()
@ -89,7 +89,7 @@ public class NewGlyph extends ChartGlyph {
.put("type", "map") .put("type", "map")
.put("mapType", "china") .put("mapType", "china")
.put("itemStyle", createItemStyle(repo)) .put("itemStyle", createItemStyle(repo))
.put("data", JSONArray.create().put(JSONObject.create().put("name", "四川").put("value", 20))) .put("data", JSONArray.create().put(JSONObject.create().put("name", "四川").put("value", 20)))
); );
return series; return series;
@ -101,4 +101,4 @@ public class NewGlyph extends ChartGlyph {
itemStyle.put("emphasis", JSONObject.create().put("label", JSONObject.create().put("show", true))); itemStyle.put("emphasis", JSONObject.create().put("label", JSONObject.create().put("show", true)));
return itemStyle; return itemStyle;
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/base/NewLegendGlyph.java

@ -22,4 +22,4 @@ public class NewLegendGlyph extends LegendGlyph {
.put("x", "left") .put("x", "left")
.put("data", JSONArray.create().put("iPhone3").put("iPhone4").put("iPhone5")); .put("data", JSONArray.create().put("iPhone3").put("iPhone4").put("iPhone5"));
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/base/NewPlot.java

@ -22,4 +22,4 @@ public abstract class NewPlot extends Plot {
public NewLegendGlyph createChartLegendGlyph(ChartData chartData) { public NewLegendGlyph createChartLegendGlyph(ChartData chartData) {
return new NewLegendGlyph(); return new NewLegendGlyph();
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/base/NewSeriesGlyph.java

@ -7,4 +7,4 @@ import com.fr.chart.chartglyph.ChartGlyph;
*/ */
public class NewSeriesGlyph extends ChartGlyph { public class NewSeriesGlyph extends ChartGlyph {
} }

6
src/com/fr/solution/plugin/chart/echarts/base/NewTitleGlyph.java

@ -22,9 +22,9 @@ public class NewTitleGlyph extends ChartGlyph {
private JSONObject createTitle(Repository repo) throws JSONException { private JSONObject createTitle(Repository repo) throws JSONException {
return JSONObject.create() return JSONObject.create()
.put("text", "iPhoneマ愠ソ") .put("text", "iPhone销量")
.put("subtext", "エソハ<EFBFBD>鮖ケ") .put("subtext", "纯属虚构")
.put("x", "center"); .put("x", "center");
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapFunctionProcessor.java

@ -21,4 +21,4 @@ public class ChineseMapFunctionProcessor extends AbstractFunctionProcessor {
public String toString() { public String toString() {
return Inter.getLocText("Plugin-ECharts_Chinese_Map"); return Inter.getLocText("Plugin-ECharts_Chinese_Map");
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapPlot.java

@ -51,4 +51,4 @@ public class ChineseMapPlot extends NewPlot {
return Inter.getLocText("Plugin-ECharts_Chinese_Map"); return Inter.getLocText("Plugin-ECharts_Chinese_Map");
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/core/map/ChineseMapPlotGlyph.java

@ -25,4 +25,4 @@ public class ChineseMapPlotGlyph extends PlotGlyph {
public String getChartType() { public String getChartType() {
return "ChineseMap"; return "ChineseMap";
} }
} }

12
src/com/fr/solution/plugin/chart/echarts/ui/map/ChineseChartTypePane.java

@ -11,9 +11,9 @@ import com.fr.solution.plugin.chart.echarts.core.map.ChineseMapPlot;
*/ */
public class ChineseChartTypePane extends UserDefinedChartTypePane { public class ChineseChartTypePane extends UserDefinedChartTypePane {
/** /**
* 弹出框的标题 * 弹出框的标题
* *
* @return 弹出框的标题 * @return 弹出框的标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return Inter.getLocText("Plugin-ECharts_Chinese_Map"); return Inter.getLocText("Plugin-ECharts_Chinese_Map");
@ -26,9 +26,9 @@ public class ChineseChartTypePane extends UserDefinedChartTypePane {
} }
/** /**
* 界面是否接受 * 界面是否接受
* @param ob 对象是否为chart * @param ob 对象是否为chart
* @return 界面是否接受对象 * @return 界面是否接受对象
*/ */
public boolean accept(Object ob) { public boolean accept(Object ob) {
return (ob instanceof Chart)&&((Chart) ob).getPlot().accept(ChineseMapPlot.class); return (ob instanceof Chart)&&((Chart) ob).getPlot().accept(ChineseMapPlot.class);
@ -45,4 +45,4 @@ public class ChineseChartTypePane extends UserDefinedChartTypePane {
"/com/fr/solution/plugin/chart/echarts/images/map/map_type1.png" "/com/fr/solution/plugin/chart/echarts/images/map/map_type1.png"
}; };
} }
} }

2
src/com/fr/solution/plugin/chart/echarts/ui/map/ChineseMapReportDataContentPane.java

@ -37,4 +37,4 @@ public class ChineseMapReportDataContentPane extends AbstractReportDataContentPa
public boolean shouldResponseChangeListener() { public boolean shouldResponseChangeListener() {
return true; return true;
} }
} }

6
src/com/fr/solution/plugin/chart/echarts/ui/map/ChineseMapTableDataContentPane.java

@ -21,10 +21,10 @@ public class ChineseMapTableDataContentPane extends AbstractTableDataContentPane
public ChineseMapTableDataContentPane(ChartDataPane parent) { public ChineseMapTableDataContentPane(ChartDataPane parent) {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
UILabel label = new UILabel("测试布局"); UILabel label = new UILabel("测试布局");
setBorder(BorderFactory.createLineBorder(Color.RED)); setBorder(BorderFactory.createLineBorder(Color.RED));
add(label, BorderLayout.NORTH); add(label, BorderLayout.NORTH);
correlationPane = new UICorrelationPane("区域名", "区域值"); correlationPane = new UICorrelationPane("区域名", "区域值");
add(correlationPane, BorderLayout.CENTER); add(correlationPane, BorderLayout.CENTER);
} }
@ -53,4 +53,4 @@ public class ChineseMapTableDataContentPane extends AbstractTableDataContentPane
public boolean shouldResponseChangeListener() { public boolean shouldResponseChangeListener() {
return true; return true;
} }
} }

4
src/com/fr/solution/plugin/chart/echarts/web/echarts.bridge.js

@ -7,7 +7,7 @@ EChartsFactory = function(options, $dom) {
this.chartID = options.chartID; this.chartID = options.chartID;
this.autoRefreshTime = options.autoRefreshTime || 0; this.autoRefreshTime = options.autoRefreshTime || 0;
this.width = options.width || $dom.width();// 补充从dom获取. this.width = options.width || $dom.width();// 补充从dom获取.
this.height = options.height || $dom.height(); this.height = options.height || $dom.height();
this.sheetIndex = options.sheetIndex || 0; this.sheetIndex = options.sheetIndex || 0;
this.ecName = options.ecName || ''; this.ecName = options.ecName || '';
@ -35,7 +35,7 @@ EChartsFactory.prototype = {
}, },
//数据监控的刷新方式 //数据监控的刷新方式
setData:function(options, aimation){ setData:function(options, aimation){
} }

Loading…
Cancel
Save