Author: scabanovich
Date: 2010-02-04 10:38:00 -0500 (Thu, 04 Feb 2010)
New Revision: 20129
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5765
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2010-02-04
15:18:54 UTC (rev 20128)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2010-02-04
15:38:00 UTC (rev 20129)
@@ -644,7 +644,14 @@
current = null;
}
if(current != null) {
+ boolean uriChanged = !stringsEqual(current.getURI(), loaded.getURI());
+ if(uriChanged) {
+ this.libraries.removeLibrary(current);
+ }
List<Change> changes = current.merge(loaded);
+ if(uriChanged) {
+ this.libraries.addLibrary(current);
+ }
fireChanges(changes);
continue;
}
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2010-02-04
15:18:54 UTC (rev 20128)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2010-02-04
15:38:00 UTC (rev 20129)
@@ -483,7 +483,7 @@
}
t.addComponent(((AbstractComponent)c).clone());
}
- t.components.putAll(components);
+// t.components.putAll(components);
return t;
}