Attachment #69208 for bug #146377

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 146377
Collapse All | Expand All

Lines 187-193 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/NewLoaderIterator.java (-1 / +1 lines)
187	try {	187	try {
188	SpecificationVersion current = model.getModuleInfo().getDependencyVersion("org.openide.loaders");	188	SpecificationVersion current = model.getModuleInfo().getDependencyVersion("org.openide.loaders");
189	loaderlessObject = current.compareTo(new SpecificationVersion("7.1")) >= 0; // NOI18N	189	loaderlessObject = current.compareTo(new SpecificationVersion("7.1")) >= 0; // NOI18N
190	lookupReadyObject = current.compareTo(new SpecificationVersion("6.0")) >= 0; // NOI18N	190	lookupReadyObject = current.compareTo(new SpecificationVersion("6.0")) >= 0 && current.compareTo(new SpecificationVersion("7.3")) < 0; // NOI18N
191	} catch (IOException ex) {	191	} catch (IOException ex) {
192	Logger.getLogger(NewLoaderIterator.class.getName()).log(Level.INFO, null, ex);	192	Logger.getLogger(NewLoaderIterator.class.getName()).log(Level.INFO, null, ex);
193	loaderlessObject = false;	193	loaderlessObject = false;

Lines 14-20 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx (-5 lines)
14	import org.openide.nodes.CookieSet;	14	import org.openide.nodes.CookieSet;
15	import org.openide.nodes.Node;	15	import org.openide.nodes.Node;
16	import org.openide.nodes.Children;	16	import org.openide.nodes.Children;
17	import org.openide.util.Lookup;
18	${EDITOR_SUPPORT_IMPORT}	17	${EDITOR_SUPPORT_IMPORT}
19		18
20	public class ${PREFIX}DataObject extends MultiDataObject {	19	public class ${PREFIX}DataObject extends MultiDataObject {
Lines 29-36 Link Here
29	return new DataNode(this, Children.LEAF, getLookup());	28	return new DataNode(this, Children.LEAF, getLookup());
30	}	29	}
31		30
32	@Override
33	public Lookup getLookup() {
34	return getCookieSet().getLookup();
35	}
36	}	31	}

Lines 248-254 Link Here

(-)a/beans/nbproject/project.xml (-1 / +1 lines)
248	<build-prerequisite/>	248	<build-prerequisite/>
249	<compile-dependency/>	249	<compile-dependency/>
250	<run-dependency>	250	<run-dependency>
251	<specification-version>7.0</specification-version>	251	<specification-version>7.3</specification-version>
252	</run-dependency>	252	</run-dependency>
253	</dependency>	253	</dependency>
254	<dependency>	254	<dependency>

Lines 45-51 Link Here

(-)a/beans/src/org/netbeans/modules/beans/beaninfo/BIDataObject.java (-5 lines)
45	import org.openide.loaders.MultiDataObject;	45	import org.openide.loaders.MultiDataObject;
46	import org.openide.nodes.CookieSet;	46	import org.openide.nodes.CookieSet;
47	import org.openide.nodes.Node;	47	import org.openide.nodes.Node;
48	import org.openide.util.Lookup;
49		48
50	/**	49	/**
51	*	50	*
Lines 64-71 Link Here
64	return new BIDataNode(this);	63	return new BIDataNode(this);
65	}	64	}
66		65
67	@Override
68	public Lookup getLookup() {
69	return getCookieSet().getLookup();
70	}
71	}	66	}

Lines 206-212 Link Here

(-)a/cnd/nbproject/project.xml (-1 / +1 lines)
206	<build-prerequisite/>	206	<build-prerequisite/>
207	<compile-dependency/>	207	<compile-dependency/>
208	<run-dependency>	208	<run-dependency>
209	<specification-version>7.0</specification-version>	209	<specification-version>7.3</specification-version>
210	</run-dependency>	210	</run-dependency>
211	</dependency>	211	</dependency>
212	<dependency>	212	<dependency>




import org.netbeans.modules.cnd.execution.BinaryExecSupport;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node.Cookie;
import org.openide.util.Lookup;

/**
 *  Abstract superclass of a C/C++/Fortran DataObject.

	init();
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    /**
     *  Initialize cookies for this DataObject. This method may get overridden
     *  by derived classes who need to use a different set of cookies.




import org.openide.loaders.MultiDataObject;
import org.openide.nodes.Node;
import org.openide.util.HelpCtx;
import org.openide.util.Lookup;

/** Superclass for Elf objects in the Repository.
 *


    protected void init() {
    
    }
    
    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    @Override

Lines 168-174 Link Here

(-)a/groovy.gsp/nbproject/project.xml (-1 / +1 lines)
168	<build-prerequisite/>	168	<build-prerequisite/>
169	<compile-dependency/>	169	<compile-dependency/>
170	<run-dependency>	170	<run-dependency>
171	<specification-version>6.0</specification-version>	171	<specification-version>7.3</specification-version>
172	</run-dependency>	172	</run-dependency>
173	</dependency>	173	</dependency>
174	<dependency>	174	<dependency>




import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;

public class GspDataObject extends MultiDataObject {
        implements Lookup.Provider {
    
    public GspDataObject(FileObject pf, GspDataLoader loader) throws DataObjectExistsException, IOException {
        super(pf, loader);

        return new GspDataNode(this, getLookup());
    }
    
    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
}

Lines 292-298 Link Here

(-)a/gsf/nbproject/project.xml (-1 / +1 lines)
292	<build-prerequisite/>	292	<build-prerequisite/>
293	<compile-dependency/>	293	<compile-dependency/>
294	<run-dependency>	294	<run-dependency>
295	<specification-version>7.0</specification-version>	295	<specification-version>7.3</specification-version>
296	</run-dependency>	296	</run-dependency>
297	</dependency>	297	</dependency>
298	<dependency>	298	<dependency>




import org.openide.loaders.SaveAsCapable;
import org.openide.nodes.Node;
import org.openide.nodes.Node.Cookie;
import org.openide.text.CloneableEditor;
import org.openide.text.CloneableEditorSupport;
import org.openide.text.DataEditorSupport;
import org.openide.util.Lookup;
import org.openide.windows.CloneableOpenSupport;

public class GsfDataObject extends MultiDataObject {

    
    public @Override Node createNodeDelegate() {
        return new GsfDataNode(this, language);
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    public @Override <T extends Cookie> T getCookie(Class<T> type) {

Lines 365-371 Link Here

(-)a/hibernate/nbproject/project.xml (-1 / +1 lines)
365	<build-prerequisite/>	365	<build-prerequisite/>
366	<compile-dependency/>	366	<compile-dependency/>
367	<run-dependency>	367	<run-dependency>
368	<specification-version>6.8</specification-version>	368	<specification-version>7.3</specification-version>
369	</run-dependency>	369	</run-dependency>
370	</dependency>	370	</dependency>
371	<dependency>	371	<dependency>




import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.text.DataEditorSupport;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;

/**
 * Represents the Hibernate mapping file

        return new HibernateMappingDataNode(this);
    }
    
    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
}

Lines 56-62 Link Here

(-)a/hibernate/src/org/netbeans/modules/hibernate/loaders/reveng/HibernateRevengDataObject.java (-5 lines)
56	import org.openide.loaders.MultiDataObject;	56	import org.openide.loaders.MultiDataObject;
57	import org.openide.nodes.CookieSet;	57	import org.openide.nodes.CookieSet;
58	import org.openide.nodes.Node;	58	import org.openide.nodes.Node;
59	import org.openide.util.Lookup;
60	import org.openide.text.DataEditorSupport;	59	import org.openide.text.DataEditorSupport;
61		60
62	/**	61	/**
Lines 141-148 Link Here
141	return new HibernateRevengDataNode(this);	140	return new HibernateRevengDataNode(this);
142	}	141	}
143		142
144	@Override
145	public Lookup getLookup() {
146	return getCookieSet().getLookup();
147	}
148	}	143	}

Lines 179-185 Link Here

(-)a/html/nbproject/project.xml (-1 / +1 lines)
179	<build-prerequisite/>	179	<build-prerequisite/>
180	<compile-dependency/>	180	<compile-dependency/>
181	<run-dependency>	181	<run-dependency>
182	<specification-version>7.0</specification-version>	182	<specification-version>7.3</specification-version>
183	</run-dependency>	183	</run-dependency>
184	</dependency>	184	</dependency>
185	<dependency>	185	<dependency>




import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.spi.queries.FileEncodingQueryImplementation;
import org.openide.awt.HtmlBrowser;
import org.openide.cookies.ViewCookie;

import org.openide.nodes.Children;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Lookup;

/** Object that represents one html file.
 *

            }
        };
        set.assign(FileEncodingQueryImplementation.class, feq);
    }
    
    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    protected org.openide.nodes.Node createNodeDelegate() {

Lines 311-317 Link Here

(-)a/java.source/nbproject/project.xml (-1 / +1 lines)
311	<build-prerequisite/>	311	<build-prerequisite/>
312	<compile-dependency/>	312	<compile-dependency/>
313	<run-dependency>	313	<run-dependency>
314	<specification-version>7.0</specification-version>	314	<specification-version>7.3</specification-version>
315	</run-dependency>	315	</run-dependency>
316	</dependency>	316	</dependency>
317	<dependency>	317	<dependency>




import org.openide.text.CloneableEditor;
import org.openide.text.CloneableEditorSupport;
import org.openide.text.DataEditorSupport;
import org.openide.util.Lookup;
import org.openide.windows.CloneableOpenSupport;

public final class JavaDataObject extends MultiDataObject {

        return JavaDataSupport.createJavaNode(getPrimaryFile());
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    protected DataObject handleCopyRename(DataFolder df, String name, String ext) throws IOException {
        FileObject fo = getPrimaryEntry ().copyRename (df.getPrimaryFile (), name, ext);
        DataObject dob = DataObject.find( fo );

Lines 162-168 Link Here

(-)a/languages/nbproject/project.xml (-1 / +1 lines)
162	<build-prerequisite/>	162	<build-prerequisite/>
163	<compile-dependency/>	163	<compile-dependency/>
164	<run-dependency>	164	<run-dependency>
165	<specification-version>5.7</specification-version>	165	<specification-version>7.3</specification-version>
166	</run-dependency>	166	</run-dependency>
167	</dependency>	167	</dependency>
168	<dependency>	168	<dependency>




import org.openide.filesystems.FileLock;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
import org.openide.util.Lookup;

public class LanguagesDataObject extends MultiDataObject {


        return new LanguagesDataNode(this);
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    @Override
    protected DataObject handleCreateFromTemplate(final DataFolder df, final String name) throws IOException {
        DataObject createdClass = super.handleCreateFromTemplate(df, name);

Lines 114-120 Link Here

(-)a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/SVGPaletteItemDataObject.java (-1 lines)
114	});	114	});
115	ic.add(this);	115	ic.add(this);
116	return new AbstractLookup(ic);	116	return new AbstractLookup(ic);
117	//return getCookieSet().getLookup();
118	}	117	}
119		118
120	private static void insert( String text, JTextComponent target) {	119	private static void insert( String text, JTextComponent target) {

Lines 169-175 Link Here

(-)a/o.apache.tools.ant.module/nbproject/project.xml (-1 / +1 lines)
169	<build-prerequisite/>	169	<build-prerequisite/>
170	<compile-dependency/>	170	<compile-dependency/>
171	<run-dependency>	171	<run-dependency>
172	<specification-version>7.0</specification-version>	172	<specification-version>7.3</specification-version>
173	</run-dependency>	173	</run-dependency>
174	</dependency>	174	</dependency>
175	<dependency>	175	<dependency>




import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Lookup;

public class AntProjectDataObject extends MultiDataObject implements PropertyChangeListener {


    @Override
    protected Node createNodeDelegate () {
        return new AntProjectNode (this);
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    void addSaveCookie (final SaveCookie save) {

Lines 1-6 Link Here

(-)a/openide.loaders/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.openide.loaders	2	OpenIDE-Module: org.openide.loaders
3	OpenIDE-Module-Specification-Version: 7.2	3	OpenIDE-Module-Specification-Version: 7.3
4	OpenIDE-Module-Localizing-Bundle: org/openide/loaders/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/openide/loaders/Bundle.properties
5	OpenIDE-Module-Recommends: org.netbeans.modules.templates.v1_0	5	OpenIDE-Module-Recommends: org.netbeans.modules.templates.v1_0
6	AutoUpdate-Essential-Module: true	6	AutoUpdate-Essential-Module: true




    */
    private FolderOrder getOrder () {
        return FolderOrder.findFor (getPrimaryFile ());
    }

    @Override
    public Lookup getLookup() {
        if (DataFolder.class == getClass()) {
            return getCookieSet().getLookup();
        } else {
            return super.getLookup();
        }
    }

    /** Get the name of the data folder.




     * returns the <code>getNodeDelegate().getLookup()</code> - which is
     * the most compatible behaviour with previous versions. However
     * this code has significant potential to deadlocks. That is why the
     * preferred advice is to override the method.
     * <pre>
     * class MyDataObject extends {@link MultiDataObject} {
     *   public Lookup getLookup() {
     *     return getCookieSet().getLookup();
     *   }
     * }
     * </pre>
     * <p>
     * <b>Warning:</b> the {@link #getCookie} method and {@link #getLookup}
     * method are ment to be interchangable - e.g. if you override one of them

    public Lookup getLookup() {
        Class<?> c = getClass();
        if (warnedClasses.add(c)) {
            LOG.warning("Should override getLookup() in " + c);
        }
        if (isValid()) {
            return getNodeDelegateImpl().getLookup();




import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.nodes.Node;
import org.openide.util.Lookup;

/** An implementation of a data object which consumes file objects not recognized by any other loaders.
*/

        }
    }
    
    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    /** We implement OpenCookie and sometimes we also have cloneable
     * editor cookie */
    @Override

Lines 845-850 Link Here

(-)a/openide.loaders/src/org/openide/loaders/MultiDataObject.java (+8 lines)
845	*/	845	*/
846	final void fireCookieChange () {	846	final void fireCookieChange () {
847	firePropertyChange (PROP_COOKIE, null, null);	847	firePropertyChange (PROP_COOKIE, null, null);
		848	}
		849
		850	/**
		851	* Overrides default implementation to use the lookup from {@link #getCookieSet}.
		852	* @since org.openide.loaders 7.3
		853	*/
		854	public @Override Lookup getLookup() {
		855	return getCookieSet().getLookup();
848	}	856	}
849		857
850	/** Fires property change but in event thread.	858	/** Fires property change but in event thread.




import org.openide.filesystems.LocalFileSystem;
import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.MultiDataObject.Entry;
import org.openide.util.Lookup;


/**

        }

        protected MultiDataObject createMultiObject(FileObject primaryFile) throws DataObjectExistsException, IOException {
            return new MultiDataObject(primaryFile, this);

                @Override
                public Lookup getLookup() {
                    return getCookieSet().getLookup();
                }
            };
        }

        @Override




            return new OwnDataObject(primaryFile, this);
        }
    }
    private static class OwnDataObject extends MultiDataObject {

        public OwnDataObject(FileObject pf, OwnDataLoader loader) throws DataObjectExistsException, IOException {
            super(pf, loader);

            return new OwnDataNode(this, getLookup());
        }

        @Override
        public Lookup getLookup() {
            return getCookieSet().getLookup();
        }
    }
    
    static class OwnDataNode extends DataNode {




        assertEquals("Object is own cookie", obj, obj.getCookie(DataObject.class));
    }
    
    static class Sample60M6DataObject extends MultiDataObject {
    implements Lookup.Provider {

        public Sample60M6DataObject(FileObject pf, Sample60M6DataLoader loader) throws DataObjectExistsException, IOException {
            super(pf, loader);

            return new Sample60M6DataNode(this, getLookup());
        }

        @Override
        public Lookup getLookup() {
            return getCookieSet().getLookup();
        }
    }

    private static class Sample60M6DataLoader extends UniFileLoader {

Lines 169-175 Link Here

(-)a/ruby.rhtml/nbproject/project.xml (-1 / +1 lines)
169	<build-prerequisite/>	169	<build-prerequisite/>
170	<compile-dependency/>	170	<compile-dependency/>
171	<run-dependency>	171	<run-dependency>
172	<specification-version>7.0</specification-version>	172	<specification-version>7.3</specification-version>
173	</run-dependency>	173	</run-dependency>
174	</dependency>	174	</dependency>
175	<dependency>	175	<dependency>




import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;

public class RhtmlDataObject extends MultiDataObject {
        implements Lookup.Provider {
    
    public RhtmlDataObject(FileObject pf, RhtmlDataLoader loader) throws DataObjectExistsException, IOException {
        super(pf, loader);

        return new RhtmlDataNode(this, getLookup());
    }
    
    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
}

Lines 312-318 Link Here

(-)a/spring.beans/nbproject/project.xml (-1 / +1 lines)
312	<build-prerequisite/>	312	<build-prerequisite/>
313	<compile-dependency/>	313	<compile-dependency/>
314	<run-dependency>	314	<run-dependency>
315	<specification-version>7.0</specification-version>	315	<specification-version>7.3</specification-version>
316	</run-dependency>	316	</run-dependency>
317	</dependency>	317	</dependency>
318	<dependency>	318	<dependency>

Lines 51-57 Link Here

(-)a/spring.beans/src/org/netbeans/modules/spring/beans/loader/SpringXMLConfigDataObject.java (-5 lines)
51	import org.openide.loaders.MultiDataObject;	51	import org.openide.loaders.MultiDataObject;
52	import org.openide.nodes.CookieSet;	52	import org.openide.nodes.CookieSet;
53	import org.openide.nodes.Node;	53	import org.openide.nodes.Node;
54	import org.openide.util.Lookup;
55	import org.openide.text.DataEditorSupport;	54	import org.openide.text.DataEditorSupport;
56	import org.xml.sax.InputSource;	55	import org.xml.sax.InputSource;
57		56
Lines 76-83 Link Here
76	return new SpringXMLConfigDataNode(this);	75	return new SpringXMLConfigDataNode(this);
77	}	76	}
78		77
79	@Override
80	public Lookup getLookup() {
81	return getCookieSet().getLookup();
82	}
83	}	78	}

Lines 215-221 Link Here

(-)a/uml.drawingarea/nbproject/project.xml (-1 / +1 lines)
215	<build-prerequisite/>	215	<build-prerequisite/>
216	<compile-dependency/>	216	<compile-dependency/>
217	<run-dependency>	217	<run-dependency>
218	<specification-version>7.0</specification-version>	218	<specification-version>7.3</specification-version>
219	</run-dependency>	219	</run-dependency>
220	</dependency>	220	</dependency>
221	<dependency>	221	<dependency>




import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

    protected Node createNodeDelegate()
    {
        return new ContextPaletteDataNode(this, getLookup());
    }
    
    public @Override Lookup getLookup()
    {
        return getCookieSet().getLookup();
    }
    
    ///////////////////////////////////////////////////////////////




import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

    protected Node createNodeDelegate()
    {
        return new PaletteItemDataNode(this, getLookup());
    }
    
    public @Override Lookup getLookup()
    {
        return getCookieSet().getLookup();
    }
    
    @Override




import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.nodes.Node.Cookie;
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;
import org.openide.util.NbPreferences;


    @Override
    protected Node createNodeDelegate() {
         return new UMLDiagramDataNode(this, getLookup());
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    public EditorCookie createEditorCookie() {




import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.nodes.Node.Cookie;
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;
import org.openide.util.NbPreferences;


    protected Node createNodeDelegate()
    {
        return new TSDiagramDataNode(this, getLookup());
    }

    @Override
    public Lookup getLookup()
    {
        return getCookieSet().getLookup();
    }

    public EditorCookie createEditorCookie()

Lines 53-58 Link Here

(-)a/visualweb.project.jsfloader/nbproject/project.xml (-10 / +10 lines)
53	<run-dependency>	53	<run-dependency>
54	<release-version>1</release-version>	54	<release-version>1</release-version>
55	<specification-version>1.8</specification-version>	55	<specification-version>1.8</specification-version>
		56	</run-dependency>
		57	</dependency>
		58	<dependency>
		59	<code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
		60	<build-prerequisite/>
		61	<compile-dependency/>
		62	<run-dependency>
		63	<release-version>0-1</release-version>
		64	<specification-version>1.0</specification-version>
56	</run-dependency>	65	</run-dependency>
57	</dependency>	66	</dependency>
58	<dependency>	67	<dependency>
Lines 214-220 Link Here
214	<build-prerequisite/>	223	<build-prerequisite/>
215	<compile-dependency/>	224	<compile-dependency/>
216	<run-dependency>	225	<run-dependency>
217	<specification-version>7.0</specification-version>	226	<specification-version>7.3</specification-version>
218	</run-dependency>	227	</run-dependency>
219	</dependency>	228	</dependency>
220	<dependency>	229	<dependency>
Lines 249-263 Link Here
249	<specification-version>6.5</specification-version>	258	<specification-version>6.5</specification-version>
250	</run-dependency>	259	</run-dependency>
251	</dependency>	260	</dependency>
252	<dependency>
253	<code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
254	<build-prerequisite/>
255	<compile-dependency/>
256	<run-dependency>
257	<release-version>0-1</release-version>
258	<specification-version>1.0</specification-version>
259	</run-dependency>
260	</dependency>
261	</module-dependencies>	261	</module-dependencies>
262	<test-dependencies>	262	<test-dependencies>
263	<test-type>	263	<test-type>




import org.netbeans.modules.visualweb.project.jsf.api.JsfDataObjectException;
import org.openide.cookies.EditorCookie;
import org.openide.nodes.CookieSet;
import org.openide.util.Lookup;


/**

    @Override
    public HelpCtx getHelpCtx () {
        return new HelpCtx("org.netbeans.modules.visualweb.project.jsfloader.JsfJavaDataLoader" + ".Obj"); // NOI18N
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    private JsfJavaEditorSupport jsfJavaEditor;

Lines 382-388 Link Here

(-)a/web.core/nbproject/project.xml (-1 / +1 lines)
382	<build-prerequisite/>	382	<build-prerequisite/>
383	<compile-dependency/>	383	<compile-dependency/>
384	<run-dependency>	384	<run-dependency>
385	<specification-version>7.0</specification-version>	385	<specification-version>7.3</specification-version>
386	</run-dependency>	386	</run-dependency>
387	</dependency>	387	</dependency>
388	<dependency>	388	<dependency>




package org.netbeans.modules.web.taglib;

import java.io.IOException;
import org.openide.util.Lookup;
import org.xml.sax.InputSource;
import org.openide.filesystems.FileObject;
import org.openide.nodes.Node;

        return getCookieSet();
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    public Taglib getTaglib() throws java.io.IOException {
        java.io.InputStream is = getPrimaryFile().getInputStream();
        try {

Lines 452-458 Link Here

(-)a/web.jsf/nbproject/project.xml (-1 / +1 lines)
452	<build-prerequisite/>	452	<build-prerequisite/>
453	<compile-dependency/>	453	<compile-dependency/>
454	<run-dependency>	454	<run-dependency>
455	<specification-version>7.0</specification-version>	455	<specification-version>7.3</specification-version>
456	</run-dependency>	456	</run-dependency>
457	</dependency>	457	</dependency>
458	<dependency>	458	<dependency>




import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.w3c.dom.Document;
import org.xml.sax.*;
import org.netbeans.api.xml.cookies.ValidateXMLCookie;

import org.netbeans.modules.xml.api.XmlFileEncodingQueryImpl;
import org.netbeans.spi.queries.FileEncodingQueryImplementation;
import org.netbeans.spi.xml.cookies.*;
import org.openide.loaders.DataNode;

/**
 *

        return getCookieSet();
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    
    public static class J2eeErrorHandler implements ErrorHandler {

        private JSFConfigDataObject dataObject;

Lines 291-297 Link Here

(-)a/web.struts/nbproject/project.xml (-1 / +1 lines)
291	<build-prerequisite/>	291	<build-prerequisite/>
292	<compile-dependency/>	292	<compile-dependency/>
293	<run-dependency>	293	<run-dependency>
294	<specification-version>7.0</specification-version>	294	<specification-version>7.3</specification-version>
295	</run-dependency>	295	</run-dependency>
296	</dependency>	296	</dependency>
297	<dependency>	297	<dependency>




import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.xml.sax.InputSource;

import org.netbeans.api.xml.cookies.ValidateXMLCookie;

import org.netbeans.modules.xml.api.XmlFileEncodingQueryImpl;
import org.netbeans.spi.queries.FileEncodingQueryImplementation;
import org.netbeans.spi.xml.cookies.*;
import org.openide.loaders.DataNode;
import org.w3c.dom.Document;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;

            return getEditorSupport();
        else
            return null;
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    /** Gets editor support for this data object. */

Lines 302-308 Link Here

(-)a/websvc.design/nbproject/project.xml (-1 / +1 lines)
302	<build-prerequisite/>	302	<build-prerequisite/>
303	<compile-dependency/>	303	<compile-dependency/>
304	<run-dependency>	304	<run-dependency>
305	<specification-version>7.0</specification-version>	305	<specification-version>7.3</specification-version>
306	</run-dependency>	306	</run-dependency>
307	</dependency>	307	</dependency>
308	<dependency>	308	<dependency>




import org.openide.nodes.Node.Cookie;
import org.openide.text.CloneableEditorSupport;
import org.openide.text.DataEditorSupport;
import org.openide.util.Lookup;
import org.openide.windows.CloneableOpenSupport;

public final class JaxWsDataObject extends MultiDataObject {

                }
            }
        });
    }
    
    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    private void lazyInitialize() {

Lines 238-244 Link Here

(-)a/websvc.jaxrpc/nbproject/project.xml (-2 / +1 lines)
238	</dependency>	238	</dependency>
239	<dependency>	239	<dependency>
240	<code-name-base>org.netbeans.modules.websvc.jaxrpc16</code-name-base>	240	<code-name-base>org.netbeans.modules.websvc.jaxrpc16</code-name-base>
241	<build-prerequisite/>
242	<run-dependency>	241	<run-dependency>
243	<release-version>1</release-version>	242	<release-version>1</release-version>
244	<specification-version>1.4</specification-version>	243	<specification-version>1.4</specification-version>
Lines 383-389 Link Here
383	<build-prerequisite/>	382	<build-prerequisite/>
384	<compile-dependency/>	383	<compile-dependency/>
385	<run-dependency>	384	<run-dependency>
386	<specification-version>6.0</specification-version>	385	<specification-version>7.3</specification-version>
387	</run-dependency>	386	</run-dependency>
388	</dependency>	387	</dependency>
389	<dependency>	388	<dependency>




import org.openide.cookies.SaveCookie;
import org.openide.filesystems.FileObject;
import org.openide.loaders.MultiFileLoader;
import org.openide.util.Lookup;
import org.openide.util.RequestProcessor;
import org.netbeans.modules.websvc.wsdl.xmlutils.XMLJ2eeDataObject;
import org.netbeans.modules.websvc.wsdl.xmlutils.XMLJ2eeUtils;

        return generationTask;
    }

    @Override
    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    protected void restartGen() {
        //System.out.println("restart Gen");
        generationTask = null;




            <code-name-base>org.netbeans.modules.xml.multiview</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.openide.loaders</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency/>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.explorer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.8</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.dialogs</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.text</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.16</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core.multiview</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.dialogs</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.explorer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.8</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.loaders</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.text</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.16</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>




import org.openide.loaders.MultiDataObject;
import org.openide.loaders.MultiFileLoader;
import org.openide.nodes.CookieSet;
import org.openide.util.Lookup;
import org.openide.windows.CloneableTopComponent;
import org.openide.ErrorManager;
import org.openide.NotifyDescriptor;

        return retValue;
    }

    public Lookup getLookup() {
        return getCookieSet().getLookup();
    }
    
    /**
     * Set whether the object is considered modified.
     * Also fires a change event.

Lines 206-212 Link Here

(-)a/xml/nbproject/project.xml (-1 / +1 lines)
206	<build-prerequisite/>	206	<build-prerequisite/>
207	<compile-dependency/>	207	<compile-dependency/>
208	<run-dependency>	208	<run-dependency>
209	<specification-version>7.0</specification-version>	209	<specification-version>7.3</specification-version>
210	</run-dependency>	210	</run-dependency>
211	</dependency>	211	</dependency>
212	<dependency>	212	<dependency>

Lines 97-107 Link Here

(-)a/xml/src/org/netbeans/modules/xml/DTDDataObject.java (-5 lines)
97	});	97	});
98	}	98	}
99		99
100	@Override
101	public final Lookup getLookup() {
102	return getCookieSet().getLookup();
103	}
104
105	/**	100	/**
106	*/	101	*/
107	@Override	102	@Override





import org.netbeans.modules.xml.lib.Util;
import org.netbeans.spi.xml.cookies.*;
import org.openide.util.Lookup;
import org.xml.sax.InputSource;

/** 

            }
        });
        
    }

    @Override
    public final Lookup getLookup() {
        return getCookieSet().getLookup();
    }

    /**

Lines 120-130 Link Here

(-)a/xml/src/org/netbeans/modules/xml/XMLDataObject.java (-5 lines)
120	this.addPropertyChangeListener (this); //??? - strange be aware of firing cycles	120	this.addPropertyChangeListener (this); //??? - strange be aware of firing cycles
121	}	121	}
122		122
123	@Override
124	public final Lookup getLookup() {
125	return getCookieSet().getLookup();
126	}
127
128	/**	123	/**
129	*/	124	*/
130	@Override	125	@Override

Return to bug 146377

Lines 978-991 Link Here

(-)a/openide.loaders/src/org/openide/loaders/DataObject.java (-9 / +2 lines)
978	* returns the <code>getNodeDelegate().getLookup()</code> - which is	978	* returns the <code>getNodeDelegate().getLookup()</code> - which is
979	* the most compatible behaviour with previous versions. However	979	* the most compatible behaviour with previous versions. However
980	* this code has significant potential to deadlocks. That is why the	980	* this code has significant potential to deadlocks. That is why the
981	* preferred advice is to override the method to:	981	* preferred advice is to override the method.
982	* <pre>
983	* class MyDataObject extends {@link MultiDataObject} {
984	* public Lookup getLookup() {
985	* return getCookieSet().getLookup();
986	* }
987	* }
988	* </pre>
989	* <p>	982	* <p>
990	* <b>Warning:</b> the {@link #getCookie} method and {@link #getLookup}	983	* <b>Warning:</b> the {@link #getCookie} method and {@link #getLookup}
991	* method are ment to be interchangable - e.g. if you override one of them	984	* method are ment to be interchangable - e.g. if you override one of them
Lines 999-1005 Link Here
999	public Lookup getLookup() {	992	public Lookup getLookup() {
1000	Class<?> c = getClass();	993	Class<?> c = getClass();
1001	if (warnedClasses.add(c)) {	994	if (warnedClasses.add(c)) {
1002	LOG.warning("Should override getLookup() in " + c + ", e.g.: [MultiDataObject.this.]getCookieSet().getLookup()");	995	LOG.warning("Should override getLookup() in " + c);
1003	}	996	}
1004	if (isValid()) {	997	if (isValid()) {
1005	return getNodeDelegateImpl().getLookup();	998	return getNodeDelegateImpl().getLookup();

Lines 60-66 Link Here

(-)a/cnd/src/org/netbeans/modules/cnd/loaders/CndDataObject.java (-6 lines)
60	import org.netbeans.modules.cnd.execution.BinaryExecSupport;	60	import org.netbeans.modules.cnd.execution.BinaryExecSupport;
61	import org.openide.nodes.CookieSet;	61	import org.openide.nodes.CookieSet;
62	import org.openide.nodes.Node.Cookie;	62	import org.openide.nodes.Node.Cookie;
63	import org.openide.util.Lookup;
64		63
65	/**	64	/**
66	* Abstract superclass of a C/C++/Fortran DataObject.	65	* Abstract superclass of a C/C++/Fortran DataObject.
Lines 77-87 Link Here
77	init();	76	init();
78	}	77	}
79		78
80	@Override
81	public Lookup getLookup() {
82	return getCookieSet().getLookup();
83	}
84
85	/**	79	/**
86	* Initialize cookies for this DataObject. This method may get overridden	80	* Initialize cookies for this DataObject. This method may get overridden
87	* by derived classes who need to use a different set of cookies.	81	* by derived classes who need to use a different set of cookies.

Lines 47-57 Link Here

(-)a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/loaders/GspDataObject.java (-7 / +1 lines)
47	import org.openide.loaders.MultiDataObject;	47	import org.openide.loaders.MultiDataObject;
48	import org.openide.nodes.CookieSet;	48	import org.openide.nodes.CookieSet;
49	import org.openide.nodes.Node;	49	import org.openide.nodes.Node;
50	import org.openide.util.Lookup;
51	import org.openide.text.DataEditorSupport;	50	import org.openide.text.DataEditorSupport;
52		51
53	public class GspDataObject extends MultiDataObject	52	public class GspDataObject extends MultiDataObject {
54	implements Lookup.Provider {
55		53
56	public GspDataObject(FileObject pf, GspDataLoader loader) throws DataObjectExistsException, IOException {	54	public GspDataObject(FileObject pf, GspDataLoader loader) throws DataObjectExistsException, IOException {
57	super(pf, loader);	55	super(pf, loader);
Lines 67-74 Link Here
67	return new GspDataNode(this, getLookup());	65	return new GspDataNode(this, getLookup());
68	}	66	}
69		67
70	@Override
71	public Lookup getLookup() {
72	return getCookieSet().getLookup();
73	}
74	}	68	}

Lines 58-67 Link Here

(-)a/gsf/src/org/netbeans/modules/gsf/GsfDataObject.java (-7 lines)
58	import org.openide.loaders.SaveAsCapable;	58	import org.openide.loaders.SaveAsCapable;
59	import org.openide.nodes.Node;	59	import org.openide.nodes.Node;
60	import org.openide.nodes.Node.Cookie;	60	import org.openide.nodes.Node.Cookie;
61	import org.openide.text.CloneableEditor;
62	import org.openide.text.CloneableEditorSupport;	61	import org.openide.text.CloneableEditorSupport;
63	import org.openide.text.DataEditorSupport;	62	import org.openide.text.DataEditorSupport;
64	import org.openide.util.Lookup;
65	import org.openide.windows.CloneableOpenSupport;	63	import org.openide.windows.CloneableOpenSupport;
66		64
67	public class GsfDataObject extends MultiDataObject {	65	public class GsfDataObject extends MultiDataObject {
Lines 95-105 Link Here
95		93
96	public @Override Node createNodeDelegate() {	94	public @Override Node createNodeDelegate() {
97	return new GsfDataNode(this, language);	95	return new GsfDataNode(this, language);
98	}
99
100	@Override
101	public Lookup getLookup() {
102	return getCookieSet().getLookup();
103	}	96	}
104		97
105	public @Override <T extends Cookie> T getCookie(Class<T> type) {	98	public @Override <T extends Cookie> T getCookie(Class<T> type) {

Lines 54-61 Link Here

(-)a/html/src/org/netbeans/modules/html/HtmlDataObject.java (-8 lines)
54	import org.netbeans.api.lexer.Token;	54	import org.netbeans.api.lexer.Token;
55	import org.netbeans.api.lexer.TokenHierarchy;	55	import org.netbeans.api.lexer.TokenHierarchy;
56	import org.netbeans.api.lexer.TokenSequence;	56	import org.netbeans.api.lexer.TokenSequence;
57	import org.netbeans.api.project.FileOwnerQuery;
58	import org.netbeans.api.project.Project;
59	import org.netbeans.spi.queries.FileEncodingQueryImplementation;	57	import org.netbeans.spi.queries.FileEncodingQueryImplementation;
60	import org.openide.awt.HtmlBrowser;	58	import org.openide.awt.HtmlBrowser;
61	import org.openide.cookies.ViewCookie;	59	import org.openide.cookies.ViewCookie;
Lines 69-75 Link Here
69	import org.openide.nodes.Children;	67	import org.openide.nodes.Children;
70	import org.openide.nodes.CookieSet;	68	import org.openide.nodes.CookieSet;
71	import org.openide.nodes.Node;	69	import org.openide.nodes.Node;
72	import org.openide.util.Lookup;
73		70
74	/** Object that represents one html file.	71	/** Object that represents one html file.
75	*	72	*
Lines 130-140 Link Here
130	}	127	}
131	};	128	};
132	set.assign(FileEncodingQueryImplementation.class, feq);	129	set.assign(FileEncodingQueryImplementation.class, feq);
133	}
134
135	@Override
136	public Lookup getLookup() {
137	return getCookieSet().getLookup();
138	}	130	}
139		131
140	protected org.openide.nodes.Node createNodeDelegate() {	132	protected org.openide.nodes.Node createNodeDelegate() {

Lines 76-82 Link Here

(-)a/java.source/src/org/netbeans/modules/java/JavaDataObject.java (-6 lines)
76	import org.openide.text.CloneableEditor;	76	import org.openide.text.CloneableEditor;
77	import org.openide.text.CloneableEditorSupport;	77	import org.openide.text.CloneableEditorSupport;
78	import org.openide.text.DataEditorSupport;	78	import org.openide.text.DataEditorSupport;
79	import org.openide.util.Lookup;
80	import org.openide.windows.CloneableOpenSupport;	79	import org.openide.windows.CloneableOpenSupport;
81		80
82	public final class JavaDataObject extends MultiDataObject {	81	public final class JavaDataObject extends MultiDataObject {
Lines 101-111 Link Here
101	return JavaDataSupport.createJavaNode(getPrimaryFile());	100	return JavaDataSupport.createJavaNode(getPrimaryFile());
102	}	101	}
103		102
104	@Override
105	public Lookup getLookup() {
106	return getCookieSet().getLookup();
107	}
108
109	protected DataObject handleCopyRename(DataFolder df, String name, String ext) throws IOException {	103	protected DataObject handleCopyRename(DataFolder df, String name, String ext) throws IOException {
110	FileObject fo = getPrimaryEntry ().copyRename (df.getPrimaryFile (), name, ext);	104	FileObject fo = getPrimaryEntry ().copyRename (df.getPrimaryFile (), name, ext);
111	DataObject dob = DataObject.find( fo );	105	DataObject dob = DataObject.find( fo );

Lines 60-66 Link Here

(-)a/languages/src/org/netbeans/modules/languages/dataobject/LanguagesDataObject.java (-6 lines)
60	import org.openide.filesystems.FileLock;	60	import org.openide.filesystems.FileLock;
61	import org.openide.loaders.DataFolder;	61	import org.openide.loaders.DataFolder;
62	import org.openide.loaders.DataObject;	62	import org.openide.loaders.DataObject;
63	import org.openide.util.Lookup;
64		63
65	public class LanguagesDataObject extends MultiDataObject {	64	public class LanguagesDataObject extends MultiDataObject {
66		65
Lines 75-85 Link Here
75	return new LanguagesDataNode(this);	74	return new LanguagesDataNode(this);
76	}	75	}
77		76
78	@Override
79	public Lookup getLookup() {
80	return getCookieSet().getLookup();
81	}
82
83	@Override	77	@Override
84	protected DataObject handleCreateFromTemplate(final DataFolder df, final String name) throws IOException {	78	protected DataObject handleCreateFromTemplate(final DataFolder df, final String name) throws IOException {
85	DataObject createdClass = super.handleCreateFromTemplate(df, name);	79	DataObject createdClass = super.handleCreateFromTemplate(df, name);

Lines 56-62 Link Here

(-)a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/AntProjectDataObject.java (-6 lines)
56	import org.openide.loaders.MultiDataObject;	56	import org.openide.loaders.MultiDataObject;
57	import org.openide.nodes.CookieSet;	57	import org.openide.nodes.CookieSet;
58	import org.openide.nodes.Node;	58	import org.openide.nodes.Node;
59	import org.openide.util.Lookup;
60		59
61	public class AntProjectDataObject extends MultiDataObject implements PropertyChangeListener {	60	public class AntProjectDataObject extends MultiDataObject implements PropertyChangeListener {
62		61
Lines 77-87 Link Here
77	@Override	76	@Override
78	protected Node createNodeDelegate () {	77	protected Node createNodeDelegate () {
79	return new AntProjectNode (this);	78	return new AntProjectNode (this);
80	}
81
82	@Override
83	public Lookup getLookup() {
84	return getCookieSet().getLookup();
85	}	79	}
86		80
87	void addSaveCookie (final SaveCookie save) {	81	void addSaveCookie (final SaveCookie save) {

Lines 252-266 Link Here

(-)a/openide.loaders/src/org/openide/loaders/DataFolder.java (-9 lines)
252	*/	252	*/
253	private FolderOrder getOrder () {	253	private FolderOrder getOrder () {
254	return FolderOrder.findFor (getPrimaryFile ());	254	return FolderOrder.findFor (getPrimaryFile ());
255	}
256
257	@Override
258	public Lookup getLookup() {
259	if (DataFolder.class == getClass()) {
260	return getCookieSet().getLookup();
261	} else {
262	return super.getLookup();
263	}
264	}	255	}
265		256
266	/** Get the name of the data folder.	257	/** Get the name of the data folder.

Lines 59-65 Link Here

(-)a/openide.loaders/src/org/openide/loaders/DefaultDataObject.java (-6 lines)
59	import org.openide.util.HelpCtx;	59	import org.openide.util.HelpCtx;
60	import org.openide.util.NbBundle;	60	import org.openide.util.NbBundle;
61	import org.openide.nodes.Node;	61	import org.openide.nodes.Node;
62	import org.openide.util.Lookup;
63		62
64	/** An implementation of a data object which consumes file objects not recognized by any other loaders.	63	/** An implementation of a data object which consumes file objects not recognized by any other loaders.
65	*/	64	*/
Lines 193-203 Link Here
193	}	192	}
194	}	193	}
195		194
196	@Override
197	public Lookup getLookup() {
198	return getCookieSet().getLookup();
199	}
200
201	/** We implement OpenCookie and sometimes we also have cloneable	195	/** We implement OpenCookie and sometimes we also have cloneable
202	* editor cookie */	196	* editor cookie */
203	@Override	197	@Override

Lines 58-64 Link Here

(-)a/openide.loaders/test/unit/src/org/openide/loaders/FileObjectInLookupByMatteoTest.java (-8 / +1 lines)
58	import org.openide.filesystems.LocalFileSystem;	58	import org.openide.filesystems.LocalFileSystem;
59	import org.openide.filesystems.MIMEResolver;	59	import org.openide.filesystems.MIMEResolver;
60	import org.openide.loaders.MultiDataObject.Entry;	60	import org.openide.loaders.MultiDataObject.Entry;
61	import org.openide.util.Lookup;
62		61
63		62
64	/**	63	/**
Lines 250-262 Link Here
250	}	249	}
251		250
252	protected MultiDataObject createMultiObject(FileObject primaryFile) throws DataObjectExistsException, IOException {	251	protected MultiDataObject createMultiObject(FileObject primaryFile) throws DataObjectExistsException, IOException {
253	return new MultiDataObject(primaryFile, this) {	252	return new MultiDataObject(primaryFile, this);
254
255	@Override
256	public Lookup getLookup() {
257	return getCookieSet().getLookup();
258	}
259	};
260	}	253	}
261		254
262	@Override	255	@Override

Lines 206-212 Link Here

(-)a/openide.loaders/test/unit/src/org/openide/loaders/FileObjectInLookupTest.java (-5 / +1 lines)
206	return new OwnDataObject(primaryFile, this);	206	return new OwnDataObject(primaryFile, this);
207	}	207	}
208	}	208	}
209	private static class OwnDataObject extends MultiDataObject implements Lookup.Provider {	209	private static class OwnDataObject extends MultiDataObject {
210		210
211	public OwnDataObject(FileObject pf, OwnDataLoader loader) throws DataObjectExistsException, IOException {	211	public OwnDataObject(FileObject pf, OwnDataLoader loader) throws DataObjectExistsException, IOException {
212	super(pf, loader);	212	super(pf, loader);
Lines 219-228 Link Here
219	return new OwnDataNode(this, getLookup());	219	return new OwnDataNode(this, getLookup());
220	}	220	}
221		221
222	@Override
223	public Lookup getLookup() {
224	return getCookieSet().getLookup();
225	}
226	}	222	}
227		223
228	static class OwnDataNode extends DataNode {	224	static class OwnDataNode extends DataNode {

Lines 85-92 Link Here

(-)a/openide.loaders/test/unit/src/org/openide/loaders/Sample60M7ProblemWithGetDataObjectTest.java (-6 / +1 lines)
85	assertEquals("Object is own cookie", obj, obj.getCookie(DataObject.class));	85	assertEquals("Object is own cookie", obj, obj.getCookie(DataObject.class));
86	}	86	}
87		87
88	static class Sample60M6DataObject extends MultiDataObject	88	static class Sample60M6DataObject extends MultiDataObject {
89	implements Lookup.Provider {
90		89
91	public Sample60M6DataObject(FileObject pf, Sample60M6DataLoader loader) throws DataObjectExistsException, IOException {	90	public Sample60M6DataObject(FileObject pf, Sample60M6DataLoader loader) throws DataObjectExistsException, IOException {
92	super(pf, loader);	91	super(pf, loader);
Lines 99-108 Link Here
99	return new Sample60M6DataNode(this, getLookup());	98	return new Sample60M6DataNode(this, getLookup());
100	}	99	}
101		100
102	@Override
103	public Lookup getLookup() {
104	return getCookieSet().getLookup();
105	}
106	}	101	}
107		102
108	private static class Sample60M6DataLoader extends UniFileLoader {	103	private static class Sample60M6DataLoader extends UniFileLoader {

Lines 47-57 Link Here

(-)a/ruby.rhtml/src/org/netbeans/modules/ruby/rhtml/loaders/RhtmlDataObject.java (-7 / +1 lines)
47	import org.openide.loaders.MultiDataObject;	47	import org.openide.loaders.MultiDataObject;
48	import org.openide.nodes.CookieSet;	48	import org.openide.nodes.CookieSet;
49	import org.openide.nodes.Node;	49	import org.openide.nodes.Node;
50	import org.openide.util.Lookup;
51	import org.openide.text.DataEditorSupport;	50	import org.openide.text.DataEditorSupport;
52		51
53	public class RhtmlDataObject extends MultiDataObject	52	public class RhtmlDataObject extends MultiDataObject {
54	implements Lookup.Provider {
55		53
56	public RhtmlDataObject(FileObject pf, RhtmlDataLoader loader) throws DataObjectExistsException, IOException {	54	public RhtmlDataObject(FileObject pf, RhtmlDataLoader loader) throws DataObjectExistsException, IOException {
57	super(pf, loader);	55	super(pf, loader);
Lines 67-74 Link Here
67	return new RhtmlDataNode(this, getLookup());	65	return new RhtmlDataNode(this, getLookup());
68	}	66	}
69		67
70	@Override
71	public Lookup getLookup() {
72	return getCookieSet().getLookup();
73	}
74	}	68	}

Lines 47-53 Link Here

(-)a/uml.drawingarea/src/org/netbeans/modules/uml/drawingarea/dataobject/ContextPaletteDataObject.java (-6 lines)
47	import org.openide.loaders.MultiDataObject;	47	import org.openide.loaders.MultiDataObject;
48	import org.openide.nodes.CookieSet;	48	import org.openide.nodes.CookieSet;
49	import org.openide.nodes.Node;	49	import org.openide.nodes.Node;
50	import org.openide.util.Lookup;
51	import org.openide.text.DataEditorSupport;	50	import org.openide.text.DataEditorSupport;
52	import org.openide.util.Exceptions;	51	import org.openide.util.Exceptions;
53	import org.openide.util.NbBundle;	52	import org.openide.util.NbBundle;
Lines 109-119 Link Here
109	protected Node createNodeDelegate()	108	protected Node createNodeDelegate()
110	{	109	{
111	return new ContextPaletteDataNode(this, getLookup());	110	return new ContextPaletteDataNode(this, getLookup());
112	}
113
114	public @Override Lookup getLookup()
115	{
116	return getCookieSet().getLookup();
117	}	111	}
118		112
119	///////////////////////////////////////////////////////////////	113	///////////////////////////////////////////////////////////////

Lines 63-69 Link Here

(-)a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObject.java (-6 lines)
63	import org.netbeans.modules.visualweb.project.jsf.api.JsfDataObjectException;	63	import org.netbeans.modules.visualweb.project.jsf.api.JsfDataObjectException;
64	import org.openide.cookies.EditorCookie;	64	import org.openide.cookies.EditorCookie;
65	import org.openide.nodes.CookieSet;	65	import org.openide.nodes.CookieSet;
66	import org.openide.util.Lookup;
67		66
68		67
69	/**	68	/**
Lines 149-159 Link Here
149	@Override	148	@Override
150	public HelpCtx getHelpCtx () {	149	public HelpCtx getHelpCtx () {
151	return new HelpCtx("org.netbeans.modules.visualweb.project.jsfloader.JsfJavaDataLoader" + ".Obj"); // NOI18N	150	return new HelpCtx("org.netbeans.modules.visualweb.project.jsfloader.JsfJavaDataLoader" + ".Obj"); // NOI18N
152	}
153
154	@Override
155	public Lookup getLookup() {
156	return getCookieSet().getLookup();
157	}	151	}
158		152
159	private JsfJavaEditorSupport jsfJavaEditor;	153	private JsfJavaEditorSupport jsfJavaEditor;

Lines 42-48 Link Here

(-)a/web.core/src/org/netbeans/modules/web/taglib/TLDDataObject.java (-6 lines)
42	package org.netbeans.modules.web.taglib;	42	package org.netbeans.modules.web.taglib;
43		43
44	import java.io.IOException;	44	import java.io.IOException;
45	import org.openide.util.Lookup;
46	import org.xml.sax.InputSource;	45	import org.xml.sax.InputSource;
47	import org.openide.filesystems.FileObject;	46	import org.openide.filesystems.FileObject;
48	import org.openide.nodes.Node;	47	import org.openide.nodes.Node;
Lines 138-148 Link Here
138	return getCookieSet();	137	return getCookieSet();
139	}	138	}
140		139
141	@Override
142	public Lookup getLookup() {
143	return getCookieSet().getLookup();
144	}
145
146	public Taglib getTaglib() throws java.io.IOException {	140	public Taglib getTaglib() throws java.io.IOException {
147	java.io.InputStream is = getPrimaryFile().getInputStream();	141	java.io.InputStream is = getPrimaryFile().getInputStream();
148	try {	142	try {

Lines 51-57 Link Here

(-)a/web.jsf/src/org/netbeans/modules/web/jsf/JSFConfigDataObject.java (-7 / +1 lines)
51	import org.openide.loaders.MultiDataObject;	51	import org.openide.loaders.MultiDataObject;
52	import org.openide.nodes.CookieSet;	52	import org.openide.nodes.CookieSet;
53	import org.openide.nodes.Node;	53	import org.openide.nodes.Node;
54	import org.openide.util.Lookup;
55	import org.w3c.dom.Document;	54	import org.w3c.dom.Document;
56	import org.xml.sax.*;	55	import org.xml.sax.*;
57	import org.netbeans.api.xml.cookies.ValidateXMLCookie;	56	import org.netbeans.api.xml.cookies.ValidateXMLCookie;
Lines 59-64 Link Here
59	import org.netbeans.modules.xml.api.XmlFileEncodingQueryImpl;	58	import org.netbeans.modules.xml.api.XmlFileEncodingQueryImpl;
60	import org.netbeans.spi.queries.FileEncodingQueryImplementation;	59	import org.netbeans.spi.queries.FileEncodingQueryImplementation;
61	import org.netbeans.spi.xml.cookies.*;	60	import org.netbeans.spi.xml.cookies.*;
		61	import org.openide.loaders.DataNode;
62		62
63	/**	63	/**
64	*	64	*
Lines 304-315 Link Here
304	return getCookieSet();	304	return getCookieSet();
305	}	305	}
306		306
307	@Override
308	public Lookup getLookup() {
309	return getCookieSet().getLookup();
310	}
311
312
313	public static class J2eeErrorHandler implements ErrorHandler {	307	public static class J2eeErrorHandler implements ErrorHandler {
314		308
315	private JSFConfigDataObject dataObject;	309	private JSFConfigDataObject dataObject;

Lines 52-58 Link Here

(-)a/web.struts/src/org/netbeans/modules/web/struts/StrutsConfigDataObject.java (-6 / +1 lines)
52	import org.openide.loaders.MultiDataObject;	52	import org.openide.loaders.MultiDataObject;
53	import org.openide.nodes.CookieSet;	53	import org.openide.nodes.CookieSet;
54	import org.openide.nodes.Node;	54	import org.openide.nodes.Node;
55	import org.openide.util.Lookup;
56	import org.xml.sax.InputSource;	55	import org.xml.sax.InputSource;
57		56
58	import org.netbeans.api.xml.cookies.ValidateXMLCookie;	57	import org.netbeans.api.xml.cookies.ValidateXMLCookie;
Lines 60-65 Link Here
60	import org.netbeans.modules.xml.api.XmlFileEncodingQueryImpl;	59	import org.netbeans.modules.xml.api.XmlFileEncodingQueryImpl;
61	import org.netbeans.spi.queries.FileEncodingQueryImplementation;	60	import org.netbeans.spi.queries.FileEncodingQueryImplementation;
62	import org.netbeans.spi.xml.cookies.*;	61	import org.netbeans.spi.xml.cookies.*;
		62	import org.openide.loaders.DataNode;
63	import org.w3c.dom.Document;	63	import org.w3c.dom.Document;
64	import org.xml.sax.ErrorHandler;	64	import org.xml.sax.ErrorHandler;
65	import org.xml.sax.SAXException;	65	import org.xml.sax.SAXException;
Lines 128-138 Link Here
128	return getEditorSupport();	128	return getEditorSupport();
129	else	129	else
130	return null;	130	return null;
131	}
132
133	@Override
134	public Lookup getLookup() {
135	return getCookieSet().getLookup();
136	}	131	}
137		132
138	/** Gets editor support for this data object. */	133	/** Gets editor support for this data object. */

Lines 72-78 Link Here

(-)a/websvc.design/src/org/netbeans/modules/websvc/design/loader/JaxWsDataObject.java (-6 lines)
72	import org.openide.nodes.Node.Cookie;	72	import org.openide.nodes.Node.Cookie;
73	import org.openide.text.CloneableEditorSupport;	73	import org.openide.text.CloneableEditorSupport;
74	import org.openide.text.DataEditorSupport;	74	import org.openide.text.DataEditorSupport;
75	import org.openide.util.Lookup;
76	import org.openide.windows.CloneableOpenSupport;	75	import org.openide.windows.CloneableOpenSupport;
77		76
78	public final class JaxWsDataObject extends MultiDataObject {	77	public final class JaxWsDataObject extends MultiDataObject {
Lines 104-114 Link Here
104	}	103	}
105	}	104	}
106	});	105	});
107	}
108
109	@Override
110	public Lookup getLookup() {
111	return getCookieSet().getLookup();
112	}	106	}
113		107
114	private void lazyInitialize() {	108	private void lazyInitialize() {

Lines 45-51 Link Here

(-)a/websvc.jaxrpc/src/org/netbeans/modules/websvc/wsdl/config/DD2beansDataObject.java (-6 lines)
45	import org.openide.cookies.SaveCookie;	45	import org.openide.cookies.SaveCookie;
46	import org.openide.filesystems.FileObject;	46	import org.openide.filesystems.FileObject;
47	import org.openide.loaders.MultiFileLoader;	47	import org.openide.loaders.MultiFileLoader;
48	import org.openide.util.Lookup;
49	import org.openide.util.RequestProcessor;	48	import org.openide.util.RequestProcessor;
50	import org.netbeans.modules.websvc.wsdl.xmlutils.XMLJ2eeDataObject;	49	import org.netbeans.modules.websvc.wsdl.xmlutils.XMLJ2eeDataObject;
51	import org.netbeans.modules.websvc.wsdl.xmlutils.XMLJ2eeUtils;	50	import org.netbeans.modules.websvc.wsdl.xmlutils.XMLJ2eeUtils;
Lines 147-157 Link Here
147	return generationTask;	146	return generationTask;
148	}	147	}
149		148
150	@Override
151	public Lookup getLookup() {
152	return getCookieSet().getLookup();
153	}
154
155	protected void restartGen() {	149	protected void restartGen() {
156	//System.out.println("restart Gen");	150	//System.out.println("restart Gen");
157	generationTask = null;	151	generationTask = null;

Lines 47-130 Link Here

(-)a/xml.multiview/nbproject/project.xml (-78 / +80 lines)
47	<code-name-base>org.netbeans.modules.xml.multiview</code-name-base>	47	<code-name-base>org.netbeans.modules.xml.multiview</code-name-base>
48	<module-dependencies>	48	<module-dependencies>
49	<dependency>	49	<dependency>
50	<code-name-base>org.openide.loaders</code-name-base>
51	<build-prerequisite/>
52	<compile-dependency/>
53	<run-dependency/>
54	</dependency>
55	<dependency>
56	<code-name-base>org.openide.filesystems</code-name-base>
57	<build-prerequisite/>
58	<compile-dependency/>
59	<run-dependency>
60	<specification-version>6.2</specification-version>
61	</run-dependency>
62	</dependency>
63	<dependency>
64	<code-name-base>org.openide.util</code-name-base>
65	<build-prerequisite/>
66	<compile-dependency/>
67	<run-dependency>
68	<specification-version>6.2</specification-version>
69	</run-dependency>
70	</dependency>
71	<dependency>
72	<code-name-base>org.openide.nodes</code-name-base>
73	<build-prerequisite/>
74	<compile-dependency/>
75	<run-dependency>
76	<specification-version>6.2</specification-version>
77	</run-dependency>
78	</dependency>
79	<dependency>
80	<code-name-base>org.openide.explorer</code-name-base>
81	<build-prerequisite/>
82	<compile-dependency/>
83	<run-dependency>
84	<specification-version>6.8</specification-version>
85	</run-dependency>
86	</dependency>
87	<dependency>
88	<code-name-base>org.openide.awt</code-name-base>
89	<build-prerequisite/>
90	<compile-dependency/>
91	<run-dependency>
92	<specification-version>6.2</specification-version>
93	</run-dependency>
94	</dependency>
95	<dependency>
96	<code-name-base>org.openide.dialogs</code-name-base>
97	<build-prerequisite/>
98	<compile-dependency/>
99	<run-dependency>
100	<specification-version>6.2</specification-version>
101	</run-dependency>
102	</dependency>
103	<dependency>
104	<code-name-base>org.openide.windows</code-name-base>
105	<build-prerequisite/>
106	<compile-dependency/>
107	<run-dependency>
108	<specification-version>6.2</specification-version>
109	</run-dependency>
110	</dependency>
111	<dependency>
112	<code-name-base>org.openide.text</code-name-base>
113	<build-prerequisite/>
114	<compile-dependency/>
115	<run-dependency>
116	<specification-version>6.16</specification-version>
117	</run-dependency>
118	</dependency>
119	<dependency>
120	<code-name-base>org.openide.actions</code-name-base>
121	<build-prerequisite/>
122	<compile-dependency/>
123	<run-dependency>
124	<specification-version>6.2</specification-version>
125	</run-dependency>
126	</dependency>
127	<dependency>
128	<code-name-base>org.netbeans.core.multiview</code-name-base>	50	<code-name-base>org.netbeans.core.multiview</code-name-base>
129	<build-prerequisite/>	51	<build-prerequisite/>
130	<compile-dependency/>	52	<compile-dependency/>
Lines 147-152 Link Here
147	<compile-dependency/>	69	<compile-dependency/>
148	<run-dependency>	70	<run-dependency>
149	<release-version>2</release-version>	71	<release-version>2</release-version>
		72	</run-dependency>
		73	</dependency>
		74	<dependency>
		75	<code-name-base>org.openide.actions</code-name-base>
		76	<build-prerequisite/>
		77	<compile-dependency/>
		78	<run-dependency>
		79	<specification-version>6.2</specification-version>
		80	</run-dependency>
		81	</dependency>
		82	<dependency>
		83	<code-name-base>org.openide.awt</code-name-base>
		84	<build-prerequisite/>
		85	<compile-dependency/>
		86	<run-dependency>
		87	<specification-version>6.2</specification-version>
		88	</run-dependency>
		89	</dependency>
		90	<dependency>
		91	<code-name-base>org.openide.dialogs</code-name-base>
		92	<build-prerequisite/>
		93	<compile-dependency/>
		94	<run-dependency>
		95	<specification-version>6.2</specification-version>
		96	</run-dependency>
		97	</dependency>
		98	<dependency>
		99	<code-name-base>org.openide.explorer</code-name-base>
		100	<build-prerequisite/>
		101	<compile-dependency/>
		102	<run-dependency>
		103	<specification-version>6.8</specification-version>
		104	</run-dependency>
		105	</dependency>
		106	<dependency>
		107	<code-name-base>org.openide.filesystems</code-name-base>
		108	<build-prerequisite/>
		109	<compile-dependency/>
		110	<run-dependency>
		111	<specification-version>6.2</specification-version>
		112	</run-dependency>
		113	</dependency>
		114	<dependency>
		115	<code-name-base>org.openide.loaders</code-name-base>
		116	<build-prerequisite/>
		117	<compile-dependency/>
		118	<run-dependency>
		119	<specification-version>7.3</specification-version>
		120	</run-dependency>
		121	</dependency>
		122	<dependency>
		123	<code-name-base>org.openide.nodes</code-name-base>
		124	<build-prerequisite/>
		125	<compile-dependency/>
		126	<run-dependency>
		127	<specification-version>6.2</specification-version>
		128	</run-dependency>
		129	</dependency>
		130	<dependency>
		131	<code-name-base>org.openide.text</code-name-base>
		132	<build-prerequisite/>
		133	<compile-dependency/>
		134	<run-dependency>
		135	<specification-version>6.16</specification-version>
136	</run-dependency>
137	</dependency>
138	<dependency>
139	<code-name-base>org.openide.util</code-name-base>
140	<build-prerequisite/>
141	<compile-dependency/>
142	<run-dependency>
143	<specification-version>6.2</specification-version>
144	</run-dependency>
145	</dependency>
146	<dependency>
147	<code-name-base>org.openide.windows</code-name-base>
148	<build-prerequisite/>
149	<compile-dependency/>
150	<run-dependency>
151	<specification-version>6.2</specification-version>
150	</run-dependency>	152	</run-dependency>
151	</dependency>	153	</dependency>
152	</module-dependencies>	154	</module-dependencies>

Lines 51-57 Link Here

(-)a/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewDataObject.java (-5 lines)
51	import org.openide.loaders.MultiDataObject;	51	import org.openide.loaders.MultiDataObject;
52	import org.openide.loaders.MultiFileLoader;	52	import org.openide.loaders.MultiFileLoader;
53	import org.openide.nodes.CookieSet;	53	import org.openide.nodes.CookieSet;
54	import org.openide.util.Lookup;
55	import org.openide.windows.CloneableTopComponent;	54	import org.openide.windows.CloneableTopComponent;
56	import org.openide.ErrorManager;	55	import org.openide.ErrorManager;
57	import org.openide.NotifyDescriptor;	56	import org.openide.NotifyDescriptor;
Lines 185-194 Link Here
185	return retValue;	184	return retValue;
186	}	185	}
187		186
188	public Lookup getLookup() {
189	return getCookieSet().getLookup();
190	}
191
192	/**	187	/**
193	* Set whether the object is considered modified.	188	* Set whether the object is considered modified.
194	* Also fires a change event.	189	* Also fires a change event.

Lines 56-62 Link Here

(-)a/xml/src/org/netbeans/modules/xml/EntityDataObject.java (-6 lines)
56		56
57	import org.netbeans.modules.xml.lib.Util;	57	import org.netbeans.modules.xml.lib.Util;
58	import org.netbeans.spi.xml.cookies.*;	58	import org.netbeans.spi.xml.cookies.*;
59	import org.openide.util.Lookup;
60	import org.xml.sax.InputSource;	59	import org.xml.sax.InputSource;
61		60
62	/**	61	/**
Lines 104-114 Link Here
104	}	103	}
105	});	104	});
106		105
107	}
108
109	@Override
110	public final Lookup getLookup() {
111	return getCookieSet().getLookup();
112	}	106	}
113		107
114	/**	108	/**