r6526 - in /1.3/data: __init__.py pipe_container.py -- June 28, 2008 - 20:49

Author: bugman
Date: Sat Jun 28 20:13:20 2008
New Revision: 6526

URL: http://svn.gna.org/viewcvs/relax?rev=6526&view=rev
Log:
Renamed PipeContainer.xml_create_pipe_element() to 
PipeContainer.xml_create_element().


Modified:
    1.3/data/__init__.py
    1.3/data/pipe_container.py

Modified: 1.3/data/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/__init__.py?rev=6526&r1=6525&r2=6526&view=diff
==============================================================================
--- 1.3/data/__init__.py (original)
+++ 1.3/data/__init__.py Sat Jun 28 20:13:20 2008
@@ -217,7 +217,7 @@
         pipe_element.setAttribute('type', self[self.current_pipe].pipe_type)
 
         # Fill the data pipe XML element.
-        self[self.current_pipe].xml_create_pipe_element(self.xmldoc, 
pipe_element)
+        self[self.current_pipe].xml_create_element(self.xmldoc, pipe_element)
 
         # Write out the XML file.
         file.write(self.xmldoc.toprettyxml(indent='    '))

Modified: 1.3/data/pipe_container.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/pipe_container.py?rev=6526&r1=6525&r2=6526&view=diff
==============================================================================
--- 1.3/data/pipe_container.py (original)
+++ 1.3/data/pipe_container.py Sat Jun 28 20:13:20 2008
@@ -131,32 +131,7 @@
         return True
 
 
-    def xml_create_hybrid_element(self, doc, element):
-        """Create an XML element for the data pipe hybridisation information.
-
-        @param doc:     The XML document object.
-        @type doc:      xml.dom.minidom.Document instance
-        @param element: The element to add the hybridisation info to.
-        @type element:  XML element object
-        """
-
-        # Create the hybrid element and add it to the higher level element.
-        hybrid_element = doc.createElement('hybrid')
-        element.appendChild(hybrid_element)
-
-        # Set the hybridisation attributes.
-        hybrid_element.setAttribute('desc', 'Data pipe hybridisation 
information')
-
-        # Create an element to store the pipes list.
-        list_element = doc.createElement('pipes')
-        hybrid_element.appendChild(list_element)
-
-        # Add the pipes list.
-        text_val = doc.createTextNode(str(self.hybrid_pipes))
-        list_element.appendChild(text_val)
-
-
-    def xml_create_pipe_element(self, doc, element):
+    def xml_create_element(self, doc, element):
         """Create a XML element for the current data pipe.
 
         @param doc:     The XML document object.
@@ -190,6 +165,31 @@
         self.mol.xml_create_element(doc, element)
 
 
+    def xml_create_hybrid_element(self, doc, element):
+        """Create an XML element for the data pipe hybridisation information.
+
+        @param doc:     The XML document object.
+        @type doc:      xml.dom.minidom.Document instance
+        @param element: The element to add the hybridisation info to.
+        @type element:  XML element object
+        """
+
+        # Create the hybrid element and add it to the higher level element.
+        hybrid_element = doc.createElement('hybrid')
+        element.appendChild(hybrid_element)
+
+        # Set the hybridisation attributes.
+        hybrid_element.setAttribute('desc', 'Data pipe hybridisation 
information')
+
+        # Create an element to store the pipes list.
+        list_element = doc.createElement('pipes')
+        hybrid_element.appendChild(list_element)
+
+        # Add the pipes list.
+        text_val = doc.createTextNode(str(self.hybrid_pipes))
+        list_element.appendChild(text_val)
+
+
     def xml_create_str_elem(doc, element):
         """Create an XML element for the structural information.