From e6589624744430b826a27a71e3d4894516969fb3 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Thu, 14 Apr 2005 19:53:45 +0000 Subject: [PATCH] Added a few missing 'protected' keywords. --- ChangeLog | 4 +++- lib/redact/part.rb | 5 ++++- lib/redact/program.rb | 9 ++++++++- lib/redact/redact.rb | 11 ++++++++++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c7f873..cd31190 100644 --- 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 cbf1b6a..e052540 100644 --- 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 bde0c03..a775367 100644 --- 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 260f342..7417c92 100644 --- 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 -- 2.30.2