Version 1.5.0-dev.4.5

dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/webkit/WebkitRemoteObject.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 
 package com.google.dart.tools.debug.core.webkit;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 /**
  * A WIP scope object.
  * 
  * @see http://code.google.com/chrome/devtools/docs/protocol/tot/runtime.html#type-RemoteObject
  */
 public class WebkitRemoteObject {
 
   public static WebkitRemoteObject createFrom(JSONObject params) throws JSONException {
     WebkitRemoteObject remoteObject = new WebkitRemoteObject();
 
@@ skipping 26 matching lines @@
   private String description;
 
   private String objectId;
 
   private String subtype;
 
   private String type;
 
   private String value;
 
+  private int listLength = -1;
+
   @Override
   public boolean equals(Object obj) {
     if (obj instanceof WebkitRemoteObject) {
       return ((WebkitRemoteObject) obj).getObjectId().equals(getObjectId());
     }
 
     return false;
   }
 
   public String getClassName() {
@@ skipping 16 matching lines @@
     return null;
   }
 
   public String getDescription() {
     return description;
   }
 
   /**
    * Return the length of the list if this object is a list.
    * 
+   * @param webkitConnection
    * @return
    */
-  public int getListLength() {
-    // TODO(devoncarew): write a test to notify us when this convention changes
-
-    // Since there is no direct way to obtain the length of an array, use the description from
-    // Dartium to derive the array length. value.getDescription() == "Array[x]"
-
-    String str = getDescription();
-
-    int startIndex = str.indexOf('[');
-    int endIndex = str.indexOf(']', startIndex);
-
-    if (startIndex != -1 && endIndex != -1) {
-      String val = str.substring(startIndex + 1, endIndex);
+  public int getListLength(WebkitConnection connection) {
+    if (listLength == -1) {
+      final CountDownLatch latch = new CountDownLatch(1);
 
       try {
-        return Integer.parseInt(val);
-      } catch (NumberFormatException nfe) {
+        connection.getRuntime().callListLength(objectId, new WebkitCallback<Integer>() {
+          @Override
+          public void handleResult(WebkitResult<Integer> result) {
+            if (result.isError()) {
+              listLength = 0;
+            } else {
+              listLength = result.getResult().intValue();
+            }
+
+            latch.countDown();
+          }
+        });
+      } catch (IOException e) {
+        listLength = 0;
+        latch.countDown();
+      }
+
+      try {
+        latch.await(3, TimeUnit.SECONDS);
+      } catch (InterruptedException e) {
 
       }
     }
 
-    return 0;
+    return listLength;
   }
 
   public String getObjectId() {
     return objectId;
   }
 
   /**
    * One of "array", "date", "node", "null", "regexp".
    */
   public String getSubtype() {
@@ skipping 43 matching lines @@
    */
   public boolean isLibraryRef() {
     if (className == null) {
       return false;
     }
 
     return className.startsWith("file:") || className.startsWith("http:");
   }
 
   public boolean isList() {
-    return "array".equals(subtype);
+    return "object".equals(type) && "List".equals(className);
   }
 
   public boolean isNode() {
     return "node".equals(subtype);
   }
 
   public boolean isNull() {
-    if (isObject() && "null".equals(subtype)) {
+    if (isObject() && "null".equals(value)) {
       return true;
     } else {
       return false;
     }
   }
 
   public boolean isNumber() {
     return "number".equals(type);
   }
 
@@ skipping 23 matching lines @@
       return "[" + type + "," + description + "]";
     } else {
       return "[" + type + "," + value + "]";
     }
   }
 
   void setDescription(String value) {
     description = value;
   }
 }