From 64fd995505f23ef064e17356dea7474ace4976b1 Mon Sep 17 00:00:00 2001
From: "kh5325.kim" <kh5325.kim@samsung.com>
Date: Tue, 2 Jul 2013 00:20:59 +0900
Subject: [PATCH] Upload tizen_2.2 source

Change-Id: I6d9f8a53c47ca919011b6397a05cd3d72e6cacc9
---
 .../launch/wizards/PlatformAttachLaunchWizard.java |  3 ---
 .../pkg/commander/rpm/RpmVersionComparer.java      |  4 ++--
 .../process/SetDefaultIncludePaths.java            | 22 +++++++++++++++-------
 .../nativeplatform/views/ui/RootstrapView.java     |  3 ---
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformAttachLaunchWizard.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformAttachLaunchWizard.java
index 2642530..15ddd1e 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformAttachLaunchWizard.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformAttachLaunchWizard.java
@@ -34,7 +34,6 @@ import java.util.List;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.wizard.IWizardContainer;
 import org.eclipse.jface.wizard.WizardDialog;
@@ -87,8 +86,6 @@ public class PlatformAttachLaunchWizard extends PlatformLaunchWizard {
         PlatformLaunchSettingProcPage page = (PlatformLaunchSettingProcPage) getPage(SETTING_PROC_PAGE);
         programPath = page.getProgramPath();
         pid = page.getPid();
-
-        final String rootstrapPath = page.getRootstrapPath();
         packages = page.getPackages();
         IWizardContainer container = getContainer();
         final PlatformLaunchUtils launchUtil = new PlatformLaunchUtils(target);
diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmVersionComparer.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmVersionComparer.java
index 77cbd17..97e652c 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmVersionComparer.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmVersionComparer.java
@@ -33,14 +33,14 @@ public class RpmVersionComparer implements IPkgVersionComparer {
                 value1 = Integer.parseInt(tok1);
             } catch (NumberFormatException e) {
                 // do nothing
-                // e.printStackTrace();
+                e.printStackTrace();
             }
 
             try {
                 value2 = Integer.parseInt(tok2);
             } catch (NumberFormatException e) {
                 // do nothing
-                // e.printStackTrace();
+                e.printStackTrace();
             }
 
             if (value1 > value2) {
diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/templateengine/process/SetDefaultIncludePaths.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/templateengine/process/SetDefaultIncludePaths.java
index 4172940..b4b2bb0 100644
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/templateengine/process/SetDefaultIncludePaths.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/templateengine/process/SetDefaultIncludePaths.java
@@ -29,6 +29,7 @@ package org.tizen.nativeplatform.templateengine.process;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,6 +39,7 @@ import java.util.Map;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
@@ -187,18 +189,24 @@ public class SetDefaultIncludePaths extends ProcessRunner {
         factory.setNamespaceAware(false);
         factory.setIgnoringComments(true);
 
-        try {
-            DocumentBuilder parser = factory.newDocumentBuilder();
-            // causes SAXException to be thrown on any parse error
+		try {
+			DocumentBuilder parser = factory.newDocumentBuilder();
+			// causes SAXException to be thrown on any parse error
             parser.setErrorHandler(ABORTING_ERROR_HANDER);
             // TODO should I be using an InputSource?
             InputSource input = new InputSource(in);
             Document doc = parser.parse(input);
             return doc;
-
-        } catch (Exception e) {
-            throw new SettingsImportExportException(e);
-        }
+		} catch (ParserConfigurationException e) {
+			e.printStackTrace();
+			throw new SettingsImportExportException(e);
+		} catch (SAXException e) {
+			e.printStackTrace();
+			throw new SettingsImportExportException(e);				
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new SettingsImportExportException(e);				
+		}
     }
 
     /**
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 b197bd3..c8ecb4d 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
@@ -808,9 +808,6 @@ public class RootstrapView extends ViewPart {
                             resources.getString("Action.Msg.Error.FiniFailed.PkgMgr"),
                             e.getMessage()));
                     return;
-                } finally {
-                    //RootstrapManager.modifyRootstrap(selected);
-                    
                 }
             }
 
-- 
2.7.4