More service api cleanup. camelCasePropertyNames

runtime/bin/vmservice/observatory/lib/src/service/object.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of service;
 
 /// A [ServiceObject] is an object known to the VM service and is tied
 /// to an owning [Isolate].
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
@@ skipping 1457 matching lines @@
 
     _upgradeCollection(map, isolate);
 
     owningClass = map.containsKey('owningClass') ? map['owningClass'] : null;
     owningLibrary = map.containsKey('owningLibrary') ? map['owningLibrary'] : null;
     kind = FunctionKind.fromJSON(map['kind']);
     isDart = !kind.isFake();
 
     if (mapIsRef) { return; }
 
-    isStatic = map['isStatic'];
-    isConst = map['isConst'];
+    isStatic = map['static'];
+    isConst = map['const'];
     parent = map['parent'];
     script = map['script'];
     tokenPos = map['tokenPos'];
     endTokenPos = map['endTokenPos'];
     code = _convertNull(map['code']);
-    unoptimizedCode = _convertNull(map['unoptimized_code']);
-    isOptimizable = map['is_optimizable'];
-    isInlinable = map['is_inlinable'];
+    unoptimizedCode = _convertNull(map['unoptimizedCode']);
+    isOptimizable = map['optimizable'];
+    isInlinable = map['inlinable'];
     deoptimizations = map['deoptimizations'];
-    usageCounter = map['usage_counter'];
+    usageCounter = map['usageCounter'];
 
     if (parent == null) {
       qualifiedName = (owningClass != null) ?
           "${owningClass.name}.${name}" :
           name;
     } else {
       qualifiedName = "${parent.qualifiedName}.${name}";
     }
 
   }
@@ skipping 87 matching lines @@
     kind = map['kind'];
     _url = map['name'];
     _shortUrl = _url.substring(_url.lastIndexOf('/') + 1);
     name = _shortUrl;
     vmName = _url;
     if (mapIsRef) {
       return;
     }
     _processSource(map['source']);
     _parseTokenPosTable(map['tokenPosTable']);
-    owningLibrary = map['owning_library'];
+    owningLibrary = map['owningLibrary'];
   }
 
   void _parseTokenPosTable(List<List<int>> table) {
     if (table == null) {
       return;
     }
     _tokenToLine.clear();
     _tokenToCol.clear();
     firstTokenPos = null;
     lastTokenPos = null;
@@ skipping 387 matching lines @@
         '${formatPercent(inclusiveTicks, totalSamplesInProfile)} '
         '($inclusiveTicks)';
     formattedExclusiveTicks =
         '${formatPercent(exclusiveTicks, totalSamplesInProfile)} '
         '($exclusiveTicks)';
   }
 
   void _update(ObservableMap m, bool mapIsRef) {
     name = m['name'];
     vmName = (m.containsKey('vmName') ? m['vmName'] : name);
-    isOptimized = m['isOptimized'] != null ? m['isOptimized'] : false;
+    isOptimized = m['optimized'] != null ? m['optimized'] : false;
     kind = CodeKind.fromString(m['kind']);
     startAddress = int.parse(m['start'], radix:16);
     endAddress = int.parse(m['end'], radix:16);
     function = isolate.getFromMap(m['function']);
-    objectPool = isolate.getFromMap(m['object_pool']);
+    objectPool = isolate.getFromMap(m['objectPool']);
     var disassembly = m['disassembly'];
     if (disassembly != null) {
       _processDisassembly(disassembly);
     }
     var descriptors = m['descriptors'];
     if (descriptors != null) {
       descriptors = descriptors['members'];
       _processDescriptors(descriptors);
     }
     // We are loaded if we have instructions or are not Dart code.
@@ skipping 247 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }