Updated thread-safe PaletteItemMgr using ITagRegistries. Palette now also reacts to tag libs coming and going from the classpath.

1 files changed, 24 insertions, 2 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/CompositeTagRegistryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/CompositeTagRegistryFactory.java
index 03b28b26e..456e58f23 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/CompositeTagRegistryFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/CompositeTagRegistryFactory.java
@@ -170,15 +170,37 @@ public final class CompositeTagRegistryFactory
             _contentType = contentType;
         }
 
-        IProject getProject()
+        /**
+         * @return project
+         */
+        public IProject getProject()
         {
             return _project;
         }
 
-        IContentType getContentType()
+        /**
+         * @return content type
+         */
+        public IContentType getContentType()
         {
             return _contentType;
         }
+        
+        public boolean equals(final Object o) {
+        	if (o instanceof TagRegistryIdentifier) {        	
+	        	final TagRegistryIdentifier other = (TagRegistryIdentifier)o;
+	        	final int otherProjectHash = other.getProject() != null ? other.getProject().hashCode() : 0;
+	        	final int thisProjectHash = getProject() != null ? getProject().hashCode() : 0;
+	        	if (otherProjectHash == thisProjectHash &&
+	        			other.getContentType().equals(this.getContentType()))
+	        		return true;
+        	}
+        	return false;
+        }
+        
+        public int hashCode() {
+        	return (getProject() != null ? getProject().hashCode() : 0) + 7*_contentType.hashCode();
+        }
 
     }