[jbosstools-commits] JBoss Tools SVN: r43883 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-09-20 16:26:57 -0400 (Thu, 20 Sep 2012)
New Revision: 43883

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
   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/scanner/ClassPathMonitor.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Do not keep EL model objects in ELReference.


Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java	2012-09-20 20:26:21 UTC (rev 43882)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java	2012-09-20 20:26:57 UTC (rev 43883)
@@ -304,7 +304,6 @@
 			elReference.setResource(file);
 			elReference.setLength(content.length());
 			elReference.setStartPosition(0);
-			elReference.init(content);
 			context.addELReference(elReference);
 		}
 		return context;
@@ -343,7 +342,6 @@
 						elReference.setResource(file);
 						elReference.setLength(value.length());
 						elReference.setStartPosition(offset);
-						elReference.init(value);
 
 						try {
 							elReference.setLineNumber(document.getLineOfOffset(startEl));
@@ -795,7 +793,6 @@
 			elReference.setResource(context.getResource());
 			elReference.setLength(text.length());
 			elReference.setStartPosition(offset);
-			elReference.init(text);
 			try {
 				if(Node.TEXT_NODE == node.getNodeType()) {
 					if(elReference.getEl().length == 1) {

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	2012-09-20 20:26:21 UTC (rev 43882)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java	2012-09-20 20:26:57 UTC (rev 43883)
@@ -17,7 +17,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -919,10 +918,8 @@
 	 */
 	void libraryDeclarationsRemoved(Map<Object,ITagLibrary> removed) {
 		if(removed == null || removed.isEmpty()) return;
-		Iterator<ITagLibrary> iterator = removed.values().iterator();
 		List<Change> changes = null;
-		while(iterator.hasNext()) {
-			ITagLibrary c = iterator.next();
+		for(ITagLibrary c: removed.values()) {
 			libraries.removeLibrary(c);
 			changes = Change.addChange(changes, new Change(this, null, c, null));
 		}

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/ClassPathMonitor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/ClassPathMonitor.java	2012-09-20 20:26:21 UTC (rev 43882)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/ClassPathMonitor.java	2012-09-20 20:26:57 UTC (rev 43883)
@@ -13,7 +13,6 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -34,7 +33,6 @@
 import org.jboss.tools.common.model.util.EclipseResourceUtil;
 import org.jboss.tools.jst.web.WebModelPlugin;
 import org.jboss.tools.jst.web.kb.IKbProject;
-import org.jboss.tools.jst.web.kb.KbMessages;
 import org.jboss.tools.jst.web.kb.KbProjectFactory;
 import org.jboss.tools.jst.web.kb.internal.KbProject;
 import org.jboss.tools.jst.web.model.helpers.InnerModelHelper;