From fdbb57ff4d9b27864201ee5b626c150640ca303c Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 9 Jun 2017 14:51:12 +0300
Subject: [PATCH] IDEA-173562 "Log message to console" for emulated method
 breakpoints prints an empty line - cleanup

---
 .../ui/breakpoints/MethodBreakpoint.java         | 13 ++++++++-----
 .../ui/breakpoints/WildcardMethodBreakpoint.java | 16 +---------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
index 61e9bf9b4d19..b4a17e1452c0 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
@@ -330,23 +330,26 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
     }
   }
 
-
   public String getEventMessage(@NotNull LocatableEvent event) {
+    return getEventMessage(event, getFileName());
+  }
+
+  static String getEventMessage(@NotNull LocatableEvent event, String defaultFileName) {
     Location location = event.location();
     if (event instanceof MethodEntryEvent) {
-      return getEventMessage(true, ((MethodEntryEvent)event).method(), location, getFileName());
+      return getEventMessage(true, ((MethodEntryEvent)event).method(), location, defaultFileName);
     }
     if (event instanceof MethodExitEvent) {
-      return getEventMessage(false, ((MethodExitEvent)event).method(), location, getFileName());
+      return getEventMessage(false, ((MethodExitEvent)event).method(), location, defaultFileName);
     }
     Object entryProperty = event.request().getProperty(METHOD_ENTRY_KEY);
     if (entryProperty instanceof Boolean) {
-      return getEventMessage((Boolean)entryProperty, location.method(), location, getFileName());
+      return getEventMessage((Boolean)entryProperty, location.method(), location, defaultFileName);
     }
     return "";
   }
 
-  static String getEventMessage(boolean entry, Method method, Location location, String defaultFileName) {
+  private static String getEventMessage(boolean entry, Method method, Location location, String defaultFileName) {
     String locationQName = DebuggerUtilsEx.getLocationMethodQName(location);
     String locationFileName;
     try {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
index a342529414ab..7e811a703627 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
@@ -38,12 +38,9 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.PatternUtil;
 import com.intellij.util.StringBuilderSpinAllocator;
 import com.intellij.xdebugger.breakpoints.XBreakpoint;
-import com.sun.jdi.Location;
 import com.sun.jdi.Method;
 import com.sun.jdi.ReferenceType;
 import com.sun.jdi.event.LocatableEvent;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.event.MethodExitEvent;
 import com.sun.jdi.request.MethodEntryRequest;
 import com.sun.jdi.request.MethodExitRequest;
 import one.util.streamex.StreamEx;
@@ -182,18 +179,7 @@ public class WildcardMethodBreakpoint extends Breakpoint<JavaMethodBreakpointPro
   }
 
   public String getEventMessage(@NotNull LocatableEvent event) {
-    Location location = event.location();
-    if (event instanceof MethodEntryEvent) {
-      return MethodBreakpoint.getEventMessage(true, ((MethodEntryEvent)event).method(), location, "");
-    }
-    if (event instanceof MethodExitEvent) {
-      return MethodBreakpoint.getEventMessage(false, ((MethodExitEvent)event).method(), location, "");
-    }
-    Object entryProperty = event.request().getProperty(METHOD_ENTRY_KEY);
-    if (entryProperty instanceof Boolean) {
-      return MethodBreakpoint.getEventMessage((Boolean)entryProperty, location.method(), location, "");
-    }
-    return "";
+    return MethodBreakpoint.getEventMessage(event, "");
   }
 
   public boolean isValid() {