gvcsfx 0.4.1 → 0.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/handlers/notification.rb +4 -4
- data/handlers/workspace.rb +34 -30
- data/lib/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ecc25d6eb16fdc872ee27d75c9069ae9d9956d7970b40828c32b7121c81c9e7d
|
4
|
+
data.tar.gz: 578403f721765e316ffc880bd517aceda7cd76d20444470668b28c6d3fa48fcf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0b77876fd3020cd65645ee9b0f44ea83ddd0fbdb827e2cd4421a89f590505d90153a3dfbc3f81bd7b9ee68c02c74ab51b256a3322f6338cdeabaa472aec5a274
|
7
|
+
data.tar.gz: 210e309fecd2fe9b01a8c87621c5fd2469d8b9f46f1391c3f2f421ced0dcfe8e8cf21d14f3cd9262f50e598133cc56e3e98a172243c1407ec7dffb61c571092a
|
data/handlers/notification.rb
CHANGED
@@ -74,7 +74,7 @@ module GvcsFx
|
|
74
74
|
if inside_jar?
|
75
75
|
@errImg = javafx.scene.image.Image.new(java.lang.Object.new.java_class.resource("/gvcsfx/res/cross.png").to_s)
|
76
76
|
else
|
77
|
-
@errImg = javafx.scene.image.Image.new("res/cross.png")
|
77
|
+
@errImg = javafx.scene.image.Image.new(File.join("file://",File.dirname(__FILE__),"..","res/cross.png"))
|
78
78
|
end
|
79
79
|
end
|
80
80
|
@errImg
|
@@ -83,7 +83,7 @@ module GvcsFx
|
|
83
83
|
if inside_jar?
|
84
84
|
@warnImg = javafx.scene.image.Image.new(java.lang.Object.new.java_class.resource("/gvcsfx/res/warn.png").to_s)
|
85
85
|
else
|
86
|
-
@warnImg = javafx.scene.image.Image.new("res/warn.png")
|
86
|
+
@warnImg = javafx.scene.image.Image.new(File.join("file://",File.dirname(__FILE__),"..","res/warn.png"))
|
87
87
|
end
|
88
88
|
end
|
89
89
|
@warnImg
|
@@ -92,7 +92,7 @@ module GvcsFx
|
|
92
92
|
if inside_jar?
|
93
93
|
@sucImg = javafx.scene.image.Image.new(java.lang.Object.new.java_class.resource("/gvcsfx/res/tick.png").to_s)
|
94
94
|
else
|
95
|
-
@sucImg = javafx.scene.image.Image.new("res/tick.png")
|
95
|
+
@sucImg = javafx.scene.image.Image.new(File.join("file://",File.dirname(__FILE__),"..","res/tick.png"))
|
96
96
|
end
|
97
97
|
end
|
98
98
|
@sucImg
|
@@ -101,7 +101,7 @@ module GvcsFx
|
|
101
101
|
if inside_jar?
|
102
102
|
@infoImg = javafx.scene.image.Image.new(java.lang.Object.new.java_class.resource("/gvcsfx/res/world.png").to_s)
|
103
103
|
else
|
104
|
-
@infoImg = javafx.scene.image.Image.new("res/world.png")
|
104
|
+
@infoImg = javafx.scene.image.Image.new(File.join("file://",File.dirname(__FILE__),"..","res/world.png"))
|
105
105
|
end
|
106
106
|
end
|
107
107
|
@infoImg
|
data/handlers/workspace.rb
CHANGED
@@ -345,46 +345,50 @@ module GvcsFx
|
|
345
345
|
dc.title = "Select VCS Workspace"
|
346
346
|
wsDir = dc.showDialog(main_stage)
|
347
347
|
|
348
|
-
@txtWorkspacePath.text = wsDir.absolute_path
|
348
|
+
@txtWorkspacePath.text = wsDir.absolute_path if not_empty?(wsDir)
|
349
349
|
end
|
350
350
|
|
351
351
|
private
|
352
352
|
def dnd_dropped(evt)
|
353
353
|
f = evt.dragboard.files
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
354
|
+
if not_empty?(f)
|
355
|
+
|
356
|
+
vcs = Gvcs::Vcs.new
|
357
|
+
ws = []
|
358
|
+
nws = []
|
359
|
+
f.each do |ff|
|
360
|
+
log_debug "Checking drop in path '#{ff.absolute_path}'"
|
361
|
+
st, path = Gvcs::Workspace.new(vcs, ff.absolute_path).workspace_root
|
362
|
+
if st
|
363
|
+
# workspace!
|
364
|
+
ws << path.strip
|
365
|
+
else
|
366
|
+
# not a workspace
|
367
|
+
nws << ff.absolute_path
|
368
|
+
end
|
366
369
|
end
|
367
|
-
end
|
368
|
-
|
369
|
-
ws.each do |w|
|
370
|
-
log_debug "Adding workspace '#{w}'"
|
371
|
-
add_workspace(w)
|
372
|
-
set_success_gmsg("Workspace '#{w}' added to list")
|
373
|
-
end
|
374
370
|
|
375
|
-
|
376
|
-
|
377
|
-
log_debug "Adding non workspace '#{w}'"
|
378
|
-
st, res = vcs.init(w)
|
379
|
-
if st
|
371
|
+
ws.each do |w|
|
372
|
+
log_debug "Adding workspace '#{w}'"
|
380
373
|
add_workspace(w)
|
381
|
-
set_success_gmsg("
|
382
|
-
|
383
|
-
|
374
|
+
set_success_gmsg("Workspace '#{w}' added to list")
|
375
|
+
end
|
376
|
+
|
377
|
+
failed = { }
|
378
|
+
nws.each do |w|
|
379
|
+
log_debug "Adding non workspace '#{w}'"
|
380
|
+
st, res = vcs.init(w)
|
381
|
+
if st
|
382
|
+
add_workspace(w)
|
383
|
+
set_success_gmsg("Non-workspace '#{w}' added to list")
|
384
|
+
else
|
385
|
+
failed[w] = res
|
386
|
+
end
|
384
387
|
end
|
385
|
-
end
|
386
388
|
|
387
|
-
|
389
|
+
raise_event(Listener::Event[:workspace_added])
|
390
|
+
|
391
|
+
end
|
388
392
|
|
389
393
|
end # dnd_dropped
|
390
394
|
|
data/lib/version.rb
CHANGED