gvcsfx 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc9dfedb147aba08f274132c94b9afbdbfc828bb336356d4e7f27a0ad7e04d26
-  data.tar.gz: 8fdf22ff5966fe94aad69c19645591cad65fc6c15d32e3827fc36d9d4c137824
+  metadata.gz: ecc25d6eb16fdc872ee27d75c9069ae9d9956d7970b40828c32b7121c81c9e7d
+  data.tar.gz: 578403f721765e316ffc880bd517aceda7cd76d20444470668b28c6d3fa48fcf
 SHA512:
-  metadata.gz: 8bd07cf9a98d3f2b1c8aba45d0b6906f4e799985aee4bf08779f428f56602b1c5430a7b666495e7580b035ad88d805e3e31e86784570c6def22bc2254b86c5ce
-  data.tar.gz: 795797b2162400a444c7ae32c65799fb39561375e4238c6f7c7132437e6dbd9b991cf599114b1fbadc55ed0912d00f1036cb24475bb91ef4b4041125570797ad
+  metadata.gz: 0b77876fd3020cd65645ee9b0f44ea83ddd0fbdb827e2cd4421a89f590505d90153a3dfbc3f81bd7b9ee68c02c74ab51b256a3322f6338cdeabaa472aec5a274
+  data.tar.gz: 210e309fecd2fe9b01a8c87621c5fd2469d8b9f46f1391c3f2f421ced0dcfe8e8cf21d14f3cd9262f50e598133cc56e3e98a172243c1407ec7dffb61c571092a

data/handlers/notification.rb

@@ -74,7 +74,7 @@ module GvcsFx
           if inside_jar?
             @errImg = javafx.scene.image.Image.new(java.lang.Object.new.java_class.resource("/gvcsfx/res/cross.png").to_s)
           else
-            @errImg = javafx.scene.image.Image.new("res/cross.png")
+            @errImg = javafx.scene.image.Image.new(File.join("file://",File.dirname(__FILE__),"..","res/cross.png"))
           end
         end
         @errImg
@@ -83,7 +83,7 @@ module GvcsFx
           if inside_jar?
             @warnImg = javafx.scene.image.Image.new(java.lang.Object.new.java_class.resource("/gvcsfx/res/warn.png").to_s)
           else
-            @warnImg = javafx.scene.image.Image.new("res/warn.png")
+            @warnImg = javafx.scene.image.Image.new(File.join("file://",File.dirname(__FILE__),"..","res/warn.png"))
           end
         end
         @warnImg
@@ -92,7 +92,7 @@ module GvcsFx
           if inside_jar?
             @sucImg = javafx.scene.image.Image.new(java.lang.Object.new.java_class.resource("/gvcsfx/res/tick.png").to_s)
           else
-            @sucImg = javafx.scene.image.Image.new("res/tick.png")
+            @sucImg = javafx.scene.image.Image.new(File.join("file://",File.dirname(__FILE__),"..","res/tick.png"))
           end
         end
         @sucImg
@@ -101,7 +101,7 @@ module GvcsFx
           if inside_jar?
             @infoImg = javafx.scene.image.Image.new(java.lang.Object.new.java_class.resource("/gvcsfx/res/world.png").to_s)
           else
-            @infoImg = javafx.scene.image.Image.new("res/world.png")
+            @infoImg = javafx.scene.image.Image.new(File.join("file://",File.dirname(__FILE__),"..","res/world.png"))
           end
         end
         @infoImg

data/handlers/workspace.rb

@@ -345,46 +345,50 @@ module GvcsFx
       dc.title = "Select VCS Workspace"
       wsDir = dc.showDialog(main_stage)
 
-      @txtWorkspacePath.text = wsDir.absolute_path
+      @txtWorkspacePath.text = wsDir.absolute_path if not_empty?(wsDir)
     end
 
     private
     def dnd_dropped(evt)
       f = evt.dragboard.files
-      vcs = Gvcs::Vcs.new
-      ws = []
-      nws = []
-      f.each do |ff|
-        log_debug "Checking drop in path '#{ff.absolute_path}'"
-        st, path = Gvcs::Workspace.new(vcs, ff.absolute_path).workspace_root
-        if st
-          # workspace!
-          ws << path.strip
-        else
-          # not a workspace
-          nws << ff.absolute_path
+      if not_empty?(f)
+
+        vcs = Gvcs::Vcs.new
+        ws = []
+        nws = []
+        f.each do |ff|
+          log_debug "Checking drop in path '#{ff.absolute_path}'"
+          st, path = Gvcs::Workspace.new(vcs, ff.absolute_path).workspace_root
+          if st
+            # workspace!
+            ws << path.strip
+          else
+            # not a workspace
+            nws << ff.absolute_path
+          end
         end
-      end
-
-      ws.each do |w|
-        log_debug "Adding workspace '#{w}'"
-        add_workspace(w)
-        set_success_gmsg("Workspace '#{w}' added to list")
-      end 
 
-      failed = { }
-      nws.each do |w|
-        log_debug "Adding non workspace '#{w}'"
-        st, res = vcs.init(w)  
-        if st
+        ws.each do |w|
+          log_debug "Adding workspace '#{w}'"
           add_workspace(w)
-          set_success_gmsg("Non-workspace '#{w}' added to list")
-        else
-          failed[w] = res
+          set_success_gmsg("Workspace '#{w}' added to list")
+        end 
+
+        failed = { }
+        nws.each do |w|
+          log_debug "Adding non workspace '#{w}'"
+          st, res = vcs.init(w)  
+          if st
+            add_workspace(w)
+            set_success_gmsg("Non-workspace '#{w}' added to list")
+          else
+            failed[w] = res
+          end
         end
-      end
 
-      raise_event(Listener::Event[:workspace_added])
+        raise_event(Listener::Event[:workspace_added])
+
+      end
 
     end # dnd_dropped
 

data/lib/version.rb

@@ -17,5 +17,5 @@
 
 
 module GvcsFx
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gvcsfx
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Chris