Browse Source

Merge pull request #1130 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0

* commit '9894e65c61f0fce6049c50475092fcbe8d58f910':
  CHART-10233 泛型修改
persist/11.0
Bjorn 5 years ago
parent
commit
34928b2297
  1. 10
      designer-chart/src/main/java/com/fr/design/chartx/impl/DefaultTypePane.java

10
designer-chart/src/main/java/com/fr/design/chartx/impl/DefaultTypePane.java

@ -10,7 +10,7 @@ import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
/** /**
* Created by shine on 2019/09/04. * Created by shine on 2019/09/04.
*/ */
public class DefaultTypePane<T extends AbstractChartWithData> extends AbstractChartTypePane<AbstractChartWithData> { public class DefaultTypePane<T extends AbstractChartWithData> extends AbstractChartTypePane<T> {
@Override @Override
protected String[] getTypeIconPath() { protected String[] getTypeIconPath() {
@ -40,22 +40,22 @@ public class DefaultTypePane<T extends AbstractChartWithData> extends AbstractCh
} }
@Override @Override
public void populateBean(AbstractChartWithData ob) { public void populateBean(T ob) {
if (getTypeIconPath().length > 0) { if (getTypeIconPath().length > 0) {
for (ChartImagePane imagePane : typeDemo) { for (ChartImagePane imagePane : typeDemo) {
imagePane.isPressing = false; imagePane.isPressing = false;
} }
typeDemo.get(getSelectIndexInChart((T) ob)).isPressing = true; typeDemo.get(getSelectIndexInChart(ob)).isPressing = true;
checkDemosBackground(); checkDemosBackground();
} }
} }
@Override @Override
public void updateBean(AbstractChartWithData ob) { public void updateBean(T ob) {
if (getTypeIconPath().length > 0) { if (getTypeIconPath().length > 0) {
for (int index = 0, len = typeDemo.size(); index < len; index++) { for (int index = 0, len = typeDemo.size(); index < len; index++) {
if (typeDemo.get(index).isPressing) { if (typeDemo.get(index).isPressing) {
setSelectIndexInChart((T) ob, index); setSelectIndexInChart(ob, index);
return; return;
} }
} }

Loading…
Cancel
Save