bug fix

triosyi · May 4, 2016 · b13f4a2 · b13f4a2
1 parent f308dbc
commit b13f4a2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/scouter.client/src/scouter/client/util/MenuUtil.java b/scouter.client/src/scouter/client/util/MenuUtil.java
@@ -391,6 +391,7 @@ public static void createCounterContextMenu(final String id, Control control, fi
  final Counter counterObj = counterEngine.getObjectType(objType).getFamily().getCounter(counter);
  mgr.addMenuListener(new IMenuListener() {
  public void menuAboutToShow(IMenuManager mgr) {
+ if (mgr == null) return;
  IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
  if (counterObj.isAll()) {
  Action act = new OpenRealTimeAllAction(win, "Current All", objType, counter, Images.all, serverId);

diff --git a/scouter.client/src/scouter/client/xlog/ImageCache.java b/scouter.client/src/scouter/client/xlog/ImageCache.java
@@ -32,7 +32,6 @@ public class ImageCache {
 
  private static ImageCache instance;
  private Map<RGB, Image> xLogDotMap = new HashMap<RGB, Image>();
- private Map<RGB, Image> objectDotMap = new HashMap<RGB, Image>();
  private Image errorXpDot = null;
 
  public synchronized static ImageCache getInstance() {
@@ -101,20 +100,6 @@ public synchronized Image getXPErrorImage() {
  return errorXpDot;
  }
 
- public synchronized Image getObjectImage(int objHash) {
- Color agentColor = AgentColorManager.getInstance().getColor(objHash);
- if (agentColor == null) {
- agentColor = ColorUtil.getInstance().getColor("gray");
- }
- RGB rgb = agentColor.getRGB();
- Image dot = objectDotMap.get(rgb);
- if (dot == null) {
- dot = createObjectImage(rgb);
- objectDotMap.put(rgb, dot);
- }
- return dot;
- }
-
  private Image createObjectImage(RGB rgb) {
  Image xp = new Image(null, 3, 3);
  GC gcc = new GC(xp);