Merge pull request #833 from Yakindu/issue_832

#832: Fixed NPE for update case. Added icons to build.properties.
itemisCREATE · Jul 14, 2016 · 60f80e4 · 60f80e4
2 parents 62555a3 + 356b35b
commit 60f80e4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/plugins/org.yakindu.sct.examples.wizard/build.properties b/plugins/org.yakindu.sct.examples.wizard/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               icons/
diff --git a/...wizard/src/org/yakindu/sct/examples/wizard/service/git/EclipseGitProgressTransformer.java b/...wizard/src/org/yakindu/sct/examples/wizard/service/git/EclipseGitProgressTransformer.java
@@ -31,6 +31,7 @@ public EclipseGitProgressTransformer(final IProgressMonitor eclipseMonitor) {
 
 	@Override
 	public void start(final int totalTasks) {
+		// the number of sub tasks is 5 in case of a download operation, but we are always called with totalTasks=2
 		mainTask = SubMonitor.convert(root, 5);
 	}
 
@@ -40,7 +41,13 @@ public void beginTask(final String name, final int total) {
 		lastWorked = 0;
 		totalWork = total;
 
-		SubMonitor sub = mainTask.newChild(1);
+		SubMonitor sub;
+		if (mainTask != null) {
+			// fork a new child from main task to have accumulated progress bar update
+			sub = mainTask.newChild(1);
+		} else {
+			sub = SubMonitor.convert(root);
+		}
 
 		if (totalWork == UNKNOWN) {
 			subTask = SubMonitor.convert(sub, IProgressMonitor.UNKNOWN);