From bf0c95d4f9d355f31839f4405544de635a9a492c Mon Sep 17 00:00:00 2001
From: "donghyuk.yang" <donghyuk.yang@samsung.com>
Date: Tue, 18 Dec 2012 16:29:34 +0900
Subject: [PATCH] [Title] Reinitialize SBI after adding and removing rootstrap

---
 .../tizen/nativeplatform/rootstrap/RootstrapManager.java | 16 +++++++++++++---
 .../org/tizen/nativeplatform/views/ui/RootstrapView.java |  9 +--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/RootstrapManager.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/RootstrapManager.java
index 25411a2..e74e82d 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/RootstrapManager.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/RootstrapManager.java
@@ -88,8 +88,12 @@ public class RootstrapManager {
 	
 	public static PlatformRootstrap addRootstrap(PlatformRootstrap rootstrap ) {
 		rootstraps.add(rootstrap);
-		SBIModel.addRootstrap(rootstrap, false);
-
+		//SBIModel.addRootstrap(rootstrap, false);
+		try {
+			SBIModel.reinitialize();
+		} catch (SBIException e) {
+			// nothing to do
+		}
 		RootstrapManager.notifyChangedRootstrap();
 
 		return rootstrap;
@@ -101,6 +105,7 @@ public class RootstrapManager {
 				rootstrap.getArch(), rootstrap.getPath().toOSString(), rootstrap.getRepositoryURLs() );
 		try {
 			SBIModel.reinitialize();
+			reinitialize();
 		} catch (SBIException e) {
 			// nothing to do
 		}
@@ -117,7 +122,12 @@ public class RootstrapManager {
 			try {
 				removeBaseFileSystem( rootstrap.getId() , rootstrap.getArch());
 			} catch (InterruptedException e) {
-				// do nothing
+				// nothing to do
+			}
+			try {
+				SBIModel.reinitialize();
+			} catch (SBIException e) {
+				// nothing to do
 			}
 			RootstrapManager.notifyChangedRootstrap();
 			return true;
diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapView.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapView.java
index efedae6..ef08347 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapView.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/views/ui/RootstrapView.java
@@ -581,14 +581,7 @@ public class RootstrapView extends ViewPart {
 		String rootId = rootstrap.getId();
 		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
     	IConfiguration config = info.getDefaultConfiguration();
-    	String targetId = PlatformConfigurationManager.getBuildTargetName(config);
-    	if (targetId == null) {
-    		try {
-				targetId = PlatformConfigurationManager.getDefaultBuildTargetName(config);
-			} catch (SBIException e) {
-				e.printStackTrace();
-			}
-    	}
+    	String targetId = PlatformConfigurationManager.getBuildTargetName(config);    	
     	SmartBuildInterface sbi = SmartBuildInterface.getInstance();
     	String toolId = sbi.getToolchainIDFromTargetID(targetId);
     	String newTargetId = SmartBuildInterface.makeTargetID(rootId, toolId);
-- 
2.7.4