Author: tchemit Date: 2012-08-08 16:20:55 +0200 (Wed, 08 Aug 2012) New Revision: 3580 Url: http://chorem.org/repositories/revision/lima/3580 Log: do not translate i18n option keys Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-08-08 14:20:17 UTC (rev 3579) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-08-08 14:20:55 UTC (rev 3580) @@ -106,9 +106,7 @@ public LimaConfig() { // set defaut option (included configuration file name : important) - for (Option o : Option.values()) { - setDefaultOption(o.key, o.defaultValue); - } + loadDefaultOptions(Option.values()); // set action alias for (Action a : Action.values()) { @@ -140,7 +138,7 @@ instance.setConfigFileName(configFileName); try { - instance.parse(new String[0]); + instance.parse(); } catch (ArgumentsParserException ex) { if (log.isErrorEnabled()) { log.error("Can't read configuration", ex); @@ -428,8 +426,8 @@ OPENEJB_REMOTEMODE("lima.openejb.remotemode", n_("lima.openejb.remotemode.description"), "false", String.class, false, false), LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false), LIMA_STATE_FILE("lima.ui.state.file", n_("lima.config.state.file"), "${lima.data.dir}/limaState.xml", String.class, false, false), - COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", _("lima.config.colorselectionfocus"), "#000000", Color.class, false, false), - COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell", _("lima.config.comportmenteditingcell"), "ALL", comportmentEditingCellEnum.class, false, false); + COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", n_("lima.config.colorselectionfocus"), "#000000", Color.class, false, false), + COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell",n_("lima.config.comportmenteditingcell"), "ALL", comportmentEditingCellEnum.class, false, false); public enum comportmentEditingCellEnum {ALL, NOTHING}