Menu
▾
▴
[Smartfrog-checkins] core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom AnnotatedNode.java,1.5,1.6 CdlDocument.java,1.38,1.39 DocNode.java,1.17,1.18 Documentation.java,1.6,1.7 DocumentedNode.java,1.5,1.6 ElementEx.java,1.14,1.15 Expression.java,1.12,1.13 ExtendedNodeFactory.java,1.3,1.4 PropertyList.java,1.40,1.41 SystemElement.java,1.3,1.4 ToplevelList.java,1.16,1.17
|
From: Steve L. <st...@us...> - 2006-02-02 14:58:37
|
Update of /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12118/src/org/smartfrog/sfcore/languages/cdl/dom Modified Files: AnnotatedNode.java CdlDocument.java DocNode.java Documentation.java DocumentedNode.java ElementEx.java Expression.java ExtendedNodeFactory.java PropertyList.java SystemElement.java ToplevelList.java Log Message: new typemapping functionality is unit testing, but not integrated Index: DocNode.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/DocNode.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DocNode.java 9 Dec 2005 16:09:37 -0000 1.17 --- DocNode.java 2 Feb 2006 14:58:28 -0000 1.18 *************** *** 22,29 **** import nu.xom.Attribute; import nu.xom.Element; import org.smartfrog.sfcore.languages.cdl.ParseContext; import org.smartfrog.sfcore.languages.cdl.dom.attributes.GenericAttribute; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; - import org.smartfrog.services.xml.java5.iterators.AttributeIterator; /** --- 22,29 ---- import nu.xom.Attribute; import nu.xom.Element; + import org.smartfrog.services.xml.java5.iterators.AttributeIterator; import org.smartfrog.sfcore.languages.cdl.ParseContext; import org.smartfrog.sfcore.languages.cdl.dom.attributes.GenericAttribute; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; /** Index: PropertyList.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/PropertyList.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** PropertyList.java 1 Feb 2006 15:15:23 -0000 1.40 --- PropertyList.java 2 Feb 2006 14:58:28 -0000 1.41 *************** *** 23,49 **** import nu.xom.Element; import nu.xom.Node; ! import org.ggf.cddlm.generated.api.CddlmConstants; import org.smartfrog.services.xml.java5.NamespaceUtils; import org.smartfrog.services.xml.utils.XsdUtils; ! import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescriptionImpl; ! import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescription; import org.smartfrog.sfcore.languages.cdl.Constants; ! import org.smartfrog.sfcore.languages.cdl.references.ReferencePath; ! import org.smartfrog.sfcore.languages.cdl.faults.CdlException; ! import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; import org.smartfrog.sfcore.languages.cdl.faults.CdlInvalidValueReferenceException; ! import org.smartfrog.sfcore.languages.cdl.generate.GenerateContext; import org.smartfrog.sfcore.languages.cdl.generate.DescriptorSource; import org.smartfrog.sfcore.languages.cdl.resolving.ResolveEnum; import org.smartfrog.sfcore.languages.cdl.utils.ClassLogger; import org.smartfrog.sfcore.languages.cdl.utils.Namespaces; import org.smartfrog.sfcore.logging.Log; - import org.smartfrog.sfcore.common.SmartFrogException; - import org.smartfrog.sfcore.common.SmartFrogCoreKeys; - import org.smartfrog.sfcore.common.SmartFrogRuntimeException; - import org.smartfrog.sfcore.prim.Prim; import javax.xml.namespace.QName; - import java.io.IOException; import java.rmi.RemoteException; --- 23,45 ---- import nu.xom.Element; import nu.xom.Node; ! import org.smartfrog.services.cddlm.cdl.cmp.CmpComponentImpl; import org.smartfrog.services.xml.java5.NamespaceUtils; import org.smartfrog.services.xml.utils.XsdUtils; ! import org.smartfrog.sfcore.common.SmartFrogCoreKeys; ! import org.smartfrog.sfcore.common.SmartFrogException; ! import org.smartfrog.sfcore.common.SmartFrogRuntimeException; import org.smartfrog.sfcore.languages.cdl.Constants; ! import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescription; ! import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescriptionImpl; import org.smartfrog.sfcore.languages.cdl.faults.CdlInvalidValueReferenceException; ! import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; import org.smartfrog.sfcore.languages.cdl.generate.DescriptorSource; + import org.smartfrog.sfcore.languages.cdl.references.ReferencePath; import org.smartfrog.sfcore.languages.cdl.resolving.ResolveEnum; import org.smartfrog.sfcore.languages.cdl.utils.ClassLogger; import org.smartfrog.sfcore.languages.cdl.utils.Namespaces; import org.smartfrog.sfcore.logging.Log; import javax.xml.namespace.QName; import java.rmi.RemoteException; *************** *** 73,78 **** /** ! * What is the state of resolution ! */ private ResolveEnum resolveState = ResolveEnum.ResolvedUnknown; --- 69,74 ---- /** ! * What is the state of resolution ! */ private ResolveEnum resolveState = ResolveEnum.ResolvedUnknown; *************** *** 396,426 **** /** - * Write something to a smartfrog file. Parent elements should delegate to - * their children as appropriate. - * <p/> - * The Base class delegates to children and otherwise does nothing - * - * @param out - * @throws java.io.IOException - * @throws org.smartfrog.sfcore.languages.cdl.faults.CdlException - * - */ - @Override - public void toSmartFrog(GenerateContext out) throws IOException, - CdlException { - //printNodeAsSFComment(out); - String name = getSfName(out); - out.enter(name, getBaseComponent(out)); - printValueToSF(out); - printAttributesToSmartFrog(out); - printChildrenToSmartFrog(out); - out.leave(); - } - - protected String getSfName(GenerateContext out) { - return out.convertElementName(this); - } - - /** * logic to extract a command or a java classname from * the command. Crude and ugly. --- 392,395 ---- *************** *** 432,436 **** * @return */ ! protected String getBaseComponent(GenerateContext out) { String parent = out.getDefaultBaseComponent(); ElementEx commandPath = (ElementEx) getFirstChildElement( --- 401,405 ---- * @return */ ! /* protected String getBaseComponent(GenerateContext out) { String parent = out.getDefaultBaseComponent(); ElementEx commandPath = (ElementEx) getFirstChildElement( *************** *** 444,448 **** } return parent; ! } --- 413,417 ---- } return parent; ! }*/ *************** *** 455,493 **** public void exportDescription(CdlComponentDescription parent) throws RemoteException, SmartFrogException { ! QName name=this.getQName(); ! if (hasChildElements()) { ! //we have children, go into parent mode ! CdlComponentDescriptionImpl description = new CdlComponentDescriptionImpl(name,parent); ! description.registerWithParent(); ! exportChildren(description); ! //namespaces ! final Namespaces namespaces = getNamespaces(); ! namespaces.exportDescription(description); ! //finally, if there is no child element in the description with the classname, we ! //register our classname as the default ! if(getChildTemplateMatching(Constants.SMARTFROG_NAMESPACE, SmartFrogCoreKeys.SF_CLASS)==null) { ! addDefaultSFClass(description); ! } ! ! //sanity check: force validate here and now ! assert null!=description.sfResolve(SmartFrogCoreKeys.SF_CLASS,true); } else { ! //no kids. export our text value. how? ! if(isValueReference() && isLazy()) { ! //export a lazy reference ! //TODO ! throw new SmartFrogException("Lazy references not supported yet"); } else { ! //normal text node. ! String text=getTextValue(); ! parent.replace(name,text); } } - } /** * Override point: add the sf class to a component. * @param description * @throws SmartFrogRuntimeException --- 424,463 ---- public void exportDescription(CdlComponentDescription parent) throws RemoteException, SmartFrogException { ! QName name = this.getQName(); ! String text = getTextValue(); ! if (isValueReference() && isLazy()) { ! //export a lazy reference ! //TODO ! throw new SmartFrogException("Lazy references not supported yet"); } else { + boolean special=CdlComponentDescriptionImpl.isSpecialNamespace(name); + if (!special) { + CdlComponentDescriptionImpl description = new CdlComponentDescriptionImpl(name, parent); + description.registerWithParent(); + exportChildren(description); + //namespaces + final Namespaces namespaces = getNamespaces(); + namespaces.exportDescription(description); + //finally, if there is no child element in the description with the classname, we + //register our classname as the default + if (getChildTemplateMatching(Constants.XMLNS_SMARTFROG, SmartFrogCoreKeys.SF_CLASS) == null) { + addDefaultSFClass(description); + } ! //sanity check: force validate here and now ! assert null != description.sfResolve(SmartFrogCoreKeys.SF_CLASS, true); ! if(text!=null) { ! description.sfReplaceAttribute(CmpComponentImpl.ATTR_TEXT,text); ! } } else { ! //something in the smartfrog namespace. special treatment ! parent.replace(name, text); } } } /** * Override point: add the sf class to a component. + * * @param description * @throws SmartFrogRuntimeException *************** *** 499,502 **** --- 469,473 ---- /** * export all our children + * * @param parent * @return *************** *** 614,617 **** --- 585,589 ---- /** * Test for being a lazy reference + * * @return true iff we are a reference with cdl:lazy=true */ Index: ElementEx.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/ElementEx.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ElementEx.java 24 Jan 2006 16:59:30 -0000 1.14 --- ElementEx.java 2 Feb 2006 14:58:28 -0000 1.15 *************** *** 24,40 **** import nu.xom.Node; import nu.xom.Text; ! import org.smartfrog.sfcore.languages.cdl.faults.CdlException; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; - import org.smartfrog.sfcore.languages.cdl.generate.GenerateContext; - import org.smartfrog.sfcore.languages.cdl.generate.ToSmartFrog; import org.smartfrog.sfcore.languages.cdl.utils.NamespaceLookup; import org.smartfrog.sfcore.languages.cdl.utils.Namespaces; - import org.smartfrog.services.xml.java5.iterators.AttributeIterator; - import org.smartfrog.services.xml.java5.iterators.NodeIterator; - import org.smartfrog.services.xml.java5.NamespaceUtils; - import org.smartfrog.sfcore.languages.sf.functions.BaseUnaryOperator; import javax.xml.namespace.QName; - import java.io.IOException; import java.util.Iterator; --- 24,35 ---- import nu.xom.Node; import nu.xom.Text; ! import org.smartfrog.services.xml.java5.NamespaceUtils; ! import org.smartfrog.services.xml.java5.iterators.AttributeIterator; ! import org.smartfrog.services.xml.java5.iterators.NodeIterator; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; import org.smartfrog.sfcore.languages.cdl.utils.NamespaceLookup; import org.smartfrog.sfcore.languages.cdl.utils.Namespaces; import javax.xml.namespace.QName; import java.util.Iterator; *************** *** 42,46 **** * Extended element with a backpointer to the element */ ! public class ElementEx extends Element implements ToSmartFrog, Iterable<Node>, NamespaceLookup { public static final String ERROR_NON_RESOLVABLE_QNAME_PREFIX = "No namespace defined for ["; --- 37,41 ---- * Extended element with a backpointer to the element */ ! public class ElementEx extends Element implements Iterable<Node>, NamespaceLookup { public static final String ERROR_NON_RESOLVABLE_QNAME_PREFIX = "No namespace defined for ["; *************** *** 180,278 **** - /** - * Write something to a smartfrog file. Parent elements should delegate to - * their children as appropriate. - * <p/> - * The Base class delegates to children and otherwise does nothing - * - * @param out - * @throws java.io.IOException - * @throws org.smartfrog.sfcore.languages.cdl.faults.CdlException - * - */ - public void toSmartFrog(GenerateContext out) throws IOException, - CdlException { - //printNodeAsSFComment(out); - //printAttributesToSmartFrog(out); - printChildrenToSmartFrog(out); - } - - /** - * print our node value as a comment - */ - protected void printNodeAsSFComment(GenerateContext out) { - out.commentln(getQualifiedName()); - String value = getValue(); - if (value != null && value.length() > 0) { - String v = value.replace("\n", " "); - out.commentln("value:" + v); - } - } - - /** - * get the value of anode, print its value - * - * @param out - * @param key - * @param includeEmptyStrings - * @param trim - */ - protected void printValueToSF(GenerateContext out, - String key, - boolean includeEmptyStrings, - boolean trim) { - - String value = getTextValue(); - if (trim) { - value = value.trim(); - } - if (value.length() == 0 && !includeEmptyStrings) { - return; - } - //replace the # statement with the 0x23, decimal 35 value - value = value.replace("#", "\u0023"); - out.printTuple(key, value); - } - - - protected void printValueToSF(GenerateContext out) { - printValueToSF(out, BaseUnaryOperator.DATA_ATTRIBUTE, false, true); - } - - - /** - * print out all the children to smartfrog - * - * @param out - * @throws IOException - * @throws CdlException - */ - public void printChildrenToSmartFrog(GenerateContext out) - throws IOException, - CdlException { - for (Node node : this) { - if (node instanceof ToSmartFrog) { - ToSmartFrog sfwriter = (ToSmartFrog) node; - sfwriter.toSmartFrog(out); - } - } - } - - /** - * print out our attribute as name "value"; pairs, with a leading underscore - * on each. If the local namespace matches that of us, no namespace info is - * included. - * - * @param out - * @throws IOException - * @throws CdlException - */ - public void printAttributesToSmartFrog(GenerateContext out) - throws IOException, - CdlException { - for (Attribute attr : attributes()) { - out.printAttribute(attr); - } - } /** --- 175,178 ---- Index: Documentation.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/Documentation.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Documentation.java 17 Jun 2005 22:23:55 -0000 1.6 --- Documentation.java 2 Feb 2006 14:58:28 -0000 1.7 *************** *** 21,25 **** import nu.xom.Element; - import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; /** --- 21,24 ---- Index: DocumentedNode.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/DocumentedNode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DocumentedNode.java 17 Jun 2005 22:23:55 -0000 1.5 --- DocumentedNode.java 2 Feb 2006 14:58:28 -0000 1.6 *************** *** 21,25 **** import nu.xom.Element; - import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; /** --- 21,24 ---- Index: Expression.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/Expression.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Expression.java 26 Jan 2006 16:37:16 -0000 1.12 --- Expression.java 2 Feb 2006 14:58:28 -0000 1.13 *************** *** 22,36 **** import nu.xom.Element; import nu.xom.Node; import org.smartfrog.sfcore.languages.cdl.dom.attributes.ValueOfAttribute; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; import org.smartfrog.sfcore.languages.cdl.generate.DescriptorSource; - import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescription; - import org.smartfrog.sfcore.common.SmartFrogException; - import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescriptionImpl; import javax.xml.namespace.QName; import java.util.Collection; import java.util.HashMap; - import java.rmi.RemoteException; /** --- 22,36 ---- import nu.xom.Element; import nu.xom.Node; + import org.smartfrog.sfcore.common.SmartFrogException; + import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescription; + import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescriptionImpl; import org.smartfrog.sfcore.languages.cdl.dom.attributes.ValueOfAttribute; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; import org.smartfrog.sfcore.languages.cdl.generate.DescriptorSource; import javax.xml.namespace.QName; + import java.rmi.RemoteException; import java.util.Collection; import java.util.HashMap; /** Index: AnnotatedNode.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/AnnotatedNode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AnnotatedNode.java 17 Jun 2005 22:23:55 -0000 1.5 --- AnnotatedNode.java 2 Feb 2006 14:58:28 -0000 1.6 *************** *** 21,25 **** import nu.xom.Element; - import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; /** --- 21,24 ---- Index: CdlDocument.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/CdlDocument.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** CdlDocument.java 1 Feb 2006 15:15:23 -0000 1.38 --- CdlDocument.java 2 Feb 2006 14:58:28 -0000 1.39 *************** *** 26,40 **** import nu.xom.ParsingException; import nu.xom.Serializer; import org.smartfrog.services.xml.java5.iterators.IteratorRelay; import org.smartfrog.services.xml.java5.iterators.NodeIterator; ! import org.smartfrog.services.filesystem.FileSystem; import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescription; import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescriptionImpl; - import org.smartfrog.sfcore.languages.cdl.ParseContext; - import org.smartfrog.sfcore.languages.cdl.Constants; - import org.smartfrog.sfcore.languages.cdl.references.EarlyReferenceProcessor; - import org.smartfrog.sfcore.languages.cdl.references.ExtractReferenceOperation; - import org.smartfrog.sfcore.languages.cdl.process.ProcessingPhase; - import org.smartfrog.sfcore.languages.cdl.importing.ImportProcessor; import org.smartfrog.sfcore.languages.cdl.dom.attributes.GenericAttribute; import org.smartfrog.sfcore.languages.cdl.dom.attributes.URIAttribute; --- 26,37 ---- import nu.xom.ParsingException; import nu.xom.Serializer; + import org.smartfrog.services.filesystem.FileSystem; import org.smartfrog.services.xml.java5.iterators.IteratorRelay; import org.smartfrog.services.xml.java5.iterators.NodeIterator; ! import org.smartfrog.sfcore.common.SmartFrogException; ! import org.smartfrog.sfcore.languages.cdl.Constants; ! import org.smartfrog.sfcore.languages.cdl.ParseContext; import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescription; import org.smartfrog.sfcore.languages.cdl.components.CdlComponentDescriptionImpl; import org.smartfrog.sfcore.languages.cdl.dom.attributes.GenericAttribute; import org.smartfrog.sfcore.languages.cdl.dom.attributes.URIAttribute; *************** *** 43,49 **** import org.smartfrog.sfcore.languages.cdl.faults.CdlResolutionException; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; - import org.smartfrog.sfcore.languages.cdl.generate.GenerateContext; - import org.smartfrog.sfcore.languages.cdl.generate.ToSmartFrog; import org.smartfrog.sfcore.languages.cdl.generate.DescriptorSource; import org.smartfrog.sfcore.languages.cdl.resolving.ExtendsProcessor; import org.smartfrog.sfcore.languages.cdl.resolving.RegisterPrototypesProcessor; --- 40,48 ---- import org.smartfrog.sfcore.languages.cdl.faults.CdlResolutionException; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; import org.smartfrog.sfcore.languages.cdl.generate.DescriptorSource; + import org.smartfrog.sfcore.languages.cdl.importing.ImportProcessor; + import org.smartfrog.sfcore.languages.cdl.process.ProcessingPhase; + import org.smartfrog.sfcore.languages.cdl.references.EarlyReferenceProcessor; + import org.smartfrog.sfcore.languages.cdl.references.ExtractReferenceOperation; import org.smartfrog.sfcore.languages.cdl.resolving.ExtendsProcessor; import org.smartfrog.sfcore.languages.cdl.resolving.RegisterPrototypesProcessor; *************** *** 51,67 **** import org.smartfrog.sfcore.languages.cdl.utils.ClassLogger; import org.smartfrog.sfcore.logging.Log; - import org.smartfrog.sfcore.common.SmartFrogException; import javax.xml.namespace.QName; import java.io.IOException; import java.io.PrintStream; - import java.io.File; - import java.io.ByteArrayOutputStream; import java.net.MalformedURLException; import java.net.URI; import java.net.URL; import java.util.ArrayList; import java.util.List; - import java.rmi.RemoteException; --- 50,65 ---- import org.smartfrog.sfcore.languages.cdl.utils.ClassLogger; import org.smartfrog.sfcore.logging.Log; import javax.xml.namespace.QName; + import java.io.ByteArrayOutputStream; + import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.net.MalformedURLException; import java.net.URI; import java.net.URL; + import java.rmi.RemoteException; import java.util.ArrayList; import java.util.List; *************** *** 70,74 **** */ ! public class CdlDocument implements Names, ToSmartFrog, DescriptorSource { /** --- 68,72 ---- */ ! public class CdlDocument implements Names, DescriptorSource { /** *************** *** 525,552 **** /** - * Write something to a smartfrog file. Parent elements should delegate to - * their children as appropriate. - * <p/> - * The Base class delegates to children and otherwise does nothing - * - * @param out - * @throws java.io.IOException - * @throws org.smartfrog.sfcore.languages.cdl.faults.CdlException - * - */ - public void toSmartFrog(GenerateContext out) throws IOException, - CdlException { - if (getConfiguration() != null) { - //ignore the configuration - //getConfiguration().toSmartFrog(out); - } - if (getSystem() != null) { - //out.enter(GenerateContext.COMPONENT_SFSYSTEM); - getSystem().toSmartFrog(out); - //out.leave(); - } - } - - /** * Add a new description * --- 523,526 ---- Index: ExtendedNodeFactory.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/ExtendedNodeFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExtendedNodeFactory.java 31 Jan 2006 13:08:15 -0000 1.3 --- ExtendedNodeFactory.java 2 Feb 2006 14:58:28 -0000 1.4 *************** *** 21,29 **** package org.smartfrog.sfcore.languages.cdl.dom; ! import nu.xom.NodeFactory; import nu.xom.Element; import nu.xom.Nodes; - import nu.xom.Document; - import nu.xom.Comment; /** --- 21,28 ---- package org.smartfrog.sfcore.languages.cdl.dom; ! import nu.xom.Document; import nu.xom.Element; + import nu.xom.NodeFactory; import nu.xom.Nodes; /** Index: ToplevelList.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/ToplevelList.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ToplevelList.java 31 Jan 2006 13:08:15 -0000 1.16 --- ToplevelList.java 2 Feb 2006 14:58:28 -0000 1.17 *************** *** 4,8 **** import nu.xom.Node; import org.smartfrog.sfcore.languages.cdl.faults.CdlDuplicatePrototypeException; - import org.smartfrog.sfcore.languages.cdl.generate.GenerateContext; /** --- 4,7 ---- *************** *** 61,88 **** /** - * create a smartfrog name from a component This is a string that is a valid - * SF name. no spaces, colons or other forbidden stuff, and it includes the - * qname if needed. - * <p/> - * If there is a weakness in this algorithm, it is that it is neither - * complete nor unique. Better to have unique names in the firstplace, - * maybe. - * <p/> - * A big troublespot is qnames. Things would be simpler if they were not - * there, or aliased to something. but they are always incorporated, if - * present. - * - * @return a safer string. - */ - public String getSfName(GenerateContext out) { - //are we the system node? - if (getOwner().getConfiguration() == this) { - return GenerateContext.COMPONENT_CONFIGURATION; - } else { - return super.getSfName(out); - } - } - - /** * test for being a toplevel list. * The relevant subclass overrides it to return true --- 60,63 ---- Index: SystemElement.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/dom/SystemElement.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SystemElement.java 1 Feb 2006 15:15:23 -0000 1.3 --- SystemElement.java 2 Feb 2006 14:58:28 -0000 1.4 *************** *** 21,27 **** import nu.xom.Element; - import org.smartfrog.sfcore.languages.cdl.generate.GenerateContext; import org.smartfrog.sfcore.languages.cdl.faults.CdlXmlParsingException; - import org.smartfrog.sfcore.common.SmartFrogCoreKeys; /** --- 21,25 ---- |