Fixed some Prevent issues

Change-Id: Ib30c92d51662579ab97cbc16242432d4c60ee69d
Signed-off-by: kh5325.kim <kh5325.kim@samsung.com>

diff --git a/org.tizen.cli/src/org/tizen/cli/command/CreateTemplate.java b/org.tizen.cli/src/org/tizen/cli/command/CreateTemplate.java
index cefa283..badae31 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/command/CreateTemplate.java
+++ b/org.tizen.cli/src/org/tizen/cli/command/CreateTemplate.java
@@ -109,15 +109,18 @@ implements CommandWithParameter
                 logger.debug( "{} not cached", name );
                 template = realm.getTemplate( name );
             }
-            cache.put( name, template );
-            template.template( models, storage );
-            final String[] dependencies = CommonRealm.separate( template.getAttribute( TemplateConstants.ATTR_DEPENDENCY ) );
-            if ( null == dependencies )
+            if ( null != template )
             {
-                continue;
+                cache.put( name, template );
+                template.template( models, storage );
+                final String[] dependencies = CommonRealm.separate( template.getAttribute( TemplateConstants.ATTR_DEPENDENCY ) );
+                if ( null == dependencies )
+                {
+                    continue;
+                }
+                
+                template( realm, dependencies, models, storage, cache );
             }
-            
-            template( realm, dependencies, models, storage, cache );
         }
         
     }

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/TargetDeviceSelector.java b/org.tizen.cli/src/org/tizen/cli/exec/TargetDeviceSelector.java
index d8e45a9..285b9e0 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/exec/TargetDeviceSelector.java
+++ b/org.tizen.cli/src/org/tizen/cli/exec/TargetDeviceSelector.java
@@ -128,6 +128,9 @@ TargetDeviceSelector
             return device;
         }
         IDevice[] devices = getConnectDevices();
+        if ( ArrayUtil.isEmpty(devices) ) {
+            return device;
+        }
         for( int i = 0; i < devices.length; i++ ) {
             if ( name.equals( devices[i].toString() ) || name.equals( devices[i].getDeviceName() ) ) {
                 device = devices[i];

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java b/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java
index f36cda7..0a3b052 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java
+++ b/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java
@@ -57,7 +57,6 @@ import org.tizen.nativecommon.templateengine.model.TizenTemplate;
 import org.tizen.nativecpp.misc.core.NewAppXmlStore;
 
 public class NativeMain extends AbstractLauncher {
-    
     private static final String PROJECTTYPE_APP = "app";
     private static final String PROJECTTYPE_STATIC = "static";
     private static final String PROJECTTYPE_SHARED = "shared";
@@ -101,7 +100,6 @@ public class NativeMain extends AbstractLauncher {
     private static final HashMap<String, String> SAMPLE_DIR_MAP = new HashMap<String, String>();
     private static final HashMap<String, String> PROJECTTYPE_MAP = new HashMap<String, String>();
 
-    
     static {
         SAMPLE_DIR_MAP.put(SAMPLE_EMPTY, SAMPLE_DIR_EMPTYPROJECT);
         SAMPLE_DIR_MAP.put(SAMPLE_FORM, SAMPLE_DIR_FORM);
@@ -123,7 +121,6 @@ public class NativeMain extends AbstractLauncher {
      * @throws Exception If unhandled exception occur
      */
     public static void main(String[] args) throws Exception {
-        
         final NativeMain instance = new NativeMain();
         
         instance.run( args );
@@ -131,7 +128,6 @@ public class NativeMain extends AbstractLauncher {
 
     @Override
     protected void execute(CommandLine cmdLine) throws Exception {
-        
         if(getInputCmd().equals(OPTION_CMD_MAKEFILE)) {
             executeMakefile(cmdLine);
         }
@@ -145,7 +141,6 @@ public class NativeMain extends AbstractLauncher {
         logger.trace("get user input");
         
         String sampleName = cmdLine.getOptionValue(OPTION_SAMPLE);
-        
         String samplePath = InstallPathConfig.getSamplesPath();
         String sampleDir = SAMPLE_DIR_MAP.get(sampleName);
         
@@ -179,8 +174,7 @@ public class NativeMain extends AbstractLauncher {
                         no
                     );
                 
-                if ( no.equals( option ) )
-                {
+                if(no.equals(option)) {
                     prompter.notify( Messages.getString("NativeMain.PROCESS_CANCEL") ); //$NON-NLS-1$
                     return ;
                 }
@@ -195,7 +189,6 @@ public class NativeMain extends AbstractLauncher {
     }
 
     private void executeMakefile(CommandLine cmdLine) throws Exception {
-        
         Prompter prompter = getPrompter();
         
         String projectType = cmdLine.getOptionValue(OPTION_MAKE_PROJECTTYPE);
@@ -230,9 +223,13 @@ public class NativeMain extends AbstractLauncher {
         }
         
         TargetModel target = BuildPluginManagerForCLI.getDefaultTarget(projectId, BuildPluginUtil.ARCH_I386);
+        if(target == null) {
+            prompter.error("Build target is null.");
+            return;
+        }
+        
         RootstrapModel rootstrap = target.getRootstrap();
         HashMap<String, DevPackageModel> devPkgMap = BuildPluginManagerForCLI.DEVPKG_MAP.get(rootstrap.getId());
-        
         ArrayList<DevPackageModel> devPkgList = new ArrayList<DevPackageModel>();
         for(DevPackageModel devPkg: devPkgMap.values()) {
             devPkgList.add(devPkg);
@@ -251,7 +248,6 @@ public class NativeMain extends AbstractLauncher {
         template.setProperty(TizenTemplate.PROPERTY_KEY_EMUL_BUILD_PROPERTY, buildProperty);
         
         generator.doRemainingJob(devPkgList, template, target);
-        
         generator.pressDefaultPostValueStore(valueStore, template);
         generator.pressPostValueStoreFromDevPkg(valueStore, template);
         generator.createBuildFiles(valueStore, template);
@@ -306,7 +302,6 @@ public class NativeMain extends AbstractLauncher {
     @Override
     protected Help createHelp() {
         return new Help(getOptions(), getCommands(), getInputCmd(), getUsageDescription()) {
-            
             NativeMain outer = NativeMain.this;
             private Help defaultHelp = new Help(outer.getSuperOptions(), outer.getCommands(), outer.getInputCmd(), outer.getUsageDescription());
             
@@ -318,7 +313,6 @@ public class NativeMain extends AbstractLauncher {
                 }
                 return super.getHelp();
             }
-            
         };
     }
-}
\ No newline at end of file
+}

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/install/Main.java b/org.tizen.cli/src/org/tizen/cli/exec/install/Main.java
index ea23ed3..fa5a9c9 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/exec/install/Main.java
+++ b/org.tizen.cli/src/org/tizen/cli/exec/install/Main.java
@@ -158,12 +158,12 @@ extends WRTLauncher
         logger.trace( "install command");
         exec.execute( install_command );
 
-        String[] result = install_command.getResult().split("\\s+");
-        int returnCode = Integer.parseInt(result[result.length-1]);
+        String[] result = install_command.getResult().split( "\\s+" );
+        int returnCode = Integer.parseInt( result[result.length-1] );
         if (returnCode != 0) {
-            ErrorMessageType type = ErrorMessageType.getErrorType(returnCode);
-            prompter.notify(type.getManagement());
-            exit(returnCode);
+            ErrorMessageType type = ErrorMessageType.getErrorType( returnCode );
+            prompter.notify( (type != null) ? type.getManagement() : null );
+            exit( returnCode );
         }
     }
 

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/uninstall/Main.java b/org.tizen.cli/src/org/tizen/cli/exec/uninstall/Main.java
index af72507..36cb4c1 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/exec/uninstall/Main.java
+++ b/org.tizen.cli/src/org/tizen/cli/exec/uninstall/Main.java
@@ -129,12 +129,12 @@ extends WRTLauncher
         uninstall_command.setTime( getTime() );
         exec.execute( uninstall_command );
 
-        String[] result = uninstall_command.getResult().split("\\s+");
-        int returnCode = Integer.parseInt(result[result.length-1]);
+        String[] result = uninstall_command.getResult().split( "\\s+" );
+        int returnCode = Integer.parseInt( result[result.length-1] );
         if (returnCode != 0) {
-            ErrorMessageType type = ErrorMessageType.getErrorType(returnCode);
-            prompter.notify(type.getManagement());
-            exit(returnCode);
+            ErrorMessageType type = ErrorMessageType.getErrorType( returnCode );
+            prompter.notify( (type != null) ? type.getManagement() : null );
+            exit( returnCode );
         }
     }