From 127ff0ac0ac836c48b34c890c87277a8572207eb Mon Sep 17 00:00:00 2001
From: Patrick Plenefisch <simonpatp@gmail.com>
Date: Thu, 11 Sep 2014 14:30:30 -0400
Subject: [PATCH] Fixing extraction recursion: use provided version

Change-Id: I0aa0a66eae85a43df308b4c0dafbe6b953ffad5c
---
 .../wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java | 2 +-
 .../wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java   | 2 +-
 .../plugins/cpp/toolchains/windows/ToolchainInstaller.java      | 2 +-
 .../wpi/first/wpilib/plugins/cpp/installer/CPPInstaller.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java
index bb24443a0f..24340b20c8 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java
@@ -23,7 +23,7 @@ public class ToolchainInstaller extends AbstractInstaller {
 	@Override
 	protected void updateInstalledVersion(String version) {
 		WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.TOOLCHAIN_INSTALLED,
-				WPILibCPPPlugin.getDefault().getCurrentVersion());
+				version);
 	}
 
 	@Override
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java
index 733578a8f3..4fd7354962 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java
@@ -23,7 +23,7 @@ public class ToolchainInstaller extends AbstractInstaller {
 	@Override
 	protected void updateInstalledVersion(String version) {
 		WPILibCPPPlugin.getDefault().getPreferenceStore().setDefault(PreferenceConstants.TOOLCHAIN_INSTALLED,
-				WPILibCPPPlugin.getDefault().getCurrentVersion());
+				version);
 	}
 
 	@Override
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/ToolchainInstaller.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/ToolchainInstaller.java
index 175a6e3abc..f63e3292d1 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/ToolchainInstaller.java
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/ToolchainInstaller.java
@@ -23,7 +23,7 @@ public class ToolchainInstaller extends AbstractInstaller {
 	@Override
 	protected void updateInstalledVersion(String version) {
 		WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.TOOLCHAIN_INSTALLED,
-				WPILibCPPPlugin.getDefault().getCurrentVersion());
+				version);
 	}
 
 	@Override
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/installer/CPPInstaller.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/installer/CPPInstaller.java
index 4702a30a5a..bebf9230ff 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/installer/CPPInstaller.java
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/installer/CPPInstaller.java
@@ -20,7 +20,7 @@ public class CPPInstaller extends AbstractInstaller {
 	@Override
 	protected void updateInstalledVersion(String version) {
 		WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.LIBRARY_INSTALLED,
-				WPILibCPPPlugin.getDefault().getCurrentVersion());
+				version);
 	}
 	
 	@Override