calculator & benitlux: remove obsolete explicit observer declaration

[nit.git] / examples / calculator / src / calculator.nit

diff --git a/examples/calculator/src/calculator.nit b/examples/calculator/src/calculator.nit
index 2cc50ec..3b89ec7 100644 (file)
--- a/examples/calculator/src/calculator.nit
+++ b/examples/calculator/src/calculator.nit
@@ -14,7 +14,7 @@
 
 # Portable calculator UI
 module calculator is
-app_name "app.nit Calc."
+       app_name "app.nit Calc."
        app_version(0, 1, git_revision)
        app_namespace "org.nitlanguage.calculator"
 
@@ -24,15 +24,21 @@ app_name "app.nit Calc."
 end
 
 import app::ui
+import app::data_store
 import android::aware
 
 import calculator_logic
 
+# Show debug output?
+fun debug: Bool do return false
+
 redef class App
        redef fun on_create
        do
+               if debug then print "App::on_create"
+
                # Create the main window
-               window = new CalculatorWindow
+               push_window new CalculatorWindow
                super
        end
 end
@@ -45,21 +51,23 @@ class CalculatorWindow
        private var context = new CalculatorContext
 
        # Main window layout
-       private var layout = new VerticalLayout(parent=self)
+       var layout = new VerticalLayout(parent=self)
 
        # Main display, at the top of the screen
        private var display = new TextInput(parent=layout)
 
        # Maps operators as `String` to their `Button`
-       private var buttons = new HashMap[String, Button]
+       var buttons = new HashMap[String, Button]
 
        init
        do
+               if debug then print "CalculatorWindow::init"
+
                # All the button labels, row by row
                var rows = [["7", "8", "9", "+"],
                            ["4", "5", "6", "-"],
-                           ["1", "2", "3", "*"],
-                           ["0", ".", "C", "/"],
+                           ["1", "2", "3", "×"],
+                           ["0", ".", "C", "÷"],
                            ["="]]
 
                for row in rows do
@@ -67,7 +75,6 @@ class CalculatorWindow
 
                        for op in row do
                                var but = new Button(parent=row_layout, text=op)
-                               but.observers.add self
                                buttons[op] = but
                        end
                end
@@ -75,6 +82,8 @@ class CalculatorWindow
 
        redef fun on_event(event)
        do
+               if debug then print "CalculatorWindow::on_event {event}"
+
                if event isa ButtonPressEvent then
 
                        var op = event.sender.text
@@ -84,12 +93,33 @@ class CalculatorWindow
                        else if op.is_numeric then
                                var n = op.to_i
                                context.push_digit n
-                       else
+                       else if op != null then
                                buttons["."].enabled = true
-                               context.push_op op.chars.first
+                               context.push_op op
                        end
 
                        display.text = context.display_text
                end
        end
+
+       redef fun on_save_state
+       do
+               if debug then print "CalculatorWindow::on_save_state"
+
+               app.data_store["context"] = context
+               super
+       end
+
+       redef fun on_restore_state
+       do
+               if debug then print "CalculatorWindow::on_restore_state"
+
+               super
+
+               var context = app.data_store["context"]
+               if not context isa CalculatorContext then return
+
+               self.context = context
+               display.text = context.display_text
+       end
 end