changeset 60:ae097e5bfc13

removed debug output
author Alexandre (Shura) Iline <alexandre.iline@sun.com>
date Thu, 19 Jul 2012 20:32:10 +0400
parents 7844f43c4834
children 2d2e434c8d9f
files tools/Jemmy/JemmyFX/samples/org/jemmy/samples/menu/MenuSample.java tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/ComboBoxWrap.java tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/MenuItemWrap.java tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/TreeItemParent.java
diffstat 4 files changed, 1 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/tools/Jemmy/JemmyFX/samples/org/jemmy/samples/menu/MenuSample.java	Mon Jul 16 20:11:41 2012 +0400
+++ b/tools/Jemmy/JemmyFX/samples/org/jemmy/samples/menu/MenuSample.java	Thu Jul 19 20:32:10 2012 +0400
@@ -25,8 +25,6 @@
 package org.jemmy.samples.menu;
 
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javafx.scene.control.ScrollPane;
 import org.jemmy.fx.NodeDock;
 import org.jemmy.fx.SceneDock;
@@ -84,7 +82,7 @@
     @Test
     public void pushMenuById() {        
         //you could find menu components by id
-        menuBar.menu().push(
+        menuBar.asMenuOwner().push(
                 new ByIdMenuItem("file"), 
                 new ByIdMenuItem("options"),
                 new ByIdMenuItem("option1"));
--- a/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/ComboBoxWrap.java	Mon Jul 16 20:11:41 2012 +0400
+++ b/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/ComboBoxWrap.java	Thu Jul 19 20:32:10 2012 +0400
@@ -130,9 +130,6 @@
 
                         @Override
                         public void run(Object... os) throws Exception {
-                            System.out.println(getControl().getValue());
-                            System.out.println(type.isInstance(getControl().getValue()) ? 
-                                    type.cast(getControl().getValue()) : null);
                             setResult(type.isInstance(getControl().getValue()) ? 
                                     type.cast(getControl().getValue()) : null);
                         }
--- a/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/MenuItemWrap.java	Mon Jul 16 20:11:41 2012 +0400
+++ b/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/MenuItemWrap.java	Thu Jul 19 20:32:10 2012 +0400
@@ -158,10 +158,6 @@
         Root.ROOT.lookup(new LookupCriteria<Scene>() {
 
             public boolean check(Node node, ControlHierarchy hierarchy) {
-                if (node.getProperties().get(Menu.class) != null) {
-                    System.out.println(node.toString());
-                    System.out.println(((MenuItem) node.getProperties().get(Menu.class)).getText());
-                }
                 if (node instanceof MenuButton && parent == null) {
                     MenuButton mb = ((MenuButton) node);
                     //menu button could be in menu bar or by itself
@@ -212,7 +208,6 @@
                         return getChildren(cntrl.getRoot());
                     }
                 };
-                System.out.println("checking scene " + cntrl.getWindow());
                 return check(hierarchy.getControls(), hierarchy);
             }
 
--- a/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/TreeItemParent.java	Mon Jul 16 20:11:41 2012 +0400
+++ b/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/TreeItemParent.java	Thu Jul 19 20:32:10 2012 +0400
@@ -45,7 +45,6 @@
     }
 
     private void refresh(TreeItem<? extends AUX> parent) {
-        System.out.println("adding: " + parent);
         getFound().add((TreeItem<AUX>) parent);
         getAux().add((AUX) parent.getValue());
         for (TreeItem<? extends AUX> si : parent.getChildren()) {