1.1 --- a/jemmysupport/nbproject/project.xml	Thu Mar 02 16:41:08 2006 +0000
     1.2 +++ b/jemmysupport/nbproject/project.xml	Thu Mar 02 16:59:25 2006 +0000
     1.3 @@ -8,7 +8,7 @@
     1.4  http://www.sun.com/
     1.5  
     1.6  The Original Code is NetBeans. The Initial Developer of the Original
     1.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
     1.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
     1.9  Microsystems, Inc. All Rights Reserved.
    1.10  -->
    1.11  <project xmlns="http://www.netbeans.org/ns/project/1">
    1.12 @@ -93,6 +93,14 @@
    1.13                      </run-dependency>
    1.14                  </dependency>
    1.15                  <dependency>
    1.16 +                    <code-name-base>org.netbeans.modules.projectui</code-name-base>
    1.17 +                    <build-prerequisite/>
    1.18 +                    <compile-dependency/>
    1.19 +                    <run-dependency>
    1.20 +                        <implementation-version/>
    1.21 +                    </run-dependency>
    1.22 +                </dependency>
    1.23 +                <dependency>
    1.24                      <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
    1.25                      <build-prerequisite/>
    1.26                      <compile-dependency/>

     2.1 --- a/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentGeneratorRunnable.java	Thu Mar 02 16:41:08 2006 +0000
     2.2 +++ b/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentGeneratorRunnable.java	Thu Mar 02 16:59:25 2006 +0000
     2.3 @@ -7,7 +7,7 @@
     2.4   * http://www.sun.com/
     2.5   *
     2.6   * The Original Code is NetBeans. The Initial Developer of the Original
     2.7 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
     2.8 + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
     2.9   * Microsystems, Inc. All Rights Reserved.
    2.10   */
    2.11  
    2.12 @@ -29,6 +29,7 @@
    2.13  import org.netbeans.api.diff.Difference;
    2.14  import org.netbeans.api.diff.StreamSource;
    2.15  import org.netbeans.jemmy.util.PNGEncoder;
    2.16 +import org.netbeans.modules.project.ui.ProjectTab;
    2.17  //import org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent;
    2.18  //import org.netbeans.modules.merge.builtin.visualizer.MergePanel;
    2.19  import org.netbeans.spi.diff.DiffProvider;
    2.20 @@ -185,18 +186,15 @@
    2.21       * @param fo FileObject to be opened in source editor. It should be java
    2.22       * DataObject
    2.23       */
    2.24 -    private void openInEditor(FileObject fo) {
    2.25 +    private void openInEditor(final FileObject fo) {
    2.26          try {
    2.27              DataObject dob = DataObject.find(fo);
    2.28 -            // selects node in projects view
    2.29 -            /* it would be nice to do it. But we are only able to find the right node.
    2.30 -            org.netbeans.api.project.Project p = org.netbeans.api.project.FileOwnerQuery.getOwner(fo);
    2.31 -            if(p != null) {
    2.32 -                org.netbeans.spi.project.ui.LogicalViewProvider lvp = (org.netbeans.spi.project.ui.LogicalViewProvider)p.getLookup().lookup(org.netbeans.spi.project.ui.LogicalViewProvider.class);
    2.33 -                org.openide.nodes.Node node = lvp.findPath(lvp.createLogicalView(), fo);
    2.34 -                System.out.println("NODE="+node);
    2.35 -            }
    2.36 -             */
    2.37 +            // selects node in projects view (must be called from AWT event queue)
    2.38 +            Mutex.EVENT.writeAccess(new Runnable() {
    2.39 +                public void run () {
    2.40 +                    ProjectTab.findDefault(ProjectTab.ID_LOGICAL).selectNodeAsync(fo);
    2.41 +                }
    2.42 +            });
    2.43              // open in editor
    2.44              ((EditorCookie)dob.getCookie(EditorCookie.class)).open();
    2.45          } catch (Exception e) {