修改一直触发查询bug

designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java

@@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.ChartsConfigPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.general.ComparatorUtils;
+import com.fr.stable.StableUtils;
 
 
 /**
@@ -57,7 +58,7 @@ public abstract class AbstractIndependentChartUI implements IndependentChartUIPr
         return new DataSeriesConditionPane();
     }
 
-    public ChartEditPane getChartEditPane(String plotID){ return ChartEditPane.getInstance();}
+    public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);}
 
     public ChartsConfigPane getChartConfigPane(String plotID){return null;}
 

designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java

@@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.ChartsConfigPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.general.ComparatorUtils;
+import com.fr.stable.StableUtils;
 
 /**
  * Created by Mitisky on 16/3/7.
@@ -68,7 +69,7 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ
         return getPlotTypePane().title4PopupWindow();
     }
 
-    public ChartEditPane getChartEditPane(String plotID){ return ChartEditPane.getInstance();}
+    public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);}
 
     public ChartsConfigPane getChartConfigPane(String plotID){return null;}
 }

designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java

@@ -97,7 +97,7 @@ public abstract class AbstractIndependentChartsUI extends AbstractProvider imple
 
     @Override
     public ChartEditPane getChartEditPane(String plotID) {
-        return ChartsEditPane.getInstance();
+        return new ChartsEditPane();
     }
 
 }

designer_chart/src/com/fr/design/mainframe/ChartPropertyPane.java

@@ -14,10 +14,9 @@ public class ChartPropertyPane extends MiddleChartPropertyPane{
 	 * 创建图表属性表实例.
 	 */
 	private synchronized static ChartPropertyPane getInstance() {
+		//todo
 		//创建新图表时，创建属性表配置面板
-		if (singleton == null) {
+		singleton = new ChartPropertyPane();
-			singleton = new ChartPropertyPane();
-		}
 		return singleton;
 	}
 
@@ -31,15 +30,12 @@ public class ChartPropertyPane extends MiddleChartPropertyPane{
 				return new Dimension(super.getPreferredSize().width, 18);
 			}
 		};
-        nameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 1, 0));
+		nameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 1, 0));
 		nameLabel.setHorizontalAlignment(SwingConstants.CENTER);
 	}
 
 	@Override
 	protected void createMainPane() {
-		this.removeAll();
-		createNameLabel();
-		this.add(createNorthComponent(), BorderLayout.NORTH);
 		this.add(chartEditPane, BorderLayout.CENTER);
 	}
 

designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java

@@ -15,6 +15,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itabpane.TitleChangeListener;
 import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.general.Inter;
+import com.fr.stable.StableUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -29,11 +30,14 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 	public MiddleChartPropertyPane() {
 		initComponenet();
 	}
-	
+
 	protected void initComponenet() {
 		this.setLayout(new BorderLayout());
 		this.setBorder(null);
-		chartEditPane = ChartEditPane.getInstance();
+
+		createNameLabel();
+		this.add(createNorthComponent(), BorderLayout.NORTH);
+		chartEditPane =  StableUtils.construct(ChartEditPane.class);
 		chartEditPane.setSupportCellData(true);
 	}
 
@@ -43,11 +47,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		this.createMainPane();
 		setSureProperty();
 	}
-	
+
 	protected abstract void createNameLabel();
-	
+
 	protected abstract JComponent createNorthComponent();
-	
+
 	protected abstract void createMainPane();
 
 
@@ -63,7 +67,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		nameLabel.setText(Inter.getLocText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : ""));
 		resetChartEditPane();
 	}
-	
+
 	protected void resetChartEditPane() {
 		remove(chartEditPane);
 		add(chartEditPane, BorderLayout.CENTER);
@@ -71,20 +75,20 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		repaint();
 		revalidate();
 	}
-	
+
 	protected TitleChangeListener titleListener = new TitleChangeListener() {
-		
+
 		@Override
 		public void fireTitleChange(String addName) {
 			nameLabel.setText(Inter.getLocText("Chart-Property_Table") + '-' + addName);
 		}
 	};
 
-    /**
+	/**
-     * 感觉ChartCollection加载图表属性界面.
+	 * 感觉ChartCollection加载图表属性界面.
-     * @param collection  收集图表
+	 * @param collection  收集图表
-     * @param ePane  面板
+	 * @param ePane  面板
-     */
+	 */
 	public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) {
 		addChartEditPane(collection.getSelectedChart().getPlot().getPlotID());
 		setSupportCellData(true);
@@ -92,11 +96,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		chartEditPane.populate(collection);
 	}
 
-    /**
+	/**
-     * 感觉ChartCollection加载图表属性界面.
+	 * 感觉ChartCollection加载图表属性界面.
-     * @param collection  收集图表
+	 * @param collection  收集图表
-     * @param ePane  面板
+	 * @param ePane  面板
-     */
+	 */
 	public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane) {
 		if (collection instanceof ChartCollection) {
 			populateChartPropertyPane((ChartCollection)collection, ePane);
@@ -123,18 +127,18 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		return BaseUtils.readIcon("/com/fr/design/images/m_report/qb.png");
 	}
 
-    /**
+	/**
-     *  预定义定位
+	 *  预定义定位
-     * @return    定位
+	 * @return    定位
-     */
+	 */
 	public Location preferredLocation() {
 		return Location.WEST_BELOW;
 	}
 
-    /**
+	/**
-     * 创建标题Panel
+	 * 创建标题Panel
-     * @return  标题panel
+	 * @return  标题panel
-     */
+	 */
 	public UITitlePanel createTitlePanel() {
 		return new UITitlePanel(this);
 	}
@@ -144,9 +148,9 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 	 */
 	public void refreshDockingView() {
 		// TODO Auto-generated method stub
-		
+
 	}
-	
+
 	/**
 	 * 设置是否支持单元格数据.
 	 */

designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -33,15 +33,6 @@ import java.util.List;
 
 public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4DataSourceChange, ChartEditPaneProvider {
 
-    public synchronized static ChartEditPane getInstance() {
-        if (singleton == null) {
-            singleton = new ChartEditPane();
-        }
-        return singleton;
-    }
-
-    private static ChartEditPane singleton;
-
     private final static int CHANGE_MIN_TIME = 80;
 
     protected ChartCollection collection;
@@ -351,7 +342,9 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
         DesignTableDataManager.addDsChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {
                 AbstractChartAttrPane attrPane = paneList.get(tabsHeaderIconPane.getSelectedIndex());
-                attrPane.refreshChartDataPane(collection);
+                if (attrPane.isShowing()) {
+                    attrPane.refreshChartDataPane(collection);
+                }
             }
         });
     }

designer_chart/src/com/fr/design/mainframe/chart/ChartsEditPane.java

@@ -13,15 +13,6 @@ import java.util.ArrayList;
 public class ChartsEditPane extends ChartEditPane {
 
     protected ChartsConfigPane chartsConfigPane;
-    private static ChartEditPane single;
-
-    public synchronized static ChartEditPane getInstance() {
-        if (single == null) {
-            single = new ChartsEditPane();
-        }
-        return single;
-    }
-
 
     public ChartsEditPane() {
         this.setLayout(new BorderLayout());