debugger draft

assira.debugger/src/main/java/net/ranides/demo/debugger/impl/CDiClass.java

@@ -42,21 +42,21 @@ public class CDiClass extends AClass<Object> implements DiClass {
     @Override
     public IFields fields() {
         AHints attr = FElements.newHints();
-        return FElements.newFields(attr, CQueryAbstract.Builder.fromQuery(attr, this::getRFields));
+        return FElements.newFields(attr, CQuery.from().query(attr, this::getRFields));
     }
 
     private CQuery<IField> getRFields(AHints hints) {
         if(hints.hintDeclared()) {
-            return CQueryAbstract.Builder
-                .fromCollection(type.fields())
+            return CQuery.from()
+                .collection(type.fields())
                 .map(f -> new CDiField(true, f));
         } else if(hints.hintAny()) {
-            return CQueryAbstract.Builder
-                .fromCollection(type.allFields())
+            return CQuery.from()
+                .collection(type.allFields())
                 .map(f -> new CDiField(isdecl(f), f));
         } else {
-            return CQueryAbstract.Builder
-                .fromCollection(type.visibleFields())
+            return CQuery.from()
+                .collection(type.visibleFields())
                 .map(f -> new CDiField(isdecl(f), f));
         }
     }
@@ -72,21 +72,21 @@ public class CDiClass extends AClass<Object> implements DiClass {
     @Override
     public IMethods methods() {
         AHints attr = FElements.newHints();
-        return FElements.newMethods(attr, CQueryAbstract.Builder.fromQuery(attr, this::getRMethods));
+        return FElements.newMethods(attr, CQuery.from().query(attr, this::getRMethods));
     }
 
     private CQuery<IMethod> getRMethods(AHints hints) {
         if(hints.hintDeclared()) {
-            return CQueryAbstract.Builder
-                .fromCollection(type.methods())
+            return CQuery.from()
+                .collection(type.methods())
                 .map(m -> new CdiMethod(true, m));
         } else if(hints.hintAny()) {
-            return CQueryAbstract.Builder
-                .fromCollection(type.allMethods())
+            return CQuery.from()
+                .collection(type.allMethods())
                 .map(m -> new CdiMethod(isdecl(m), m));
         } else {
-            return CQueryAbstract.Builder
-                .fromCollection(type.visibleMethods())
+            return CQuery.from()
+                .collection(type.visibleMethods())
                 .map(m -> new CdiMethod(isdecl(m), m));
         }
     }

assira.debugger/src/main/java/net/ranides/demo/debugger/impl/CDiConnection.java

@@ -77,8 +77,8 @@ public class CDiConnection implements DiConnection {
 
     @Override
     public DiClasses types(String name) {
-        CQuery<DiClass> query = CQueryAbstract.Builder
-            .fromCollection(vm.classesByName(name))
+        CQuery<DiClass> query = CQuery.from()
+            .collection(vm.classesByName(name))
             .filter(ClassType.class::isInstance)
             .map(ClassType.class::cast)
             .map(CDiClass::new);
@@ -87,8 +87,8 @@ public class CDiConnection implements DiConnection {
 
     @Override
     public DiClasses types() {
-        CQuery<DiClass> query = CQueryAbstract.Builder
-            .fromCollection(vm.allClasses())
+        CQuery<DiClass> query = CQuery.from()
+            .collection(vm.allClasses())
             .filter(ClassType.class::isInstance)
             .map(ClassType.class::cast)
             .map(CDiClass::new);