swt 0.10 → 0.11

data/lib/swt/full.rb

@@ -43,9 +43,6 @@ module Swt
   module DND
     import org.eclipse.swt.dnd.DND
 
-    # Only load Clipboard in full running mode.
-    import org.eclipse.swt.dnd.Clipboard
-
     import org.eclipse.swt.dnd.Transfer
     import org.eclipse.swt.dnd.TextTransfer
     import org.eclipse.swt.dnd.FileTransfer

data/lib/swt/minimal.rb

@@ -4,7 +4,7 @@ require 'swt/event_loop'
 require 'swt/cucumber_runner'
 
 module Swt
-  VERSION = "0.10" # also change in swt.gemspec
+  VERSION = "0.11" # also change in swt.gemspec
   
   import org.eclipse.swt.SWT
   
@@ -48,18 +48,22 @@ module Swt
 
   # Runs the given block in the SWT Event thread
   def self.sync_exec(&block)
+    error = nil
+    result = nil
     runnable = Swt::RRunnable.new do
       begin
-        block.call
+        result = block.call
       rescue => e
-        puts "error in sync exec"
-        puts e.message
-        puts e.backtrace
+        error = e
       end
     end
     unless display.is_disposed
       display.syncExec(runnable)
+      if error
+        raise error
+      end
     end
+    result
   end
   
   # Runs the given block in the SWT Event thread after
@@ -70,14 +74,18 @@ module Swt
   end
 
   def self.display
-    if defined?(SWT_APP_NAME)
-      Swt::Widgets::Display.app_name = SWT_APP_NAME
+    @display ||= begin
+      if defined?(SWT_APP_NAME)
+        Swt::Widgets::Display.app_name = SWT_APP_NAME
+      end
+      display ||= (Swt::Widgets::Display.getCurrent || Swt::Widgets::Display.new)
+      
+      # clipboard class must be imported after the display is created
+      Swt::DND.send(:import, org.eclipse.swt.dnd.Clipboard)
+      display
     end
-    @display ||= (Swt::Widgets::Display.getCurrent || Swt::Widgets::Display.new)
   end
 
-  display # must be created before we import the Clipboard class.
-  
   def self.event_loop(&stop_condition)
     stop_conditions << stop_condition
     run_event_loop
@@ -94,15 +102,15 @@ module Swt
   def self.run_event_loop
     return if event_loop_running?
     @event_loop_running = true
-    display = Swt::Widgets::Display.current
+    this_display = display
     
     until stop_conditions.any? {|c| c[] }
-      unless display.read_and_dispatch
-        display.sleep
+      unless this_display.read_and_dispatch
+        this_display.sleep
       end
     end
     
-    display.dispose
+    this_display.dispose
   end
 end
 

data/lib/swt/swt_bot_extensions.rb

@@ -1,5 +1,5 @@
 
-module SwtbotExtensions
+module SwtBotExtensions
   def c_tab_folder
     c_tab_item.widget.parent
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swt
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-10 00:00:00.000000000 +01:00
+date: 2011-11-16 00:00:00.000000000 +00:00
 default_executable: 
 dependencies: []
 description: Includes SWT jars and imports SWT classes into Ruby.