diff --git a/cnd/src/org/netbeans/modules/cnd/loaders/CoreElfObject.java b/cnd/src/org/netbeans/modules/cnd/loaders/CoreElfObject.java --- a/cnd/src/org/netbeans/modules/cnd/loaders/CoreElfObject.java +++ b/cnd/src/org/netbeans/modules/cnd/loaders/CoreElfObject.java @@ -86,13 +86,13 @@ check for DebuggerCookie.class, return null if so, else return super.getCookie. */ - public Node.Cookie getCookie(Class c) { - if (c.isAssignableFrom(ExecCookie.class)) { - return null; - } else { - return super.getCookie(c); - } - } +// public Node.Cookie getCookie(Class c) { +// if (c.isAssignableFrom(ExecCookie.class)) { +// return null; +// } else { +// return super.getCookie(c); +// } +// } /* * Return name with extension so renaming etc works diff --git a/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java b/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java --- a/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java +++ b/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java @@ -122,12 +122,12 @@ addPropertyChangeListener(listener); } - public Node.Cookie getCookie (Class c) { - // Looks like a bug - why is it done this way? This inevitable leads to a ClassCastException - if (SchemaElement.class.isAssignableFrom(c)) - return getCookie(DBElementProvider.class); - return super.getCookie(c); - } +// public Node.Cookie getCookie (Class c) { +// // Looks like a bug - why is it done this way? This inevitable leads to a ClassCastException +// if (SchemaElement.class.isAssignableFrom(c)) +// return getCookie(DBElementProvider.class); +// return super.getCookie(c); +// } public SchemaElement getSchema() { if (schemaElement == null) diff --git a/form/src/org/netbeans/modules/form/FormDataObject.java b/form/src/org/netbeans/modules/form/FormDataObject.java --- a/form/src/org/netbeans/modules/form/FormDataObject.java +++ b/form/src/org/netbeans/modules/form/FormDataObject.java @@ -101,21 +101,21 @@ //-------------------------------------------------------------------- // Other methods - @Override - public T getCookie(Class type) { - T retValue; - - if (OpenCookie.class.equals(type) || EditCookie.class.equals(type)) { - if (openEdit == null) - openEdit = new OpenEdit(); - retValue = type.cast(openEdit); - } else if (type.isAssignableFrom(FormEditorSupport.class)) { - retValue = (T) getFormEditorSupport(); - } else { - retValue = super.getCookie(type); - } - return retValue; - } +// @Override +// public T getCookie(Class type) { +// T retValue; +// +// if (OpenCookie.class.equals(type) || EditCookie.class.equals(type)) { +// if (openEdit == null) +// openEdit = new OpenEdit(); +// retValue = type.cast(openEdit); +// } else if (type.isAssignableFrom(FormEditorSupport.class)) { +// retValue = (T) getFormEditorSupport(); +// } else { +// retValue = super.getCookie(type); +// } +// return retValue; +// } @Override public Lookup getLookup() { diff --git a/form/src/org/netbeans/modules/form/palette/PaletteItemDataObject.java b/form/src/org/netbeans/modules/form/palette/PaletteItemDataObject.java --- a/form/src/org/netbeans/modules/form/palette/PaletteItemDataObject.java +++ b/form/src/org/netbeans/modules/form/palette/PaletteItemDataObject.java @@ -151,15 +151,15 @@ return new ItemNode(); } - @Override - public T getCookie(Class cookieClass) { - if (PaletteItem.class.equals(cookieClass)) { - if (!fileLoaded) - loadFile(); - return cookieClass.cast(paletteItem); - } - return super.getCookie(cookieClass); - } +// @Override +// public T getCookie(Class cookieClass) { +// if (PaletteItem.class.equals(cookieClass)) { +// if (!fileLoaded) +// loadFile(); +// return cookieClass.cast(paletteItem); +// } +// return super.getCookie(cookieClass); +// } // ------- diff --git a/gsf/src/org/netbeans/modules/gsf/GsfDataObject.java b/gsf/src/org/netbeans/modules/gsf/GsfDataObject.java --- a/gsf/src/org/netbeans/modules/gsf/GsfDataObject.java +++ b/gsf/src/org/netbeans/modules/gsf/GsfDataObject.java @@ -102,12 +102,12 @@ return getCookieSet().getLookup(); } - public @Override T getCookie(Class type) { - if (type.isAssignableFrom(GenericEditorSupport.class) && language != null) { - return type.cast(createEditorSupport ()); - } - return super.getCookie(type); - } +// public @Override T getCookie(Class type) { +// if (type.isAssignableFrom(GenericEditorSupport.class) && language != null) { +// return type.cast(createEditorSupport ()); +// } +// return super.getCookie(type); +// } @Override protected DataObject handleCopyRename(DataFolder df, String name, String ext) throws IOException { diff --git a/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java b/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java --- a/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java +++ b/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java @@ -116,27 +116,27 @@ resType = getResource(pf); } - public T getCookie(Class c) { - Node.Cookie retValue = null; - if (ValidateXMLCookie.class.isAssignableFrom(c)) { - if (validateCookie == null) { - InputSource in = DataObjectAdapters.inputSource(this); - validateCookie = new ValidateXMLSupport(in); - } - return (T) validateCookie; - } else if (CheckXMLCookie.class.isAssignableFrom(c)) { - if (checkCookie == null) { - InputSource in = DataObjectAdapters.inputSource(this); - checkCookie = new CheckXMLSupport(in); - } - return (T) checkCookie; - } - - if (retValue == null) { - retValue = super.getCookie(c); - } - return (T) retValue; - } +// public T getCookie(Class c) { +// Node.Cookie retValue = null; +// if (ValidateXMLCookie.class.isAssignableFrom(c)) { +// if (validateCookie == null) { +// InputSource in = DataObjectAdapters.inputSource(this); +// validateCookie = new ValidateXMLSupport(in); +// } +// return (T) validateCookie; +// } else if (CheckXMLCookie.class.isAssignableFrom(c)) { +// if (checkCookie == null) { +// InputSource in = DataObjectAdapters.inputSource(this); +// checkCookie = new CheckXMLSupport(in); +// } +// return (T) checkCookie; +// } +// +// if (retValue == null) { +// retValue = super.getCookie(c); +// } +// return (T) retValue; +// } public HelpCtx getHelpCtx() { diff --git a/java.source/src/org/netbeans/modules/java/ClassDataObject.java b/java.source/src/org/netbeans/modules/java/ClassDataObject.java --- a/java.source/src/org/netbeans/modules/java/ClassDataObject.java +++ b/java.source/src/org/netbeans/modules/java/ClassDataObject.java @@ -77,13 +77,13 @@ return new JavaNode (this, false); } - public @Override T getCookie(Class type) { - if (type.isAssignableFrom(OpenSourceCookie.class)) { - return type.cast(new OpenSourceCookie()); - } else { - return super.getCookie (type); - } - } +// public @Override T getCookie(Class type) { +// if (type.isAssignableFrom(OpenSourceCookie.class)) { +// return type.cast(new OpenSourceCookie()); +// } else { +// return super.getCookie (type); +// } +// } private final class OpenSourceCookie implements OpenCookie { diff --git a/mobility.editor/src/org/netbeans/modules/mobility/editor/pub/J2MEDataObject.java b/mobility.editor/src/org/netbeans/modules/mobility/editor/pub/J2MEDataObject.java --- a/mobility.editor/src/org/netbeans/modules/mobility/editor/pub/J2MEDataObject.java +++ b/mobility.editor/src/org/netbeans/modules/mobility/editor/pub/J2MEDataObject.java @@ -140,7 +140,7 @@ return new ProxyLookup((isValid() ? getNodeDelegate() : createNodeDelegate()).getLookup(), new Lookup() { public T lookup(Class clazz) { - return (T) getCookie(clazz); + return (T) J2MEDataObject.this.getCookie((Class) clazz); } public Result lookup(final Template template) { @@ -152,7 +152,7 @@ } public Collection allInstances() { - Cookie c = getCookie(template.getType()); + Cookie c = getCookie((Class) template.getType()); return c == null ? Collections.EMPTY_SET : Collections.singleton((T)c); } @@ -161,13 +161,13 @@ }); } - public @Override Cookie getCookie(Class type) { - - if (type.isAssignableFrom(J2MEEditorSupport.class)) { - return createJavaEditorSupport(); - } - return super.getCookie(type); - } +// public @Override Cookie getCookie(Class type) { +// +// if (type.isAssignableFrom(J2MEEditorSupport.class)) { +// return createJavaEditorSupport(); +// } +// return super.getCookie(type); +// } protected synchronized J2MEEditorSupport createJavaEditorSupport() { if (jes == null) { diff --git a/openide.loaders/src/org/openide/loaders/DataObject.java b/openide.loaders/src/org/openide/loaders/DataObject.java --- a/openide.loaders/src/org/openide/loaders/DataObject.java +++ b/openide.loaders/src/org/openide/loaders/DataObject.java @@ -965,7 +965,7 @@ * @param c class of requested cookie * @return a cookie or null if such cookies are not supported */ - public T getCookie(Class c) { + public final T getCookie(Class c) { if (c.isInstance (this)) { return c.cast(this); } diff --git a/openide.loaders/src/org/openide/loaders/DataShadow.java b/openide.loaders/src/org/openide/loaders/DataShadow.java --- a/openide.loaders/src/org/openide/loaders/DataShadow.java +++ b/openide.loaders/src/org/openide/loaders/DataShadow.java @@ -545,13 +545,13 @@ } /* Scans the orginal bundle */ - @Override - public T getCookie(Class c) { - if (c.isInstance(this)) { - return c.cast(this); - } - return original.getCookie (this, c); - } +// @Override +// public T getCookie(Class c) { +// if (c.isInstance(this)) { +// return c.cast(this); +// } +// return original.getCookie (this, c); +// } @Override public Lookup getLookup() { diff --git a/openide.loaders/src/org/openide/loaders/DefaultDataObject.java b/openide.loaders/src/org/openide/loaders/DefaultDataObject.java --- a/openide.loaders/src/org/openide/loaders/DefaultDataObject.java +++ b/openide.loaders/src/org/openide/loaders/DefaultDataObject.java @@ -200,10 +200,10 @@ /** We implement OpenCookie and sometimes we also have cloneable * editor cookie */ - @Override - public T getCookie(Class c) { - return getCookie (c, false); - } +// @Override +// public T getCookie(Class c) { +// return getCookie (c, false); +// } @Override final void checkCookieSet(Class c) { diff --git a/openide.loaders/src/org/openide/loaders/InstanceDataObject.java b/openide.loaders/src/org/openide/loaders/InstanceDataObject.java --- a/openide.loaders/src/org/openide/loaders/InstanceDataObject.java +++ b/openide.loaders/src/org/openide/loaders/InstanceDataObject.java @@ -567,22 +567,22 @@ } /* Serve up editor cookies where requested. */ - @Override - public T getCookie(Class clazz) { - T supe = null; - if (getPrimaryFile().hasExt(XML_EXT)) { - // #24683 fix: do not return any cookie until the .settings file is written - // successfully; PROP_COOKIE is fired when cookies are available. - String filename = getPrimaryFile().getPath(); - if (createdIDOs.contains(filename)) return null; - - Object res = getCookieFromEP(clazz); - supe = res instanceof Node.Cookie ? clazz.cast(res) : null; - if (InstanceCookie.class.isAssignableFrom(clazz)) return supe; - } - if (supe == null) supe = super.getCookie(clazz); - return supe; - } +// @Override +// public T getCookie(Class clazz) { +// T supe = null; +// if (getPrimaryFile().hasExt(XML_EXT)) { +// // #24683 fix: do not return any cookie until the .settings file is written +// // successfully; PROP_COOKIE is fired when cookies are available. +// String filename = getPrimaryFile().getPath(); +// if (createdIDOs.contains(filename)) return null; +// +// Object res = getCookieFromEP(clazz); +// supe = res instanceof Node.Cookie ? clazz.cast(res) : null; +// if (InstanceCookie.class.isAssignableFrom(clazz)) return supe; +// } +// if (supe == null) supe = super.getCookie(clazz); +// return supe; +// } @Override void checkCookieSet(Class clazz) { diff --git a/openide.loaders/src/org/openide/loaders/MultiDataObject.java b/openide.loaders/src/org/openide/loaders/MultiDataObject.java --- a/openide.loaders/src/org/openide/loaders/MultiDataObject.java +++ b/openide.loaders/src/org/openide/loaders/MultiDataObject.java @@ -833,15 +833,15 @@ * @return an instance of that class, or null if this class of cookie * is not supported */ - @Override - public T getCookie(Class type) { - CookieSet c = cookieSet; - if (c != null) { - T cookie = c.getCookie (type); - if (cookie != null) return cookie; - } - return super.getCookie (type); - } +// @Override +// public T getCookie(Class type) { +// CookieSet c = cookieSet; +// if (c != null) { +// T cookie = c.getCookie (type); +// if (cookie != null) return cookie; +// } +// return super.getCookie (type); +// } /** Fires cookie change. */ diff --git a/openide.loaders/src/org/openide/loaders/XMLDataObject.java b/openide.loaders/src/org/openide/loaders/XMLDataObject.java --- a/openide.loaders/src/org/openide/loaders/XMLDataObject.java +++ b/openide.loaders/src/org/openide/loaders/XMLDataObject.java @@ -299,34 +299,34 @@ * @return a cookie (instanceof cls) that has been found in info or * super.getCookie(cls). */ - public T getCookie(Class cls) { - getIP ().waitFinished(); - - Object cake = getIP().lookupCookie(cls); - - if (ERR.isLoggable(Level.FINE)) { - ERR.fine("Query for " + cls + " for " + this); // NOI18N - ERR.fine("Gives a cake " + cake + " for " + this); // NOI18N - } - - if (cake instanceof InstanceCookie) { - cake = ofCookie ((InstanceCookie)cake, cls); - } - - if (ERR.isLoggable(Level.FINE)) { - ERR.fine("After ofCookie: " + cake + " for " + this); // NOI18N - } - - if (cake == null) { - cake = super.getCookie (cls); - } - - if (ERR.isLoggable(Level.FINE)) { - ERR.fine("getCookie returns " + cake + " for " + this); // NOI18N - } - - return cls.cast(cake); - } +// public T getCookie(Class cls) { +// getIP ().waitFinished(); +// +// Object cake = getIP().lookupCookie(cls); +// +// if (ERR.isLoggable(Level.FINE)) { +// ERR.fine("Query for " + cls + " for " + this); // NOI18N +// ERR.fine("Gives a cake " + cake + " for " + this); // NOI18N +// } +// +// if (cake instanceof InstanceCookie) { +// cake = ofCookie ((InstanceCookie)cake, cls); +// } +// +// if (ERR.isLoggable(Level.FINE)) { +// ERR.fine("After ofCookie: " + cake + " for " + this); // NOI18N +// } +// +// if (cake == null) { +// cake = super.getCookie (cls); +// } +// +// if (ERR.isLoggable(Level.FINE)) { +// ERR.fine("getCookie returns " + cake + " for " + this); // NOI18N +// } +// +// return cls.cast(cake); +// } /** Special support of InstanceCookie.Of. If the Info class * provides InstanceCookie but not IC.Of, we add the extra interface to diff --git a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/PaletteItemDataObject.java b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/PaletteItemDataObject.java --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/PaletteItemDataObject.java +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/PaletteItemDataObject.java @@ -161,14 +161,14 @@ return new ItemNode(); } - @Override - public T getCookie(Class cookieClass) { - - if (PaletteItemInfoCookie.class.isAssignableFrom(cookieClass)){ - return cookieClass.cast(new PaletteItemInfoImpl( this )); - } - return cookieClass.cast(super.getCookie(cookieClass)); - } +// @Override +// public T getCookie(Class cookieClass) { +// +// if (PaletteItemInfoCookie.class.isAssignableFrom(cookieClass)){ +// return cookieClass.cast(new PaletteItemInfoImpl( this )); +// } +// return cookieClass.cast(super.getCookie(cookieClass)); +// } // ------- diff --git a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObject.java b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObject.java --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObject.java +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObject.java @@ -95,32 +95,32 @@ private OpenEdit openEdit = null; /** Overrides behaviour to provide compound save cookie. */ - @Override - public T getCookie(Class clazz) { - if(clazz == SaveCookie.class){ - FileObject primaryJsfFileObject = Utils.findJspForJava(getPrimaryFile()); - if( primaryJsfFileObject != null && primaryJsfFileObject.isValid()) { - SaveCookie javaSaveCookie = (SaveCookie)super.getCookie(clazz); - JsfJspDataObject jsfJspDataObject = (JsfJspDataObject) getCookie(JsfJspDataObject.class); - SaveCookie jspSaveCookie; - if(jsfJspDataObject == null) { - jspSaveCookie = null; - } else { - jspSaveCookie = (SaveCookie)jsfJspDataObject.getPureCookie(clazz); - } - - if(javaSaveCookie == null && jspSaveCookie == null) { - return null; - } else { - return clazz.cast(new CompoundSaveCookie(javaSaveCookie, jspSaveCookie)); - } - } - }else if (clazz.isAssignableFrom(JsfJavaEditorSupport.class)) { - return clazz.cast(getJsfJavaEditorSupport()); - } - - return super.getCookie(clazz); - } +// @Override +// public T getCookie(Class clazz) { +// if(clazz == SaveCookie.class){ +// FileObject primaryJsfFileObject = Utils.findJspForJava(getPrimaryFile()); +// if( primaryJsfFileObject != null && primaryJsfFileObject.isValid()) { +// SaveCookie javaSaveCookie = (SaveCookie)super.getCookie(clazz); +// JsfJspDataObject jsfJspDataObject = (JsfJspDataObject) getCookie(JsfJspDataObject.class); +// SaveCookie jspSaveCookie; +// if(jsfJspDataObject == null) { +// jspSaveCookie = null; +// } else { +// jspSaveCookie = (SaveCookie)jsfJspDataObject.getPureCookie(clazz); +// } +// +// if(javaSaveCookie == null && jspSaveCookie == null) { +// return null; +// } else { +// return clazz.cast(new CompoundSaveCookie(javaSaveCookie, jspSaveCookie)); +// } +// } +// }else if (clazz.isAssignableFrom(JsfJavaEditorSupport.class)) { +// return clazz.cast(getJsfJavaEditorSupport()); +// } +// +// return super.getCookie(clazz); +// } public T createCookie(Class klass) { if (OpenCookie.class.equals(klass) || EditCookie.class.equals(klass)) { diff --git a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObject.java b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObject.java --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObject.java +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObject.java @@ -205,35 +205,35 @@ } /** Overrides behaviour to provide compound save cookie. */ - @Override - public T getCookie(Class clazz) { - if(clazz == SaveCookie.class){ - FileObject primaryJavaFileObject = Utils.findJavaForJsp(getPrimaryFile()); - if(primaryJavaFileObject != null && primaryJavaFileObject.isValid()) { - SaveCookie jspSaveCookie = (SaveCookie)super.getCookie(clazz); - JsfJavaDataObject jsfJavaDataObject = Utils.findCorrespondingJsfJavaDataObject(getPrimaryFile(), false); - SaveCookie javaSaveCookie; - if(jsfJavaDataObject == null) { - javaSaveCookie = null; - } else { - javaSaveCookie = (SaveCookie)jsfJavaDataObject.getPureCookie(clazz); - } - - if(jspSaveCookie == null && javaSaveCookie == null) { - return null; - } else { - return clazz.cast(new CompoundSaveCookie(jspSaveCookie, javaSaveCookie)); - } - } - } else { - // XXX NB #80853 Fix the cookie creation when referred by impl classes. - if (TagLibParseCookie.class.isAssignableFrom(clazz)) { - return clazz.cast(super.getCookie(TagLibParseCookie.class)); - } - } - - return super.getCookie(clazz); - } +// @Override +// public T getCookie(Class clazz) { +// if(clazz == SaveCookie.class){ +// FileObject primaryJavaFileObject = Utils.findJavaForJsp(getPrimaryFile()); +// if(primaryJavaFileObject != null && primaryJavaFileObject.isValid()) { +// SaveCookie jspSaveCookie = (SaveCookie)super.getCookie(clazz); +// JsfJavaDataObject jsfJavaDataObject = Utils.findCorrespondingJsfJavaDataObject(getPrimaryFile(), false); +// SaveCookie javaSaveCookie; +// if(jsfJavaDataObject == null) { +// javaSaveCookie = null; +// } else { +// javaSaveCookie = (SaveCookie)jsfJavaDataObject.getPureCookie(clazz); +// } +// +// if(jspSaveCookie == null && javaSaveCookie == null) { +// return null; +// } else { +// return clazz.cast(new CompoundSaveCookie(jspSaveCookie, javaSaveCookie)); +// } +// } +// } else { +// // XXX NB #80853 Fix the cookie creation when referred by impl classes. +// if (TagLibParseCookie.class.isAssignableFrom(clazz)) { +// return clazz.cast(super.getCookie(TagLibParseCookie.class)); +// } +// } +// +// return super.getCookie(clazz); +// } private transient JsfJspEditorSupport jsfJspEditorSupport; diff --git a/web.core/src/org/netbeans/modules/web/core/jsploader/JspServletDataObject.java b/web.core/src/org/netbeans/modules/web/core/jsploader/JspServletDataObject.java --- a/web.core/src/org/netbeans/modules/web/core/jsploader/JspServletDataObject.java +++ b/web.core/src/org/netbeans/modules/web/core/jsploader/JspServletDataObject.java @@ -79,19 +79,19 @@ return JavaDataSupport.createJavaNode(getPrimaryFile()); } - @Override - public Cookie getCookie(Class type) { - if (type.isAssignableFrom(ServletEditorCookie.class)) { - if (servletEditor == null) { - EditorCookie ed = (EditorCookie) super.getCookie(EditorCookie.class); - if (ed != null) - servletEditor = new ServletEditorCookie(ed, this); - } - if (servletEditor != null) - return servletEditor; - } - return super.getCookie(type); - } +// @Override +// public Cookie getCookie(Class type) { +// if (type.isAssignableFrom(ServletEditorCookie.class)) { +// if (servletEditor == null) { +// EditorCookie ed = (EditorCookie) super.getCookie(EditorCookie.class); +// if (ed != null) +// servletEditor = new ServletEditorCookie(ed, this); +// } +// if (servletEditor != null) +// return servletEditor; +// } +// return super.getCookie(type); +// } /** Get the name of the data object. * Uses the name of the source JSP diff --git a/xml/src/org/netbeans/modules/xml/DTDDataObject.java b/xml/src/org/netbeans/modules/xml/DTDDataObject.java --- a/xml/src/org/netbeans/modules/xml/DTDDataObject.java +++ b/xml/src/org/netbeans/modules/xml/DTDDataObject.java @@ -133,27 +133,27 @@ /** Synchronize and delegate to super. */ - @Override - public Node.Cookie getCookie(Class klass) { - - Node.Cookie cake = null; - boolean change = false; - - // take lock to prevent deadlock on cookie set that can be called - // from other thred during cookie removal - synchronized (this) { - cake = super.getCookie (klass); - - if ( ( cake == null ) && - ( CloneableOpenSupport.class == klass ) ) { //!!! HACK -- backward compatibility - cake = super.getCookie (OpenCookie.class); - } - } - - if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug ("DTD cookie query " + klass + " => " + cake); // NOI18N - - return cake; - } +// @Override +// public Node.Cookie getCookie(Class klass) { +// +// Node.Cookie cake = null; +// boolean change = false; +// +// // take lock to prevent deadlock on cookie set that can be called +// // from other thred during cookie removal +// synchronized (this) { +// cake = super.getCookie (klass); +// +// if ( ( cake == null ) && +// ( CloneableOpenSupport.class == klass ) ) { //!!! HACK -- backward compatibility +// cake = super.getCookie (OpenCookie.class); +// } +// } +// +// if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug ("DTD cookie query " + klass + " => " + cake); // NOI18N +// +// return cake; +// } public DataObjectCookieManager getCookieManager () { diff --git a/xml/src/org/netbeans/modules/xml/XMLDataObject.java b/xml/src/org/netbeans/modules/xml/XMLDataObject.java --- a/xml/src/org/netbeans/modules/xml/XMLDataObject.java +++ b/xml/src/org/netbeans/modules/xml/XMLDataObject.java @@ -177,29 +177,29 @@ /** Delegate to super with possible debug messages. */ - @Override - public org.openide.nodes.Node.Cookie getCookie(Class klass) { - Node.Cookie cake = null; - - if (SaveCookie.class.equals (klass) ) { - if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug ("XMLDataObject::getCookie");//, new RuntimeException ("Save cookie check")); // NOI18N - } - - // take lock to prevent deadlock on cookie set that can be called - // from other thread during cookie removal - synchronized (this) { - cake = super.getCookie (klass); - - if ( ( cake == null ) && - ( CloneableOpenSupport.class == klass ) ) { //!!! HACK -- backward compatibility - cake = super.getCookie (OpenCookie.class); - } - } - - if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug ("XMLDataOObject::getCookie: class = " + klass + " => " + cake); // NOI18N - - return cake; - } +// @Override +// public org.openide.nodes.Node.Cookie getCookie(Class klass) { +// Node.Cookie cake = null; +// +// if (SaveCookie.class.equals (klass) ) { +// if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug ("XMLDataObject::getCookie");//, new RuntimeException ("Save cookie check")); // NOI18N +// } +// +// // take lock to prevent deadlock on cookie set that can be called +// // from other thread during cookie removal +// synchronized (this) { +// cake = super.getCookie (klass); +// +// if ( ( cake == null ) && +// ( CloneableOpenSupport.class == klass ) ) { //!!! HACK -- backward compatibility +// cake = super.getCookie (OpenCookie.class); +// } +// } +// +// if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug ("XMLDataOObject::getCookie: class = " + klass + " => " + cake); // NOI18N +// +// return cake; +// } public DataObjectCookieManager getCookieManager() {