Author: scabanovich Date: 2008-02-19 07:17:01 -0500 (Tue, 19 Feb 2008) New Revision: 6417 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamElement.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractContextVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/DataModelSelectionAttribute.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamObject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueList.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMap.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMapEntry.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueString.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlFactory.java Log: JBIDE-1785 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamElement.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamElement.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamElement.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -10,8 +10,13 @@ ******************************************************************************/ package org.jboss.tools.seam.core; +import java.util.List; +import java.util.Properties; + import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; +import org.jboss.tools.seam.core.event.Change; +import org.w3c.dom.Element; /** * Common interface for objects of seam model. @@ -45,5 +50,28 @@ public IResource getResource(); public ISeamElement clone() throws CloneNotSupportedException; + + /** + * Updates this seam object to be equal to the passed seam object. + * @param s + * @return List of performed modifications. + */ + public List<Change> merge(ISeamElement s); + + /** + * Serializes this object to XML element and adds it as child to the passed element. + * @param parent + * @param context + * @return + */ + public Element toXML(Element parent, Properties context); + /** + * Extracts data from the passed XML element to update this object + * to be equal to seam object serialized to XML. + * @param element + * @param context + */ + public void loadXML(Element element, Properties context); + } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractContextVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractContextVariable.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractContextVariable.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -14,6 +14,7 @@ import java.util.Properties; import org.jboss.tools.seam.core.ISeamContextVariable; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; import org.jboss.tools.seam.core.IValueInfo; import org.jboss.tools.seam.core.ScopeType; @@ -58,7 +59,8 @@ * @param f * @return list of changes */ - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); AbstractContextVariable f = (AbstractContextVariable)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -17,6 +17,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.seam.core.IOpenableElement; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamTextSourceReference; import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; import org.jboss.tools.seam.core.IValueInfo; @@ -91,7 +92,8 @@ return c; } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); if(s instanceof AbstractSeamDeclaration) { AbstractSeamDeclaration d = (AbstractSeamDeclaration)s; @@ -119,7 +121,9 @@ XModelObject old = pushModelObject(context); - name = element.getAttribute(SeamXMLConstants.ATTR_NAME); + if(element.hasAttribute(SeamXMLConstants.ATTR_NAME)) { + name = element.getAttribute(SeamXMLConstants.ATTR_NAME); + } SeamXMLHelper.loadMap(element, attributes, "attributes", context); popModelObject(context, old); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -16,6 +16,7 @@ import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IBijectedAttribute; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.IValueInfo; import org.jboss.tools.seam.core.event.Change; import org.w3c.dom.Element; @@ -59,7 +60,8 @@ public void setValue(IValueInfo value) {} - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); AbstractContextVariable f = (AbstractContextVariable)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/DataModelSelectionAttribute.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/DataModelSelectionAttribute.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/DataModelSelectionAttribute.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -13,6 +13,7 @@ import java.util.List; import java.util.Properties; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.IValueInfo; import org.jboss.tools.seam.core.event.Change; import org.w3c.dom.Element; @@ -39,7 +40,8 @@ this.value = value == null ? null : value.getValue(); } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); if(s instanceof DataModelSelectionAttribute) { DataModelSelectionAttribute sf = (DataModelSelectionAttribute)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -15,6 +15,7 @@ import org.eclipse.jdt.core.IMethod; import org.jboss.tools.seam.core.ISeamAnnotatedFactory; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; import org.jboss.tools.seam.core.IValueInfo; import org.jboss.tools.seam.core.ScopeType; @@ -42,7 +43,8 @@ this.autoCreate = autoCreate; } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamAnnotatedFactory af = (SeamAnnotatedFactory)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentDeclaration.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentDeclaration.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IResource; import org.jboss.tools.seam.core.ISeamComponentDeclaration; import org.jboss.tools.seam.core.ISeamContextVariable; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ScopeType; import org.jboss.tools.seam.core.event.Change; @@ -40,7 +41,8 @@ * @param d * @return list of changes */ - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamComponentDeclaration d = (SeamComponentDeclaration)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -19,6 +19,7 @@ import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.seam.core.ISeamComponentMethod; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.SeamComponentMethodType; import org.jboss.tools.seam.core.event.Change; import org.w3c.dom.Element; @@ -82,7 +83,8 @@ } } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamComponentMethod m = (SeamComponentMethod)s; if(!typesAreEqual(types, m.types)) { @@ -132,6 +134,10 @@ public void loadXML(Element element, Properties context) { super.loadXML(element, context); + if(id instanceof IMember) { + javaSource = (IMember)id; + } + if(element.hasAttribute(ATTR_COMP_TYPES)) { String v = element.getAttribute(ATTR_COMP_TYPES); if(v != null && v.length() > 0) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -30,6 +30,7 @@ import org.jboss.tools.seam.core.IRole; import org.jboss.tools.seam.core.ISeamComponentMethod; import org.jboss.tools.seam.core.ISeamContextVariable; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; @@ -237,7 +238,8 @@ * @param d * @return list of changes */ - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamJavaComponentDeclaration jd = (SeamJavaComponentDeclaration)s; if(!stringsEqual(className, jd.className)) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -20,6 +20,7 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.common.xml.XMLUtilities; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.event.Change; import org.w3c.dom.Element; @@ -63,7 +64,8 @@ } } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); if(s instanceof SeamJavaContextVariable) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamObject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamObject.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamObject.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core; +import java.lang.annotation.Inherited; import java.util.List; import java.util.Properties; @@ -123,10 +124,11 @@ * @param f * @return list of changes */ - public List<Change> merge(SeamObject s) { - source = s.source; - id = s.id; - resource = s.resource; + public List<Change> merge(ISeamElement s) { + SeamObject o = (SeamObject)s; + source = o.source; + id = o.id; + resource = o.resource; //If there are no changes, null is returned, //which prevents creating a lot of unnecessary objects. //Subclasses and clients must check returned Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -27,6 +27,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.FindObjectHelper; import org.jboss.tools.common.xml.XMLUtilities; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamPropertiesDeclaration; import org.jboss.tools.seam.core.ISeamProperty; import org.jboss.tools.seam.core.SeamCorePlugin; @@ -68,7 +69,8 @@ * @param d * @return list of changes */ - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamPropertiesDeclaration pd = (SeamPropertiesDeclaration)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -15,6 +15,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.xml.XMLUtilities; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamProperty; import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; import org.jboss.tools.seam.core.IValueInfo; @@ -48,7 +49,8 @@ return 0; } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamProperty d = (SeamProperty)s; @@ -121,7 +123,7 @@ Element c = XMLUtilities.getUniqueChild(element, SeamXMLConstants.TAG_VALUE); if(c != null) { SeamObject v = null; - String cls = element.getAttribute(SeamXMLConstants.ATTR_CLASS); + String cls = c.getAttribute(SeamXMLConstants.ATTR_CLASS); if(SeamXMLConstants.CLS_MAP.equals(cls)) { v = new SeamValueMap(); } else if(SeamXMLConstants.CLS_LIST.equals(cls)) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -56,6 +56,7 @@ for (int i = 0; i < FILE_SCANNERS.length; i++) { IFileScanner scanner = FILE_SCANNERS[i]; if(scanner.isRelevant(f)) { + long t = System.currentTimeMillis(); if(!scanner.isLikelyComponentSource(f)) { p.pathRemoved(f.getFullPath()); return false; @@ -67,6 +68,9 @@ SeamCorePlugin.getDefault().logError(e); } if(c != null) componentsLoaded(c, f); + long dt = System.currentTimeMillis() - t; + timeUsed += dt; +// System.out.println("Time=" + timeUsed); } } } @@ -79,6 +83,8 @@ return true; } + static long timeUsed = 0; + void componentsLoaded(LoadedDeclarations c, IFile resource) { if(c == null || c.getComponents().size() + c.getFactories().size() == 0) return; p.registerComponents(c, resource.getFullPath()); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueList.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueList.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueList.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -15,6 +15,7 @@ import java.util.Properties; import org.jboss.tools.common.xml.XMLUtilities; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.event.Change; import org.jboss.tools.seam.core.event.ISeamValueList; import org.jboss.tools.seam.core.event.ISeamValueString; @@ -37,7 +38,8 @@ adopt(value); } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamValueList v = (SeamValueList)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMap.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMap.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMap.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -15,6 +15,7 @@ import java.util.Properties; import org.jboss.tools.common.xml.XMLUtilities; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.event.Change; import org.jboss.tools.seam.core.event.ISeamValueMap; import org.jboss.tools.seam.core.event.ISeamValueMapEntry; @@ -37,7 +38,8 @@ adopt(entry); } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamValueMap v = (SeamValueMap)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMapEntry.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMapEntry.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMapEntry.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -14,6 +14,7 @@ import java.util.Properties; import org.jboss.tools.common.xml.XMLUtilities; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.event.Change; import org.jboss.tools.seam.core.event.ISeamValueMapEntry; import org.jboss.tools.seam.core.event.ISeamValueString; @@ -46,7 +47,8 @@ adopt(value); } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamValueMapEntry e = (SeamValueMapEntry)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueString.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueString.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueString.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -13,6 +13,7 @@ import java.util.List; import java.util.Properties; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.IValueInfo; import org.jboss.tools.seam.core.event.Change; import org.jboss.tools.seam.core.event.ISeamValueString; @@ -36,7 +37,8 @@ if(value != null) currentValue = value.getValue(); } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamValueString v = (SeamValueString)s; String v1 = currentValue; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -169,7 +169,7 @@ element.setAttribute(ATTR_NAME, method.getElementName()); String[] s = method.getParameterTypes(); StringBuffer sb = new StringBuffer(); - for (int i = 0; i < s.length; i++) sb.append(s[i]).append(';'); + for (int i = 0; i < s.length; i++) sb.append(s[i]).append(','); element.setAttribute(ATTR_PARAMS, sb.toString()); } @@ -188,8 +188,11 @@ String params = element.getAttribute(ATTR_PARAMS); String[] ps = new String[0]; if(params != null && params.length() > 0) { - ps = params.split(";"); + ps = params.split(","); } + if(ps.length > 0) { + System.out.println("!!"); + } return type.getMethod(name, ps); } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -15,6 +15,7 @@ import java.util.Properties; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; import org.jboss.tools.seam.core.IValueInfo; import org.jboss.tools.seam.core.ScopeType; @@ -133,7 +134,8 @@ * @param d * @return list of changes */ - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamXmlComponentDeclaration xd = (SeamXmlComponentDeclaration)s; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlFactory.java 2008-02-19 12:02:07 UTC (rev 6416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlFactory.java 2008-02-19 12:17:01 UTC (rev 6417) @@ -13,6 +13,7 @@ import java.util.List; import java.util.Properties; +import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamXmlFactory; import org.jboss.tools.seam.core.IValueInfo; import org.jboss.tools.seam.core.event.Change; @@ -54,7 +55,8 @@ setValue(value == null ? null : value.getValue()); } - public List<Change> merge(SeamObject s) { + @Override + public List<Change> merge(ISeamElement s) { List<Change> changes = super.merge(s); SeamXmlFactory xf = (SeamXmlFactory)s;