From c3b2ef6ef2af04217dd1381d229e074fab82b99b Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 11 Nov 2014 17:56:21 +0300
Subject: [PATCH] IDEA-125102 Message  "All elements in visible range are null"
 should be enhanced

---
 .../intellij/debugger/ui/impl/watch/MessageDescriptor.java   | 2 --
 .../com/intellij/debugger/ui/tree/render/ArrayRenderer.java  | 5 +++--
 resources-en/src/messages/DebuggerBundle.properties          | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/MessageDescriptor.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/MessageDescriptor.java
index dbcd11cdea64..502df8af71d8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/MessageDescriptor.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/MessageDescriptor.java
@@ -34,8 +34,6 @@ public class MessageDescriptor extends NodeDescriptorImpl {
   public static final MessageDescriptor LOCAL_VARIABLES_INFO_UNAVAILABLE = new MessageDescriptor(
     DebuggerBundle.message("message.node.local.variables.debug.info.not.available")
   );
-  public static final MessageDescriptor ALL_ELEMENTS_IN_VISIBLE_RANGE_ARE_NULL = new MessageDescriptor(
-    DebuggerBundle.message("message.node.all.array.elements.null"));
   public static final MessageDescriptor ALL_ELEMENTS_IN_RANGE_ARE_NULL = new MessageDescriptor(
     DebuggerBundle.message("message.node.all.elements.null"));
   public static final MessageDescriptor ARRAY_IS_EMPTY = new MessageDescriptor(DebuggerBundle.message("message.node.empty.array"));
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
index e66990a04775..ae764a24a3fa 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.debugger.ui.tree.render;
 
+import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.DebuggerContext;
 import com.intellij.debugger.engine.DebuggerManagerThreadImpl;
 import com.intellij.debugger.engine.evaluation.EvaluateException;
@@ -179,10 +180,10 @@ public class ArrayRenderer extends NodeRendererImpl{
 
       if (added == 0) {
         if(START_INDEX == 0 && array.length() - 1 <= END_INDEX) {
-          children.add(nodeManager.createMessageNode(MessageDescriptor.ALL_ELEMENTS_IN_RANGE_ARE_NULL.getLabel()));
+          children.add(nodeManager.createMessageNode(MessageDescriptor.ALL_ELEMENTS_IN_RANGE_ARE_NULL));
         }
         else {
-          children.add(nodeManager.createMessageNode(MessageDescriptor.ALL_ELEMENTS_IN_VISIBLE_RANGE_ARE_NULL.getLabel()));
+          children.add(nodeManager.createMessageNode(DebuggerBundle.message("message.node.all.array.elements.null", START_INDEX, END_INDEX)));
         }
       }
       else {
diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties
index 5168323e961a..8e09ea8a52a5 100644
--- a/resources-en/src/messages/DebuggerBundle.properties
+++ b/resources-en/src/messages/DebuggerBundle.properties
@@ -383,7 +383,7 @@ error.invalid.field.name=Invalid field name ''{0}''
 label.unknown.value=<unknown>
 message.node.debug.info.not.available=Debug info not available
 message.node.local.variables.debug.info.not.available=Local variables debug info not available
-message.node.all.array.elements.null=All elements in visible range are null
+message.node.all.array.elements.null=All elements in range ({0}, {1}) are null
 message.node.all.elements.null=All elements are null
 message.node.empty.array=Empty
 message.node.class.has.no.fields=Class has no fields