Move stream debugger icons into a plugin directory (IDEA-CR-27251)
authorVitaliy.Bibaev <vitaliy.bibaev@jetbrains.com>
Tue, 6 Feb 2018 09:22:01 +0000 (12:22 +0300)
committerVitaliy.Bibaev <vitaliy.bibaev@jetbrains.com>
Tue, 6 Feb 2018 09:25:17 +0000 (12:25 +0300)
platform/util/src/com/intellij/icons/AllIcons.java
plugins/stream-debugger/resources/META-INF/plugin.xml
plugins/stream-debugger/resources/icons/stream_debugger.png [moved from platform/icons/src/debugger/streamDebugger/stream_debugger.png with 100% similarity]
plugins/stream-debugger/resources/icons/stream_debugger@2x.png [moved from platform/icons/src/debugger/streamDebugger/stream_debugger@2x.png with 100% similarity]
plugins/stream-debugger/resources/icons/tab.png [moved from platform/icons/src/debugger/streamDebugger/tab.png with 100% similarity]
plugins/stream-debugger/resources/icons/tab@2x.png [moved from platform/icons/src/debugger/streamDebugger/tab@2x.png with 100% similarity]
plugins/stream-debugger/src/com/intellij/debugger/streams/ui/impl/EvaluationAwareTraceWindow.java
plugins/stream-debugger/src/icons/JavaDebuggerStreamsIcons.java [new file with mode: 0644]

index 41c9211598f4f380a76b1ae06e025a449793b1d7..d790d5457306bd5199e0058517cbc60965bd5d80 100644 (file)
@@ -315,12 +315,6 @@ public class AllIcons {
     public static final Icon ShowCurrentFrame = IconLoader.getIcon("/debugger/showCurrentFrame.png"); // 16x16
     public static final Icon SmartStepInto = IconLoader.getIcon("/debugger/smartStepInto.png"); // 16x16
     public static final Icon StackFrame = IconLoader.getIcon("/debugger/stackFrame.png"); // 16x16
-    
-    public static class StreamDebugger {
-      public static final Icon Stream_debugger = IconLoader.getIcon("/debugger/streamDebugger/stream_debugger.png"); // 16x16
-      public static final Icon Tab = IconLoader.getIcon("/debugger/streamDebugger/tab.png"); // 16x16
-
-    }
     public static final Icon ThreadAtBreakpoint = IconLoader.getIcon("/debugger/threadAtBreakpoint.png"); // 16x16
     public static final Icon ThreadCurrent = IconLoader.getIcon("/debugger/threadCurrent.png"); // 16x16
     public static final Icon ThreadFrozen = IconLoader.getIcon("/debugger/threadFrozen.png"); // 16x16
index 760e4b83d98dabbcf4729c1ca57cfd6fd4b9e07f..0d9da627d4cdf890b0b0eeaf8b85802fd7f74224 100644 (file)
@@ -70,7 +70,7 @@
   <actions>
     <action id="StreamTracerAction"
             class="com.intellij.debugger.streams.action.TraceStreamAction"
-            icon="AllIcons.Debugger.StreamDebugger.Stream_debugger"
+            icon="JavaDebuggerStreamsIcons.Stream_debugger"
             text="Trace Current Stream Chain">
       <add-to-group group-id="XDebugger.ToolWindow.TopToolbar" anchor="after" relative-to-action="EvaluateExpression"/>
     </action>
index b0e16221af383b7553d67468abf3987c9ac9edde..1aa42b26cce13bd7ddcbf112f016daa91e76e16c 100644 (file)
@@ -22,6 +22,7 @@ import com.intellij.ui.components.JBLabel;
 import com.intellij.util.ui.JBDimension;
 import com.intellij.xdebugger.XDebugSession;
 import com.intellij.xdebugger.XDebugSessionListener;
+import icons.JavaDebuggerStreamsIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -70,14 +71,14 @@ public class EvaluationAwareTraceWindow extends DialogWrapper {
     final QualifierExpression qualifierExpression = chain.getQualifierExpression();
     final MyPlaceholder firstTab = new MyPlaceholder();
     myTabsPane.insertTab(TraceUtil.formatQualifierExpression(qualifierExpression.getText(), 30),
-                         AllIcons.Debugger.StreamDebugger.Tab, firstTab, qualifierExpression.getText(), 0);
+                         JavaDebuggerStreamsIcons.Tab, firstTab, qualifierExpression.getText(), 0);
     myTabContents.add(firstTab);
 
     for (int i = 0, chainLength = chain.length(); i < chainLength; i++) {
       final StreamCall call = chain.getCall(i);
       final MyPlaceholder tab = new MyPlaceholder();
       final String callName = call.getName().replace(" ", "");
-      myTabsPane.insertTab(callName, AllIcons.Debugger.StreamDebugger.Tab, tab, TraceUtil.formatWithArguments(call), i + 1);
+      myTabsPane.insertTab(callName, JavaDebuggerStreamsIcons.Tab, tab, TraceUtil.formatWithArguments(call), i + 1);
       myTabContents.add(tab);
     }
 
diff --git a/plugins/stream-debugger/src/icons/JavaDebuggerStreamsIcons.java b/plugins/stream-debugger/src/icons/JavaDebuggerStreamsIcons.java
new file mode 100644 (file)
index 0000000..9aa62ae
--- /dev/null
@@ -0,0 +1,18 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED
+ * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
+ */
+public class JavaDebuggerStreamsIcons {
+  private static Icon load(String path) {
+    return IconLoader.getIcon(path, JavaDebuggerStreamsIcons.class);
+  }
+
+  public static final Icon Stream_debugger = load("/icons/stream_debugger.png"); // 16x16
+  public static final Icon Tab = load("/icons/tab.png"); // 16x16
+}