Author: scabanovich
Date: 2009-11-05 09:25:20 -0500 (Thu, 05 Nov 2009)
New Revision: 18414
Modified:
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-1592
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 2009-11-05
12:50:16 UTC (rev 18413)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-11-05
14:25:20 UTC (rev 18414)
@@ -477,6 +477,14 @@
List<Change> changes = super.merge(s);
AbstractTagLib t = (AbstractTagLib)s;
Change children = new Change(this, null, null, null);
+ if(!stringsEqual(uri, t.uri)) {
+ changes = Change.addChange(changes, new Change(this, URI, uri, t.uri));
+ uri = t.uri;
+ }
+ if(!stringsEqual(version, t.version)) {
+ changes = Change.addChange(changes, new Change(this, TLDLibrary.VERSION, version,
t.version));
+ version = t.version;
+ }
mergeComponents(t, children);
changes = Change.addChange(changes, children);