Version 1.5.0-dev.4.5

dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/dartium/DartiumDebugValue.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
@@ skipping 39 matching lines @@
     if (value.isList()) {
       return new DartiumDebugIndexedValue(target, variable, value);
     } else {
       return new DartiumDebugValue(target, variable, value);
     }
   }
 
   private DartiumDebugVariable variable;
   protected WebkitRemoteObject value;
 
-  private VariableCollector variableCollector;
+  protected VariableCollector variableCollector;
 
   protected DartiumDebugValue(DartiumDebugTarget target, DartiumDebugVariable variable,
       WebkitRemoteObject value) {
     super(target);
 
     this.variable = variable;
     this.value = value;
   }
 
   public void computeDetail(final ValueCallback callback) {
@@ skipping 119 matching lines @@
     if (value.isString()) {
       return DebuggerUtils.printString(value.getValue());
     }
 
     if (isPrimitive()) {
       return value.getValue();
     }
 
     if (isListValue()) {
       if (value.getClassName() != null) {
-        return value.getClassName() + "[" + value.getListLength() + "]";
+        return value.getClassName() + "[" + value.getListLength(getConnection()) + "]";
       } else {
-        return "List[" + value.getListLength() + "]";
+        return "List[" + value.getListLength(getConnection()) + "]";
       }
     }
 
     return value.getDescription();
   }
 
   @Override
   public String getId() {
     if (value == null || value.isNull()) {
       return null;
@@ skipping 47 matching lines @@
 
       return variableCollector.getVariables();
     } catch (Throwable t) {
       throw createDebugException(t);
     }
   }
 
   @Override
   public boolean hasVariables() throws DebugException {
     try {
-      if (isListValue()) {
-        return value.getListLength() > 0;
-      } else {
-        return value.hasObjectId();
-      }
+      return value.hasObjectId() && !value.isNull() && !value.isPrimitive();
     } catch (Throwable t) {
       throw createDebugException(t);
     }
   }
 
   @Override
   public boolean isAllocated() throws DebugException {
     return true;
   }
 
@@ skipping 12 matching lines @@
     return value.isPrimitive();
   }
 
   @Override
   public void reset() {
     variableCollector = null;
 
     fireEvent(new DebugEvent(this, DebugEvent.CHANGE, DebugEvent.CONTENT));
   }
 
+  protected void populate() {
+    if (value.hasObjectId()) {
+      variableCollector = VariableCollector.createCollector(
+          getTarget(),
+          variable,
+          Collections.singletonList(value));
+    } else {
+      variableCollector = VariableCollector.empty();
+    }
+  }
+
   private void evalOnGlobalContext(final String expression,
       final WebkitResult<WebkitRemoteObject> originalResult, final IWatchExpressionListener listener) {
     try {
       getConnection().getRuntime().evaluate(
           expression,
           null,
           false,
           new WebkitCallback<WebkitRemoteObject>() {
             @Override
             public void handleResult(WebkitResult<WebkitRemoteObject> result) {
@@ skipping 29 matching lines @@
     }
 
     try {
       JSONObject obj = new JSONObject(objectId);
       return obj.getString("id");
     } catch (Throwable t) {
       return null;
     }
   }
 
-  private void populate() {
-    if (value.hasObjectId()) {
-      variableCollector = VariableCollector.createCollector(
-          getTarget(),
-          variable,
-          Collections.singletonList(value));
-    } else {
-      variableCollector = VariableCollector.empty();
-    }
-  }
-
 }