added cancel button,

updated gitlib

resources/FM.xml

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<repositoryBundle>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit</repositoryDirName>
+        <url>git@10.20.90.10:cockpit.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-common</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-common.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-dashboard</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-dashboard.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-gis</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-gis.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-historization</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-historization.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-digital-pen</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-digital-pen.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-tbm</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-tbm.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-housing-industry-datamodel</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-housing-industry-datamodel.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-blue-folder</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-blue-folder.git</url>
+    </repositories>
+    <repositories>
+        <repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-all-jobs</repositoryDirName>
+        <url>git@10.20.90.10:cockpit-all-jobs.git</url>
+    </repositories>
+</repositoryBundle>

src/productliner/gui/MainApplicationWindow.java

@@ -25,6 +25,7 @@ import java.util.Properties;
 
 import javax.swing.BoxLayout;
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
@@ -64,6 +65,8 @@ public class MainApplicationWindow {
 	private JTextPaneGitLogger gitLogger;
 	private RepositoriesBundle repositoriesBundle;
 	private final List<String> repoBundles = new LinkedList<>();
+	private JButton btnCancel;
+	private SwingWorker<Void, Void> swingWorker;
 
 	/**
 	 * Launch the application.
@@ -87,7 +90,7 @@ public class MainApplicationWindow {
 
 	/**
 	 * Create the application.
-	 * 
+	 *
 	 * @param properties
 	 */
 	public MainApplicationWindow(final Properties properties) {
@@ -152,28 +155,24 @@ public class MainApplicationWindow {
 		panel_2.setLayout(new GridLayout(0, 4, 0, 0));
 
 		btnPull = new JButton("Pull");
+		btnPull.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(final ActionEvent e) {
+				handleGeneric(EGitActionType.PULL);
+			}
+		});
 		panel_2.add(btnPull);
 
 		btnStatus = new JButton("Status");
-		panel_2.add(btnStatus);
 		btnStatus.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(final ActionEvent e) {
 				handleGeneric(EGitActionType.STATUS);
 			}
 		});
+		panel_2.add(btnStatus);
 
 		btnCommit = new JButton("Commit");
-		panel_2.add(btnCommit);
-
-		btnPush = new JButton("Push");
-		panel_2.add(btnPush);
-		btnPush.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(final ActionEvent e) {
-				handleGeneric(EGitActionType.PUSH);
-			}
-		});
 		btnCommit.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(final ActionEvent e) {
@@ -183,15 +182,32 @@ public class MainApplicationWindow {
 				}
 			}
 		});
-		btnPull.addActionListener(new ActionListener() {
+		panel_2.add(btnCommit);
+
+		btnPush = new JButton("Push");
+		btnPush.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(final ActionEvent e) {
-				handleGeneric(EGitActionType.PULL);
+				handleGeneric(EGitActionType.PUSH);
+			}
+		});
+		panel_2.add(btnPush);
+
+		ImageIcon cancelIcon = new ImageIcon("resources/cancel.png");
+		btnCancel = new JButton(cancelIcon);
+		btnCancel.setToolTipText("Cancel current action");
+		btnCancel.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(final ActionEvent e) {
+				if (swingWorker != null) swingWorker.cancel(true);
 			}
 		});
+		panel_1.add(btnCancel);
+
 		frmProductliner.addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(final WindowEvent e) {
+				btnCancel.doClick();
 				MainApplicationWindow.this.properties.put("windowHeight",
 						String.valueOf(MainApplicationWindow.this.frmProductliner.getHeight()));
 				PropertySaver.save(MainApplicationWindow.this.properties);
@@ -256,7 +272,7 @@ public class MainApplicationWindow {
 		disableAllButtons();
 		gitLogger.addInfoToLog("Starting " + type);
 
-		SwingWorker<Void, Void> swingWorker = new SwingWorker<Void, Void>() {
+		swingWorker = new SwingWorker<Void, Void>() {
 			@Override
 			protected Void doInBackground() throws Exception {
 				switch (type) {