VanaClock 1.0.2 → 1.0.3

data/VanaClock.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Vanaclock-1.0.2
+# Gem::Specification for Vanaclock-1.0.3
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{VanaClock}
-  s.version = "1.0.2"
-  s.date = %q{2007-09-08}
+  s.version = "1.0.3"
+  s.date = %q{2007-09-20}
   s.summary = %q{VanaClock is a clock for Final Fantasy Online written in jruby and java swing. JRuby is required to run this clock.}
   s.email = %q{ttilley@gmail.com}
   s.homepage = %q{http://vanatime.rubyforge.org/}
@@ -16,19 +16,19 @@ Gem::Specification.new do |s|
   s.authors = ["Travis Tilley"]
   s.files = ["README", "Manifest", "LICENSE", "lib/vana_clock.rb", "CHANGELOG", "bin/VanaClock", "VanaClock.gemspec"]
   s.executables = ["VanaClock"]
-  s.add_dependency(%q<VanaTime>, [">= 2.0.0"])
+  s.add_dependency(%q<VanaTime>, [">= 2.1.0"])
 end
 
 
 # # Original Rakefile source (requires the Echoe gem):
 # 
-# version = "1.0.2"
+# version = "1.0.3"
 # 
 # ENV['RUBY_FLAGS'] = ""
 # 
 # begin
 #   require 'rubygems'
-#   gem 'echoe', '=2.3'
+#   gem 'echoe', '=2.4'
 #   require 'echoe'
 # 
 #   Echoe.new('VanaClock', version) do |p|
@@ -38,7 +38,7 @@ end
 #     p.url = "http://vanatime.rubyforge.org/"
 #     p.author = 'Travis Tilley'
 #     p.email = "ttilley@gmail.com"
-#     p.dependencies = ["VanaTime >=2.0.0"]
+#     p.dependencies = ["VanaTime >=2.1.0"]
 #   end
 # 
 # rescue LoadError => boom

data/lib/vana_clock.rb

@@ -27,7 +27,7 @@ module VanaClock
       @clock = clock
     end
     def actionPerformed(event)
-      @clock.time_manager.earth_time=(Time.now)
+      @clock.time_manager.update_earth_time(Time.now)
     end
   end
 
@@ -163,54 +163,49 @@ module VanaClock
       clock_window.getContentPane.add clock_container
 
       # create the procs that update UI elements
-      on_second = lambda do |time|
-        @vana_time.setText time.to_s
-        @earth_time.setText time.earth_time.to_s
+      on_time_string = lambda do |m,o,n|
+        @vana_time.setText "#{m.time.date_string} #{n}"
       end
-      on_day = lambda do |day|
-        @vana_day.setText day.to_s
+      on_earth_time = lambda do |m,o,n|
+        @earth_time.setText n.to_s
       end
-      on_moon_percent = lambda do |moon|
-        @moon_percent.setText moon.percent
+      on_day_string = lambda do |m,o,n|
+        @vana_day.setText n
       end
-      on_moon_phase = lambda do |moon|
-        @phase_name.setText moon.phase
-        @next_phase_name.setText moon.next_phase
+      on_moon_percent_string = lambda do |m,o,n|
+        @moon_percent.setText n
       end
-      on_optimal_phase = lambda do |moon|
-        @optimal_phase_name.setText moon.optimal_phase
+      on_moon_phase_name = lambda do |m,o,n|
+        @phase_name.setText n
       end
-      on_phase_count = lambda do |countdown|
-        @next_phase_countdown.setText countdown.to_next
+      on_next_phase_name = lambda do |m,o,n|
+        @next_phase_name.setText n
       end
-      on_optimal_count = lambda do |countdown|
-        @optimal_phase_countdown.setText countdown.to_optimal
+      on_optimal_phase = lambda do |m,o,n|
+        @optimal_phase_name.setText n
       end
-
-      # create time, day, and moon objects
-      vt = FFXI::VanaTime.now
-      vd = FFXI::VanaDay.new(vt)
-      vm = FFXI::VanaMoon.new(vt.earth_time)
-
-      # draw the UI
-      on_second.call vt
-      on_day.call vd
-      on_moon_percent.call vm
-      on_moon_phase.call vm
-      on_optimal_phase.call vm
-
-      # manage the above
+      on_phase_count = lambda do |m,o,n|
+        @next_phase_countdown.setText n
+      end
+      on_optimal_count = lambda do |m,o,n|
+        @optimal_phase_countdown.setText n
+      end
+      
+      # set up the time manager
       @time_manager = FFXI::TimeManager.new
-      @time_manager.manage(vt, vd, vm)
-
-      # register callbacks
-      @time_manager.callback_proc(MS_SECOND, on_second)
-      @time_manager.callback_proc("day", on_day)
-      @time_manager.callback_proc("moon_percent", on_moon_percent)
-      @time_manager.callback_proc("moon_phase", on_moon_phase)
-      @time_manager.callback_proc("next_optimal_phase", on_optimal_phase)
-      @time_manager.callback_proc("next_phase_countdown", on_phase_count)
-      @time_manager.callback_proc("optimal_phase_countdown", on_optimal_count)
+      @time_manager.callback(:time_string, on_time_string)
+      @time_manager.callback(:earth_time, on_earth_time)
+      @time_manager.callback(:day_string, on_day_string)
+      @time_manager.callback(:moon_percent_string, on_moon_percent_string)
+      @time_manager.callback(:moon_phase_name, on_moon_phase_name)
+      @time_manager.callback(:next_phase_name, on_next_phase_name)
+      @time_manager.callback(:optimal_phase_name, on_optimal_phase)
+      @time_manager.callback(:next_phase_countdown_string, on_phase_count)
+      @time_manager.callback(:optimal_phase_countdown_string,
+        on_optimal_count)
+      
+      # enable cascading updates and do the first update
+      @time_manager.enable_cascading_updates(Time.now)
 
       # create AbstractAction
       update_action = UpdateAction.new

metadata

@@ -1,33 +1,12 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
-name: VanaClock
-version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-09-08 00:00:00 -04:00
-summary: VanaClock is a clock for Final Fantasy Online written in jruby and java swing. JRuby is required to run this clock.
-require_paths: 
-- lib
-email: ttilley@gmail.com
+--- !ruby/object:Gem::Specification
 homepage: http://vanatime.rubyforge.org/
-rubyforge_project: vanatime
-description: VanaClock is a clock for Final Fantasy Online written in jruby and java swing. JRuby is required to run this clock.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
+extensions: []
+executables: 
+- VanaClock
+version: !ruby/object:Gem::Version
+  version: 1.0.3
 post_install_message: 
-authors: 
-- Travis Tilley
+date: 2007-09-20 04:00:00 +00:00
 files: 
 - README
 - Manifest
@@ -36,25 +15,43 @@ files:
 - CHANGELOG
 - bin/VanaClock
 - VanaClock.gemspec
-test_files: []
-
+rubygems_version: 0.9.4
 rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: 
-- VanaClock
-extensions: []
-
-requirements: []
-
+signing_key: 
+cert_chain: 
+name: VanaClock
+has_rdoc: true
+platform: ruby
+summary: VanaClock is a clock for Final Fantasy Online written in jruby and java swing.
+  JRuby is required to run this clock.
+default_executable: 
+bindir: bin
+required_ruby_version: !ruby/object:Gem::Version::Requirement
+  version: 
+  requirements: 
+  - - '>'
+    - !ruby/object:Gem::Version
+      version: 0.0.0
+require_paths: 
+- lib
+specification_version: 1
+test_files: []
 dependencies: 
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: VanaTime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
+  version_requirements: !ruby/object:Gem::Version::Requirement
     version: 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+description: VanaClock is a clock for Final Fantasy Online written in jruby and java
+  swing. JRuby is required to run this clock.
+authors: 
+- Travis Tilley
+email: ttilley@gmail.com
+extra_rdoc_files: []
+requirements: []
+rubyforge_project: vanatime
+autorequire: