From e0d47bafc80721d8671a65cb0878c647640f33c5 Mon Sep 17 00:00:00 2001 From: Jihoon Song Date: Fri, 14 Jun 2013 17:04:51 +0900 Subject: [PATCH] [Title] fixed sonar critical serverities [Desc.] [Issue] Change-Id: Icb16acacf9280a45f0cc6c72144592fd168948f9 --- org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java | 19 +++++++++---------- org.tizen.cli/src/org/tizen/cli/exec/wgt/Main.java | 17 ++++++++--------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java b/org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java index 5392ceb..ea2c4ff 100644 --- a/org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java +++ b/org.tizen.cli/src/org/tizen/cli/exec/sign/Main.java @@ -53,7 +53,6 @@ import org.tizen.common.sign.command.ReadSigningProfileFileCommand; import org.tizen.common.sign.command.SignCommand; import org.tizen.common.sign.preferences.SigningProfileItem; import org.tizen.common.sign.util.SigningProfileUtil; -import org.tizen.common.util.CollectionUtil; import org.tizen.common.util.FilenameUtil; @@ -191,15 +190,15 @@ extends AbstractLauncher logger.debug( "Base directory :{}", baseDir ); // final String[] includes = cmdLine.getOptionValues( OPT_INCLUDE ); - final String[] includes = null; - logger.debug( "Includes :{}", CollectionUtil.toString( includes ) ); - +// logger.debug( "Includes :{}", CollectionUtil.toString( includes ) ); +// // String[] excludes = cmdLine.getOptionValues( OPT_EXCLUDE ); - String[] excludes = null; - if ( null == includes && null == excludes ) - { - excludes = getDefaultExcludes(); - } +// if ( null == includes && null == excludes ) +// { +// excludes = getDefaultExcludes(); +// } + + String[] excludes = getDefaultExcludes(); if ( !cmdLine.hasOption( OPT_NOCHECK ) ) { @@ -267,7 +266,7 @@ extends AbstractLauncher profileItems.addAll( readProfile.getProfileItems() ); final SignCommand command = new SignCommand( baseDir, profileName, profileItems ); - command.setIncludes( includes ); + command.setIncludes( null ); command.setExcludes( excludes ); getExecutor().execute( command ); } diff --git a/org.tizen.cli/src/org/tizen/cli/exec/wgt/Main.java b/org.tizen.cli/src/org/tizen/cli/exec/wgt/Main.java index 878fa1c..4372a48 100644 --- a/org.tizen.cli/src/org/tizen/cli/exec/wgt/Main.java +++ b/org.tizen.cli/src/org/tizen/cli/exec/wgt/Main.java @@ -148,16 +148,15 @@ extends AbstractLauncher logger.debug( "Base directory :{}", baseDir ); // final String[] includes = cmdLine.getOptionValues( OPT_INCLUDE ); - final String[] includes = null; - logger.debug( "Includes :{}", CollectionUtil.toString( includes ) ); - +// logger.debug( "Includes :{}", CollectionUtil.toString( includes ) ); +// // String[] excludes = cmdLine.getOptionValues( OPT_EXCLUDE ); - String[] excludes = null; - if ( null == includes && null == excludes ) - { - excludes = getDefaultExcludes(); - } +// if ( null == includes && null == excludes ) +// { +// excludes = getDefaultExcludes(); +// } + String[] excludes = getDefaultExcludes(); logger.debug( "Excludes :{}", CollectionUtil.toString( excludes ) ); if ( !cmdLine.hasOption( OPT_NOCHECK ) ) @@ -208,7 +207,7 @@ extends AbstractLauncher } ResourceLayer startLayer = new ResourceLayer("start", new VirtualFileHandler()); - Resource[] resources = getResources(baseDir, startLayer, includes, excludes); + Resource[] resources = getResources(baseDir, startLayer, null, excludes); zipFiles(wgtPath, baseDir, resources); } -- 2.7.4