From ca4d418dc456d47f6794df1d8e6aa53b9bbd45aa Mon Sep 17 00:00:00 2001 From: Jihoon Song Date: Wed, 20 Mar 2013 14:37:25 +0900 Subject: [PATCH] [Title] common-eplugin: fixed NPE about Policy in SignCommand [Desc.] [Issue] Change-Id: I81c08781222232271d2bce3f677b625b0df91b64 --- .../src/org/tizen/common/sign/command/SignCommand.java | 2 +- .../src/org/tizen/common/sign/signer/SignatureGenerator.java | 3 --- .../src/org/tizen/common/core/command/PolicyRegistryFactory.java | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java b/org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java index 795327f..d12a00e 100755 --- a/org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java +++ b/org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java @@ -81,7 +81,7 @@ public class SignCommand extends FileHandlingCommand { Assert.notNull( handler ); if ( !handler.is( this.path, Attribute.EXISTS ) ) { - final Policy policy = context.getPolicy( "nonexist.in.dir.project" ); + final Policy policy = context.getPolicy( Policy.NONEXIST_IN_PROJECT ); final MessagePolicy messagePolicy = policy.adapt( MessagePolicy.class ); messagePolicy.print( context.getPrompter(), "{0} doesn't exist", this.path ); diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/signer/SignatureGenerator.java b/org.tizen.common.sign/src/org/tizen/common/sign/signer/SignatureGenerator.java index 800cdae..d5257ba 100644 --- a/org.tizen.common.sign/src/org/tizen/common/sign/signer/SignatureGenerator.java +++ b/org.tizen.common.sign/src/org/tizen/common/sign/signer/SignatureGenerator.java @@ -35,8 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tizen.common.CommonPlugin; import org.tizen.common.core.command.ExecutionContext; -import org.tizen.common.core.command.Policy; -import org.tizen.common.core.command.policy.SimplePolicy; import org.tizen.common.sign.command.ReadSigningProfileFileCommand; import org.tizen.common.sign.command.SignCommand; import org.tizen.common.sign.preferences.Messages; @@ -67,7 +65,6 @@ public class SignatureGenerator { // Constructor public SignatureGenerator() { this.newCtx =CommonPlugin.getDefault().getExecutor().getContext(); - this.newCtx.getPolicyRegistry().register( new SimplePolicy( Policy.PRINTOUT_RESULT_SIGNING ) ); this.pStore = SigningProfileUtil.getPreferenceStore(); } diff --git a/org.tizen.common/src/org/tizen/common/core/command/PolicyRegistryFactory.java b/org.tizen.common/src/org/tizen/common/core/command/PolicyRegistryFactory.java index 64b1a3c..50cfdb3 100644 --- a/org.tizen.common/src/org/tizen/common/core/command/PolicyRegistryFactory.java +++ b/org.tizen.common/src/org/tizen/common/core/command/PolicyRegistryFactory.java @@ -34,6 +34,7 @@ import org.tizen.common.core.command.policy.FilePolicy; import org.tizen.common.core.command.policy.MessagePolicy; import org.tizen.common.core.command.policy.OptionPolicy; import org.tizen.common.core.command.policy.PolicyRegistry; +import org.tizen.common.core.command.policy.SimplePolicy; import org.tizen.common.core.command.policy.UncaughtExceptionHandlingPolicy; import org.tizen.common.core.command.prompter.FileHandlingOption; @@ -139,6 +140,8 @@ implements Factory }); registry.register( new EclipsePolicy(EXIST_OUT_FILE)); registry.register( new EclipsePolicy( NONEXIST_IN_FILE ) ); + registry.register( new SimplePolicy( Policy.PRINTOUT_RESULT_SIGNING ) ); + registry.register( new EclipsePolicy( Policy.NONEXIST_IN_PROJECT ) ); return registry; } -- 2.7.4