From 2809c63c9c1f3e9aa9a4bbef4aa8519a606878c8 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 3 Mar 2016 14:35:55 +0300
Subject: [PATCH] error reporting: attachments pulled up from LogMessageEx to
 LogMessage to allow IDEs add default attachments (e.g. log files) to all
 reports

---
 .../com/intellij/diagnostic/LogMessage.java   | 20 +++++++++++++++++++
 .../com/intellij/diagnostic/LogMessageEx.java | 20 -------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/diagnostic/LogMessage.java b/platform/platform-impl/src/com/intellij/diagnostic/LogMessage.java
index 4194b8541e17..5c454e82836b 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/LogMessage.java
+++ b/platform/platform-impl/src/com/intellij/diagnostic/LogMessage.java
@@ -15,13 +15,20 @@
  */
 package com.intellij.diagnostic;
 
+import com.intellij.openapi.diagnostic.Attachment;
 import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.SmartList;
 import org.apache.log4j.spi.LoggingEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
 
 public class LogMessage extends AbstractMessage {
   private final Throwable myThrowable;
   private final String myHeader;
+  private List<Attachment> myAttachments = null;
 
   @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
   public LogMessage(LoggingEvent aEvent) {
@@ -83,4 +90,17 @@ public class LogMessage extends AbstractMessage {
   public String getThrowableText() {
     return StringUtil.getThrowableText(getThrowable());
   }
+
+  public void addAttachment(Attachment attachment) {
+    if (myAttachments == null) {
+      myAttachments = new SmartList<Attachment>();
+    }
+    myAttachments.add(attachment);
+  }
+
+  @NotNull
+  @Override
+  public List<Attachment> getAllAttachments() {
+    return myAttachments != null ? myAttachments : Collections.emptyList();
+  }
 }
diff --git a/platform/platform-impl/src/com/intellij/diagnostic/LogMessageEx.java b/platform/platform-impl/src/com/intellij/diagnostic/LogMessageEx.java
index d0546c0a2562..a80800f2fd10 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/LogMessageEx.java
+++ b/platform/platform-impl/src/com/intellij/diagnostic/LogMessageEx.java
@@ -19,7 +19,6 @@ import com.intellij.openapi.diagnostic.Attachment;
 import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.util.ExceptionUtil;
-import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,7 +28,6 @@ import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 /**
  * @author ksafonov
@@ -38,7 +36,6 @@ public class LogMessageEx extends LogMessage {
   private final IdeaLoggingEvent myEvent;
   private final String myTitle;
   private final String myNotificationText;
-  private List<Attachment> myAttachments = null;
 
   /**
    * @param title            text to show in Event Log tool window entry (it comes before 'more')
@@ -65,23 +62,6 @@ public class LogMessageEx extends LogMessage {
     return myTitle;
   }
 
-  public void addAttachment(String path, String content) {
-    addAttachment(new Attachment(path, content));
-  }
-
-  public void addAttachment(Attachment attachment) {
-    if (myAttachments == null) {
-      myAttachments = new SmartList<Attachment>();
-    }
-    myAttachments.add(attachment);
-  }
-
-  @NotNull
-  @Override
-  public List<Attachment> getAllAttachments() {
-    return myAttachments != null ? myAttachments : Collections.<Attachment>emptyList();
-  }
-
   public IdeaLoggingEvent toEvent() {
     return myEvent;
   }