From e13f1187f46dc3491677956b106ce8ee63f5bd40 Mon Sep 17 00:00:00 2001
From: daniel <daniel@finereport.com>
Date: Thu, 24 Aug 2017 11:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIAR=E4=BB=BB=E5=8A=A1=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/data/DesignTableDataManager.java   |  7 ++---
 .../mainframe/loghandler/LogHandlerBar.java   | 26 +------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/designer_base/src/com/fr/design/data/DesignTableDataManager.java b/designer_base/src/com/fr/design/data/DesignTableDataManager.java
index 621e303b1b..5248c9626a 100644
--- a/designer_base/src/com/fr/design/data/DesignTableDataManager.java
+++ b/designer_base/src/com/fr/design/data/DesignTableDataManager.java
@@ -36,6 +36,7 @@ import java.io.ByteArrayOutputStream;
 import java.text.Collator;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 设计器管理操作数据集的类:
@@ -54,11 +55,11 @@ public abstract class DesignTableDataManager {
      * 其实globalDsCache没有绝对的必要，只是为了操作方便。如果没有它，那么每次清空服务器数据集或者存储过程的时候，还要去遍历找一下，
      * 这个操作可能比较复杂 。 从减少代码复杂度的角度看，还是很有必要的
      */
-    private static java.util.Map<String, TableDataWrapper> globalDsCache = new java.util.HashMap<String, TableDataWrapper>();
-    private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
+    private static java.util.Map<String, TableDataWrapper> globalDsCache = new ConcurrentHashMap<String, TableDataWrapper>();
+    private static java.util.Map<String, String> dsNameChangedMap = new ConcurrentHashMap<String, String>();
 //    private static List<ChangeListener> dsListeners = new ArrayList<ChangeListener>();
 
-    private static Map<String, List<ChangeListener>> dsListenersMap = new HashMap<String, List<ChangeListener>>();
+    private static Map<String, List<ChangeListener>> dsListenersMap = new ConcurrentHashMap<String, List<ChangeListener>>();;
 
 
     public static String NO_PARAMETER = "no_paramater_pane";
diff --git a/designer_base/src/com/fr/design/mainframe/loghandler/LogHandlerBar.java b/designer_base/src/com/fr/design/mainframe/loghandler/LogHandlerBar.java
index eeba6c2fd6..9b33b3c111 100644
--- a/designer_base/src/com/fr/design/mainframe/loghandler/LogHandlerBar.java
+++ b/designer_base/src/com/fr/design/mainframe/loghandler/LogHandlerBar.java
@@ -33,8 +33,6 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 	private int SERVERNUM = 0;
 
 	private boolean isWithSerious;
-	private int i;
-	private Timer timer;
 
 	public LogHandlerBar() {
 		this(null);
@@ -95,29 +93,7 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 	}
 
 	public synchronized void timerPaint() {
-		isWithSerious = true;
-		timer = new Timer(500, null);
-		ActionListener taskAction = new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				if (i < 5) {
-					isWithSerious = i % 2 == 0 ? true : false;
-					repaint();
-				} else if (i == 5) {
-					if (timer == null)
-						return;
-					timer.stop();
-					timer = null;
-					i = 0;
-					isWithSerious = true;
-					return;
-				}
-				i++;
-			}
-		};
-		if (timer != null) {
-			timer.addActionListener(taskAction);
-			timer.start();
-		}
+		repaint();
 	}
 
 	public int getInfo() {