Browse Source

Merge branch 'master' of bjorn/finekit into master

master
richie 5 years ago committed by Gogs
parent
commit
455bf07ae0
  1. 4
      src/main/java/com/fanruan/api/design/chart/DefaultOtherPane.java
  2. 16
      src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java

4
src/main/java/com/fanruan/api/design/chart/DefaultOtherPane.java

@ -36,7 +36,7 @@ public class DefaultOtherPane<T extends BaseChartWithData> extends BaseOtherPane
* 根据图表对象属性还原面板选项
*/
@Override
public void populate(BaseChartWithData ob) {
public void populate(T ob) {
if (ob.getNameJavaScriptGroup() == null) {
ob.setNameJavaScriptGroup(new NameJavaScriptGroup());
}
@ -54,7 +54,7 @@ public class DefaultOtherPane<T extends BaseChartWithData> extends BaseOtherPane
* 根据面板选项更新图表对象属性
*/
@Override
public void update(BaseChartWithData ob) {
public void update(T ob) {
if (hyperLinkPane != null) {
hyperLinkPane.update(ob.getNameJavaScriptGroup());
}

16
src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java

@ -110,20 +110,4 @@ public class DefaultTypePane<T extends BaseChartWithData> extends AbstractChartT
protected Component[][] getPaneComponents(JPanel typePane) {
return super.getPaneComponents(typePane);
}
//TODO 已经在父类中加了默认实现,jar包更新后直接删除
@Override
protected String[] getTypeLayoutPath() {
return new String[0];
}
@Override
protected String[] getTypeLayoutTipName() {
return new String[0];
}
@Override
protected String getPlotTypeID() {
return null;
}
}

Loading…
Cancel
Save