Attachment 64195 Details for Bug 136399 – Patch for 2.0

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for 2.0

136399.txt (text/plain), 4.71 KB, created by Valentin Baciu

on 2007-04-18 10:48:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Valentin Baciu

Created: 2007-04-18 10:48:17 EDT

Size: 4.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.xml.core
>Index: src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentManagerImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/xml/plugins/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentManagerImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 CMDocumentManagerImpl.java
>--- src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentManagerImpl.java	15 Feb 2007 03:36:35 -0000	1.6
>+++ src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelqueryimpl/CMDocumentManagerImpl.java	18 Apr 2007 14:48:23 -0000
>@@ -51,6 +51,7 @@
>     this.cmDocumentReferenceProvider = cmDocumentReferenceProvider;
>     setPropertyEnabled(PROPERTY_AUTO_LOAD, true);
>     setPropertyEnabled(PROPERTY_USE_CACHED_RESOLVED_URI, false);
>+    setPropertyEnabled(PROPERTY_PERFORM_URI_RESOLUTION, true);
>   }         
> 
>        
>@@ -158,7 +159,16 @@
> 
>     if (getPropertyEnabled(PROPERTY_AUTO_LOAD))
>     {
>-      resolvedURI = lookupOrCreateResolvedURI(publicId, systemId);
>+      // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=136399
>+
>+      if (getPropertyEnabled(PROPERTY_PERFORM_URI_RESOLUTION))
>+      {
>+        resolvedURI = lookupOrCreateResolvedURI(publicId, systemId);
>+      }
>+      else
>+      {
>+        resolvedURI = systemId;
>+      }
>     }    
>     else
>     {
>@@ -252,8 +262,6 @@
>     cmDocumentCache.setStatus(resolvedURI, CMDocumentCache.STATUS_LOADING);
>   
>     CMDocument result = null;         
>-    int x = 1;
>-    x++;
>     if (resolvedURI != null && resolvedURI.length() > 0)
>     {
>       // try to get from cache
>Index: src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManager.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/xml/plugins/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManager.java,v
>retrieving revision 1.5
>diff -u -r1.5 CMDocumentManager.java
>--- src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManager.java	10 Apr 2007 20:05:38 -0000	1.5
>+++ src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/modelquery/CMDocumentManager.java	18 Apr 2007 14:48:23 -0000
>@@ -59,6 +59,14 @@
> 	public static final String PROPERTY_USE_CACHED_RESOLVED_URI = "useCachedResovledURI"; //$NON-NLS-1$
> 
> 	/**
>+	 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=136399
>+	 * Allows a client to control whether the document manager attempts to resolve a
>+	 * CM document's URI. When set to false, the CM systemID will be assumed to point
>+	 * to an already resolved URI. By default this property is set to true.
>+	 */
>+	public static final String PROPERTY_PERFORM_URI_RESOLUTION = "performURIResolution"; //$NON-NLS-1$
>+	
>+	/**
> 	 * Set the enabled state of a property.
> 	 */
> 	public void setPropertyEnabled(String propertyName, boolean enabled);
>#P org.eclipse.wst.html.core
>Index: src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/html/plugins/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java,v
>retrieving revision 1.8
>diff -u -r1.8 XHTMLAssociationProvider.java
>--- src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java	10 Apr 2007 18:31:49 -0000	1.8
>+++ src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java	18 Apr 2007 14:48:24 -0000
>@@ -13,6 +13,7 @@
> 
> import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
> import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
>+import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
> import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
> import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
> import org.w3c.dom.Document;
>@@ -39,6 +40,14 @@
> 	public XHTMLAssociationProvider(CMDocumentCache cache, URIResolver idResolver) {
> 		super(cache);
> 		this.idResolver = idResolver;
>+		   
>+		// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=136399. If the CM document URI
>+		// is resolved and cached at this level instruct the CM model manager to avoid 
>+		// re-resolving the URI.
>+
>+		if (USE_QUICK_CACHE) {
>+		  documentManager.setPropertyEnabled(CMDocumentManager.PROPERTY_PERFORM_URI_RESOLUTION, false);
>+		}
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 136399: 57945 | 64195