calculator & benitlux: remove obsolete explicit observer declaration
authorAlexis Laferrière <alexis.laf@xymus.net>
Fri, 24 Jun 2016 01:20:21 +0000 (21:20 -0400)
committerAlexis Laferrière <alexis.laf@xymus.net>
Fri, 24 Jun 2016 01:21:17 +0000 (21:21 -0400)
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

contrib/benitlux/src/client/features/debug.nit
contrib/benitlux/src/client/features/push.nit
contrib/benitlux/src/client/ios.nit
contrib/benitlux/src/client/views/beer_views.nit
contrib/benitlux/src/client/views/home_views.nit
contrib/benitlux/src/client/views/social_views.nit
contrib/benitlux/src/client/views/user_views.nit
examples/calculator/src/calculator.nit
examples/calculator/src/scientific_calculator.nit

index ae7be3c..e34fcc2 100644 (file)
@@ -24,7 +24,7 @@ redef class UserWindow
        private var layout_debug = new VerticalLayout(parent=layout)
 
        private var lbl_debug_title = new Label(parent=layout_debug,
-               text="Debug options".t)
+               text="Debug options".t, size=1.5)
 
        private var but_test_notif = new Button(parent=layout_debug,
                text="Test notifications".t)
@@ -38,15 +38,6 @@ redef class UserWindow
        private var but_test_menu = new Button(parent=layout_debug,
                text="Test menu diff".t)
 
-       init
-       do
-               lbl_debug_title.size = 1.5
-
-               for c in [but_test_notif, but_test_checkin, but_test_checkout, but_test_menu] do
-                       c.observers.add self
-               end
-       end
-
        redef fun on_event(event)
        do
                super
index bbbeaea..62b8fc2 100644 (file)
@@ -180,7 +180,7 @@ redef class UserWindow
        private var layout_push_options = new VerticalLayout(parent=layout)
 
        private var lbl_push_options_title = new Label(parent=layout_push_options,
-               text="Notifications options".t)
+               text="Notifications options".t, size=1.5)
 
        private var chk_notify_on_new_beers = new CheckBox(parent=layout_push_options,
                text="Notify when there are new beers".t)
@@ -194,14 +194,9 @@ redef class UserWindow
 
        init
        do
-               lbl_push_options_title.size = 1.5
                chk_notify_on_new_beers.is_checked = app.notify_on_new_beers
                chk_notify_menu_daily.is_checked = app.notify_menu_daily
                chk_notify_on_checkins.is_checked = app.notify_on_checkins
-
-               for c in [chk_notify_menu_daily, chk_notify_on_new_beers, chk_notify_on_checkins] do
-                       c.observers.add self
-               end
        end
 
        redef fun on_event(event)
index 9601202..f8d99a2 100644 (file)
@@ -27,7 +27,6 @@ redef class HomeWindow
        do
                title = "Benitlux"
                update_checkin_text
-               checkin_button.observers.add self
        end
 
        # TODO hide when not logged in
index 2c09795..59ae555 100644 (file)
@@ -63,7 +63,6 @@ class BeerView
                for i in [1..5] do
                        var but = new StarButton(beer_info.beer, i, i <= rating, parent=l_stars)
                        but.size = 1.5
-                       but.observers.add self
                        star_buttons.add but
                end
        end
index 6834a74..d9f2483 100644 (file)
@@ -79,13 +79,6 @@ class HomeWindow
        #private var news_button = new Button(parent=news_header, text="Open website") # TODO
        private var news_label = new Label(parent=layout_news, text="Bière en cask le jeudi!")
 
-       init
-       do
-               for c in [but_login, but_preferences, beer_button, social_button] do
-                       c.observers.add self
-               end
-       end
-
        redef fun on_resume do refresh
 
        # Refresh content of this page
index b523013..f9d5b5f 100644 (file)
@@ -36,10 +36,6 @@ class SocialWindow
 
        init
        do
-               for c in [but_search, but_followed, but_followers] do
-                       c.observers.add self
-               end
-
                # Load friends and suggestions
                (new ListUsersAction(self, "rest/friends?token={app.token}&n=16")).start
        end
@@ -108,7 +104,6 @@ class PeopleView
                        # Show unfollow button if not on the home screen
                        if not home_window_mode or not user_and_following.following then
                                var but = new FollowButton(user.id, user_and_following.following, user_and_following.followed, parent=layout_top_line)
-                               but.observers.add self
                        end
                end
 
index f0ae1e5..e485d4b 100644 (file)
@@ -60,11 +60,7 @@ class UserWindow
                but_logout.enabled = app.user != null
        end
 
-       init
-       do
-               but_logout.observers.add self
-               refresh
-       end
+       init do refresh
 
        redef fun on_event(event)
        do
@@ -128,13 +124,6 @@ class SignupWindow
 
        private var but_signup = new Button(parent=layout_register, text="Signup".t)
 
-       init
-       do
-               for c in [but_login, but_signup] do
-                       c.observers.add self
-               end
-       end
-
        redef fun on_event(event)
        do
                if debug then print "BenitluxWindow::on_event {event}"
index 1d02e87..3b89ec7 100644 (file)
@@ -75,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
index c22e44e..b050aa3 100644 (file)
@@ -30,7 +30,6 @@ redef 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