new constructor for RowIcon

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java
index 6926ce2236ca9f781372ddf95bcab8be95e7cb52..9662ee2ecbaf3419ea53d2405540b7546e295df7 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java
@@ -126,10 +126,7 @@ public class DebuggerTreeRenderer extends ColoredTreeCellRenderer {
     }
     final Icon valueIcon = valueDescriptor.getValueIcon();
     if (nodeIcon != null && valueIcon != null) {
-      final RowIcon composite = new RowIcon(2);
-      composite.setIcon(nodeIcon, 0);
-      composite.setIcon(valueIcon, 1);
-      nodeIcon = composite;
+      nodeIcon = new RowIcon(nodeIcon, valueIcon);
     }
     return nodeIcon;
   }

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
index 9c2c0aeab228ad33068aa5bfd590d437215d9634..324c64e475c3a43e4df457b5df960f5c72d6843e 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,10 +116,7 @@ public class JavaGenerateMemberCompletionContributor {
                                                                     final PsiMethod baseMethod,
                                                                     PsiClass baseClass, PsiSubstitutor substitutor) {
 
-    RowIcon icon = new RowIcon(2);
-    icon.setIcon(baseMethod.getIcon(0), 0);
-    icon.setIcon(implemented ? AllIcons.Gutter.ImplementingMethod : AllIcons.Gutter.OverridingMethod, 1);
-
+    RowIcon icon = new RowIcon(baseMethod.getIcon(0), implemented ? AllIcons.Gutter.ImplementingMethod : AllIcons.Gutter.OverridingMethod);
     return createGenerateMethodElement(baseMethod, substitutor, icon, baseClass.getName(), new InsertHandler<LookupElement>() {
       @Override
       public void handleInsert(InsertionContext context, LookupElement item) {

diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java
index dbdcff0f798b23a0f03fe6147ea6b400ab8e7571..7a42e49017da81a9e2660bcb55d7e9b36cd73410 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,10 +115,7 @@ public final class MethodHierarchyNodeDescriptor extends HierarchyNodeDescriptor
       }
 
       if (myStateIcon != null) {
-        final RowIcon icon = new RowIcon(2);
-        icon.setIcon(myStateIcon, 0);
-        icon.setIcon(newIcon, 1);
-        newIcon = icon;
+        newIcon = new RowIcon(myStateIcon, newIcon);
       }
 
       setIcon(newIcon);

diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
index 0cd97b593d90d82dc6d38e11000f0543bab16cc5..31ded4983c8ba03e4b27b2cf2e5840f8f335c969 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
@@ -642,9 +642,7 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps
               setForeground(JBColor.RED);
             }
 
-            RowIcon icon = new RowIcon(2);
-            icon.setIcon(methodIcon, 0);
-            icon.setIcon(overrideIcon, 1);
+            RowIcon icon = new RowIcon(methodIcon, overrideIcon);
             setIcon(icon);
             setDisabledIcon(icon);
             break;

diff --git a/platform/core-api/src/com/intellij/psi/impl/ElementBase.java b/platform/core-api/src/com/intellij/psi/impl/ElementBase.java
index 2f776de1324c8e335c46c445b3ebfae896977479..702411925593951641a30d3dabcb4eda9eb11f2d 100644 (file)
--- a/platform/core-api/src/com/intellij/psi/impl/ElementBase.java
+++ b/platform/core-api/src/com/intellij/psi/impl/ElementBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -157,15 +157,10 @@ public abstract class ElementBase extends UserDataHolderBase implements Iconable
   }
 
   protected Icon getAdjustedBaseIcon(Icon icon, @Iconable.IconFlags int flags) {
-    Icon result = icon;
     if ((flags & ICON_FLAG_VISIBILITY) > 0) {
-      RowIcon rowIcon = new RowIcon(2);
-      rowIcon.setIcon(icon, 0);
-      rowIcon.setIcon(VISIBILITY_ICON_PLACEHOLDER.getValue(), 1);
-      result = rowIcon;
+      return new RowIcon(icon, VISIBILITY_ICON_PLACEHOLDER.getValue());
     }
-
-    return result;
+    return icon;
   }
 
   protected boolean isVisibilitySupported() {

diff --git a/platform/core-api/src/com/intellij/ui/RowIcon.java b/platform/core-api/src/com/intellij/ui/RowIcon.java
index ffd75097dd3515195cfa96020f34d17b0af46b11..a9714624b2094f4d6d2c6657513c34e767cf0ad4 100644 (file)
--- a/platform/core-api/src/com/intellij/ui/RowIcon.java
+++ b/platform/core-api/src/com/intellij/ui/RowIcon.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,12 @@ public class RowIcon implements Icon {
     //myOrientation = orientation;
   }
 
+  public RowIcon(Icon... icons) {
+    this(icons.length);
+    System.arraycopy(icons, 0, myIcons, 0, icons.length);
+    recalculateSize();
+  }
+
   public int hashCode() {
     return myIcons.length > 0 ? myIcons[0].hashCode() : 0;
   }

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java
index 53c2069444e5a9de122a771e18ee3cc958759de3..007a7536adb6ed47f4954f361df767849bb8f1ec 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java
@@ -359,13 +359,8 @@ public class IntentionHintComponent implements Disposable, ScrollAwareHint {
 
     Icon smartTagIcon = showRefactoringsBulb ? AllIcons.Actions.RefactoringBulb : showFix ? AllIcons.Actions.QuickfixBulb : AllIcons.Actions.IntentionBulb;
 
-    myHighlightedIcon = new RowIcon(2);
-    myHighlightedIcon.setIcon(smartTagIcon, 0);
-    myHighlightedIcon.setIcon(AllIcons.General.ArrowDown, 1);
-
-    myInactiveIcon = new RowIcon(2);
-    myInactiveIcon.setIcon(smartTagIcon, 0);
-    myInactiveIcon.setIcon(ourInactiveArrowIcon, 1);
+    myHighlightedIcon = new RowIcon(smartTagIcon, AllIcons.General.ArrowDown);
+    myInactiveIcon = new RowIcon(smartTagIcon, ourInactiveArrowIcon);
 
     myIconLabel = new JLabel(myInactiveIcon);
     myIconLabel.setOpaque(false);