From fa59477c020267fdfbc7182cc98014e8d33a85b0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 27 May 2010 19:12:55 +0200 Subject: [PATCH] Make LED pattern an abstract class, abstract parse and dump methods --- src/led-pattern-rx44.vala | 4 ++-- src/led-pattern-rx51.vala | 4 ++-- src/led-pattern.vala | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/led-pattern-rx44.vala b/src/led-pattern-rx44.vala index 93244ee..5b9554c 100644 --- a/src/led-pattern-rx44.vala +++ b/src/led-pattern-rx44.vala @@ -21,7 +21,7 @@ class LedPatternRX44 : LedPattern { public List engine_g; public List engine_b; - public bool parse (string line) { + public override bool parse (string line) { string[] key_value = line.split ("="); if (key_value.length != 2) { @@ -71,7 +71,7 @@ class LedPatternRX44 : LedPattern { return list; } - public string dump () { + public override string dump () { return "%s=%d;%d;%d;%s;%s;%s".printf (name, priority, screen_on, timeout, dump_pattern (engine_r), dump_pattern (engine_g), dump_pattern (engine_b)); } diff --git a/src/led-pattern-rx51.vala b/src/led-pattern-rx51.vala index 2c62e92..1518c4b 100644 --- a/src/led-pattern-rx51.vala +++ b/src/led-pattern-rx51.vala @@ -22,7 +22,7 @@ class LedPatternRX51 : LedPattern { public List engine1; public List engine2; - public bool parse (string line) { + public override bool parse (string line) { string[] key_value = line.split ("="); if (key_value.length != 2) { @@ -96,7 +96,7 @@ class LedPatternRX51 : LedPattern { return list; } - public string dump () { + public override string dump () { return "%s=%d;%d;%d;%s;%s;%s".printf (name, priority, screen_on, timeout, dump_led_map (), dump_pattern (engine1), dump_pattern (engine2)); } diff --git a/src/led-pattern.vala b/src/led-pattern.vala index de4e393..4f9b196 100644 --- a/src/led-pattern.vala +++ b/src/led-pattern.vala @@ -16,7 +16,7 @@ * along with LED Pattern Editor. If not, see . */ -class LedPattern : Object { +abstract class LedPattern : Object { enum ScreenOn { DISPLAY_OFF = 0, DISPLAY_ON = 1, @@ -33,6 +33,9 @@ class LedPattern : Object { public double duration; + public abstract string dump (); + public abstract bool parse (string line); + public signal void changed (); } -- 1.7.9.5