X-Git-Url: http://git.code-monkey.de/?p=redact.git;a=blobdiff_plain;f=lib%2Fredact%2Fpart.rb;h=b1b99786a179513975f302b1d6f17b9272b6c1df;hp=4d6cf9f5e410f230580bb7c40cec08c1dea2b71d;hb=04b09aeb9b490ef5f1dcf2e4aa04f7d5cc766752;hpb=e9365708ca242a2f4104adcd9551743b505894f8

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index 4d6cf9f..b1b9978 100644
--- 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