Some cosmetic changes.

diff --git a/ChangeLog b/ChangeLog
index 53c95dd449b73b0142d59ce97bddfed6e7bb96d0..f93fc2f6ddd4abf73370b716c8913b5034273ae0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 --
-$Id: ChangeLog 19 2005-04-02 22:05:24Z tilman $
+$Id: ChangeLog 20 2005-04-02 22:15:29Z tilman $
 ++
 
 2005-04-03 Tilman Sauerbeck (tilman at code-monkey de)
         * lib/redact/part.rb: Made 'text_class' and 'color_class' parameters
           writable
+        * lib/redact/part.rb: Some cosmetic changes
 
 2005-04-02 Tilman Sauerbeck (tilman at code-monkey de)
         * lib/redact/part.rb: Made 'step' and 'aspect' parameters

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index 4d6cf9f5e410f230580bb7c40cec08c1dea2b71d..b1b99786a179513975f302b1d6f17b9272b6c1df 100644 (file)
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 19 2005-04-02 22:05:24Z tilman $
+# $Id: part.rb 20 2005-04-02 22:15:29Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -58,12 +58,10 @@ module Redact
                end
 
                def clip=(part)
-                       if self == part
+                       if part == self
                                raise(ArgumentError, "cannot clip part to itself")
-                       elsif part.nil?
-                               @clip = nil
-                       elsif part.collection != @collection
-                               raise(ArgumentError, "parts' collections not identical")
+                       elsif !part.nil? && part.collection != @collection
+                               raise(ArgumentError, "items not in the same collection")
                        else
                                @clip = part
                        end
@@ -178,10 +176,10 @@ module Redact
                end
 
                def confine=(part)
-                       if part == self
+                       if part == @part
                                raise(ArgumentError, "cannot confine part to itself")
                        elsif !part.nil? && part.collection != @part.collection
-                               raise(ArgumentError, "parts' collections not identical")
+                               raise(ArgumentError, "items not in the same collection")
                        else
                                @confine = part
                        end