Changeset 28884

Timestamp:

01/23/09 11:12:58 (4 years ago)

Author:

isaisstillalive

Message:

• new内にごちゃごちゃ書くのはどうかと思ったけどinitializeにまとめられたので、factoryクラスメソッドからnewに戻した。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/component.rb (modified) (1 diff)
• lib/ruwin/control.rb (modified) (1 diff)
• lib/ruwin/window.rb (modified) (2 diffs)
• test/ruwin/test_component.rb (modified) (7 diffs)
• test/ruwin/test_control.rb (modified) (1 diff)

lang/ruby/ruwin/lib/ruwin/component.rb

@@ -22 +22 @@
     
     class << self
-      def factory parent = nil
+      def new parent = nil
         Factory.newwindow(parent, self)
       end

lang/ruby/ruwin/lib/ruwin/control.rb

@@ -6 +6 @@
     class << self
       def new parent
-        factory parent
+        super
       end
       

lang/ruby/ruwin/lib/ruwin/window.rb

@@ -17 +17 @@
       
       self.class.instance_variable_get(:@controls).each do |name, klass|
-        control = klass.factory self
+        control = klass.new self
         @controls[control.hWnd] = [name, control]
         instance_variable_set :"@#{name}", control
@@ -27 +27 @@
     @controls = {}
     class << self
-      def new
-        factory
-      end
-      
       def add_control klass, name, *args, &block
         @controls[name] = klass.inherit(name, *args, &block)

lang/ruby/ruwin/test/ruwin/test_component.rb

@@ -15 +15 @@
     assert_equal 2, klass.test_pro
     
-    instance = klass.factory
+    instance = klass.new
     assert_equal 2, instance.instance_variable_get(:@proparty)[:test_pro]
     assert_respond_to instance, :test_pro
@@ -88 +88 @@
   
   
-  def test_factory
+  def test_new
     klass = Class.new(Ruwin::Component)
-    instance = klass.factory
+    instance = klass.new
     assert_equal WS_CLIPSIBLINGS,     instance.style&WS_CLIPSIBLINGS
     assert_equal WS_OVERLAPPEDWINDOW, instance.style&WS_OVERLAPPEDWINDOW
   end
   
-  def test_factory_defined_const
+  def test_new_defined_const
     klass = Class.new(Ruwin::Component)
     klass.class_eval <<-'END'
@@ -102 +102 @@
       EXSTYLE = 2
     END
-    instance = klass.factory
+    instance = klass.new
     assert_equal "BUTTON", instance.classname
     assert_equal 1, instance.style&1
@@ -117 +117 @@
       exstyle   8
     END
-    instance = klass.factory
+    instance = klass.new
     assert_equal "caption", instance.caption
     assert_equal 4, instance.style&4
@@ -126 +126 @@
   
   def test_send_message_with_error_code
-    instance = Ruwin::Component.factory
+    instance = Ruwin::Component.new
     def instance.sendMessage *args
       :returned
@@ -134 +134 @@
   
   def test_send_message_with_error_code_returned_error_code
-    instance = Ruwin::Component.factory
+    instance = Ruwin::Component.new
     def instance.sendMessage *args
       :error_code
@@ -142 +142 @@
   
   def test_draw_bundling
-    instance = Ruwin::Component.factory
+    instance = Ruwin::Component.new
     instance.instance_variable_set :@messages, []
     class << instance

lang/ruby/ruwin/test/ruwin/test_control.rb

@@ -16 +16 @@
   def test_new
     klass = Class.new(Ruwin::Control)
-    window = Ruwin::Component.factory
+    window = Ruwin::Component.new
     instance = klass.new(window)
     assert_equal 0,                   instance.style&WS_CLIPSIBLINGS