1.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/DomRangeImpl.java	Mon Apr 23 20:33:55 2007 +0000
     1.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/DomRangeImpl.java	Mon Apr 23 22:08:22 2007 +0000
     1.3 @@ -20,14 +20,12 @@
     1.4  package org.netbeans.modules.visualweb.designer.jsf.text;
     1.5  
     1.6  
     1.7 +import java.util.logging.Level;
     1.8 +import java.util.logging.Logger;
     1.9  import org.netbeans.modules.visualweb.api.designer.DomProvider;
    1.10  import org.netbeans.modules.visualweb.api.designer.DomProvider.DomPosition;
    1.11  import org.netbeans.modules.visualweb.api.designer.DomProvider.DomPosition.Bias;
    1.12 -import org.netbeans.modules.visualweb.designer.jsf.JsfForm;
    1.13  
    1.14 -import org.openide.ErrorManager;
    1.15 -
    1.16 -import org.w3c.dom.DocumentFragment;
    1.17  import org.w3c.dom.Node;
    1.18  import org.w3c.dom.ranges.DocumentRange;
    1.19  
    1.20 @@ -92,39 +90,55 @@
    1.21  //        this.jsfForm = jsfForm;
    1.22          this.domDocumentImpl = domDocumentImpl;
    1.23  
    1.24 -        // Determine if this node is in a DocumentFragment which means
    1.25 -        // it's read only
    1.26 -        Node curr = dotNode;
    1.27 -
    1.28 -        while (curr.getParentNode() != null) {
    1.29 -            curr = curr.getParentNode();
    1.30 -        }
    1.31 -
    1.32 -//        if (curr == webform.getJspDom()) {
    1.33 -        if (curr == domDocumentImpl.getJsfForm().getJspDom()) {
    1.34 +//        // Determine if this node is in a DocumentFragment which means
    1.35 +//        // it's read only
    1.36 +//        Node curr = dotNode;
    1.37 +//
    1.38 +//        while (curr.getParentNode() != null) {
    1.39 +//            curr = curr.getParentNode();
    1.40 +//        }
    1.41 +//
    1.42 +////        if (curr == webform.getJspDom()) {
    1.43 +//        if (curr == domDocumentImpl.getJsfForm().getJspDom()) {
    1.44 +//            // It's below the main document dom node so it's part of
    1.45 +//            // the writable document portion
    1.46 +////            DocumentRange dom = (DocumentRange)webform.getJspDom();
    1.47 +//            DocumentRange dom = (DocumentRange)domDocumentImpl.getJsfForm().getJspDom();
    1.48 +//            
    1.49 +//            domRange = dom.createRange();
    1.50 +//            domRange.setStart(markNode, markOffset);
    1.51 +//            domRange.setEnd(dotNode, dotOffset);
    1.52 +////        } else if (webform.getManager().isInlineEditing()) {
    1.53 +//        } else if (domDocumentImpl.getJsfForm().isInlineEditing()) {
    1.54 +//            // Handle regions in generated dom
    1.55 +//            assert curr instanceof DocumentFragment;
    1.56 +//
    1.57 +//            //assert webform.getSelection().getInlineEditor().getFragment() == curr;
    1.58 +//            DocumentRange dom = (DocumentRange)curr.getOwnerDocument();
    1.59 +//            domRange = dom.createRange();
    1.60 +//            domRange.setStart(markNode, markOffset);
    1.61 +//            domRange.setEnd(dotNode, dotOffset);
    1.62 +//        } else {
    1.63 +////            assert false : dotNode + "; " + curr + "; " + webform.getJspDom(); // NOI18N
    1.64 +//            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL,
    1.65 +////                    new IllegalStateException("dotNode=" + dotNode + ", curr=" + curr + ", jsp dom=" + webform.getJspDom())); // NOI18N
    1.66 +//                    new IllegalStateException("dotNode=" + dotNode + ", curr=" + curr + ", jsp dom=" + domDocumentImpl.getJsfForm().getJspDom())); // NOI18N
    1.67 +//        }
    1.68 +        // XXX #102048 If the owner is the source doc, get the range.
    1.69 +        if (dotNode.getOwnerDocument() == domDocumentImpl.getJsfForm().getJspDom()) {
    1.70              // It's below the main document dom node so it's part of
    1.71              // the writable document portion
    1.72 -//            DocumentRange dom = (DocumentRange)webform.getJspDom();
    1.73              DocumentRange dom = (DocumentRange)domDocumentImpl.getJsfForm().getJspDom();
    1.74              
    1.75              domRange = dom.createRange();
    1.76              domRange.setStart(markNode, markOffset);
    1.77              domRange.setEnd(dotNode, dotOffset);
    1.78 -//        } else if (webform.getManager().isInlineEditing()) {
    1.79 -        } else if (domDocumentImpl.getJsfForm().isInlineEditing()) {
    1.80 -            // Handle regions in generated dom
    1.81 -            assert curr instanceof DocumentFragment;
    1.82 -
    1.83 -            //assert webform.getSelection().getInlineEditor().getFragment() == curr;
    1.84 -            DocumentRange dom = (DocumentRange)curr.getOwnerDocument();
    1.85 -            domRange = dom.createRange();
    1.86 -            domRange.setStart(markNode, markOffset);
    1.87 -            domRange.setEnd(dotNode, dotOffset);
    1.88          } else {
    1.89 -//            assert false : dotNode + "; " + curr + "; " + webform.getJspDom(); // NOI18N
    1.90 -            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL,
    1.91 -//                    new IllegalStateException("dotNode=" + dotNode + ", curr=" + curr + ", jsp dom=" + webform.getJspDom())); // NOI18N
    1.92 -                    new IllegalStateException("dotNode=" + dotNode + ", curr=" + curr + ", jsp dom=" + domDocumentImpl.getJsfForm().getJspDom())); // NOI18N
    1.93 +            Logger logger = Logger.getLogger(DomRangeImpl.class.getName());
    1.94 +            logger.log(Level.INFO, null,
    1.95 +                new IllegalStateException("dotNode=" + dotNode // NOI18N
    1.96 +                    + ", dotNode owner=" + dotNode.getOwnerDocument() // NOI18N
    1.97 +                    + ", jsp dom=" + domDocumentImpl.getJsfForm().getJspDom())); // NOI18N
    1.98          }
    1.99  
   1.100          dotIsFirst = false;