From 6f2750c12c7a8ba95734d4aa743e159b3d278ef2 Mon Sep 17 00:00:00 2001 From: "hyunsik.noh" Date: Thu, 23 Jan 2014 17:45:17 +0900 Subject: [PATCH] CLI: Fix prevent issues Change-Id: I83c131cc65ec2f9096388e435940329c4bd6abd9 Signed-off-by: hyunsik.noh --- .../src/org/tizen/ncli/core/CommandLineParser.java | 4 +- .../ide/subcommands/CreateWebProjectCommand.java | 61 ++++++++++++---------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java b/org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java index 27c5430..381a510 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java @@ -94,7 +94,9 @@ public class CommandLineParser extends CmdLineParser { findTreeNode = SubCommandData.getRootNode().addChild(cmdInfo); }else if( null != preCmd) { TreeNode findPreTreeNode= SubCommandData.getRootNode().findTreeNode(preCmd); - findPreTreeNode.addChild(cmdInfo); + if(findPreTreeNode != null) { + findPreTreeNode.addChild(cmdInfo); + } } log.trace("Sub command call..Setting CURRENT_CMD...{}", cmdInfo); } else {// In case of Main diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java index 5e9a4d1..24a1477 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java @@ -221,36 +221,39 @@ public class CreateWebProjectCommand extends AbstractSubCommand groupList = libraryPool.getLibraryGroupWithDepends(sl); - - // copy libraries - for (TizenTemplateLibraryGroup group : groupList) + + if(options!=null) { + // get support libraries + SupportLibraries sl = options.getSupportLibraries(); + if(sl!=null) { + // get profile info + ProfileInfo profileInfo = InstallPathConfig.getLatestProfileInfo(); + + // extract jar file contained built-in library + String rootPath = pg.extractBuiltinJarFiles(WebConstant.BUILTIN_TEMPLATE_LIBRARIES_FOLDER); + + // get library pool + if (profileInfo != null) { - if (group.getSelectedElement().getKindsOfLibrary() == TizenTemplateKindsOfLibraries.TIZENWEBUIFW) - { - copyTizenWebUIFWLibrary(group); - } - else - { - copyNormalLibrary(group); + libraryPool = new TizenTemplateLibrariesPool(profileInfo, rootPath); + + // get template library groups + if (libraryPool != null) + { // In case of sample, pool is null + List groupList = libraryPool.getLibraryGroupWithDepends(sl); + + // copy libraries + for (TizenTemplateLibraryGroup group : groupList) + { + if (group.getSelectedElement().getKindsOfLibrary() == TizenTemplateKindsOfLibraries.TIZENWEBUIFW) + { + copyTizenWebUIFWLibrary(group); + } + else + { + copyNormalLibrary(group); + } + } } } } -- 2.7.4