Index: src/org/netbeans/modules/project/ui/actions/NewProject.java
===================================================================
RCS file: /cvs/projects/projectui/src/org/netbeans/modules/project/ui/actions/NewProject.java,v
retrieving revision 1.26
diff -c -r1.26 NewProject.java
*** src/org/netbeans/modules/project/ui/actions/NewProject.java	24 Feb 2006 16:59:42 -0000	1.26
--- src/org/netbeans/modules/project/ui/actions/NewProject.java	22 May 2006 12:52:47 -0000
***************
*** 95,129 ****
      
      private void doPerform () {
          
!         FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource( "Templates/Project" ); //NOI18N                
!         NewProjectWizard wizard = prepareWizardDescriptor(fo);
          
!         try {
!                         
!             final Set newObjects = wizard.instantiate ();            
!             Object mainProperty = wizard.getProperty( /* XXX Define somewhere */ "setAsMain" ); // NOI18N
!             boolean setFirstMain = true;
!             if ( mainProperty instanceof Boolean ) {
!                 setFirstMain = ((Boolean)mainProperty).booleanValue();
!             }
!             final boolean setFirstMainFinal = setFirstMain; 
!             
!             //#69618: the non-project cache may contain a project folder listed in newObjects:
!             ProjectManager.getDefault().clearNonProjectCache();
!                                     
!             SwingUtilities.invokeLater( new Runnable() {
              
!                 public void run() {
                      ProjectUtilities.WaitCursor.show();
                      
!                     if ( newObjects != null && !newObjects.isEmpty() ) { 
                          // First. Open all returned projects in the GUI.
! 
                          LinkedList filesToOpen = new LinkedList();
                          List projectsToOpen = new LinkedList();
! 
                          for( Iterator it = newObjects.iterator(); it.hasNext(); ) {
!                             Object obj = it.next ();
                              FileObject newFo;
                              DataObject newDo;
                              if (obj instanceof DataObject) {
--- 95,129 ----
      
      private void doPerform () {
          
!         FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource( "Templates/Project" ); //NOI18N
!         final NewProjectWizard wizard = prepareWizardDescriptor(fo);
          
!         
!         SwingUtilities.invokeLater( new Runnable() {
              
!             public void run() {
!                 try {
!                     
!                     Set newObjects = wizard.instantiate();
!                     Object mainProperty = wizard.getProperty( /* XXX Define somewhere */ "setAsMain" ); // NOI18N
!                     boolean setFirstMain = true;
!                     if ( mainProperty instanceof Boolean ) {
!                         setFirstMain = ((Boolean)mainProperty).booleanValue();
!                     }
!                     final boolean setFirstMainFinal = setFirstMain;
!                     
!                     //#69618: the non-project cache may contain a project folder listed in newObjects:
!                     ProjectManager.getDefault().clearNonProjectCache();
                      ProjectUtilities.WaitCursor.show();
                      
!                     if ( newObjects != null && !newObjects.isEmpty() ) {
                          // First. Open all returned projects in the GUI.
!                         
                          LinkedList filesToOpen = new LinkedList();
                          List projectsToOpen = new LinkedList();
!                         
                          for( Iterator it = newObjects.iterator(); it.hasNext(); ) {
!                             Object obj = it.next();
                              FileObject newFo;
                              DataObject newDo;
                              if (obj instanceof DataObject) {
***************
*** 172,196 ****
                          // Show the project tab to show the user we did something
                          ProjectUtilities.makeProjectTabVisible( true );
                          
!                         // Second open the files                
                          if (filesToOpen.isEmpty() && lastProject != null) {
                              // Just select and expand the project node
                              ProjectUtilities.selectAndExpandProject(lastProject);
!                         }
!                         else {
                              for( Iterator it = filesToOpen.iterator(); it.hasNext(); ) { // Open the files
                                  ProjectUtilities.openAndSelectNewObject( (DataObject)it.next() );
                              }
!                         }                                                
! 
                      }
                      ProjectUtilities.WaitCursor.hide();
                  }
!             } );
!         }
!         catch ( IOException e ) {
!             ErrorManager.getDefault().notify( ErrorManager.INFORMATIONAL, e );
!         }
          
          
      }
--- 172,196 ----
                          // Show the project tab to show the user we did something
                          ProjectUtilities.makeProjectTabVisible( true );
                          
!                         // Second open the files
                          if (filesToOpen.isEmpty() && lastProject != null) {
                              // Just select and expand the project node
                              ProjectUtilities.selectAndExpandProject(lastProject);
!                         } else {
                              for( Iterator it = filesToOpen.iterator(); it.hasNext(); ) { // Open the files
                                  ProjectUtilities.openAndSelectNewObject( (DataObject)it.next() );
                              }
!                         }
!                         
                      }
                      ProjectUtilities.WaitCursor.hide();
+                 } catch ( IOException e ) {
+                     ErrorManager.getDefault().notify( ErrorManager.INFORMATIONAL, e );
                  }
!             }
!             
!         } );
!         
          
          
      }