From afcc461543774e5bab83028dd80f9dd8ff89c17b Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <Alexander.Marchuk@jetbrains.com>
Date: Wed, 19 Nov 2014 13:58:41 +0300
Subject: [PATCH] fix bug for not 2d arrays and remove busyTable

---
 python/helpers/pydev/pydev_console_utils.py            |  2 +-
 python/helpers/pydev/pydevd_comm.py                    |  2 +-
 python/helpers/pydev/pydevd_vars.py                    |  2 +-
 .../python/debugger/array/ArrayTableForm.form          | 10 +---------
 .../python/debugger/array/ArrayTableForm.java          | 10 ----------
 .../python/debugger/array/NumpyArrayTable.java         |  9 ---------
 6 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/python/helpers/pydev/pydev_console_utils.py b/python/helpers/pydev/pydev_console_utils.py
index 2ba020a0c585..dee5cf39c1d2 100644
--- a/python/helpers/pydev/pydev_console_utils.py
+++ b/python/helpers/pydev/pydev_console_utils.py
@@ -390,7 +390,7 @@ class BaseInterpreterInterface:
         name = attr.split("\t")[-1]
         array = pydevd_vars.evalInContext(name, self.getNamespace(), self.getNamespace())
 
-        metaxml, r, c, f = pydevd_vars.array_to_meta_xml(array, name, format)
+        array, metaxml, r, c, f = pydevd_vars.array_to_meta_xml(array, name, format)
         xml += metaxml
         format = '%' + f
         if rows == -1 and cols == -1:
diff --git a/python/helpers/pydev/pydevd_comm.py b/python/helpers/pydev/pydevd_comm.py
index 7d55d46bc0d3..a8f8af661de9 100644
--- a/python/helpers/pydev/pydevd_comm.py
+++ b/python/helpers/pydev/pydevd_comm.py
@@ -991,7 +991,7 @@ class InternalGetArray(InternalThreadCommand):
 
             xml = "<xml>"
 
-            metaxml, rows, cols, format = pydevd_vars.array_to_meta_xml(var, self.name, self.format)
+            var, metaxml, rows, cols, format = pydevd_vars.array_to_meta_xml(var, self.name, self.format)
             xml += metaxml
             self.format = '%' + format
             if self.rows == -1 and self.cols == -1:
diff --git a/python/helpers/pydev/pydevd_vars.py b/python/helpers/pydev/pydevd_vars.py
index eebe6f3d1c01..a9c6b7310897 100644
--- a/python/helpers/pydev/pydevd_vars.py
+++ b/python/helpers/pydev/pydevd_vars.py
@@ -493,7 +493,7 @@ def array_to_meta_xml(array, name, format):
         bounds = (array.min(), array.max())
     xml = '<array slice=\"%s\" rows=\"%s\" cols=\"%s\" format=\"%s\" type=\"%s\" max=\"%s\" min=\"%s\"/>' % \
            (slice, rows, cols, format, type, bounds[1], bounds[0])
-    return xml, rows, cols, format
+    return array, xml, rows, cols, format
 
 
 
diff --git a/python/src/com/jetbrains/python/debugger/array/ArrayTableForm.form b/python/src/com/jetbrains/python/debugger/array/ArrayTableForm.form
index 8c6f3fcdd0c9..de84cbecb089 100644
--- a/python/src/com/jetbrains/python/debugger/array/ArrayTableForm.form
+++ b/python/src/com/jetbrains/python/debugger/array/ArrayTableForm.form
@@ -69,20 +69,12 @@
       </grid>
       <component id="fd814" class="com.intellij.ui.EditorTextField" binding="mySliceTextField" custom-create="true">
         <constraints>
-          <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <toolTipText value="Current slice."/>
         </properties>
       </component>
-      <component id="a8664" class="com.intellij.ui.table.JBTable" binding="myBusyTable" custom-create="true">
-        <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="18" height="18"/>
-          </grid>
-        </constraints>
-        <properties/>
-      </component>
     </children>
   </grid>
 </form>
diff --git a/python/src/com/jetbrains/python/debugger/array/ArrayTableForm.java b/python/src/com/jetbrains/python/debugger/array/ArrayTableForm.java
index f50f0161034f..93b273ab8abc 100644
--- a/python/src/com/jetbrains/python/debugger/array/ArrayTableForm.java
+++ b/python/src/com/jetbrains/python/debugger/array/ArrayTableForm.java
@@ -47,7 +47,6 @@ public class ArrayTableForm {
   private JPanel myFormatPanel;
   private JPanel myMainPanel;
   private JTable myTable;
-  private JBTable myBusyTable;
   private final Project myProject;
   private KeyListener myResliceCallback;
   private KeyListener myReformatCallback;
@@ -84,11 +83,6 @@ public class ArrayTableForm {
         return editor;
       }
     };
-
-    myBusyTable = new JBTable(new DefaultTableModel());
-    myBusyTable.getEmptyText().setText("");
-    myBusyTable.setBackground(myBusyTable.getTableHeader().getBackground());
-    myBusyTable.setBorder(BorderFactory.createEmptyBorder());
   }
 
   public EditorTextField getSliceTextField() {
@@ -125,10 +119,6 @@ public class ArrayTableForm {
     return myScrollPane;
   }
 
-  public void setBusy(boolean busy) {
-    myBusyTable.setPaintBusy(busy);
-  }
-
   public static class ColumnHeaderRenderer extends DefaultTableHeaderCellRenderer {
     @Override
     public Component getTableCellRendererComponent(JTable table, Object value, boolean selected, boolean focused, int row, int column) {
diff --git a/python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java b/python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java
index 950434855bd5..1424140c8b78 100644
--- a/python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java
+++ b/python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java
@@ -342,15 +342,6 @@ public class NumpyArrayTable {
     initTableModel(true);
   }
 
-  public void setBusy(final boolean busy) {
-    UIUtil.invokeLaterIfNeeded(new Runnable() {
-      @Override
-      public void run() {
-        myComponent.setBusy(busy);
-      }
-    });
-  }
-
   /**
    * @return double presentation from [0:1] range
    */