Changeset 1914

Timestamp:

08/05/07 15:19:03 (1 year ago)

Author:

nahi

Message:

• extracted common part from classDefCreator.rb and mappingRegistryCreatorSupport.rb
  

Files:

• trunk/lib/wsdl/soap/classDefCreator.rb (modified) (3 diffs)
• trunk/lib/wsdl/soap/classDefCreatorSupport.rb (modified) (2 diffs)
• trunk/lib/wsdl/soap/mappingRegistryCreatorSupport.rb (modified) (2 diffs)

trunk/lib/wsdl/soap/classDefCreator.rb

@@ -327 +327 @@
-  end
-
-  def element_basetype(ele)
-    if klass = basetype_class(ele.type)
-      klass
-    elsif ele.local_simpletype
-      basetype_class(ele.local_simpletype.base)
-    else
-      nil
-    end
-  end
-
-  def attribute_basetype(attr)
-    if klass = basetype_class(attr.type)
-      klass
-    elsif attr.local_simpletype
-      basetype_class(attr.local_simpletype.base)
-    else
-      nil
-    end
-  end
-
-  def basetype_class(type)
-    return nil if type.nil?
-    if simpletype = @simpletypes[type]
-      basetype_mapped_class(simpletype.base)
-    else
-      basetype_mapped_class(type)
-    end
-  end
-
-  def define_attribute(c, attributes)
-    const = {}
@@ -385 +356 @@
-  end
-
-  def name_element(element)
-    return element.name if element.name 
-    return element.ref if element.ref
-    raise RuntimeError.new("cannot define name of #{element}")
-  end
-
-  def name_attribute(attribute)
-    return attribute.name if attribute.name 
-    return attribute.ref if attribute.ref
-    raise RuntimeError.new("cannot define name of #{attribute}")
-  end
-
-  def dump_arraydef(qname, complextype)
-    classname = create_class_name(qname)
@@ -403 +362 @@
-    c.comment = "#{qname}"
-    c.dump
-  end
-
-  def check_classname(classname)
-    if @modulepath.nil? and Object.constants.include?(classname)
-      warn("created definition re-opens an existing toplevel class: #{classname}")
-    end
-  end
-

trunk/lib/wsdl/soap/classDefCreatorSupport.rb

@@ -17 +17 @@
-
-
-
+, @simpletypes,
-module ClassDefCreatorSupport
-  include XSD::CodeGen::GenSupport
@@ -192 +192 @@
-    }.join("\n")
-  end
+
+  def element_basetype(ele)
+    if klass = basetype_class(ele.type)
+      klass
+    elsif ele.local_simpletype
+      basetype_class(ele.local_simpletype.base)
+    else
+      nil
+    end
+  end
+
+  def attribute_basetype(attr)
+    if klass = basetype_class(attr.type)
+      klass
+    elsif attr.local_simpletype
+      basetype_class(attr.local_simpletype.base)
+    else
+      nil
+    end
+  end
+
+  def basetype_class(type)
+    return nil if type.nil?
+    if simpletype = @simpletypes[type]
+      basetype_mapped_class(simpletype.base)
+    else
+      basetype_mapped_class(type)
+    end
+  end
+
+  def name_element(element)
+    return element.name if element.name 
+    return element.ref if element.ref
+    raise RuntimeError.new("cannot define name of #{element}")
+  end
+
+  def name_attribute(attribute)
+    return attribute.name if attribute.name 
+    return attribute.ref if attribute.ref
+    raise RuntimeError.new("cannot define name of #{attribute}")
+  end
+
+  def check_classname(classname)
+    if @modulepath.nil? and Object.constants.include?(classname)
+      warn("created definition re-opens an existing toplevel class: #{classname}")
+    end
+  end
-end
-

trunk/lib/wsdl/soap/mappingRegistryCreatorSupport.rb

@@ -118 +118 @@
-  end
-
-  def element_basetype(ele)
-    if klass = basetype_class(ele.type)
-      klass
-    elsif ele.local_simpletype
-      basetype_class(ele.local_simpletype.base)
-    else
-      nil
-    end
-  end
-
-  def attribute_basetype(attr)
-    if klass = basetype_class(attr.type)
-      klass
-    elsif attr.local_simpletype
-      basetype_class(attr.local_simpletype.base)
-    else
-      nil
-    end
-  end
-
-  def basetype_class(type)
-    return nil if type.nil?
-    if simpletype = @simpletypes[type]
-      basetype_mapped_class(simpletype.base)
-    else
-      basetype_mapped_class(type)
-    end
-  end
-
-  def define_attribute(attributes)
-    schema_attribute = []
@@ -165 +136 @@
-      }.join(",\n    ") +
-    "\n  }"
-  end
-
-  def name_element(element)
-    return element.name if element.name 
-    return element.ref if element.ref
-    raise RuntimeError.new("cannot define name of #{element}")
-  end
-
-  def name_attribute(attribute)
-    return attribute.name if attribute.name 
-    return attribute.ref if attribute.ref
-    raise RuntimeError.new("cannot define name of #{attribute}")
-  end
-