[jbosstools-commits] JBoss Tools SVN: r2454 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
Author: scabanovich
Date: 2007-07-17 04:29:11 -0400 (Tue, 17 Jul 2007)
New Revision: 2454
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
EXIN-217 Merge of variables improved
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-07-17
08:02:36 UTC (rev 2453)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-07-17
08:29:11 UTC (rev 2454)
@@ -269,24 +269,8 @@
String oldClassName = c == null ? null : c.getClassName();
if(current != null) {
- Set<ISeamContextVariable> oldVariables = current.getDeclaredVariables();
List<Change> changes = current.merge(loaded);
if(changes != null && changes.size() > 0) {
-
- Set<ISeamContextVariable> newVariables = current.getDeclaredVariables();
- if(oldVariables != null && newVariables != null) {
- for (ISeamContextVariable v : oldVariables) {
- if(!newVariables.contains(v)) {
- allVariables.remove(v);
- }
- }
- for (ISeamContextVariable v : newVariables) {
- if(!oldVariables.contains(v)) {
- allVariables.add(v);
- }
- }
- }
-
Change cc = new Change(c, null, null, null);
cc.addChildren(changes);
List<Change> cchanges = Change.addChange(null, cc);