diff --git a/designer/src/com/fr/start/Designer.java b/designer/src/com/fr/start/Designer.java index 09b7fa76e..526df8f09 100644 --- a/designer/src/com/fr/start/Designer.java +++ b/designer/src/com/fr/start/Designer.java @@ -1,6 +1,7 @@ package com.fr.start; import com.fr.base.BaseUtils; +import com.fr.base.Env; import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.core.ActionFactory; @@ -35,7 +36,6 @@ import com.fr.general.Inter; import com.fr.stable.ProductConstants; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; -import com.fr.stable.web.ServletContext; import com.fr.stable.xml.XMLTools; import javax.swing.*; @@ -432,7 +432,8 @@ public class Designer extends BaseDesigner { InformationCollector collector = InformationCollector.getInstance(); collector.collectStopTime(); collector.saveXMLFile(); - ServletContext.fireServletStopListener(); + Env currentEnv = FRContext.getCurrentEnv(); + currentEnv.doWhenServerShutDown(); } } \ No newline at end of file diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index 05e023135..3c25fc7ff 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -2282,4 +2282,9 @@ public class RemoteEnv extends AbstractEnv { return StringUtils.EMPTY; } } + + @Override + public void doWhenServerShutDown() { + + } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/UserDefinedChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/UserDefinedChartTypePane.java new file mode 100644 index 000000000..1f40de8be --- /dev/null +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/UserDefinedChartTypePane.java @@ -0,0 +1,42 @@ +package com.fr.design.mainframe.chart.gui.type; + +import com.fr.chart.chartattr.Chart; + +/** + * Created by mengao on 2017/8/30. + * 不能删掉这个类,echarts插件中用到 + */ +public abstract class UserDefinedChartTypePane extends AbstractChartTypePane { + protected String[] getTypeLayoutPath() { + return new String[0]; + } + + protected String[] getTypeLayoutTipName(){ + return new String[0]; + } + + protected String[] getTypeIconPath(){ + return new String[]{"/com/fr/design/images/chart/default.png"}; + } + + protected String[] getTypeTipName() { + return new String[]{title4PopupWindow()}; + } + + public void updateBean(Chart chart) { + + } + + public void populateBean(Chart chart){ + typeDemo.get(0).isPressing = true; + checkDemosBackground(); + } + + /** + * 弹出界面的标题 + * @return 标题 + */ + public String title4PopupWindow(){ + return ""; + } +}