Author: tchemit Date: 2008-07-25 21:36:41 +0000 (Fri, 25 Jul 2008) New Revision: 914 Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionAction.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java Log: introduce Context as a real contract renmae old Context to AbstractContext Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionAction.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionAction.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionAction.java 2008-07-25 21:36:41 UTC (rev 914) @@ -8,7 +8,7 @@ /** * A simple empty action for an option. * <p/> - * Use method {@link #doRun(AbstractContext,Option[])} to launch action for the given options. + * Use method {@link #doRun(Context, Option[])} to launch action for the given options. * <p/> * This method offers some hooks to use for controling running : * <p/> @@ -23,7 +23,7 @@ * @author chemit */ -public abstract class OptionAction<O extends Option, P extends OptionParser, C extends AbstractContext<P>> { +public abstract class OptionAction<O extends Option, P extends OptionParser, C extends Context<P>> { protected final Log log = LogFactory.getLog(getClass()); @@ -43,7 +43,7 @@ * Method to implement logic of the action for the current option. * <p/> * <b>This method will never by directly called, you have to use - * {@link #doRun(AbstractContext,Option[])} method instead which offers some hooks to control actions.</b> + * {@link #doRun(Context ,Option[])} method instead which offers some hooks to control actions.</b> * * @throws Exception if any problem while action */ Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -16,13 +16,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.option.AbstractContext; import org.codelutin.option.Config; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; import org.codelutin.option.Option; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; /** * OptionAction to change a property in a config. @@ -37,7 +37,7 @@ Option option = action.getOption(); - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); String category = getCategory(context, action.getOption()); @@ -75,7 +75,7 @@ * @param option the option to test * @return the category of an IsisOptionConfig */ - protected String getCategory(AbstractContext context, Option option) { + protected String getCategory(Context context, Option option) { String value = option.getConstantArgumentValue(-1); if (value == null) { // used by default main category Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -20,6 +20,7 @@ import org.codelutin.option.ConfigKey; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; /** @author chemit */ public class OptionActionEditConfigRunnable implements OptionActionRunnable { @@ -30,7 +31,7 @@ public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); Config[] configs = new Config[context.getConfigKeys().size()]; int i = 0; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -16,11 +16,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.option.AbstractContext; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; import static org.codelutin.option.ParserUtil.addTitle; import org.codelutin.util.ReflectUtil; @@ -34,7 +34,7 @@ protected final Log log = LogFactory.getLog(getClass()); public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); String category = action.getOption().getConstantArgumentValue(0); log.info("required showConfig pour category [" + category + "]"); Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -16,12 +16,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.option.AbstractContext; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; import org.codelutin.option.OptionKey; +import org.codelutin.option.Context; import static org.codelutin.option.ParserUtil.addTitle; import org.codelutin.option.def.OptionDefinition; import org.codelutin.util.ReflectUtil; @@ -38,7 +38,7 @@ public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); StringWriter writer = new StringWriter(); String title = "TODO Add project name v " + context.getMainConfig().getPropertyKey("version").getCurrentValue(); @@ -56,7 +56,7 @@ * @param name title @throws java.io.IOException if any io pb while writing * @throws java.io.IOException if any pb while writing */ - public void printUsage(AbstractContext<?> context, Writer w, String name) throws IOException { + public void printUsage(Context<?> context, Writer w, String name) throws IOException { //TODO Use a Visitor in context try { @@ -71,7 +71,7 @@ } } - public void toString(AbstractContext<?> context, Writer w, String head, String prefix, String prefixOption, String prefixConfig) throws IOException { + public void toString(Context<?> context, Writer w, String head, String prefix, String prefixOption, String prefixConfig) throws IOException { w.append(addTitle(head, '=', true)).append("\n\n"); w.append(addTitle(prefixOption, '-', false)).append("\n"); for (OptionKey key : context.getParser().getOptionKeys()) { Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -16,9 +16,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import org.codelutin.option.AbstractContext; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; import java.io.File; @@ -28,7 +28,7 @@ protected final Log log = LogFactory.getLog(getClass()); public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); File property = (File) context.getMainConfig().getProperty("configFileName"); property.delete(); Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -15,11 +15,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.option.AbstractContext; import org.codelutin.option.ConfigKey; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; import org.codelutin.option.ParserUtil; +import org.codelutin.option.Context; import java.io.StringWriter; @@ -29,7 +29,7 @@ protected final Log log = LogFactory.getLog(getClass()); public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); String category = action.getOption().getConstantArgumentValue(0); log.info("required showConfig pour category [" + category + "]"); Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java 2008-07-25 21:36:09 UTC (rev 913) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java 2008-07-25 21:36:41 UTC (rev 914) @@ -15,9 +15,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.option.AbstractContext; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.Context; /** @author chemit */ public class OptionActionUiRunnable implements OptionActionRunnable { @@ -27,7 +27,7 @@ protected boolean init = false; public void run(OptionAction action) throws Exception { - AbstractContext<?> context = action.getContext(); + Context<?> context = action.getContext(); Boolean bool = action.getOption().getValuedArgumentValue(0, Boolean.class, "flag", false); boolean launchUI = bool != null && bool; log.info(action.getOption().getUsedAlias() + ", value:" + bool);