CHART-10233 接口修改

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractChartTypeUI.java

@@ -5,7 +5,6 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.chartx.impl.AbstractDataPane;
 import com.fr.design.chartx.impl.AbstractOtherPane;
-import com.fr.design.chartx.impl.DefaultTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.ChartEditPane;
@@ -25,9 +24,7 @@ import com.fr.stable.fun.mark.API;
 public abstract class AbstractChartTypeUI extends AbstractProvider implements ChartTypeUIProvider {
 
     @Override
-    public AbstractChartTypePane getPlotTypePane() {
+    public abstract AbstractChartTypePane getPlotTypePane();
-        return new DefaultTypePane();
-    }
 
     @Override
     public abstract AbstractDataPane getChartDataPane(AttributeChangeListener listener);

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

@@ -1,79 +0,0 @@
-package com.fr.design.chartx.impl;
-
-import com.fr.chart.charttypes.ChartTypeManager;
-import com.fr.chart.impl.AbstractChartWithData;
-import com.fr.chartx.attr.ChartProvider;
-import com.fr.design.ChartTypeInterfaceManager;
-import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
-
-/**
- * Created by shine on 2019/09/04.
- */
-public class DefaultTypePane<T extends AbstractChartWithData> extends AbstractChartTypePane<T> {
-
-    @Override
-    protected String[] getTypeIconPath() {
-        return ChartTypeInterfaceManager.getInstance().getDemoImagePath(getPlotID());
-    }
-
-    @Override
-    protected String[] getTypeTipName() {
-        return ChartTypeInterfaceManager.getInstance().getSubName(getPlotID());
-    }
-
-    @Override
-    public ChartProvider getDefaultChart() {
-        return ChartTypeManager.getInstance().getChartTypes(getPlotID())[0];
-    }
-
-    @Override
-    public String title4PopupWindow() {
-        return ChartTypeInterfaceManager.getInstance().getName(getPlotID());
-    }
-
-    protected int getSelectIndexInChart(T chart) {
-        return 0;
-    }
-
-    protected void setSelectIndexInChart(T chart, int index) {
-    }
-
-    @Override
-    public void populateBean(T ob) {
-        if (getTypeIconPath().length > 0) {
-            for (ChartImagePane imagePane : typeDemo) {
-                imagePane.isPressing = false;
-            }
-            typeDemo.get(getSelectIndexInChart(ob)).isPressing = true;
-            checkDemosBackground();
-        }
-    }
-
-    @Override
-    public void updateBean(T ob) {
-        if (getTypeIconPath().length > 0) {
-            for (int index = 0, len = typeDemo.size(); index < len; index++) {
-                if (typeDemo.get(index).isPressing) {
-                    setSelectIndexInChart(ob, index);
-                    return;
-                }
-            }
-        }
-    }
-
-    @Override
-    protected String[] getTypeLayoutPath() {
-        return new String[0];
-    }
-
-    @Override
-    protected String[] getTypeLayoutTipName() {
-        return new String[0];
-    }
-
-    @Override
-    protected String getPlotTypeID() {
-        return null;
-    }
-}

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

@@ -17,11 +17,11 @@ import com.fr.stable.Constants;
 
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
-import java.util.ArrayList;
-import java.util.List;
 
 
 public abstract class AbstractChartTypePane<T extends ChartProvider> extends FurtherBasicBeanPane<T> {
@@ -43,10 +43,19 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
 
     protected JPanel stylePane; //样式布局的面板
     private JPanel typePane;
+
     protected abstract String[] getTypeIconPath();
+
     protected abstract String[] getTypeTipName();
-    protected abstract String[] getTypeLayoutPath();
+
-    protected abstract String[] getTypeLayoutTipName();
+    protected String[] getTypeLayoutPath() {
+        return new String[0];
+    }
+
+    protected String[] getTypeLayoutTipName() {
+        return new String[0];
+    }
+
     protected int lastStyleIndex = -1;
     protected boolean typeChanged = false;//图表类型是否发生变化
 
@@ -192,20 +201,22 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
 
     /**
      * 此接口已删除，不用实现了
-     *
+     * <p>
      * 获取各图表类型界面ID, 本质是plotID
      * 使用getPlotID
+     *
      * @return 图表类型界面ID
      */
     @Deprecated
-    protected abstract String getPlotTypeID();
+    protected String getPlotTypeID() {
+        return null;
+    }
 
     public String getPlotID() {
         return plotID;
     }
 
     /**
-     *
      * @param ob 对象
      * @return
      */