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

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-04-18 16:21:47 -0400 (Mon, 18 Apr 2011)
New Revision: 30647

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
   trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ELFunction.java
   trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/IELFunction.java
Log:
JBIDE--8746
https://issues.jboss.org/browse/JBIDE-8746

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java	2011-04-18 19:53:46 UTC (rev 30646)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java	2011-04-18 20:21:47 UTC (rev 30647)
@@ -186,6 +186,7 @@
 				f.setId(t);
 				f.setName(new XMLValueInfo(t, XModelObjectConstants.ATTR_NAME));
 				f.setSignature(new XMLValueInfo(t, ATTR_FUNC_SIGN));
+				f.setFunctionClass(new XMLValueInfo(t, ELFunction.FUNCTION_CLASS));
 				library.addFunction(f);
 			}
 		}
@@ -233,6 +234,7 @@
 				f.setId(t);
 				f.setName(new XMLValueInfo(t, ATTR_FUNC_NAME));
 				f.setSignature(new XMLValueInfo(t, ATTR_FUNC_SIGN));
+				f.setFunctionClass(new XMLValueInfo(t, ELFunction.FUNCTION_CLASS));
 				library.addFunction(f);
 			}
 		}

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ELFunction.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ELFunction.java	2011-04-18 19:53:46 UTC (rev 30646)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ELFunction.java	2011-04-18 20:21:47 UTC (rev 30647)
@@ -27,8 +27,10 @@
 
 public class ELFunction extends KbObject implements IELFunction {
 	public static final String SIGNATURE = "signature"; //$NON-NLS-1$
+	public static final String FUNCTION_CLASS = "function-class"; //$NON-NLS-1$
 	private String name;
 	private String signature;
+	private String functionClass;
 
 	public ELFunction() {}
 
@@ -40,6 +42,10 @@
 		return signature;
 	}
 
+	public String getFunctionClass() {
+		return functionClass;
+	}
+
 	public void setName(IValueInfo s) {
 		name = s == null ? null : s.getValue();
 		attributesInfo.put(XMLStoreConstants.ATTR_NAME, s);
@@ -50,6 +56,11 @@
 		attributesInfo.put(SIGNATURE, s);
 	}
 
+	public void setFunctionClass(IValueInfo s) {
+		functionClass = s == null ? null : s.getValue();
+		attributesInfo.put(FUNCTION_CLASS, s);
+	}
+
 	public ELFunction clone() throws CloneNotSupportedException {
 		return (ELFunction)super.clone();
 	}
@@ -73,6 +84,7 @@
 
 		setName(attributesInfo.get(XMLStoreConstants.ATTR_NAME));
 		setSignature(attributesInfo.get(SIGNATURE));
+		setFunctionClass(attributesInfo.get(FUNCTION_CLASS));
 
 		if(name == null && element.hasAttribute(XMLStoreConstants.ATTR_NAME)) {
 			name = element.getAttribute(XMLStoreConstants.ATTR_NAME);
@@ -95,6 +107,7 @@
 			String attrname = a.getModelEntity().getAttribute(XMLScanner.ATTR_FUNC_NAME) != null ? XMLScanner.ATTR_FUNC_NAME : XModelObjectConstants.ATTR_NAME;
 			attributesInfo.put(XMLStoreConstants.ATTR_NAME, new XMLValueInfo(a, attrname));
 			attributesInfo.put(SIGNATURE, new XMLValueInfo(a, XMLScanner.ATTR_FUNC_SIGN));
+			attributesInfo.put(FUNCTION_CLASS, new XMLValueInfo(a, FUNCTION_CLASS));
 		} else {
 			super.loadAttributesInfo(element, context);
 		}
@@ -113,6 +126,10 @@
 			changes = Change.addChange(changes, new Change(this, SIGNATURE, signature, a.signature));
 			signature = a.signature;
 		}
+		if(!stringsEqual(functionClass, a.functionClass)) {
+			changes = Change.addChange(changes, new Change(this, FUNCTION_CLASS, functionClass, a.functionClass));
+			functionClass = a.functionClass;
+		}
 		return changes;
 	}
 

Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/IELFunction.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/IELFunction.java	2011-04-18 19:53:46 UTC (rev 30646)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/IELFunction.java	2011-04-18 20:21:47 UTC (rev 30647)
@@ -24,4 +24,9 @@
 	 * @return the signature
 	 */
 	String getFunctionSignature();
+
+	/**
+	 * @return function class
+	 */
+	String getFunctionClass();
 }
\ No newline at end of file