MISC: Resolved dereference null return value

Change-Id: I17d4708164d8ed7bedbc7f2bc8bc91c8f41a6701
Signed-off-by: donghyuk.yang <donghyuk.yang@samsung.com>

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/build/PlatformProjectDependentPackager.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/build/PlatformProjectDependentPackager.java
index 7694368..f0ce2fa 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/build/PlatformProjectDependentPackager.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/build/PlatformProjectDependentPackager.java
@@ -174,13 +174,15 @@ public class PlatformProjectDependentPackager extends CommonProjectDependentPack
         String[] envs = sbi.getEnvironmentVariables();
         if (PreferencesManager.isProxyUsed()) {
             String[] proxyInfo = PreferencesManager.getProxyParsedURL();
-            String protocol = proxyInfo[0];
-            String host = proxyInfo[1];
-            String port = proxyInfo[2];
-            SmartBuildInterface sbi = SmartBuildInterface.getInstance();
-            String envKey = String.format("%s_proxy", protocol);
-            String envValue = String.format("%s://%s:%s", protocol, host, port);
-            envs = sbi.addEnvironmentVariableArray(envKey, envValue);
+            if (proxyInfo != null) {
+                String protocol = proxyInfo[0];
+                String host = proxyInfo[1];
+                String port = proxyInfo[2];
+                SmartBuildInterface sbi = SmartBuildInterface.getInstance();
+                String envKey = String.format("%s_proxy", protocol);
+                String envValue = String.format("%s://%s:%s", protocol, host, port);
+                envs = sbi.addEnvironmentVariableArray(envKey, envValue);
+            }
         }
         return envs;
     }

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/manifest/PlatformManifestModel.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/manifest/PlatformManifestModel.java
index 5ccce2f..4225f06 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/manifest/PlatformManifestModel.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/manifest/PlatformManifestModel.java
@@ -49,11 +49,10 @@ public class PlatformManifestModel {
     }
 
     public List<String> getExecutableFiles() {
+        List<String> files = new ArrayList<String>();
         if (appDatas.size() <= 0) {
-            return null;
+            return files;
         }
-
-        List<String> files = new ArrayList<String>();
         for (ApplicationData data : appDatas) {
             String exec = data.getExec();
             if (exec != null && !exec.isEmpty()) {

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/IPkgCommander.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/IPkgCommander.java
index 0d8f319..02d3eb8 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/IPkgCommander.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/IPkgCommander.java
@@ -33,7 +33,7 @@ import java.util.Map;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.tizen.nativeplatform.pkg.model.PkgInfo;
 import org.tizen.nativeplatform.pkg.model.PkgStatus;
-import org.tizen.nativeplatform.pkgmgr.PackageManagerOuputReceiver;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 import org.tizen.nativeplatform.repo.model.Repository;
 import org.tizen.nativeplatform.types.CmdTargetTypes;
 import org.tizen.nativeplatform.types.PkgInstallTypes;
@@ -44,7 +44,7 @@ public interface IPkgCommander {
         RPM, ZYPPER, PKGCMD
     }
 
-    PackageManagerOuputReceiver getOutputReceiver();
+    PackageManagerOutputReceiver getOutputReceiver();
 
     void setHttpProxy(String proxy);
 

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/deb/DebCommanderHost.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/deb/DebCommanderHost.java
index 0f89b56..ddb24df 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/deb/DebCommanderHost.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/deb/DebCommanderHost.java
@@ -1,5 +1,6 @@
 package org.tizen.nativeplatform.pkg.commander.deb;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -9,7 +10,7 @@ import org.tizen.nativeplatform.pkg.commander.IPkgCommander;
 import org.tizen.nativeplatform.pkg.model.PkgInfo;
 import org.tizen.nativeplatform.pkg.model.PkgStatus;
 import org.tizen.nativeplatform.pkg.tools.DpkgTool;
-import org.tizen.nativeplatform.pkgmgr.PackageManagerOuputReceiver;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 import org.tizen.nativeplatform.repo.model.Repository;
 import org.tizen.nativeplatform.types.CmdTargetTypes;
 import org.tizen.nativeplatform.types.PkgInstallTypes;
@@ -23,7 +24,7 @@ public class DebCommanderHost implements IPkgCommander {
     }
 
     @Override
-    public PackageManagerOuputReceiver getOutputReceiver() {
+    public PackageManagerOutputReceiver getOutputReceiver() {
         return null;
     }
 
@@ -129,7 +130,8 @@ public class DebCommanderHost implements IPkgCommander {
 
     @Override
     public List<PkgStatus> getAllPkgList() {
-        return null;
+        List<PkgStatus> list = new ArrayList<PkgStatus>();
+        return list;
     }
 
     @Override
@@ -154,7 +156,8 @@ public class DebCommanderHost implements IPkgCommander {
 
     @Override
     public List<Repository> getRepoList() {
-        return null;
+        List<Repository> result = new ArrayList<Repository>();
+        return result;
     }
 
     @Override
@@ -264,12 +267,12 @@ public class DebCommanderHost implements IPkgCommander {
 
     @Override
     public PkgInstallTypes searchPkg(String pkg) {
-        return null;
+        return PkgInstallTypes.NOT_EXISTS;
     }
 
     @Override
     public String getSrcPkgName(String pkg) {
-        return null;
+        return "";
     }
 
     @Override

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderCommon.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderCommon.java
index 383048d..18be286 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderCommon.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderCommon.java
@@ -48,7 +48,7 @@ import org.tizen.nativeplatform.pkg.tools.PkgcmdTool;
 import org.tizen.nativeplatform.pkg.tools.RpmTool;
 import org.tizen.nativeplatform.pkg.tools.ZypperTool;
 import org.tizen.nativeplatform.pkg.tools.ZypperXmlParser;
-import org.tizen.nativeplatform.pkgmgr.PackageManagerOuputReceiver;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 import org.tizen.nativeplatform.repo.model.Repository;
 import org.tizen.nativeplatform.types.PkgInstallTypes;
 import org.tizen.nativeplatform.util.CharacterStripper;
@@ -73,12 +73,12 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
 
     protected final Logger logger = LoggerFactory.getLogger(RpmCommanderCommon.class);
     protected String http_proxy;
-    protected PackageManagerOuputReceiver rec;
+    protected PackageManagerOutputReceiver rec;
 
     /**
      * This console is for getting log, not printing log to console
      */
-    abstract protected PackageManagerOuputReceiver getNewOuputReceiver();
+    abstract protected PackageManagerOutputReceiver getNewOuputReceiver();
 
     abstract public Map<String, PkgStatus> getLocalPkgList();
 
@@ -93,13 +93,13 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
     abstract protected ICommandStatus execute(String command, IProgressMonitor monitor,
             boolean printlog);
 
-    abstract protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    abstract protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             IProgressMonitor monitor);
 
-    abstract protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    abstract protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             int timeout, IProgressMonitor monitor);
 
-    abstract protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    abstract protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             IProgressMonitor monitor, boolean printLog);
 
     abstract protected void changeUpdateMode();
@@ -128,7 +128,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
         }
     }
 
-    public PackageManagerOuputReceiver getOutputReceiver() {
+    public PackageManagerOutputReceiver getOutputReceiver() {
         return rec;
     }
 
@@ -216,7 +216,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
             return new String[0];
         }
         String command = makeCommand(getResetRpmDb(), RpmTool.pkgArchCommand(pkg));
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             return null;
@@ -245,7 +245,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
             return new String[0];
         }
         String command = makeCommand(getResetRpmDb(), RpmTool.pkgNameCommand(pkg));
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             return null;
@@ -278,7 +278,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
         List<String> result = new ArrayList<String>();
         if (tool.equals(TOOL.ZYPPER)) {
             String command = makeCommand(getResetRpmDb(), ZypperTool.versionCommand(pkg));
-            PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+            PackageManagerOutputReceiver hrec = getNewOuputReceiver();
             ICommandStatus status = execute(command, hrec, null);
             if (!status.isOk()) {
                 return new String[0];
@@ -298,7 +298,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
                 return new String[0];
             }
             String command = makeCommand(getResetRpmDb(), RpmTool.pkgFullVerCommand(pkg));
-            PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+            PackageManagerOutputReceiver hrec = getNewOuputReceiver();
             ICommandStatus status = execute(command, hrec, null);
             if (!status.isOk()) {
                 return new String[0];
@@ -575,7 +575,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
         if (type == TOOL.ZYPPER) {
             String command = makeCommand(getProxyCommand(), getResetRpmDb(),
                     ZypperTool.pkgInfoCommand(pkg));
-            PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+            PackageManagerOutputReceiver hrec = getNewOuputReceiver();
             status = execute(command, hrec, null);
         } else if (type == TOOL.RPM) {
             String command = makeCommand(getResetRpmDb(), RpmTool.pkgInfoCommand(pkg));
@@ -645,7 +645,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
         }
         String command = makeCommand(getProxyCommand(), getResetRpmDb(),
                 ZypperTool.remotePkgListCommandWithXmlOut());
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, 10000, null);
         if (!status.isOk()) {
             printResultLog("Failed to get remote package list");
@@ -672,7 +672,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
 
     public Map<String, PkgStatus> getLocalPkgList(String tag) {
         String command = makeCommand(getResetRpmDb(), RpmTool.pkgListByTagCommand(tag));
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             printResultLog("Failed to get local package list");
@@ -734,7 +734,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
             return result;
         }
         String command = makeCommand(getResetRpmDb(), ZypperTool.repoListCommandXmlOut());
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             printResultLog("Failed to get repository list");
@@ -762,7 +762,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
     public ICommandStatus refreshRepoListXmlOut() {
         String command = makeCommand(getProxyCommand(), getResetRpmDb(),
                 ZypperTool.refreshRepoCommandXmlOut());
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, 10000, null);
         if (status == null || !status.isOk()) {
             printResultLog("Failed to refresh repository");
@@ -792,7 +792,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
 
     private ICommandStatus addRepoXmlOut(String name, String url) {
         String command = ZypperTool.addRemoteRepoCommandXmlOut(name, url);
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             printResultLog("Failed to add repository");
@@ -823,7 +823,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
 
     public ICommandStatus addLocalRepoXmlOut(String name, String path) {
         String command = ZypperTool.addLocalRepoCommandXmlOut(name, path);
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             printResultLog("Failed to add local repository");
@@ -854,7 +854,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
 
     public ICommandStatus removeRepoXmlOut(String name) {
         String command = ZypperTool.removeRepoCommandXmlOut(name);
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             printResultLog("Failed to remove repository");
@@ -889,7 +889,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
         String command = makeCommand(getResetRpmDb(), RpmTool.pkgListCommand(pkg));
         // Do not use global output receiver
         // because this log is not needed to print in console
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             return ret;
@@ -916,7 +916,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
     public boolean existsFile(String file) {
         boolean ret = false;
         String command = String.format(CMD_FILE_FILE, file);
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             return ret;
@@ -940,7 +940,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
 
     public void resetRepo() {
         String command = makeCommand(CMD_RESET_REPO);
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             printResultLog("Failed to reset repository");
@@ -952,7 +952,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
     public Map<String, PkgStatus> getWhatProvides(String capability) {
         String command = makeCommand(getProxyCommand(),
                 ZypperTool.whatProvideCommandXmlOut(capability));
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
 
         Map<String, PkgStatus> result = null;
@@ -976,7 +976,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
     public PkgInstallTypes searchPkg(String pkg) {
         String command = makeCommand(getProxyCommand(), getResetRpmDb(),
                 ZypperTool.searchPkgCommandWithXmlOut(pkg));
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         PkgInstallTypes result = PkgInstallTypes.NOT_EXISTS;
         if (!status.isOk()) {
@@ -1001,7 +1001,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
     public String getSrcPkgName(String pkg) {
         String tag = "INFO:%{SourceRPM}::%{Version}-%{Release}";
         String command = makeCommand(getResetRpmDb(), RpmTool.aPkgInfoByTagCommand(tag, pkg));
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, null);
         if (!status.isOk()) {
             return "";
@@ -1032,7 +1032,7 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
     private ICommandStatus upgradeXmlOut(IProgressMonitor monitor) {
         String command = makeCommand(getProxyCommand(), getResetRpmDb(),
                 ZypperTool.distUpgradeCommandXmlOut());
-        PackageManagerOuputReceiver hrec = getNewOuputReceiver();
+        PackageManagerOutputReceiver hrec = getNewOuputReceiver();
         ICommandStatus status = execute(command, hrec, monitor);
         if (!status.isOk()) {
             printResultLog("Failed to upgrade dist");
@@ -1079,14 +1079,14 @@ public abstract class RpmCommanderCommon implements IPkgCommander {
         return LOG_INFO_PREFIX + WS + msg;
     }
 
-    protected PackageManagerOuputReceiver getNewOuputReceiverWithConsole() {
+    protected PackageManagerOutputReceiver getNewOuputReceiverWithConsole() {
         return getNewOuputReceiver(CONSOLE_NAME);
     }
 
-    protected PackageManagerOuputReceiver getNewOuputReceiver(String consoleName) {
+    protected PackageManagerOutputReceiver getNewOuputReceiver(String consoleName) {
         ConsoleManager cm = new ConsoleManager(consoleName, true);
         MessageConsoleStream mcs = cm.getMessageConsoleStream();
-        PackageManagerOuputReceiver rec = new PackageManagerOuputReceiver();
+        PackageManagerOutputReceiver rec = new PackageManagerOutputReceiver();
         rec.setMessageConsoleStream(mcs);
 
         return rec;

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderDevice.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderDevice.java
index 9179130..78d83cb 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderDevice.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderDevice.java
@@ -42,7 +42,7 @@ import org.tizen.nativeplatform.pkg.commander.CommandStatus;
 import org.tizen.nativeplatform.pkg.commander.ICommandStatus;
 import org.tizen.nativeplatform.pkg.model.PkgStatus;
 import org.tizen.nativeplatform.pkg.tools.PkgcmdTool;
-import org.tizen.nativeplatform.pkgmgr.PackageManagerOuputReceiver;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 import org.tizen.nativeplatform.types.CmdTargetTypes;
 import org.tizen.nativeplatform.util.CommandLauncherOnDevice;
 import org.tizen.sdblib.IDevice;
@@ -317,17 +317,17 @@ public class RpmCommanderDevice extends RpmCommanderCommon {
         return status;
     }
 
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             IProgressMonitor monitor) {
         return execute(command, rec, monitor, true);
     }
 
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             int timeout, IProgressMonitor monitor) {
         return execute(command, rec, timeout, monitor, true);
     }
 
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             IProgressMonitor monitor, boolean printlog) {
         if (printlog) {
             printCommandLog(command);
@@ -339,7 +339,7 @@ public class RpmCommanderDevice extends RpmCommanderCommon {
         return status;
     }
 
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             int timeout, IProgressMonitor monitor, boolean printlog) {
         if (printlog) {
             printCommandLog(command);
@@ -351,8 +351,8 @@ public class RpmCommanderDevice extends RpmCommanderCommon {
         return status;
     }
 
-    protected PackageManagerOuputReceiver getNewOuputReceiver() {
-        PackageManagerOuputReceiver rec = new PackageManagerOuputReceiver();
+    protected PackageManagerOutputReceiver getNewOuputReceiver() {
+        PackageManagerOutputReceiver rec = new PackageManagerOutputReceiver();
         rec.setPrintConsole(false);
         return rec;
     }

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderHost.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderHost.java
index 856ec62..22df753 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderHost.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderHost.java
@@ -32,7 +32,7 @@ import java.util.Map;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.tizen.nativeplatform.pkg.commander.ICommandStatus;
 import org.tizen.nativeplatform.pkg.model.PkgStatus;
-import org.tizen.nativeplatform.pkgmgr.PackageManagerOuputReceiver;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 import org.tizen.nativeplatform.types.CmdTargetTypes;
 
 public class RpmCommanderHost extends RpmCommanderCommon {
@@ -47,7 +47,7 @@ public class RpmCommanderHost extends RpmCommanderCommon {
     }
 
     @Override
-    protected PackageManagerOuputReceiver getNewOuputReceiver() {
+    protected PackageManagerOutputReceiver getNewOuputReceiver() {
         return null;
     }
 
@@ -87,19 +87,19 @@ public class RpmCommanderHost extends RpmCommanderCommon {
     }
 
     @Override
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             IProgressMonitor monitor) {
         return null;
     }
 
     @Override
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec, int timeout,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec, int timeout,
             IProgressMonitor monitor) {
         return null;
     }
 
     @Override
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             IProgressMonitor monitor, boolean printLog) {
         return null;
     }

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderRootstrap.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderRootstrap.java
index 9fcd9a8..b10f8e2 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderRootstrap.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmCommanderRootstrap.java
@@ -42,7 +42,7 @@ import org.tizen.nativeplatform.password.SudoPasswdManager;
 import org.tizen.nativeplatform.pkg.commander.CommandStatus;
 import org.tizen.nativeplatform.pkg.commander.ICommandStatus;
 import org.tizen.nativeplatform.pkg.model.PkgStatus;
-import org.tizen.nativeplatform.pkgmgr.PackageManagerOuputReceiver;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 import org.tizen.nativeplatform.types.CmdTargetTypes;
 import org.tizen.nativeplatform.util.CommandLauncherOnRootstrap;
 
@@ -126,17 +126,17 @@ public class RpmCommanderRootstrap extends RpmCommanderCommon {
         return status;
     }
 
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             IProgressMonitor monitor) {
         return execute(command, rec, monitor, true);
     }
 
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec, int timeout,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec, int timeout,
             IProgressMonitor monitor) {
         return execute(command, rec, monitor, true);
     }
 
-    protected ICommandStatus execute(String command, PackageManagerOuputReceiver rec,
+    protected ICommandStatus execute(String command, PackageManagerOutputReceiver rec,
             IProgressMonitor monitor, boolean printlog) {
         String chrootedCommand = getChrootedCommand(command);
         if (printlog) {
@@ -154,7 +154,7 @@ public class RpmCommanderRootstrap extends RpmCommanderCommon {
         return String.format("chroot %s sh -c \"%s\"", rootPath.toOSString(), cmd);
     }
 
-    protected PackageManagerOuputReceiver getNewOuputReceiver() {
+    protected PackageManagerOutputReceiver getNewOuputReceiver() {
         return null;
     }
 

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmPackageLauncher.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmPackageLauncher.java
index b83e6a6..399fc4d 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmPackageLauncher.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkg/commander/rpm/RpmPackageLauncher.java
@@ -281,7 +281,7 @@ public class RpmPackageLauncher implements IPkgLauncher {
                     PlatformLaunchMessages.IS_NOT_INITIALIZED_ROOTSTRAP, target.getRootstrap()
                             .getId()));
         } else {
-            PkgMgrInitializer initializer = new PkgMgrInitializer(target);
+            PkgMgrInitializer initializer = new PkgMgrInitializer(target, CmdTargetTypes.ROOTSTRAP);
             initializer.initRootstrapRepoInfo();
         }
         if (useRds) {
@@ -306,7 +306,7 @@ public class RpmPackageLauncher implements IPkgLauncher {
         } else if (!PlatformLaunchUtil.checkDeviceRootOn(target.getDevice())) {
             newInterruptedException(PlatformLaunchMessages.DEVICE_IS_NOT_ROOT_ON);
         } else {
-            PkgMgrInitializer initializer = new PkgMgrInitializer(target);
+            PkgMgrInitializer initializer = new PkgMgrInitializer(target, CmdTargetTypes.DEVICE);
             initializer.initDeviceRepoInfo();
         }
         if (useRds) {

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOuputReceiver.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOutputReceiver.java
similarity index 95%
rename from org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOuputReceiver.java
rename to org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOutputReceiver.java
index 20644a2..3d512b1 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOuputReceiver.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PackageManagerOutputReceiver.java
@@ -32,14 +32,14 @@ import java.util.ArrayList;
 import org.eclipse.ui.console.MessageConsoleStream;
 import org.tizen.sdblib.receiver.MultiLineReceiver;
 
-public class PackageManagerOuputReceiver extends MultiLineReceiver {
+public class PackageManagerOutputReceiver extends MultiLineReceiver {
 
     public boolean isCancelled = false;
     private boolean printConsole = true;
     private ArrayList<String> log = null;
     private MessageConsoleStream mcs = null;
 
-    public PackageManagerOuputReceiver() {
+    public PackageManagerOutputReceiver() {
         super();
         setTrimLines(false);
     }

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PkgMgrInitializer.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PkgMgrInitializer.java
index 3d2e247..e26a36b 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PkgMgrInitializer.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/PkgMgrInitializer.java
@@ -61,6 +61,18 @@ public class PkgMgrInitializer {
             this.rtCommander = target.getCommander(CmdTargetTypes.ROOTSTRAP);
         }
     }
+    
+    public PkgMgrInitializer(PkgCommandTarget target, CmdTargetTypes type) {
+        this.target = target;
+        if (type == CmdTargetTypes.DEVICE && target.isSetDevice()) {
+            this.device = target.getDevice();
+            this.dvCommander = target.getCommander(CmdTargetTypes.DEVICE);
+        }
+        if (type == CmdTargetTypes.ROOTSTRAP && target.isSetRootstrap()) {
+            this.rootstrap = target.getRootstrap();
+            this.rtCommander = target.getCommander(CmdTargetTypes.ROOTSTRAP);
+        }        
+    }
 
     public void initRootstrapRepoInfo() {
         initRootstrapRepoInfo(true);

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/BuildsystemTab.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/BuildsystemTab.java
index 669422a..b6add1b 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/BuildsystemTab.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/BuildsystemTab.java
@@ -170,7 +170,7 @@ public class BuildsystemTab extends CommonTab {
                         InterruptedException {
                     monitor.beginTask(resources.getString("PkgMgr.Message.Upgrade"), -1);
                     ICommandStatus status = commander.upgrade(monitor);
-                    if (!status.isOk()) {
+                    if (status != null && !status.isOk()) {
                         throw new InterruptedException();
                     }
                     monitor.done();

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/CommonTab.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/CommonTab.java
index 50c6dcd..5132ec9 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/CommonTab.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/pkgmgr/ui/CommonTab.java
@@ -90,6 +90,7 @@ import org.tizen.nativeplatform.pkg.commander.IPkgVersionComparer;
 import org.tizen.nativeplatform.pkg.commander.factory.PkgVersionComparerFactory;
 import org.tizen.nativeplatform.pkg.model.PkgInfo;
 import org.tizen.nativeplatform.pkg.model.PkgStatus;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 import org.tizen.nativeplatform.repo.model.Repository;
 import org.tizen.nativeplatform.ui.adapter.PackageTableSelectionAdapter;
 import org.tizen.nativeplatform.ui.adapter.RepoTableSelectionAdapter;
@@ -252,8 +253,11 @@ abstract public class CommonTab {
         log_gd.heightHint = 150;
         composite.setLayoutData(log_gd);
         composite.setLayout(new FillLayout());
-
-        MessageConsole c = commander.getOutputReceiver().getMsgConsoleStream().getConsole();
+        PackageManagerOutputReceiver receiver = commander.getOutputReceiver();
+        if (receiver == null) {
+            return;
+        }
+        MessageConsole c = receiver.getMsgConsoleStream().getConsole();
         logViewer = new IOConsoleViewer(composite, c);
         // Positions the cursor at the end of the log.
         int line = logViewer.getTextWidget().getLineCount();

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/BaseFileSystemGenerator.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/BaseFileSystemGenerator.java
index 51b9d26..28f1c7a 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/BaseFileSystemGenerator.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/BaseFileSystemGenerator.java
@@ -42,16 +42,18 @@ public class BaseFileSystemGenerator {
             }
 
             String command;
-            Map<String, String> env = null;
+            SmartBuildInterface sbi = SmartBuildInterface.getInstance();
+            Map<String, String> env = sbi.getEnvMap();
             if (PreferencesManager.isProxyUsed()) {
                 String[] proxyInfo = PreferencesManager.getProxyParsedURL();
-                String protocol = proxyInfo[0];
-                String host = proxyInfo[1];
-                String port = proxyInfo[2];
-                SmartBuildInterface sbi = SmartBuildInterface.getInstance();
-                String envKey = String.format("%s_proxy", protocol);
-                String envValue = String.format("%s://%s:%s", protocol, host, port);
-                env = sbi.addEnvironmentVariable(envKey, envValue);
+                if (proxyInfo != null) {
+                    String protocol = proxyInfo[0];
+                    String host = proxyInfo[1];
+                    String port = proxyInfo[2];                    
+                    String envKey = String.format("%s_proxy", protocol);
+                    String envValue = String.format("%s://%s:%s", protocol, host, port);
+                    env.put(envKey, envValue);
+                }
             }
 
             command = String.format("%s -n %s -a %s -u %s -p rpm --ctrl GBS -g TizenPlatform",

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/CommandLauncherOnDevice.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/CommandLauncherOnDevice.java
index 0e06025..d72554a 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/CommandLauncherOnDevice.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/CommandLauncherOnDevice.java
@@ -36,7 +36,7 @@ import org.tizen.common.CommonPlugin;
 import org.tizen.common.ui.page.preference.SdbPreferencePage;
 import org.tizen.nativeplatform.pkg.commander.CommandStatus;
 import org.tizen.nativeplatform.pkg.commander.ICommandStatus;
-import org.tizen.nativeplatform.pkgmgr.PackageManagerOuputReceiver;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 import org.tizen.sdblib.IDevice;
 import org.tizen.sdblib.exception.SdbCommandRejectedException;
 import org.tizen.sdblib.exception.ShellCommandUnresponsiveException;
@@ -45,14 +45,14 @@ import org.tizen.sdblib.exception.TimeoutException;
 public class CommandLauncherOnDevice {
 
     public static synchronized ICommandStatus execute(IDevice device, String command,
-            PackageManagerOuputReceiver rec) {
+            PackageManagerOutputReceiver rec) {
         int defaultTimeout = CommonPlugin.getDefault().getPreferenceStore()
                 .getInt(SdbPreferencePage.KEY_SDB_RESPONSE_TIMEOUT);
         return execute(device, command, rec, defaultTimeout);
     }
 
     public static synchronized ICommandStatus execute(IDevice device, String command,
-            PackageManagerOuputReceiver rec, int timeout) {
+            PackageManagerOutputReceiver rec, int timeout) {
         String[] prevLog = {};
         if (rec.getLog() != null) {
             prevLog = rec.getLog();

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/CommandLauncherOnRootstrap.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/CommandLauncherOnRootstrap.java
index 1ffcea0..3cacd2f 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/CommandLauncherOnRootstrap.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/CommandLauncherOnRootstrap.java
@@ -40,17 +40,17 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.tizen.nativeplatform.pkg.commander.CommandStatus;
 import org.tizen.nativeplatform.pkg.commander.ICommandStatus;
-import org.tizen.nativeplatform.pkgmgr.PackageManagerOuputReceiver;
+import org.tizen.nativeplatform.pkgmgr.PackageManagerOutputReceiver;
 
 public class CommandLauncherOnRootstrap {
 
     public static ICommandStatus executeSudo(String command, String workingDir,
-            PackageManagerOuputReceiver rec, IProgressMonitor monitor) {
+            PackageManagerOutputReceiver rec, IProgressMonitor monitor) {
         return executeSudo(command, workingDir, null, rec, monitor);
     }
 
     public static ICommandStatus executeSudo(String command, String workingDir,
-            Map<String, String> newEnv, PackageManagerOuputReceiver rec, IProgressMonitor monitor) {
+            Map<String, String> newEnv, PackageManagerOutputReceiver rec, IProgressMonitor monitor) {
 
         // generate script
         ICommandStatus status = null;
@@ -66,12 +66,12 @@ public class CommandLauncherOnRootstrap {
     }
 
     public static ICommandStatus execute(String command, String workingDir,
-            PackageManagerOuputReceiver rec, IProgressMonitor monitor) {
+            PackageManagerOutputReceiver rec, IProgressMonitor monitor) {
         return execute(command, workingDir, null, rec, monitor);
     }
 
     public static synchronized ICommandStatus execute(String command, String workingDir,
-            Map<String, String> newEnv, PackageManagerOuputReceiver rec, IProgressMonitor monitor) {
+            Map<String, String> newEnv, PackageManagerOutputReceiver rec, IProgressMonitor monitor) {
 
         CommandStatus status = null;
         Process proc = null;