1.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java	Mon Mar 26 23:42:59 2007 +0000
     1.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java	Mon Mar 26 23:49:08 2007 +0000
     1.3 @@ -239,13 +239,13 @@
     1.4          return designers;
     1.5      }
     1.6  
     1.7 -    static Designer[] findDesignersForFileObject(FileObject jsfJspFileObject) {
     1.8 -        JsfForm jsfForm = findJsfForm(jsfJspFileObject);
     1.9 -        if (jsfForm == null) {
    1.10 -            return new Designer[0];
    1.11 -        }
    1.12 -        return findDesigners(jsfForm);
    1.13 -    }
    1.14 +//    static Designer[] findDesignersForFileObject(FileObject jsfJspFileObject) {
    1.15 +//        JsfForm jsfForm = findJsfForm(jsfJspFileObject);
    1.16 +//        if (jsfForm == null) {
    1.17 +//            return new Designer[0];
    1.18 +//        }
    1.19 +//        return findDesigners(jsfForm);
    1.20 +//    }
    1.21  
    1.22      static Designer[] findDesignersForDesignContext(DesignContext designContext) {
    1.23          JsfForm jsfForm = findJsfForm(designContext);

     2.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/WebForm.java	Mon Mar 26 23:42:59 2007 +0000
     2.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/WebForm.java	Mon Mar 26 23:49:08 2007 +0000
     2.3 @@ -181,7 +181,7 @@
     2.4      } // End of JspDataObjectListener.
     2.5  
     2.6      
     2.7 -//    private boolean isClosing = false;
     2.8 +//    private boolean cisClosing = false;
     2.9  
    2.10  //    private WebForm() {
    2.11  //        // XXX Get rid of this constructor.
    2.12 @@ -454,35 +454,35 @@
    2.13          }
    2.14      }
    2.15      
    2.16 -    public static WebForm findWebFormForFileObject(FileObject jsfJspFileObject) {
    2.17 -//        synchronized (LOCK_WEB_FORMS) {
    2.18 -//            WebForm webform = (WebForm)webFormsByFileObject.get(fo);
    2.19 -//
    2.20 -//            return webform;
    2.21 -//        }
    2.22 -        
    2.23 -//        return getWebFormForDesigner(getDesignerFinder().findDesignerForFileObject(fo));
    2.24 -        
    2.25 -//        DataObject dobj;
    2.26 -//        try {
    2.27 -//            dobj = DataObject.find(fo);
    2.28 -//        } catch (DataObjectNotFoundException ex) {
    2.29 -//            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
    2.30 +//    public static WebForm findWebFormForFileObject(FileObject jsfJspFileObject) {
    2.31 +////        synchronized (LOCK_WEB_FORMS) {
    2.32 +////            WebForm webform = (WebForm)webFormsByFileObject.get(fo);
    2.33 +////
    2.34 +////            return webform;
    2.35 +////        }
    2.36 +//        
    2.37 +////        return getWebFormForDesigner(getDesignerFinder().findDesignerForFileObject(fo));
    2.38 +//        
    2.39 +////        DataObject dobj;
    2.40 +////        try {
    2.41 +////            dobj = DataObject.find(fo);
    2.42 +////        } catch (DataObjectNotFoundException ex) {
    2.43 +////            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
    2.44 +////            return null;
    2.45 +////        }
    2.46 +////        
    2.47 +////        HtmlDomProvider htmlDomProvider = getHtmlDomProviderFinder().findHtmlDomProvider(dobj);
    2.48 +////        synchronized (htmlDomProvider2webForm) {
    2.49 +////            return htmlDomProvider2webForm.get(htmlDomProvider);
    2.50 +////        }
    2.51 +//        
    2.52 +//        Designer[] designers = getHtmlDomProviderService().findDesignersForFileObject(jsfJspFileObject);
    2.53 +//        if (designers.length > 0 && designers[0] instanceof WebForm) {
    2.54 +//            return (WebForm)designers[0];
    2.55 +//        } else {
    2.56  //            return null;
    2.57  //        }
    2.58 -//        
    2.59 -//        HtmlDomProvider htmlDomProvider = getHtmlDomProviderFinder().findHtmlDomProvider(dobj);
    2.60 -//        synchronized (htmlDomProvider2webForm) {
    2.61 -//            return htmlDomProvider2webForm.get(htmlDomProvider);
    2.62 -//        }
    2.63 -        
    2.64 -        Designer[] designers = getHtmlDomProviderService().findDesignersForFileObject(jsfJspFileObject);
    2.65 -        if (designers.length > 0 && designers[0] instanceof WebForm) {
    2.66 -            return (WebForm)designers[0];
    2.67 -        } else {
    2.68 -            return null;
    2.69 -        }
    2.70 -    }
    2.71 +//    }
    2.72  
    2.73  //    // XXX This is very suspicious, but is just copies previous perf fixes.
    2.74  //    // The FacesModel should fire events about being to be destroyed, and then
    2.75 @@ -2431,9 +2431,9 @@
    2.76              return new Designer[0];
    2.77          }
    2.78  
    2.79 -        public Designer[] findDesignersForFileObject(FileObject jsfJspFileObject) {
    2.80 -            return new Designer[0];
    2.81 -        }
    2.82 +//        public Designer[] findDesignersForFileObject(FileObject jsfJspFileObject) {
    2.83 +//            return new Designer[0];
    2.84 +//        }
    2.85  
    2.86  //        public Designer[] findDesignersForDesignContext(DesignContext designContext) {
    2.87  //            return new Designer[0];