From a10ecc4fb22fd2e562d5c6da8517bb351cfa1daf Mon Sep 17 00:00:00 2001 From: Bon-Yong Lee Date: Mon, 6 May 2013 10:54:00 +0900 Subject: [PATCH] Fix potential bug as sonar report --- .../tizen/cli/command/CommandWithParameter.java | 2 +- .../src/org/tizen/cli/exec/WRTLauncher.java | 7 ---- .../tizen/cli/exec/gen/CLIProjectGenerator.java | 40 ---------------------- .../src/org/tizen/cli/exec/gen/NativeMain.java | 2 +- 4 files changed, 2 insertions(+), 49 deletions(-) mode change 100644 => 100755 org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java mode change 100644 => 100755 org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java diff --git a/org.tizen.cli/src/org/tizen/cli/command/CommandWithParameter.java b/org.tizen.cli/src/org/tizen/cli/command/CommandWithParameter.java index d411dda..63dea07 100755 --- a/org.tizen.cli/src/org/tizen/cli/command/CommandWithParameter.java +++ b/org.tizen.cli/src/org/tizen/cli/command/CommandWithParameter.java @@ -29,6 +29,6 @@ import org.tizen.common.core.command.ExecutionContext; public interface CommandWithParameter { - public void process( ExecutionContext context, String[] args ) throws Exception; + void process( ExecutionContext context, String[] args ) throws Exception; } diff --git a/org.tizen.cli/src/org/tizen/cli/exec/WRTLauncher.java b/org.tizen.cli/src/org/tizen/cli/exec/WRTLauncher.java index a059469..6c1ac34 100755 --- a/org.tizen.cli/src/org/tizen/cli/exec/WRTLauncher.java +++ b/org.tizen.cli/src/org/tizen/cli/exec/WRTLauncher.java @@ -101,13 +101,6 @@ extends AbstractLauncher protected IDevice device = null; /** - *

- * check SDB demon status - *

- */ - protected boolean bSDBStart = false; - - /** * Get target device * * @return device diff --git a/org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java b/org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java old mode 100644 new mode 100755 index 060fc3f..edc72f9 --- a/org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java +++ b/org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java @@ -53,9 +53,6 @@ public class CLIProjectGenerator extends AbstractProjectGenerator { private static final String PACKAGE_PREFIX_TEMPLATE_PROCESS = Activator.PLUGIN_ID + ".templateengine.process"; - private static final String MACRO_SRCS = "CLI_SRC"; - private static final String MACRO_OBJS = "CLI_OBJ"; - private static final String MACRO_DEPS = "CLI_DEPS"; private static final String MACRO_BINARY = "CLI_BINARY"; private static final String MACRO_PRJTYPE = "projectType"; private static final String MACRO_PLATFORM_VER = "platformVer"; @@ -148,43 +145,6 @@ public class CLIProjectGenerator extends AbstractProjectGenerator { valueStore.put(MACRO_TOOLCHAIN, (String) template.getProperty(MACRO_TOOLCHAIN)); } - private static void pressValueStoreForSrcObjDep(Map valueStore, TizenTemplate template) { - String projectPath = FileUtil.appendPath(template.getProjectPath(), "src"); - File projectDir = new File(projectPath); - - StringBuffer srcBuffer = new StringBuffer(); - StringBuffer objBuffer = new StringBuffer(); - StringBuffer depBuffer = new StringBuffer(); - boolean firstSrc = true; - - for(File projectFile: projectDir.listFiles()) { - if(projectFile.isFile()) { - String ext = FileUtil.getFileExtension(projectFile.getName()); - if("cpp".equals(ext)) { - String name = FileUtil.getFileNameWithoutExtension(projectFile.getName()); - if(firstSrc) { - firstSrc = false; - } - else { - srcBuffer.append(" \\\n"); - objBuffer.append(" \\\n"); - depBuffer.append(" \\\n"); - } - srcBuffer.append("../src/" + name + ".cpp"); - objBuffer.append("./src/" + name + ".o"); - depBuffer.append("./src/" + name + ".d"); - } - } - } - srcBuffer.append(" \n"); - objBuffer.append(" \n"); - depBuffer.append(" \n"); - - valueStore.put(MACRO_SRCS, srcBuffer.toString()); - valueStore.put(MACRO_OBJS, objBuffer.toString()); - valueStore.put(MACRO_DEPS, depBuffer.toString()); - } - @Override public void pressPostValueStoreFromDevPkg(Map valueStore, TizenTemplate template) { BuildProperty emulBuildProperty = (BuildProperty) template.getProperty(TizenTemplate.PROPERTY_KEY_EMUL_BUILD_PROPERTY); 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 old mode 100644 new mode 100755 index 2278e50..7573b85 --- a/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java +++ b/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java @@ -306,7 +306,7 @@ public class NativeMain extends AbstractLauncher { if(cmds.getOption(this.getInputCmd()) == null) { return defaultHelp.getHelp(); } - else return super.getHelp(); + return super.getHelp(); } }; -- 2.7.4