1.1 --- a/bpel.core/src/org/netbeans/modules/bpel/core/multiview/BPELSourceMultiViewElement.java	Wed Oct 03 10:02:22 2007 +0000
     1.2 +++ b/bpel.core/src/org/netbeans/modules/bpel/core/multiview/BPELSourceMultiViewElement.java	Wed Oct 03 10:18:03 2007 +0000
     1.3 @@ -38,8 +38,8 @@
     1.4   * Version 2 license, then the option applies only if the new code is
     1.5   * made subject to such option by the copyright holder.
     1.6   */
     1.7 +package org.netbeans.modules.bpel.core.multiview;
     1.8  
     1.9 -package org.netbeans.modules.bpel.core.multiview;
    1.10  import java.io.IOException;
    1.11  import java.io.ObjectInput;
    1.12  import java.io.ObjectOutput;
    1.13 @@ -330,28 +330,12 @@
    1.14      }
    1.15      
    1.16      private void initialize() {
    1.17 -            
    1.18 -        /**
    1.19 -         * only thing which works to make the XmlNav show for this MVElement see
    1.20 -         * (http://www.netbeans.org/issues/show_bug.cgi?id=67257)
    1.21 -         */
    1.22 -        associateLookup(new ProxyLookup(new Lookup[] {
    1.23 -        // Lookups.singleton(getDataObject().getNodeDelegate())
    1.24 -                Lookups.fixed(new Object[] {
    1.25 -                        // Need ActionMap in lookup so editor actions work.
    1.26 -                        // Fix for #85512.
    1.27 -                        getActionMap(),
    1.28 -                        getDataObject(),
    1.29 -                        getDataObject().getNodeDelegate() }) }));
    1.30 -        /*
    1.31 -         * getDataObject() is put here because method createMultiView in 
    1.32 -         * BpelMultiviewSupport is create TopComponent with lookup
    1.33 -         * that retrieved from defaultDesc . This defaultDesc is source 
    1.34 -         * description. So I put into lookup dataOject.
    1.35 -         * It will be used later for activate Design view.
    1.36 -         * Second object in lookup is "hack" that described above.
    1.37 -         */
    1.38 -        
    1.39 +      associateLookup(new ProxyLookup(new Lookup[] { // # 67257
    1.40 +        Lookups.fixed(new Object[] {
    1.41 +          getActionMap(), // # 85512
    1.42 +          getDataObject(),
    1.43 +          getDataObject().getNodeDelegate() }),
    1.44 +          getDataObject().getLookup() })); // # 117029
    1.45      }
    1.46      
    1.47      private BPELValidationController getValidationController() {

     2.1 --- a/xslt.core/src/org/netbeans/modules/xslt/core/multiview/source/XSLTSourceMultiViewElement.java	Wed Oct 03 10:02:22 2007 +0000
     2.2 +++ b/xslt.core/src/org/netbeans/modules/xslt/core/multiview/source/XSLTSourceMultiViewElement.java	Wed Oct 03 10:18:03 2007 +0000
     2.3 @@ -38,8 +38,8 @@
     2.4   * Version 2 license, then the option applies only if the new code is
     2.5   * made subject to such option by the copyright holder.
     2.6   */
     2.7 +package org.netbeans.modules.xslt.core.multiview.source;
     2.8  
     2.9 -package org.netbeans.modules.xslt.core.multiview.source;
    2.10  import java.io.IOException;
    2.11  import java.io.ObjectInput;
    2.12  import java.io.ObjectOutput;
    2.13 @@ -116,27 +116,12 @@
    2.14      }
    2.15      
    2.16      private void initialize() {
    2.17 -        /**
    2.18 -         * only thing which works to make the XmlNav show for this MVElement see
    2.19 -         * (http://www.netbeans.org/issues/show_bug.cgi?id=67257)
    2.20 -         */
    2.21 -        associateLookup(new ProxyLookup(new Lookup[] {
    2.22 -            // Lookups.singleton(getDataObject().getNodeDelegate())
    2.23 -            Lookups.fixed(new Object[] {
    2.24 -                // Need ActionMap in lookup so editor actions work.
    2.25 -                // Fix for #85512.
    2.26 -                getActionMap(),
    2.27 -                getDataObject(),
    2.28 -                getDataObject().getNodeDelegate() }) }));
    2.29 -        /*
    2.30 -         * getDataObject() is put here because method createMultiView in
    2.31 -         * XsltMultiviewSupport is create TopComponent with lookup
    2.32 -         * that retrieved from defaultDesc . This defaultDesc is source
    2.33 -         * description. So I put into lookup dataOject.
    2.34 -         * It will be used later for activate Design view.
    2.35 -         * Second object in lookup is "hack" that described above.
    2.36 -         */
    2.37 -        
    2.38 +      associateLookup(new ProxyLookup(new Lookup[] { // # 67257
    2.39 +        Lookups.fixed(new Object[] {
    2.40 +          getActionMap(), // # 85512
    2.41 +          getDataObject(),
    2.42 +          getDataObject().getNodeDelegate() }),
    2.43 +          getDataObject().getLookup() })); // # 117029
    2.44      }
    2.45      
    2.46      public void writeExternal(ObjectOutput out) throws IOException {
    2.47 @@ -388,7 +373,3 @@
    2.48          return false;
    2.49      }
    2.50  }
    2.51 -
    2.52 -
    2.53 -
    2.54 -

     3.1 --- a/xslt.tmap/src/org/netbeans/modules/xslt/tmap/multiview/source/TMapSourceMultiViewElement.java	Wed Oct 03 10:02:22 2007 +0000
     3.2 +++ b/xslt.tmap/src/org/netbeans/modules/xslt/tmap/multiview/source/TMapSourceMultiViewElement.java	Wed Oct 03 10:18:03 2007 +0000
     3.3 @@ -116,27 +116,12 @@
     3.4      }
     3.5      
     3.6      private void initialize() {
     3.7 -        /**
     3.8 -         * only thing which works to make the XmlNav show for this MVElement see
     3.9 -         * (http://www.netbeans.org/issues/show_bug.cgi?id=67257)
    3.10 -         */
    3.11 -        associateLookup(new ProxyLookup(new Lookup[] {
    3.12 -            // Lookups.singleton(getDataObject().getNodeDelegate())
    3.13 -            Lookups.fixed(new Object[] {
    3.14 -                // Need ActionMap in lookup so editor actions work.
    3.15 -                // Fix for #85512.
    3.16 -                getActionMap(),
    3.17 -                getDataObject(),
    3.18 -                getDataObject().getNodeDelegate() }) }));
    3.19 -        /*
    3.20 -         * getDataObject() is put here because method createMultiView in
    3.21 -         * TMapMultiviewSupport is create TopComponent with lookup
    3.22 -         * that retrieved from defaultDesc . This defaultDesc is source
    3.23 -         * description. So I put into lookup dataOject.
    3.24 -         * It will be used later for activate Design view.
    3.25 -         * Second object in lookup is "hack" that described above.
    3.26 -         */
    3.27 -        
    3.28 +      associateLookup(new ProxyLookup(new Lookup[] { // # 67257
    3.29 +        Lookups.fixed(new Object[] {
    3.30 +          getActionMap(), // # 85512
    3.31 +          getDataObject(),
    3.32 +          getDataObject().getNodeDelegate() }),
    3.33 +          getDataObject().getLookup() })); // # 117029
    3.34      }
    3.35      
    3.36      public void writeExternal(ObjectOutput out) throws IOException {
    3.37 @@ -388,7 +373,3 @@
    3.38          return false;
    3.39      }
    3.40  }
    3.41 -
    3.42 -
    3.43 -
    3.44 -