Added a few missing 'protected' keywords.

diff --git a/ChangeLog b/ChangeLog
index 9c7f873b09e24148b5922199aa02fd63fe00febe..cd311900f7647e87c3a013e568f8711617b8525c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 --
-$Id: ChangeLog 27 2005-04-14 19:47:06Z tilman $
+$Id: ChangeLog 28 2005-04-14 19:53:45Z tilman $
 ++
 
 2005-04-14 Tilman Sauerbeck (tilman at code-monkey de)
@@ -8,6 +8,8 @@ $Id: ChangeLog 27 2005-04-14 19:47:06Z tilman $
         * lib/part.rb: Code cleanup
         * lib/part.rb: Fixed the regular expression that checks
           whether a font name is actually a filename
+        * lib/{redact,part,program}.rb: Added a few missing "protected" 
+          statements
 
 2005-04-09 Tilman Sauerbeck (tilman at code-monkey de)
         * test/crossfade.rb: Updated for recent tween mode fixes

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index cbf1b6a8fdae702fd43d1c49654dc7e32f5d100b..e052540ad5e91628a6115735c4c36d68c2d5068e 100644 (file)
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 27 2005-04-14 19:47:06Z tilman $
+# $Id: part.rb 28 2005-04-14 19:53:45Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -386,6 +386,7 @@ module Redact
                        @id = image.id
                end
 
+               protected
                def to_eet_name
                        "Edje_Part_Image_Id"
                end
@@ -444,6 +445,7 @@ module Redact
                        @border = [r, r, t, b]
                end
 
+               protected
                def to_eet_properties
                        super.merge!(
                        {"image.id" => [@image.nil? ? -1 : @image.id],
@@ -528,6 +530,7 @@ module Redact
                        @shadow_color = parse_hex_color(c)
                end
 
+               protected
                def to_eet_properties
                        super.merge!(
                        {"color2.r" => [@outline_color[0], :char],

diff --git a/lib/redact/program.rb b/lib/redact/program.rb
index bde0c030b43fc8b4682ad559382d463e8d67842a..a77536748aab2b036a9729dd6e33977d29acef77 100644 (file)
--- a/lib/redact/program.rb
+++ b/lib/redact/program.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: program.rb 25 2005-04-14 19:42:06Z tilman $
+# $Id: program.rb 28 2005-04-14 19:53:45Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -84,6 +84,7 @@ module Redact
                        @in_range = v
                end
 
+               protected
                def to_eet_name
                        "Edje_Program"
                end
@@ -139,6 +140,7 @@ module Redact
                        @time = v
                end
 
+               protected
                def to_eet_properties
                        mode = case @mode
                        when :linear: 1
@@ -166,6 +168,7 @@ module Redact
                        @targets = ProgramArgs.new(collection)
                end
 
+               protected
                def to_eet_properties
                        super.merge!({"targets" => [@targets]})
                end
@@ -190,6 +193,7 @@ module Redact
                        @emission_source = v.to_str.dup
                end
 
+               protected
                def to_eet_properties
                        super.merge!(
                        {"state" => [@emission_signal],
@@ -236,18 +240,21 @@ module Redact
                        @id = v.id
                end
 
+               protected
                def to_eet_properties
                        {"id" => [@id]}
                end
        end
 
        class ProgramAfter < ProgramArg
+               protected
                def to_eet_name
                        "Edje_Program_After"
                end
        end
 
        class ProgramTarget < ProgramArg
+               protected
                def to_eet_name
                        "Edje_Program_Target"
                end

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 260f34208c31afa73de7d7a2613406ac43c1b91b..7417c92467e21f01a934369056c97716e7b4d10d 100644 (file)
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 25 2005-04-14 19:42:06Z tilman $
+# $Id: redact.rb 28 2005-04-14 19:53:45Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -90,6 +90,7 @@ module Redact
                        block_given? ? (yield c) : c
                end
 
+               protected
                def to_eet_name
                        "Edje_File"
                end
@@ -123,12 +124,14 @@ module Redact
                        @value = value.to_str.dup.freeze
                end
 
+               protected
                def to_eet_name
                        "Edje_Data"
                end
        end
 
        class FontDirectory < Array # :nodoc:
+               protected
                def to_eet_name
                        "Edje_Font_Directory"
                end
@@ -145,6 +148,7 @@ module Redact
                        @filename = filename.to_str.dup.freeze
                end
 
+               protected
                def to_eet_name
                        "Edje_Font_Directory_Entry"
                end
@@ -161,6 +165,7 @@ module Redact
                        entry.id = size - 1
                end
 
+               protected
                def to_eet_name
                        "Edje_Image_Directory"
                end
@@ -191,6 +196,7 @@ module Redact
                        end
                end
 
+               protected
                def to_eet_name
                        "Edje_Image_Directory_Entry"
                end
@@ -204,6 +210,7 @@ module Redact
        end
 
        class CollectionDirectory < Array # :nodoc:
+               protected
                def to_eet_name
                        "Edje_Part_Collection_Directory"
                end
@@ -219,6 +226,7 @@ module Redact
                        @id = col.id
                end
 
+               protected
                def to_eet_name
                        "Edje_Part_Collection_Directory_Entry"
                end
@@ -326,6 +334,7 @@ module Redact
                        end
                end
 
+               protected
                def to_eet_name
                        "Edje_Part_Collection"
                end