[jbosstools-commits] JBoss Tools SVN: r20503 - in branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/jsf2/model and 1 other directory.
Author: scabanovich
Date: 2010-02-26 06:47:26 -0500 (Fri, 26 Feb 2010)
New Revision: 20503
Modified:
branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta
branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentLoader.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5940
Modified:
branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta
===================================================================
---
branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2010-02-26
11:46:25 UTC (rev 20502)
+++
branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2010-02-26
11:47:26 UTC (rev 20503)
@@ -35,10 +35,12 @@
<XModelEntity
ImplementationLoadingClass="org.jboss.tools.jsf.jsf2.model.FileCompositeComponentLoader"
ImplementingClass="org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl"
- ObjectEditorClass="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"
XMLSUBPATH="html" name="FileJSF2Component">
+ ObjectEditorClass="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"
+ XMLSUBPATH="html" name="FileJSF2Component">
<XChildrenEntities>
<XChildEntity maxCount="1" name="JSF2ComponentInterface"
required="yes"/>
<XChildEntity name="JSF2ComponentImplementation"/>
+ <XChildEntity name="AnyElement"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
Modified:
branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentLoader.java
===================================================================
---
branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentLoader.java 2010-02-26
11:46:25 UTC (rev 20502)
+++
branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentLoader.java 2010-02-26
11:47:26 UTC (rev 20503)
@@ -6,7 +6,9 @@
import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader;
import org.jboss.tools.common.model.util.NamespaceMapping;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.common.xml.XMLUtilities;
import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
public class FileCompositeComponentLoader extends SimpleWebFileLoader {
@@ -56,6 +58,20 @@
return super.isSaveable(entity, n, v, dv);
}
+ public void load(Element element, XModelObject o) {
+ super.load(element, o);
+ if(o.getModelEntity().getName().startsWith("FileJSF2Component")) {
+ Element c = XMLUtilities.getUniqueChild(element, "composite:interface");
+ if(c == null) {
+ NodeList l = element.getElementsByTagName("composite:interface");
+ if(l != null && l.getLength() > 0) {
+ Element is = (Element)l.item(0);
+ XModelObject io = o.getChildByPath("Interface");
+ if(io != null) load(is, io);
+ }
+ }
+ }
+ }
public boolean save(Element parent, XModelObject o) {
if(!needToSave(o)) return true;