- Lima-commits - mailman.cloud.codelutin.com

26 Sep '14

Author: dcosse Date: 2014-09-26 11:10:52 +0200 (Fri, 26 Sep 2014) New Revision: 3923 Url: http://forge.chorem.org/projects/lima/repository/revisions/3923 Log: refs #1115 refactoring recommendation sonar Added: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java Removed: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java trunk/lima-swing/src/main/java/org/chorem/lima/actions/MiscAction.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DefaultLimaTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/StringTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -26,13 +26,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaXAResource; -import org.chorem.lima.entity.AccountImpl; import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier; import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaApplicationContextCache; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.util.TopiaUtil; import javax.annotation.Resource; import javax.ejb.Stateless; @@ -91,9 +88,6 @@ LimaCallaoTopiaPersistenceContext tx = rootContext.newPersistenceContext(); - // TODO DCossé 24/07/14 remove it as soon as migration service is done. - //createShemaIfNeeded(rootContext, tx); - DAO_HELPER.set(tx); Transaction tr = transactionManager.getTransaction(); @@ -118,24 +112,4 @@ return result; } - /** - * Test if schema do not already exists and create it if not found. - * - * @param applicationContext transaction - * @throws TopiaException - */ - protected void createShemaIfNeeded(LimaCallaoTopiaApplicationContext applicationContext, LimaCallaoTopiaPersistenceContext tx) throws TopiaException { - //LimaCallaoTopiaPersistenceContext - if (!applicationContext.isSchemaEmpty()) { - boolean exist = TopiaUtil.isSchemaExist(tx, AccountImpl.class.getName()); - if (!exist) { - - if (log.isInfoEnabled()) { - log.info("Creating to schema in database"); - } - applicationContext.createSchema(); - } - } - } - } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -55,8 +55,6 @@ protected static final Log log = LogFactory.getLog(LimaServiceConfig.class); -// protected static volatile LimaServiceConfig instance; - protected static AccountingRules accountingRules; protected static final String LIMA_DEFAULT_CONF_FILENAME = "lima.properties"; @@ -187,22 +185,6 @@ config.saveForUser(); } -// /** -// * Load configuration with custom file name. -// */ -// protected void loadConfiguration() { -// try { -// config.parse(); -// } catch (ArgumentsParserException ex) { -// if (log.isErrorEnabled()) { -// log.error("Can't read configuration", ex); -// } -// } -// -// config.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, -// LimaCallaoEntityEnum.getImplementationClassesAsString()); -// } - /** * Lima option definition. * <p/> Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -1,765 +0,0 @@ -/* - * #%L - * Lima Swing - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima; - -import com.google.common.collect.ImmutableSet; -import jaxx.runtime.JAXXUtil; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.actions.MiscAction; -import org.chorem.lima.business.api.OptionsService; -import org.chorem.lima.entity.LimaCallaoEntityEnum; -import org.chorem.lima.service.LimaServiceFactory; -import org.nuiton.config.ApplicationConfig; -import org.nuiton.config.ArgumentsParserException; -import org.nuiton.config.ConfigOptionDef; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; -import org.nuiton.util.converter.ConverterUtil; - -import java.awt.*; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.IOException; -import java.util.Locale; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; -import static org.nuiton.i18n.I18n.n; - -/** - * La configuration de l'application. - * - * @author chemit - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ - */ -public class LimaConfig extends ApplicationConfig { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(LimaConfig.class); - - static public final Set<Character> NUMBER_SEPARATOR = ImmutableSet.of(' ', ',', '.', ';'); - static public final Set<Integer> NUMBER_DECIMALS = ImmutableSet.of(0, 1, 2, 3, 4, 5, 6); - - protected static LimaConfig instance; - - private static final String configFile = "lima-config.properties"; - - protected OptionsService optionsService; - - /** La version du logiciel. */ - protected Version version; - - /** - * Get the configuration file - * @return name of the config. file - * */ - /*public String getConfigFile() { - return configFile; - }*/ - - /** - * Get copyright text (include version). - * - * @return copyright text - */ - public String getCopyrightText() { - return "Version " + getVersion() + " Codelutin @ 2008-2012"; - } - - /** - * Version as string. - * - * @return le nombre global ex: 3.2.0.0 - */ - public String getVersion() { - return version.toString(); - } - - /** - * Lima config constructor. - * <p/> - * Define all default options and action alias. - */ - public LimaConfig() { - - // set defaut option (included configuration file name : important) - loadDefaultOptions(Option.values()); - - // set action alias - for (Action a : Action.values()) { - for (String alias : a.aliases) { - addActionAlias(alias, a.action); - } - } - - // ajout des alias (can be set in option enum ?) - addAlias("--disableui", "--launchui false"); - - // initialisation des répertoires - // TODO what is it for ? - //FileUtil.setCurrentDirectory(getLimaUserDirectory()); - //getLimaUserDirectory().mkdirs(); - - } - - public static LimaConfig getInstance() { - if (instance == null) { - instance = new LimaConfig(); - instance.loadConfiguration(configFile); - } - - return instance; - } - - protected void loadConfiguration(String configFileName) { - - instance.setConfigFileName(configFileName); - try { - instance.parse(); - } catch (ArgumentsParserException ex) { - if (log.isErrorEnabled()) { - log.error("Can't read configuration", ex); - } - } - instance.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, - LimaCallaoEntityEnum.getImplementationClassesAsString()); - } - - @Override - public ApplicationConfig parse(String... args) throws ArgumentsParserException { - - // super parse, read config file etc... - super.parse(args); - - // on ne peut pas connaitre la version avant la lecture du fichier - // on supprime tout ce qui est apres - (-SNAPSHOT, -rc-1 ,...) - String sVersion = VersionUtil.removeSnapshot(getOption("application.version")); - version = VersionUtil.valueOf(sVersion); - - return this; - - } - - /** - * Get application locale. - * - * @return configuration application locale - */ - public Locale getLocale() { - String local = getOption(Option.LOCALE.key); - Locale result = ConverterUtil.convert(Locale.class, local); - return result; - } - - /** - * Locale setter for command line parameters. - * - * @param locale new locale - */ - public void setLocale(String locale) { - setOption(Option.LOCALE.key, locale); - } - - /** - * Change locale (not command line version). - * Save user file. - * - * @param newLocale new locale - */ - public void setLocale(Locale newLocale) { - setOption(Option.LOCALE.key, newLocale.toString()); - saveForUser(); - firePropertyChange("locale", null, newLocale); - } - - /** - * Get application decimal separator - * - * @return configuration application decimal separator - */ - public char getDecimalSeparator() { - char decimalSeparator = getOption(Option.DECIMAL_SEPARATOR.key).charAt(0); - return decimalSeparator; - } - - /** - * Change decimal separator - * Save user file. - * - * @param decimalSeparator new DecimalSeparator - */ - public void setDecimalSeparator(String decimalSeparator) { - setOption(Option.DECIMAL_SEPARATOR.key, decimalSeparator); - saveForUser(); - firePropertyChange("decimalSeparator", null, decimalSeparator); - } - - /** - * Get application scale - * - * @return configuration application scale - */ - public int getScale() { - return getOptionAsInt(Option.SCALE.key); - } - - /** - * Change scale - * Save user file. - * - * @param scale new Scale - */ - public void setScale(String scale) { - setOption(Option.SCALE.key, scale); - saveForUser(); - firePropertyChange("scale", null, scale); - if (log.isInfoEnabled()) { - log.info("new scale" + scale); - } - optionsService.setScale(scale); - } - - /** - * Get application thousand separator - * - * @return configuration application thousand separator - */ - public char getThousandSeparator() { - return getOption(Option.THOUSAND_SEPARATOR.key).charAt(0); - } - - /** - * Change the thousand separator - * Save user file. - * - * @param thousandSeparator new thousandSeparator - */ - public void setThousandSeparator(String thousandSeparator) { - setOption(Option.THOUSAND_SEPARATOR.key, thousandSeparator); - saveForUser(); - firePropertyChange("thousandSeparator", null, thousandSeparator); - } - - /** - * currency configuration boolean - * - * @return {@code true} if the currency must be displayed - */ - public boolean getCurrency() { - return getOptionAsBoolean(Option.CURRENCY.key); - } - - /** - * Change the currency displaying - * - * @param currency the new currency to set in configuration - */ - public void setCurrency(boolean currency) { - setOption(Option.CURRENCY.key, Boolean.toString(currency)); - saveForUser(); - firePropertyChange("currency", null, currency); - } - - /** - * Launch ui configuration value. - * - * @return {@code true} if ui must be displayed - */ - public boolean isLaunchui() { - boolean launchUI = getOptionAsBoolean(Option.LAUNCH_UI.key); - return launchUI; - } - - /** - * Launch ui setter for command line parameters. - * - * @param launchui new lauch ui value - */ - public void setLaunchui(String launchui) { - setOption(Option.LAUNCH_UI.key, launchui); - } - - /** - * Get support email address. - * - * @return support email - */ - public String getSupportEmail() { - return getOption(Option.SUPPORT_EMAIL.key); - } - - /** - * Return true if ejb mode is configured as remote. - * - * @return {@code true} if remote mode should be used - */ - public boolean isEJBRemoteMode() { - boolean result = getOptionAsBoolean(Option.OPENEJB_REMOTEMODE.key); - return result; - } - - public File getDataDirectory() { - File result = getOptionAsFile(Option.DATA_DIR.key); - return result; - } - - public File getLimaStateFile() { - File result = getOptionAsFile(Option.LIMA_STATE_FILE.key); - return result; - } - - public File getResourcesDirectory() { - File result = getOptionAsFile(Option.RESOURCES_DIRECTORY.key); - return result; - } - - public File getI18nDirectory() { - File result = getOptionAsFile(Option.I18N_DIRECTORY.key); - return result; - } - - public String getHostAdress() { - return getOption(Option.LIMA_HOST_ADDRESS.key); - } - - public void setColorSelectionFocus(String color) { - setOption(Option.COLOR_SELECTION_FOCUS.key, color); - } - - public Color getColorSelectionFocus() { - return getOptionAsColor((Option.COLOR_SELECTION_FOCUS.key)); - } - - public void setSelectAllEditingCell(boolean selectAllEditingCell) { - setOption(Option.SELECT_ALL_EDITING_CELL.key, Boolean.toString(selectAllEditingCell)); - } - - public boolean isSelectAllEditingCell() { - return getOptionAsBoolean((Option.SELECT_ALL_EDITING_CELL.key)); - } - - /** Used in ???? */ - public static final String[] DEFAULT_JAXX_PCS = {"fullScreen", "locale", "decimalSeparator", "scale", "thousandSeparator", "currency"}; - - /** Used in ???? */ - public void removeJaxxPropertyChangeListener() { - PropertyChangeListener[] toRemove = JAXXUtil.findJaxxPropertyChangeListener(DEFAULT_JAXX_PCS, getPropertyChangeListeners()); - if (toRemove == null || toRemove.length == 0) { - return; - } - if (log.isDebugEnabled()) { - log.debug("before remove : " + getPropertyChangeListeners().length); - log.debug("toRemove : " + toRemove.length); - - } - for (PropertyChangeListener listener : toRemove) { - removePropertyChangeListener(listener); - } - if (log.isDebugEnabled()) { - log.debug("after remove : " + getPropertyChangeListeners().length); - } - } - - /** - * Lima option definition. - * <p/> - * Contains all lima configuration key, with defaut value and - * information for jaxx configuration frame ({@link #type}, - * {@link #_transient}, {@link #_final}...) - */ - public enum Option implements ConfigOptionDef { - - - CONFIG_FILE(CONFIG_FILE_NAME, - t("lima.config.configFileName.label"), - n("lima.config.configFileName.description"), - "lima-config.properties", - String.class, true, true), - - DATA_DIR("lima.data.dir", - t("lima.config.data.dir.label"), - n("lima.config.data.dir.description"), - "${user.home}/.lima", - File.class, false, false), - - RESOURCES_DIRECTORY("lima.resources.dir", - t("lima.config.resources.dir.label"), - n("lima.config.resources.dir.description"), - "${lima.data.dir}/resources-${application.version}", - String.class, false, false), - - I18N_DIRECTORY("lima.i18n.dir", - t("lima.config.i18n.dir.label"), - n("lima.config.i18n.dir.description"), - "${lima.resources.dir}/i18n", - String.class, false, false), - - LOCALE("lima.ui.locale", - t("lima.config.locale.label"), - n("lima.config.locale.description"), - "fr_FR", - Locale.class, false, false), - - DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", - t("lima.config.decimalseparator.label"), - n("lima.config.decimalseparator.description"), - ",", - Character.class, false, false), - - SCALE("lima.data.bigDecimal.scale", - t("lima.config.scale.label"), - n("lima.config.scale.description"), - "2", - Integer.class, false, false), - - THOUSAND_SEPARATOR("lima.thousandSeparator", - t("limma.config.thousandseparator.label"), - n("limma.config.thousandseparator.description"), - " ", - Character.class, false, false), - - CURRENCY("lima.config.currency", - t("lima.config.currency.label"), - n("lima.config.currency.description"), - "false", - Boolean.class, false, false), - - LAUNCH_UI("lima.ui.launchui", - t("lima.config.ui.flaunchui.label"), - n("lima.config.ui.flaunchui.description"), - "true", Boolean.class, true, true), - - SUPPORT_EMAIL("lima.misc.supportemail", - t("lima.misc.supportemail.label"), - n("lima.misc.supportemail.description"), - "support(a)codelutin.com", - String.class, false, false), - - OPENEJB_REMOTEMODE("lima.openejb.remotemode", - t("lima.openejb.remotemode.label"), - n("lima.openejb.remotemode.description"), - "false", - String.class, false, false), - - LIMA_HOST_ADDRESS("lima.host.address", - t("lima.config.host.adress.label"), - n("lima.config.host.adress.description"), - "localhost", - String.class, false, false), - - LIMA_STATE_FILE("lima.ui.state.file", - t("lima.config.state.file.label"), - n("lima.config.state.file.description"), - "${lima.data.dir}/limaState.xml", - String.class, false, false), - - COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", - t("lima.config.colorselectionfocus.label"), - n("lima.config.colorselectionfocus.description"), - "#000000", - Color.class, false, false), - - SELECT_ALL_EDITING_CELL("lima.ui.table.cell.selectAllEditingCell", - t("lima.config.selectAllEditingCell.label"), - n("lima.config.selectAllEditingCell.description"), - "true", - Boolean.class, false, false), - - TABLE_CELL_BACKGROUND("lima.ui.table.cell.background", - t("lima.config.cell.background.label"), - n("lima.config.cell.background.description"), - "#FFFFFF", - Color.class, false, false), - - TABLE_CELL_FOREGROUND("lima.ui.table.cell.foreground", - t("lima.config.cell.foreground.label"), - n("lima.config.cell.foreground.description"), - "#000000", - Color.class, false, false), - - TABLE_CELL_PAIR_BACKGROUND("lima.ui.table.cell.pair.background", - t("lima.config.cell.pair.background.label"), - n("lima.config.cell.pair.background.description"), - "#EEEEEE", - Color.class, false, false), - - TABLE_CELL_PAIR_FOREGROUND("lima.ui.table.cell.pair.foreground", - t("lima.config.cell.pair.foreground.label"), - n("lima.config.cell.pair.foreground.description"), - "#000000", - Color.class, false, false), - - TABLE_CELL_SELECTED_BACKGROUND("lima.ui.table.cell.selected.background", - t("lima.config.cell.selected.background.label"), - n("lima.config.cell.selected.background.description"), - "#0066CC", - Color.class, false, false), - - TABLE_CELL_SELECTED_FOREGROUND("lima.ui.table.cell.selected.foreground", - t("lima.config.cell.selected.foreground.label"), - n("lima.config.cell.selected.foreground.description"), - "#FFFFFF", - Color.class, false, false), - - TABLE_CELL_PAIR_SELECTED_BACKGROUND("lima.ui.table.cell.pair.selected.background", - t("lima.config.cell.pair.selected.background.label"), - n("lima.config.cell.pair.selected.background.description"), - "#006699", - Color.class, false, false), - - TABLE_CELL_PAIR_SELECTED_FOREGROUND("lima.ui.table.cell.pair.selected.foreground", - t("lima.config.cell.pair.selected.foreground.label"), - n("lima.config.cell.pair.selected.foreground.description"), - "#FFFFFF", - Color.class, false, false), - - TABLE_CELL_ERROR_BACKGROUND("lima.ui.table.cell.error.background", - t("lima.config.cell.error.background.label"), - n("lima.config.cell.error.background.description"), - "#FFFFFF", - Color.class, false, false), - - TABLE_CELL_ERROR_FOREGROUND("lima.ui.table.cell.error.foreground", - t("lima.config.cell.error.foreground.label"), - n("lima.config.cell.error.foreground.description"), - "#FF0936", - Color.class, false, false), - - TABLE_CELL_PAIR_ERROR_BACKGROUND("lima.ui.table.cell.pair.error.background", - t("lima.config.cell.pair.error.background.label"), - n("lima.config.cell.pair.error.background.description"), - "#EEEEEE", - Color.class, false, false), - - TABLE_CELL_PAIR_ERROR_FOREGROUND("lima.ui.table.cell.pair.error.foreground", - t("lima.config.cell.pair.error.foreground.label"), - n("lima.config.cell.pair.error.foreground.description"), - "#FC0625", - Color.class, false, false), - - TABLE_CELL_SELECTED_ERROR_BACKGROUND("lima.ui.table.cell.selected.error.background", - t("lima.config.cell.selected.error.background.label"), - n("lima.config.cell.selected.error.background.description"), - "#0066CC", - Color.class, false, false), - - TABLE_CELL_SELECTED_ERROR_FOREGROUND("lima.ui.table.cell.selected.error.foreground", - t("lima.config.cell.selected.error.foreground.label"), - n("lima.config.cell.selected.error.foreground.description"), - "#C998C1", - Color.class, false, false), - - TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND("lima.ui.table.cell.pair.selected.error.background", - t("lima.config.cell.pair.selected.error.background.label"), - n("lima.config.cell.pair.selected.error.background.description"), - "#006699", - Color.class, false, false), - - TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND("lima.ui.table.cell.pair.selected.error.foreground", - t("lima.config.cell.pair.selected.error.foreground.label"), - n("lima.config.cell.pair.selected.error.foreground.description"), - "#C96678", - Color.class, false, false), - - TABLE_CELL_MANDATORY_BACKGROUND("lima.ui.table.cell.mandatory.background", - t("lima.config.cell.mandatory.background.label"), - n("lima.config.cell.mandatory.background.description"), - "#FFCCCC", - Color.class, false, false), - - TABLE_CELL_MANDATORY_FOREGROUND("lima.ui.table.cell.mandatory.foreground", - t("lima.config.cell.mandatory.foreground.label"), - n("lima.config.cell.mandatory.foreground.description"), - "#000000", - Color.class, false, false), - - TABLE_CELL_PAIR_MANDATORY_BACKGROUND("lima.ui.table.cell.pair.mandatory.background", - t("lima.config.cell.pair.mandatory.background.label"), - n("lima.config.cell.pair.mandatory.background.description"), - "#FF99CC", - Color.class, false, false), - - TABLE_CELL_PAIR_MANDATORY_FOREGROUND("lima.ui.table.cell.pair.mandatory.foreground", - t("lima.config.cell.pair.mandatory.foreground.label"), - n("lima.config.cell.pair.mandatory.foreground.description"), - "#000000", - Color.class, false, false), - - TABLE_CELL_SELECTED_MANDATORY_BACKGROUND("lima.ui.table.cell.selected.mandatory.background", - t("lima.config.cell.selected.mandatory.background.label"), - n("lima.config.cell.selected.mandatory.background.description"), - "#FF0000", - Color.class, false, false), - - TABLE_CELL_SELECTED_MANDATORY_FOREGROUND("lima.ui.table.cell.selected.mandatory.foreground", - t("lima.config.cell.selected.mandatory.foreground.label"), - n("lima.config.cell.selected.mandatory.foreground.description"), - "#FFFFFF", - Color.class, false, false), - - TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND("lima.ui.table.cell.pair.selected.mandatory.background", - t("lima.config.cell.pair.selected.mandatory.background.label"), - n("lima.config.cell.pair.selected.mandatory.background.description"), - "#990000", - Color.class, false, false), - - TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND("lima.ui.table.cell.pair.selected.mandatory.foreground", - t("lima.config.cell.pair.selected.mandatory.foreground.label"), - n("lima.config.cell.pair.selected.mandatory.foreground.description"), - "#000000", - Color.class, false, false); - - public enum ComportmentEditingCellEnum {ALL, NOTHING} - - public final String key; - - public final String label; - - public final String description; - - public String defaultValue; - - public final Class<?> type; - - public boolean _transient; - - public boolean _final; - - Option(String key, String label, String description, String defaultValue, - Class<?> type, boolean _transient, boolean _final) { - this.key = key; - this.label = label; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - this._final = _final; - this._transient = _transient; - } - - @Override - public boolean isFinal() { - return _final; - } - - @Override - public void setFinal(boolean _final) { - this._final = _final; - } - - @Override - public boolean isTransient() { - return _transient; - } - - @Override - public void setTransient(boolean _transient) { - this._transient = _transient; - } - - @Override - public String getDefaultValue() { - return defaultValue; - } - - @Override - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - public String getLabel () { - return label; - } - - @Override - public String getDescription() { - return t(description); - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return type; - } - } - - /** Lima action definition. */ - public enum Action { - - HELP(n("lima.action.commandline.help"), MiscAction.class.getName() + "#help", "-h", "--help"); - - /** Before init action step. */ - public static final int BEFORE_EXIT_STEP = 0; - - /** After init action step. */ - public static final int AFTER_INIT_STEP = 1; - - public String description; - - public String action; - - public String[] aliases; - - Action(String description, String action, String... aliases) { - this.description = description; - this.action = action; - this.aliases = aliases; - } - - public String getDescription() { - return t(description); - } - } - - /** - * Override save action to propagate some option to server. - */ - @Override - public void save(File file, - boolean forceAll, - String... excludeKeys) throws IOException { - - super.save(file, forceAll, excludeKeys); - - // propagate scale option to serveur option - optionsService = LimaServiceFactory.getService(OptionsService.class); - - // scale server option - String scaleOption = getOption("scale"); - if (StringUtils.isNotBlank(scaleOption)) { - optionsService.setScale(scaleOption); - } - } -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -59,7 +59,7 @@ log.error("Global application exception", ex); } - ErrorHelper errorHelper = new ErrorHelper(LimaConfig.getInstance()); + ErrorHelper errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); errorHelper.showErrorDialog(null, ex.getMessage(), ex); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -53,7 +53,7 @@ private static final Log log = LogFactory.getLog(LimaMain.class); /** Lima configuration. */ - public static LimaConfig config; + public static LimaSwingConfig config; /** splash */ private static LimaSplash splash; @@ -76,7 +76,7 @@ // do actions config = context.getConfig(); - config.doAction(LimaConfig.Action.AFTER_INIT_STEP); + config.doAction(LimaSwingConfig.Action.AFTER_INIT_STEP); // display main ui if (config.isLaunchui()) { @@ -112,7 +112,7 @@ // init root context LimaSwingApplicationContext context = LimaSwingApplicationContext.init(); - LimaConfig config = context.getConfig(); + LimaSwingConfig config = context.getConfig(); config.parse(args); context.initI18n(config); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -58,7 +58,7 @@ public static JAXXContextEntryDef<DecoratorProvider> DECORATOR_PROVIDER_DEF = JAXXUtil.newContextEntryDef("decoratorProvider", DecoratorProvider.class); - public static JAXXContextEntryDef<LimaConfig> CONFIG_DEF = JAXXUtil.newContextEntryDef("limaConfig", LimaConfig.class); + public static JAXXContextEntryDef<LimaSwingConfig> CONFIG_DEF = JAXXUtil.newContextEntryDef("limaConfig", LimaSwingConfig.class); /** * @return <code>true</code> si le context a été initialisé via la méthode @@ -83,7 +83,7 @@ } instance = new LimaSwingApplicationContext(); instance.setContextValue(new MainViewHandler()); - CONFIG_DEF.setContextValue(instance, LimaConfig.getInstance()); + CONFIG_DEF.setContextValue(instance, LimaSwingConfig.getInstance()); DECORATOR_PROVIDER_DEF.setContextValue(instance, new LimaDecoratorProvider()); initApplicationContext(); return instance; @@ -108,7 +108,7 @@ return instance; } - public LimaConfig getConfig() { + public LimaSwingConfig getConfig() { return CONFIG_DEF.getContextValue(this); } @@ -116,7 +116,7 @@ return DECORATOR_PROVIDER_DEF.getContextValue(this); } - public void initI18n(LimaConfig config) { + public void initI18n(LimaSwingConfig config) { I18n.close(); Copied: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java (from rev 3921, trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java) =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -0,0 +1,750 @@ +/* + * #%L + * Lima Swing + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima; + +import com.google.common.collect.ImmutableSet; +import jaxx.runtime.JAXXUtil; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.actions.MiscAction; +import org.chorem.lima.business.api.OptionsService; +import org.chorem.lima.entity.LimaCallaoEntityEnum; +import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; +import org.nuiton.config.ConfigOptionDef; +import org.nuiton.converter.ConverterUtil; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.VersionBuilder; + +import java.awt.*; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.IOException; +import java.util.Locale; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * La configuration de l'application. + * + * @author chemit + * @version $Revision$ + * <p/> + * Last update : $Date$ + * By : $Author$ + */ +public class LimaSwingConfig extends ApplicationConfig { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(LimaSwingConfig.class); + + public static final Set<Character> NUMBER_SEPARATOR = ImmutableSet.of(' ', ',', '.', ';'); + public static final Set<Integer> NUMBER_DECIMALS = ImmutableSet.of(0, 1, 2, 3, 4, 5, 6); + + protected static LimaSwingConfig instance; + + private static final String configFile = "lima-config.properties"; + + protected OptionsService optionsService; + + /** La version du logiciel. */ + protected Version version; + + /** + * Get copyright text (include version). + * + * @return copyright text + */ + public String getCopyrightText() { + return "Version " + getVersion() + " Codelutin @ 2008-2012"; + } + + /** + * Version as string. + * + * @return le nombre global ex: 3.2.0.0 + */ + public String getVersion() { + return version.toString(); + } + + /** + * Lima config constructor. + * <p/> + * Define all default options and action alias. + */ + public LimaSwingConfig() { + + // set defaut option (included configuration file name : important) + loadDefaultOptions(Option.values()); + + // set action alias + for (Action a : Action.values()) { + for (String alias : a.aliases) { + addActionAlias(alias, a.action); + } + } + + // ajout des alias (can be set in option enum ?) + addAlias("--disableui", "--launchui false"); + } + + public static LimaSwingConfig getInstance() { + if (instance == null) { + instance = new LimaSwingConfig(); + instance.loadConfiguration(configFile); + } + + return instance; + } + + protected void loadConfiguration(String configFileName) { + + instance.setConfigFileName(configFileName); + try { + instance.parse(); + } catch (ArgumentsParserException ex) { + if (log.isErrorEnabled()) { + log.error("Can't read configuration", ex); + } + } + instance.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, + LimaCallaoEntityEnum.getImplementationClassesAsString()); + } + + @Override + public ApplicationConfig parse(String... args) throws ArgumentsParserException { + + // super parse, read config file etc... + super.parse(args); + + // on ne peut pas connaitre la version avant la lecture du fichier + VersionBuilder nb = new VersionBuilder(); + nb.setVersion(getOption("application.version")); + version = nb.build(); + return this; + + } + + /** + * Get application locale. + * + * @return configuration application locale + */ + public Locale getLocale() { + String local = getOption(Option.LOCALE.key); + Locale result = ConverterUtil.convert(Locale.class, local); + return result; + } + + /** + * Locale setter for command line parameters. + * + * @param locale new locale + */ + public void setLocale(String locale) { + setOption(Option.LOCALE.key, locale); + } + + /** + * Change locale (not command line version). + * Save user file. + * + * @param newLocale new locale + */ + public void setLocale(Locale newLocale) { + setOption(Option.LOCALE.key, newLocale.toString()); + saveForUser(); + firePropertyChange("locale", null, newLocale); + } + + /** + * Get application decimal separator + * + * @return configuration application decimal separator + */ + public char getDecimalSeparator() { + char decimalSeparator = getOption(Option.DECIMAL_SEPARATOR.key).charAt(0); + return decimalSeparator; + } + + /** + * Change decimal separator + * Save user file. + * + * @param decimalSeparator new DecimalSeparator + */ + public void setDecimalSeparator(String decimalSeparator) { + setOption(Option.DECIMAL_SEPARATOR.key, decimalSeparator); + saveForUser(); + firePropertyChange("decimalSeparator", null, decimalSeparator); + } + + /** + * Get application scale + * + * @return configuration application scale + */ + public int getScale() { + return getOptionAsInt(Option.SCALE.key); + } + + /** + * Change scale + * Save user file. + * + * @param scale new Scale + */ + public void setScale(String scale) { + setOption(Option.SCALE.key, scale); + saveForUser(); + firePropertyChange("scale", null, scale); + if (log.isInfoEnabled()) { + log.info("new scale" + scale); + } + optionsService.setScale(scale); + } + + /** + * Get application thousand separator + * + * @return configuration application thousand separator + */ + public char getThousandSeparator() { + return getOption(Option.THOUSAND_SEPARATOR.key).charAt(0); + } + + /** + * Change the thousand separator + * Save user file. + * + * @param thousandSeparator new thousandSeparator + */ + public void setThousandSeparator(String thousandSeparator) { + setOption(Option.THOUSAND_SEPARATOR.key, thousandSeparator); + saveForUser(); + firePropertyChange("thousandSeparator", null, thousandSeparator); + } + + /** + * currency configuration boolean + * + * @return {@code true} if the currency must be displayed + */ + public boolean getCurrency() { + return getOptionAsBoolean(Option.CURRENCY.key); + } + + /** + * Change the currency displaying + * + * @param currency the new currency to set in configuration + */ + public void setCurrency(boolean currency) { + setOption(Option.CURRENCY.key, Boolean.toString(currency)); + saveForUser(); + firePropertyChange("currency", null, currency); + } + + /** + * Launch ui configuration value. + * + * @return {@code true} if ui must be displayed + */ + public boolean isLaunchui() { + boolean launchUI = getOptionAsBoolean(Option.LAUNCH_UI.key); + return launchUI; + } + + /** + * Launch ui setter for command line parameters. + * + * @param launchui new lauch ui value + */ + public void setLaunchui(String launchui) { + setOption(Option.LAUNCH_UI.key, launchui); + } + + /** + * Get support email address. + * + * @return support email + */ + public String getSupportEmail() { + return getOption(Option.SUPPORT_EMAIL.key); + } + + /** + * Return true if ejb mode is configured as remote. + * + * @return {@code true} if remote mode should be used + */ + public boolean isEJBRemoteMode() { + boolean result = getOptionAsBoolean(Option.OPENEJB_REMOTEMODE.key); + return result; + } + + public File getDataDirectory() { + File result = getOptionAsFile(Option.DATA_DIR.key); + return result; + } + + public File getLimaStateFile() { + File result = getOptionAsFile(Option.LIMA_STATE_FILE.key); + return result; + } + + public File getResourcesDirectory() { + File result = getOptionAsFile(Option.RESOURCES_DIRECTORY.key); + return result; + } + + public File getI18nDirectory() { + File result = getOptionAsFile(Option.I18N_DIRECTORY.key); + return result; + } + + public String getHostAdress() { + return getOption(Option.LIMA_HOST_ADDRESS.key); + } + + public void setColorSelectionFocus(String color) { + setOption(Option.COLOR_SELECTION_FOCUS.key, color); + } + + public Color getColorSelectionFocus() { + return getOptionAsColor((Option.COLOR_SELECTION_FOCUS.key)); + } + + public void setSelectAllEditingCell(boolean selectAllEditingCell) { + setOption(Option.SELECT_ALL_EDITING_CELL.key, Boolean.toString(selectAllEditingCell)); + } + + public boolean isSelectAllEditingCell() { + return getOptionAsBoolean((Option.SELECT_ALL_EDITING_CELL.key)); + } + + /** Used in ???? */ + protected static final String[] DEFAULT_JAXX_PCS = {"fullScreen", "locale", "decimalSeparator", "scale", "thousandSeparator", "currency"}; + + /** Used in ???? */ + public void removeJaxxPropertyChangeListener() { + PropertyChangeListener[] toRemove = JAXXUtil.findJaxxPropertyChangeListener(DEFAULT_JAXX_PCS, getPropertyChangeListeners()); + if (toRemove == null || toRemove.length == 0) { + return; + } + if (log.isDebugEnabled()) { + log.debug("before remove : " + getPropertyChangeListeners().length); + log.debug("toRemove : " + toRemove.length); + + } + for (PropertyChangeListener listener : toRemove) { + removePropertyChangeListener(listener); + } + if (log.isDebugEnabled()) { + log.debug("after remove : " + getPropertyChangeListeners().length); + } + } + + /** + * Lima option definition. + * <p/> + * Contains all lima configuration key, with defaut value and + * information for jaxx configuration frame ({@link #type}, + * {@link #_transient}, {@link #_final}...) + */ + public enum Option implements ConfigOptionDef { + + + CONFIG_FILE(CONFIG_FILE_NAME, + t("lima.config.configFileName.label"), + n("lima.config.configFileName.description"), + "lima-config.properties", + String.class, true, true), + + DATA_DIR("lima.data.dir", + t("lima.config.data.dir.label"), + n("lima.config.data.dir.description"), + "${user.home}/.lima", + File.class, false, false), + + RESOURCES_DIRECTORY("lima.resources.dir", + t("lima.config.resources.dir.label"), + n("lima.config.resources.dir.description"), + "${lima.data.dir}/resources-${application.version}", + String.class, false, false), + + I18N_DIRECTORY("lima.i18n.dir", + t("lima.config.i18n.dir.label"), + n("lima.config.i18n.dir.description"), + "${lima.resources.dir}/i18n", + String.class, false, false), + + LOCALE("lima.ui.locale", + t("lima.config.locale.label"), + n("lima.config.locale.description"), + "fr_FR", + Locale.class, false, false), + + DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", + t("lima.config.decimalseparator.label"), + n("lima.config.decimalseparator.description"), + ",", + Character.class, false, false), + + SCALE("lima.data.bigDecimal.scale", + t("lima.config.scale.label"), + n("lima.config.scale.description"), + "2", + Integer.class, false, false), + + THOUSAND_SEPARATOR("lima.thousandSeparator", + t("limma.config.thousandseparator.label"), + n("limma.config.thousandseparator.description"), + " ", + Character.class, false, false), + + CURRENCY("lima.config.currency", + t("lima.config.currency.label"), + n("lima.config.currency.description"), + "false", + Boolean.class, false, false), + + LAUNCH_UI("lima.ui.launchui", + t("lima.config.ui.flaunchui.label"), + n("lima.config.ui.flaunchui.description"), + "true", Boolean.class, true, true), + + SUPPORT_EMAIL("lima.misc.supportemail", + t("lima.misc.supportemail.label"), + n("lima.misc.supportemail.description"), + "support(a)codelutin.com", + String.class, false, false), + + OPENEJB_REMOTEMODE("lima.openejb.remotemode", + t("lima.openejb.remotemode.label"), + n("lima.openejb.remotemode.description"), + "false", + String.class, false, false), + + LIMA_HOST_ADDRESS("lima.host.address", + t("lima.config.host.adress.label"), + n("lima.config.host.adress.description"), + "localhost", + String.class, false, false), + + LIMA_STATE_FILE("lima.ui.state.file", + t("lima.config.state.file.label"), + n("lima.config.state.file.description"), + "${lima.data.dir}/limaState.xml", + String.class, false, false), + + COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", + t("lima.config.colorselectionfocus.label"), + n("lima.config.colorselectionfocus.description"), + "#000000", + Color.class, false, false), + + SELECT_ALL_EDITING_CELL("lima.ui.table.cell.selectAllEditingCell", + t("lima.config.selectAllEditingCell.label"), + n("lima.config.selectAllEditingCell.description"), + "true", + Boolean.class, false, false), + + TABLE_CELL_BACKGROUND("lima.ui.table.cell.background", + t("lima.config.cell.background.label"), + n("lima.config.cell.background.description"), + "#FFFFFF", + Color.class, false, false), + + TABLE_CELL_FOREGROUND("lima.ui.table.cell.foreground", + t("lima.config.cell.foreground.label"), + n("lima.config.cell.foreground.description"), + "#000000", + Color.class, false, false), + + TABLE_CELL_PAIR_BACKGROUND("lima.ui.table.cell.pair.background", + t("lima.config.cell.pair.background.label"), + n("lima.config.cell.pair.background.description"), + "#EEEEEE", + Color.class, false, false), + + TABLE_CELL_PAIR_FOREGROUND("lima.ui.table.cell.pair.foreground", + t("lima.config.cell.pair.foreground.label"), + n("lima.config.cell.pair.foreground.description"), + "#000000", + Color.class, false, false), + + TABLE_CELL_SELECTED_BACKGROUND("lima.ui.table.cell.selected.background", + t("lima.config.cell.selected.background.label"), + n("lima.config.cell.selected.background.description"), + "#0066CC", + Color.class, false, false), + + TABLE_CELL_SELECTED_FOREGROUND("lima.ui.table.cell.selected.foreground", + t("lima.config.cell.selected.foreground.label"), + n("lima.config.cell.selected.foreground.description"), + "#FFFFFF", + Color.class, false, false), + + TABLE_CELL_PAIR_SELECTED_BACKGROUND("lima.ui.table.cell.pair.selected.background", + t("lima.config.cell.pair.selected.background.label"), + n("lima.config.cell.pair.selected.background.description"), + "#006699", + Color.class, false, false), + + TABLE_CELL_PAIR_SELECTED_FOREGROUND("lima.ui.table.cell.pair.selected.foreground", + t("lima.config.cell.pair.selected.foreground.label"), + n("lima.config.cell.pair.selected.foreground.description"), + "#FFFFFF", + Color.class, false, false), + + TABLE_CELL_ERROR_BACKGROUND("lima.ui.table.cell.error.background", + t("lima.config.cell.error.background.label"), + n("lima.config.cell.error.background.description"), + "#FFFFFF", + Color.class, false, false), + + TABLE_CELL_ERROR_FOREGROUND("lima.ui.table.cell.error.foreground", + t("lima.config.cell.error.foreground.label"), + n("lima.config.cell.error.foreground.description"), + "#FF0936", + Color.class, false, false), + + TABLE_CELL_PAIR_ERROR_BACKGROUND("lima.ui.table.cell.pair.error.background", + t("lima.config.cell.pair.error.background.label"), + n("lima.config.cell.pair.error.background.description"), + "#EEEEEE", + Color.class, false, false), + + TABLE_CELL_PAIR_ERROR_FOREGROUND("lima.ui.table.cell.pair.error.foreground", + t("lima.config.cell.pair.error.foreground.label"), + n("lima.config.cell.pair.error.foreground.description"), + "#FC0625", + Color.class, false, false), + + TABLE_CELL_SELECTED_ERROR_BACKGROUND("lima.ui.table.cell.selected.error.background", + t("lima.config.cell.selected.error.background.label"), + n("lima.config.cell.selected.error.background.description"), + "#0066CC", + Color.class, false, false), + + TABLE_CELL_SELECTED_ERROR_FOREGROUND("lima.ui.table.cell.selected.error.foreground", + t("lima.config.cell.selected.error.foreground.label"), + n("lima.config.cell.selected.error.foreground.description"), + "#C998C1", + Color.class, false, false), + + TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND("lima.ui.table.cell.pair.selected.error.background", + t("lima.config.cell.pair.selected.error.background.label"), + n("lima.config.cell.pair.selected.error.background.description"), + "#006699", + Color.class, false, false), + + TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND("lima.ui.table.cell.pair.selected.error.foreground", + t("lima.config.cell.pair.selected.error.foreground.label"), + n("lima.config.cell.pair.selected.error.foreground.description"), + "#C96678", + Color.class, false, false), + + TABLE_CELL_MANDATORY_BACKGROUND("lima.ui.table.cell.mandatory.background", + t("lima.config.cell.mandatory.background.label"), + n("lima.config.cell.mandatory.background.description"), + "#FFCCCC", + Color.class, false, false), + + TABLE_CELL_MANDATORY_FOREGROUND("lima.ui.table.cell.mandatory.foreground", + t("lima.config.cell.mandatory.foreground.label"), + n("lima.config.cell.mandatory.foreground.description"), + "#000000", + Color.class, false, false), + + TABLE_CELL_PAIR_MANDATORY_BACKGROUND("lima.ui.table.cell.pair.mandatory.background", + t("lima.config.cell.pair.mandatory.background.label"), + n("lima.config.cell.pair.mandatory.background.description"), + "#FF99CC", + Color.class, false, false), + + TABLE_CELL_PAIR_MANDATORY_FOREGROUND("lima.ui.table.cell.pair.mandatory.foreground", + t("lima.config.cell.pair.mandatory.foreground.label"), + n("lima.config.cell.pair.mandatory.foreground.description"), + "#000000", + Color.class, false, false), + + TABLE_CELL_SELECTED_MANDATORY_BACKGROUND("lima.ui.table.cell.selected.mandatory.background", + t("lima.config.cell.selected.mandatory.background.label"), + n("lima.config.cell.selected.mandatory.background.description"), + "#FF0000", + Color.class, false, false), + + TABLE_CELL_SELECTED_MANDATORY_FOREGROUND("lima.ui.table.cell.selected.mandatory.foreground", + t("lima.config.cell.selected.mandatory.foreground.label"), + n("lima.config.cell.selected.mandatory.foreground.description"), + "#FFFFFF", + Color.class, false, false), + + TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND("lima.ui.table.cell.pair.selected.mandatory.background", + t("lima.config.cell.pair.selected.mandatory.background.label"), + n("lima.config.cell.pair.selected.mandatory.background.description"), + "#990000", + Color.class, false, false), + + TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND("lima.ui.table.cell.pair.selected.mandatory.foreground", + t("lima.config.cell.pair.selected.mandatory.foreground.label"), + n("lima.config.cell.pair.selected.mandatory.foreground.description"), + "#000000", + Color.class, false, false); + + protected enum ComportmentEditingCellEnum {ALL, NOTHING} + + protected final String key; + + protected final String label; + + protected final String description; + + protected String defaultValue; + + protected final Class<?> type; + + protected boolean _transient; + + protected boolean _final; + + Option(String key, String label, String description, String defaultValue, + Class<?> type, boolean _transient, boolean _final) { + this.key = key; + this.label = label; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this._final = _final; + this._transient = _transient; + } + + @Override + public boolean isFinal() { + return _final; + } + + @Override + public void setFinal(boolean _final) { + this._final = _final; + } + + @Override + public boolean isTransient() { + return _transient; + } + + @Override + public void setTransient(boolean _transient) { + this._transient = _transient; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + public String getLabel () { + return label; + } + + @Override + public String getDescription() { + return t(description); + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + } + + /** Lima action definition. */ + public enum Action { + + HELP(n("lima.action.commandline.help"), MiscAction.class.getName() + "#help", "-h", "--help"); + + /** Before init action step. */ + public static final int BEFORE_EXIT_STEP = 0; + + /** After init action step. */ + public static final int AFTER_INIT_STEP = 1; + + public String description; + + public String action; + + public String[] aliases; + + Action(String description, String action, String... aliases) { + this.description = description; + this.action = action; + this.aliases = aliases; + } + + public String getDescription() { + return t(description); + } + } + + /** + * Override save action to propagate some option to server. + */ + @Override + public void save(File file, + boolean forceAll, + String... excludeKeys) throws IOException { + + super.save(file, forceAll, excludeKeys); + + // propagate scale option to serveur option + optionsService = LimaServiceFactory.getService(OptionsService.class); + + // scale server option + String scaleOption = getOption("scale"); + if (StringUtils.isNotBlank(scaleOption)) { + optionsService.setScale(scaleOption); + } + } +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/actions/MiscAction.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/actions/MiscAction.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/actions/MiscAction.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -25,8 +25,8 @@ package org.chorem.lima.actions; -import org.chorem.lima.LimaConfig; import org.chorem.lima.LimaMain; +import org.chorem.lima.LimaSwingConfig; import java.util.Arrays; @@ -44,20 +44,20 @@ public class MiscAction { /** La configuration de l'application. */ - protected LimaConfig config; + protected LimaSwingConfig config; - public MiscAction(LimaConfig config) { + public MiscAction(LimaSwingConfig config) { this.config = config; } public void help() { System.out.println(t("lima.message.help.usage")); - for (LimaConfig.Option o : LimaConfig.Option.values()) { - System.out.println("\t" + o.key + "(" + o.defaultValue + "):" + o.getDescription()); + for (LimaSwingConfig.Option o : LimaSwingConfig.Option.values()) { + System.out.println("\t" + o.getKey() + "(" + o.getDefaultValue() + "):" + o.getDescription()); } System.out.println("Actions:"); - for (LimaConfig.Action a : LimaConfig.Action.values()) { + for (LimaSwingConfig.Action a : LimaSwingConfig.Action.values()) { System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + "):" + a.getDescription()); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-09-26 09:10:52 UTC (rev 3923) @@ -31,7 +31,7 @@ java.util.Locale javax.swing.JButton jaxx.runtime.SwingUtil - org.chorem.lima.LimaConfig + org.chorem.lima.LimaSwingConfig org.chorem.lima.LimaSwingApplicationContext org.chorem.lima.enums.ImportExportEnum </import> @@ -42,7 +42,7 @@ SwingUtil.getLayer(mainPanel).setUI(betaLayer); } - public LimaConfig getConfig() { + public LimaSwingConfig getConfig() { return LimaSwingApplicationContext.CONFIG_DEF.getContextValue(getDelegateContext()); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -30,8 +30,8 @@ import jaxx.runtime.swing.config.ConfigUIHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; import org.chorem.lima.LimaSwingApplicationContext; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.api.HttpServerService; import org.chorem.lima.enums.ImportExportEnum; import org.chorem.lima.service.LimaServiceFactory; @@ -105,15 +105,15 @@ //Get xml lima state file protected File getLimaStateFile() { - LimaConfig limaConfig = LimaConfig.getInstance(); + LimaSwingConfig limaSwingConfig = LimaSwingConfig.getInstance(); - File limaStateFile = limaConfig.getLimaStateFile(); + File limaStateFile = limaSwingConfig.getLimaStateFile(); return limaStateFile; } public void changeLanguage(MainView mainUI, Locale newLocale) { - LimaConfig config = mainUI.getConfig(); + LimaSwingConfig config = mainUI.getConfig(); // sauvegarde de la nouvelle locale config.setLocale(newLocale); @@ -155,11 +155,11 @@ public void showConfig(JAXXContext context) { MainView ui = getUI(context); - final LimaConfig config = ui.getConfig(); + final LimaSwingConfig config = ui.getConfig(); ConfigUIHelper helper = new ConfigUIHelper(config); - helper.registerCallBack(LimaConfig.Option.COLOR_SELECTION_FOCUS.key, t("lima.config.colorselectionfocus"), new ImageIcon(), new Runnable() { + helper.registerCallBack(LimaSwingConfig.Option.COLOR_SELECTION_FOCUS.getKey(), t("lima.config.colorselectionfocus"), new ImageIcon(), new Runnable() { @Override public void run() { UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource(new LineBorder(config.getColorSelectionFocus(), 2))); @@ -167,92 +167,92 @@ }); helper.addCategory(t("lima.config.category.directories"), t("lima.config.category.directories.description")); - helper.addOption(LimaConfig.Option.CONFIG_FILE); - helper.setOptionShortLabel(LimaConfig.Option.CONFIG_FILE.getLabel()); + helper.addOption(LimaSwingConfig.Option.CONFIG_FILE); + helper.setOptionShortLabel(LimaSwingConfig.Option.CONFIG_FILE.getLabel()); helper.addCategory(t("lima.config.category.table"), t("lima.config.category.table.description")); - helper.addOption(LimaConfig.Option.TABLE_CELL_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_ERROR_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_ERROR_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_ERROR_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_ERROR_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND.getLabel()); - helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND); - helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND.getLabel()); - helper.addOption(LimaConfig.Option.COLOR_SELECTION_FOCUS); - helper.setOptionShortLabel(LimaConfig.Option.COLOR_SELECTION_FOCUS.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_SELECTED_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_SELECTED_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_SELECTED_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_SELECTED_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_ERROR_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_ERROR_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_ERROR_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_ERROR_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND); + helper.setOptionShortLabel(LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND.getLabel()); + helper.addOption(LimaSwingConfig.Option.COLOR_SELECTION_FOCUS); + helper.setOptionShortLabel(LimaSwingConfig.Option.COLOR_SELECTION_FOCUS.getLabel()); helper.addCategory(t("lima.config.category.other"), t("lima.config.category.other.description")); - helper.addOption(LimaConfig.Option.LOCALE); - helper.setOptionShortLabel(LimaConfig.Option.LOCALE.getLabel()); + helper.addOption(LimaSwingConfig.Option.LOCALE); + helper.setOptionShortLabel(LimaSwingConfig.Option.LOCALE.getLabel()); - JComboBox<Character> comboBoxSeparator = new JComboBox<Character>(LimaConfig.NUMBER_SEPARATOR.toArray(new Character[LimaConfig.NUMBER_SEPARATOR.size()])); + JComboBox<Character> comboBoxSeparator = new JComboBox<Character>(LimaSwingConfig.NUMBER_SEPARATOR.toArray(new Character[LimaSwingConfig.NUMBER_SEPARATOR.size()])); DefaultCellEditor separatorEditor = new DefaultCellEditor(comboBoxSeparator); comboBoxSeparator.setRenderer(new NumberSeparatorCellRenderer()); NumberSeparatorTableCellRenderer separatorRenderer = new NumberSeparatorTableCellRenderer(); - helper.addOption(LimaConfig.Option.DECIMAL_SEPARATOR); - helper.setOptionShortLabel(LimaConfig.Option.DECIMAL_SEPARATOR.getLabel()); + helper.addOption(LimaSwingConfig.Option.DECIMAL_SEPARATOR); + helper.setOptionShortLabel(LimaSwingConfig.Option.DECIMAL_SEPARATOR.getLabel()); helper.setOptionRenderer(separatorRenderer); helper.setOptionEditor(separatorEditor); - JComboBox<Integer> comboBoxDecimal = new JComboBox<Integer>(LimaConfig.NUMBER_DECIMALS.toArray(new Integer[LimaConfig.NUMBER_DECIMALS.size()])); + JComboBox<Integer> comboBoxDecimal = new JComboBox<Integer>(LimaSwingConfig.NUMBER_DECIMALS.toArray(new Integer[LimaSwingConfig.NUMBER_DECIMALS.size()])); DefaultCellEditor decimalEditor = new DefaultCellEditor(comboBoxDecimal); - helper.addOption(LimaConfig.Option.SCALE); - helper.setOptionShortLabel(LimaConfig.Option.SCALE.getLabel()); + helper.addOption(LimaSwingConfig.Option.SCALE); + helper.setOptionShortLabel(LimaSwingConfig.Option.SCALE.getLabel()); helper.setOptionEditor(decimalEditor); - helper.addOption(LimaConfig.Option.THOUSAND_SEPARATOR); - helper.setOptionShortLabel(LimaConfig.Option.THOUSAND_SEPARATOR.getLabel()); + helper.addOption(LimaSwingConfig.Option.THOUSAND_SEPARATOR); + helper.setOptionShortLabel(LimaSwingConfig.Option.THOUSAND_SEPARATOR.getLabel()); helper.setOptionRenderer(separatorRenderer); helper.setOptionEditor(separatorEditor); - helper.addOption(LimaConfig.Option.CURRENCY); - helper.setOptionShortLabel(LimaConfig.Option.CURRENCY.getLabel()); + helper.addOption(LimaSwingConfig.Option.CURRENCY); + helper.setOptionShortLabel(LimaSwingConfig.Option.CURRENCY.getLabel()); /*Pas de 'callBack' sur le changement de comportement lors de l'édition d'une cellule, * car les deux éditeurs concernés rappellent la config dans un listener ('focusGained')*/ - helper.addOption(LimaConfig.Option.SELECT_ALL_EDITING_CELL); - helper.setOptionShortLabel(LimaConfig.Option.SELECT_ALL_EDITING_CELL.getLabel()); + helper.addOption(LimaSwingConfig.Option.SELECT_ALL_EDITING_CELL); + helper.setOptionShortLabel(LimaSwingConfig.Option.SELECT_ALL_EDITING_CELL.getLabel()); helper.buildUI(context, t("lima.config.category.directories")); helper.displayUI(ui, false); @@ -260,7 +260,7 @@ public void gotoSite(JAXXContext context) { - LimaConfig config = getUI(context).getConfig(); + LimaSwingConfig config = getUI(context).getConfig(); URL siteURL = config.getOptionAsURL("application.site.url"); try { @@ -487,7 +487,7 @@ public void loadURI(MainView ui) { int port = LimaServiceFactory.getService( HttpServerService.class).getHttpPort(); - String address = LimaConfig.getInstance().getHostAdress(); + String address = LimaSwingConfig.getInstance().getHostAdress(); String url = "http://" + address + ":" + port + "/"; if (log.isDebugEnabled()) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.ImportService; @@ -121,7 +121,7 @@ // Gets factory service LimaServiceFactory.addServiceListener(ImportService.class, this); accountService = LimaServiceFactory.getService(AccountService.class); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -26,8 +26,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; import org.chorem.lima.LimaSwingApplicationContext; +import org.chorem.lima.LimaSwingConfig; import javax.swing.*; import java.awt.event.KeyEvent; @@ -81,7 +81,7 @@ BigDecimal cellEditorValue; int pointIndex = stringValue.indexOf("."); if (pointIndex != -1) { - LimaConfig config = LimaSwingApplicationContext.getContext().getConfig(); + LimaSwingConfig config = LimaSwingApplicationContext.getContext().getConfig(); String actualDecimals = stringValue.substring(pointIndex, stringValue.length()-1); if (config.getScale() > actualDecimals.length()) { cellEditorValue = new BigDecimal(stringValue); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -24,8 +24,8 @@ */ package org.chorem.lima.ui.celleditor; -import org.chorem.lima.LimaConfig; import org.chorem.lima.LimaSwingApplicationContext; +import org.chorem.lima.LimaSwingConfig; import javax.swing.*; import java.awt.*; @@ -39,7 +39,7 @@ public static String format(BigDecimal value) { - LimaConfig config = LimaSwingApplicationContext.getContext().getConfig(); + LimaSwingConfig config = LimaSwingApplicationContext.getContext().getConfig(); StringBuilder scale = new StringBuilder(); for (int i = 0; i < config.getScale(); i++) { scale.append("0"); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -28,8 +28,8 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; import org.chorem.lima.LimaSwingApplicationContext; +import org.chorem.lima.LimaSwingConfig; import org.jdesktop.swingx.JXDatePicker; import javax.swing.*; @@ -118,7 +118,7 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { JFormattedTextField dateFormattedTextField = datePicker.getEditor(); - LimaConfig config = LimaConfig.getInstance(); + LimaSwingConfig config = LimaSwingConfig.getInstance(); if (config.isSelectAllEditingCell()) { dateFormattedTextField.selectAll(); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DefaultLimaTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DefaultLimaTableCellRenderer.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DefaultLimaTableCellRenderer.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -24,7 +24,7 @@ * #L% */ -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.ui.common.TableModelWithGroup; import javax.swing.*; @@ -64,12 +64,12 @@ line = model.indexInGroup(row); } - LimaConfig limaConfig = LimaConfig.getInstance(); + LimaSwingConfig limaSwingConfig = LimaSwingConfig.getInstance(); // border Border border = BorderFactory.createEmptyBorder(1, 1, 1, 1); if (hasFocus) { - Color color = limaConfig.getOptionAsColor(LimaConfig.Option.COLOR_SELECTION_FOCUS.key); + Color color = limaSwingConfig.getOptionAsColor(LimaSwingConfig.Option.COLOR_SELECTION_FOCUS.getKey()); border = BorderFactory.createLineBorder(color, 2); } else if (line == 0 && table.getModel() instanceof TableModelWithGroup) { border = BorderFactory.createMatteBorder(1, 0, 0, 0, Color.BLACK); @@ -79,61 +79,61 @@ // color - LimaConfig.Option backgroundOption; - LimaConfig.Option foreGroundOption; + LimaSwingConfig.Option backgroundOption; + LimaSwingConfig.Option foreGroundOption; if ((line & 1) == 1 || line % 2 == 1) { if (isSelected) { if (errorDetector.isError(table, value, row, column)) { - backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND; } else if (isMandatory(table, value, row, column)){ - backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND; } else { - backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND; } } else { if (errorDetector.isError(table, value, row, column)) { - backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND; } else if (isMandatory(table, value, row, column)){ - backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND; } else { - backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_PAIR_FOREGROUND; } } } else { if (isSelected) { if (errorDetector.isError(table, value, row, column)) { - backgroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND; } else if (isMandatory(table, value, row, column)){ - backgroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND; } else { - backgroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_SELECTED_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_SELECTED_FOREGROUND; } } else { if (errorDetector.isError(table, value, row, column)) { - backgroundOption = LimaConfig.Option.TABLE_CELL_ERROR_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_ERROR_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_ERROR_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_ERROR_FOREGROUND; } else if (isMandatory(table, value, row, column)){ - backgroundOption = LimaConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND; } else { - backgroundOption = LimaConfig.Option.TABLE_CELL_BACKGROUND; - foreGroundOption = LimaConfig.Option.TABLE_CELL_FOREGROUND; + backgroundOption = LimaSwingConfig.Option.TABLE_CELL_BACKGROUND; + foreGroundOption = LimaSwingConfig.Option.TABLE_CELL_FOREGROUND; } } } - myCell.setBackground(limaConfig.getOptionAsColor(backgroundOption.key)); - myCell.setForeground(limaConfig.getOptionAsColor(foreGroundOption.key)); + myCell.setBackground(limaSwingConfig.getOptionAsColor(backgroundOption.getKey())); + myCell.setForeground(limaSwingConfig.getOptionAsColor(foreGroundOption.getKey())); setValue(value); myCell.setText(text); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/StringTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/StringTableCellEditor.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/StringTableCellEditor.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import javax.swing.*; import javax.swing.border.Border; @@ -106,7 +106,7 @@ * Two kinds of edition, with LimaConfig value * */ public void runEdition() { - LimaConfig config = LimaConfig.getInstance(); + LimaSwingConfig config = LimaSwingConfig.getInstance(); if (config.isSelectAllEditingCell()) { getComponent().selectAll(); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractColumn.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractColumn.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -24,7 +24,7 @@ * #L% */ -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.util.ErrorHelper; import javax.swing.table.TableCellEditor; @@ -50,7 +50,7 @@ this.columnClass = columnClass; this.columnName = columnName; this.editable = editable; - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); } public Class<?> getColumnClass() { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.util.ErrorHelper; import javax.swing.table.AbstractTableModel; @@ -56,7 +56,7 @@ columns = Lists.newArrayList(); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); initColumn(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.ImportService; @@ -74,7 +74,7 @@ this.view = view; entryBookService = LimaServiceFactory.getService(EntryBookService.class); LimaServiceFactory.addServiceListener(ImportService.class, this); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); } public void init() { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -28,7 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.FiscalPeriodService; @@ -79,7 +79,7 @@ financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class); LimaServiceFactory.addServiceListener(ImportService.class, this); LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -28,7 +28,7 @@ import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.api.FinancialStatementService; import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatement; import org.chorem.lima.business.exceptions.NotAllowedLabelException; @@ -70,7 +70,7 @@ // Gets factory service financialStatementService = LimaServiceFactory.getService(FinancialStatementService.class); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -29,7 +29,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -106,7 +106,7 @@ LimaServiceFactory.addServiceListener(FinancialPeriodService.class, this); LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); LimaServiceFactory.addServiceListener(ImportService.class, this); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); initShortCuts(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.exceptions.AfterLastFiscalPeriodException; import org.chorem.lima.business.exceptions.BeforeFirstFiscalPeriodException; import org.chorem.lima.business.exceptions.LockedEntryBookException; @@ -68,7 +68,7 @@ protected FinancialTransactionUnbalancedViewHandler(FinancialTransactionUnbalancedView view) { this.view = view; - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); initShortCuts(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -29,7 +29,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; @@ -92,7 +92,7 @@ financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); } public void init() { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -32,7 +32,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.business.ExportResult; import org.chorem.lima.business.ImportExportResults; @@ -120,7 +120,7 @@ //services importService = LimaServiceFactory.getService(ImportService.class); exportService = LimaServiceFactory.getService(ExportService.class); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); //create the wait dialog panel waitView = new ImportExportWaitView(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -31,7 +31,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.beans.LetteringFilterImpl; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; @@ -102,7 +102,7 @@ accountService = LimaServiceFactory.getService(AccountService.class); financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); entryBookService = LimaServiceFactory.getService(EntryBookService.class); - errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java 2014-09-25 15:25:32 UTC (rev 3922) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java 2014-09-26 09:10:52 UTC (rev 3923) @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.MultiPartEmail; -import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaSwingConfig; import org.jdesktop.swingx.JXErrorPane; import org.jdesktop.swingx.error.ErrorInfo; import org.jdesktop.swingx.error.ErrorReporter; @@ -62,9 +62,9 @@ /** Log. */ private static final Log log = LogFactory.getLog(ErrorHelper.class); - protected LimaConfig config; + protected LimaSwingConfig config; - public ErrorHelper(LimaConfig config) { + public ErrorHelper(LimaSwingConfig config) { this.config = config; }

1 0

r3922 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n lima-business/src/test/java/org/chorem/lima/business lima-business/src/test/java/org/chorem/lima/business/accountingrules lima-business/src/test/resources lima-callao/src/main/java/org/chorem/lima/entity lima-callao/src/main/resources lima-callao/src/main/resources/db lima-swing/src/main/java/org/chorem/lima lima-
by dcosse＠users.chorem.org 25 Sep '14

25 Sep '14

Author: dcosse Date: 2014-09-25 17:25:32 +0200 (Thu, 25 Sep 2014) New Revision: 3922 Url: http://forge.chorem.org/projects/lima/repository/revisions/3922 Log: refs #1115 refactoring au tours du lancement de l'application Added: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java trunk/lima-callao/src/main/resources/db/ trunk/lima-callao/src/main/resources/db/migration/ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java Removed: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/ trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java Modified: trunk/lima-business/pom.xml trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java trunk/lima-business/src/test/resources/lima-test.properties trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaRendererUtil.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalYearsPane.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/pom.xml 2014-09-25 15:25:32 UTC (rev 3922) @@ -59,7 +59,7 @@ </dependency> <dependency> <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> + <artifactId>topia-service-flyway</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -126,6 +126,21 @@ </dependencies> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>lima.properties</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <excludes> + <exclude>lima.properties</exclude> + </excludes> + </resource> + </resources> <pluginManagement> <plugins> <plugin> Deleted: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -1,281 +0,0 @@ -/* - * #%L - * Lima business - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.business; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaTechnicalException; -import org.chorem.lima.business.accountingrules.FranceAccountingRules; -import org.chorem.lima.business.migration.DatabaseMigrationClass; -import org.chorem.lima.entity.LimaCallaoEntityEnum; -import org.nuiton.config.ApplicationConfig; -import org.nuiton.config.ArgumentsParserException; -import org.nuiton.config.ConfigOptionDef; -import org.nuiton.topia.migration.TopiaMigrationEngine; -import org.nuiton.topia.migration.TopiaMigrationService; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; - -import java.io.File; - -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - -/** - * Configuration pour le business. - * <p/> - * A voir comment le lier avec celui de lima swing. - * - * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ - */ -public class LimaConfig extends ApplicationConfig { - - protected static final Log log = LogFactory.getLog(LimaConfig.class); - - protected static volatile LimaConfig instance; - - protected static AccountingRules accountingRules; - - protected static final String LIMA_DEFAULT_CONF_FILENAME = "lima.properties"; - - protected static ApplicationConfig config = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME); - - public LimaConfig() { - try { - setOption("topia.service.migration", TopiaMigrationEngine.class.getName()); - setOption("topia.service.migration.callback", DatabaseMigrationClass.class.getName()); - - setOption(TopiaMigrationService.MIGRATION_SHOW_SQL, Boolean.TRUE.toString()); - setOption(TopiaMigrationService.MIGRATION_SHOW_PROGRESSION, Boolean.TRUE.toString()); - - LimaConfig.config.loadDefaultOptions(ServiceConfigOption.values()); - LimaConfig.config.parse(); - - } catch (ArgumentsParserException ex) { - throw new LimaTechnicalException("Can't read configuration", ex); - } - } - - public static LimaConfig getInstance() { - if (LimaConfig.instance == null) { - LimaConfig.instance = new LimaConfig(); - LimaConfig.instance.loadConfiguration(); - } - return instance; - } - - public ApplicationConfig getConfig() { - return config; - } - - /** - * Instancie la bonne classe de nationalite en fonction du fichier de configuration. - * - * L'instance est conservée en cache. - * - * @return l'instance de rule - */ - public AccountingRules getAccountingRules() { - - if (accountingRules == null) { - loadAccountingRules(); - } - - return accountingRules; - } - - protected static void loadAccountingRules() { - Class<?> accountingRulesClass = config.getOptionAsClass(ServiceConfigOption.RULES_NATIONALTY.key); - if (accountingRulesClass == null) { - if (log.isErrorEnabled()) { - log.error("No accounting rules defined for:" + ServiceConfigOption.RULES_NATIONALTY.key); - } - accountingRules = new FranceAccountingRules(); - } else { - try { - accountingRules = (AccountingRules) accountingRulesClass.newInstance(); - } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("Can't instantiate accounting rules", ex); - } - - } - } - } - - public void setAccountingRule(String accountingRule) { - LimaConfig.config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule); - // clear cache - loadAccountingRules(); - } - - public File getDataDir() { - File datadir = config.getOptionAsFile(ServiceConfigOption.DATA_DIR.getKey()); - return datadir; - } - - public File getReportsDir() { - File reportsDir = config.getOptionAsFile(ServiceConfigOption.REPORTS_DIR.getKey()); - return reportsDir; - } - - public String getAddressServer() { - String serverAddress = config.getOption(ServiceConfigOption.SERVER_ADRESS.getKey()); - return serverAddress; - } - - public int getHttpPort() { - String httpPort = config.getOption(ServiceConfigOption.HTTP_PORT.getKey()); - Integer port = Integer.valueOf(httpPort); - return port; - } - - public String getScale() { - String scale = config.getOption(ServiceConfigOption.SCALE.getKey()); - return scale; - } - - public void setScale(String locale) { - config.setOption(ServiceConfigOption.SCALE.key, locale); - config.saveForUser(); - } - - public String getVatPDFUrl() { - String vatPDFUrl = config.getOption(ServiceConfigOption.VAT_PDF_URL.getKey()); - return vatPDFUrl; - } - - public void setVatPDFUrl(String url) { - config.setOption(ServiceConfigOption.VAT_PDF_URL.key, url); - config.saveForUser(); - } - - /** - * Load configuration with custom file name. - */ - protected void loadConfiguration() { - try { - config.parse(); - } catch (ArgumentsParserException ex) { - if (log.isErrorEnabled()) { - log.error("Can't read configuration", ex); - } - } - - config.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, - LimaCallaoEntityEnum.getImplementationClassesAsString()); - } - - /** - * Lima option definition. - * <p/> - * Contains all lima configuration key, with defaut value and - * information for jaxx configuration frame ({@code #type}, - * {@code #transientBoolean}, {@code #finalBoolean}...) - */ - public enum ServiceConfigOption implements ConfigOptionDef { - - CONFIG_FILE(CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima.properties", String.class, true, true), - DATA_DIR("lima.data.dir", n("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), - REPORTS_DIR("lima.reports.dir", n("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), - RULES_NATIONALTY("lima.rules", n("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), - HTTP_PORT("lima.httpport", n("lima.config.httpport.description"), "5462", String.class, false, false), - SERVER_ADRESS("lima.serveraddress", n("lima.config.serveraddress.description"), "", String.class, false, false), - SCALE("lima.scale", n("lima.config.scale.description"), "2", String.class, false, false), - VAT_PDF_URL("lima.report.vatpdfurl", n("lima.config.reportvatpdfurl.description"), "default", String.class, false, false); - - private final String key; - - private final String description; - - private String defaultValue; - - private final Class<?> type; - - private boolean transientBoolean; - - private boolean finalBoolean; - - ServiceConfigOption(String key, String description, String defaultValue, - Class<?> type, boolean transientBoolean, boolean finalBoolean) { - this.key = key; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - this.finalBoolean = finalBoolean; - this.transientBoolean = transientBoolean; - } - - @Override - public boolean isFinal() { - return finalBoolean; - } - - @Override - public void setFinal(boolean finalBoolean) { - this.finalBoolean = finalBoolean; - } - - @Override - public boolean isTransient() { - return transientBoolean; - } - - @Override - public void setTransient(boolean transientBoolean) { - this.transientBoolean = transientBoolean; - } - - @Override - public String getDefaultValue() { - return defaultValue; - } - - @Override - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - @Override - public String getDescription() { - return t(description); - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return type; - } - } - -} Added: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -0,0 +1,47 @@ +package org.chorem.lima.business; + +import com.google.common.base.Function; +import com.google.common.collect.Maps; +import org.chorem.lima.entity.LimaCallaoEntityEnum; +import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; +import org.nuiton.topia.flyway.TopiaFlywayService; +import org.nuiton.topia.flyway.TopiaFlywayServiceImpl; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; + +import java.util.Map; +import java.util.Properties; + +/** + * Created by davidcosse on 24/09/14. + */ +public class LimaConfigurationHelper { + + public static Function<Properties, LimaCallaoTopiaApplicationContext> getCreateTopiaContextFunction() { + return new Function<Properties, LimaCallaoTopiaApplicationContext>() { + @Override + public LimaCallaoTopiaApplicationContext apply(Properties input) { + LimaCallaoTopiaApplicationContext result = new LimaCallaoTopiaApplicationContext(input); + return result; + } + }; + } + + public static Properties getRootContextProperties(LimaServiceConfig serviceConfig) { + Properties result = serviceConfig.getFlatOptions(); + // add persistence classes from generated code + result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString()); + + Map<String, String> toAddIfNotPresent = Maps.newLinkedHashMap(); + toAddIfNotPresent.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName()); + toAddIfNotPresent.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "true"); + toAddIfNotPresent.put(TopiaConfigurationConstants.CONFIG_PERSISTENCE_INIT_SCHEMA, "true"); + + for (Map.Entry<String, String> entry : toAddIfNotPresent.entrySet()) { + if (!result.containsKey(entry.getKey())) { + result.setProperty(entry.getKey(), entry.getValue()); + } + } + + return result; + } +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -23,7 +23,6 @@ package org.chorem.lima.business; -import com.google.common.base.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaXAResource; @@ -31,7 +30,6 @@ import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier; import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext; -import org.nuiton.config.ApplicationConfig; import org.nuiton.topia.persistence.TopiaApplicationContextCache; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.util.TopiaUtil; @@ -61,17 +59,8 @@ private static final Log log = LogFactory.getLog(LimaInterceptor.class); - public static final ThreadLocal<LimaCallaoTopiaDaoSupplier> DAO_HELPER = new ThreadLocal<LimaCallaoTopiaDaoSupplier>(); + public static final ThreadLocal<LimaCallaoTopiaDaoSupplier> DAO_HELPER = new ThreadLocal<>(); - protected static final Function<Properties, LimaCallaoTopiaApplicationContext> CREATE_CONTEXT_FUNCTION = new Function<Properties, LimaCallaoTopiaApplicationContext>() { - @Override - public LimaCallaoTopiaApplicationContext apply(Properties input) { - return new LimaCallaoTopiaApplicationContext(input); - } - }; - - protected static boolean schemaExistChecked = false; - @Resource private TransactionManager transactionManager; @@ -95,20 +84,21 @@ context.getTarget().getClass() + "#" + context.getMethod().getName()); } - ApplicationConfig config = LimaConfig.getInstance().getConfig(); + LimaServiceConfig config = LimaServiceConfig.getInstance(); - LimaCallaoTopiaApplicationContext rootContext = TopiaApplicationContextCache.getContext(config.getFlatOptions(), CREATE_CONTEXT_FUNCTION); + Properties contextProperties = LimaConfigurationHelper.getRootContextProperties(config); + LimaCallaoTopiaApplicationContext rootContext = TopiaApplicationContextCache.getContext(contextProperties, LimaConfigurationHelper.getCreateTopiaContextFunction()); LimaCallaoTopiaPersistenceContext tx = rootContext.newPersistenceContext(); // TODO DCossé 24/07/14 remove it as soon as migration service is done. - createShemaIfNeeded(rootContext, tx); + //createShemaIfNeeded(rootContext, tx); DAO_HELPER.set(tx); Transaction tr = transactionManager.getTransaction(); - // enlist topia xaresource, will will commited or rollback + // enlist topia xaresource, will commited or rollback // by container tr.enlistResource(new LimaXAResource(tx)); @@ -136,7 +126,7 @@ */ protected void createShemaIfNeeded(LimaCallaoTopiaApplicationContext applicationContext, LimaCallaoTopiaPersistenceContext tx) throws TopiaException { //LimaCallaoTopiaPersistenceContext - if (!schemaExistChecked) { + if (!applicationContext.isSchemaEmpty()) { boolean exist = TopiaUtil.isSchemaExist(tx, AccountImpl.class.getName()); if (!exist) { @@ -145,8 +135,6 @@ } applicationContext.createSchema(); } - - schemaExistChecked = true; } } Copied: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java (from rev 3921, trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java) =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -0,0 +1,293 @@ +/* + * #%L + * Lima business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaTechnicalException; +import org.chorem.lima.business.accountingrules.FranceAccountingRules; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; +import org.nuiton.config.ConfigOptionDef; + +import java.io.File; +import java.util.Properties; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Configuration pour le business. + * <p/> + * A voir comment le lier avec celui de lima swing. + * + * @author chatellier + * @version $Revision$ + * <p/> + * Last update : $Date$ + * By : $Author$ + */ +public class LimaServiceConfig { + + protected static final Log log = LogFactory.getLog(LimaServiceConfig.class); + +// protected static volatile LimaServiceConfig instance; + + protected static AccountingRules accountingRules; + + protected static final String LIMA_DEFAULT_CONF_FILENAME = "lima.properties"; + + protected static ApplicationConfig config; + + protected static volatile LimaServiceConfig instance; + + public LimaServiceConfig(String configFileName) { + try { + ApplicationConfig defaultConfig = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME); + defaultConfig.loadDefaultOptions(ServiceConfigOption.values()); + defaultConfig.parse(); + + if (StringUtils.isNotBlank(configFileName)) { + Properties flatOptions = defaultConfig.getFlatOptions(false); + + config = new ApplicationConfig(flatOptions, configFileName); + config.parse(); + } else { + if (log.isWarnEnabled()) { + log.warn("No specific configuration provided, using the default one"); + } + config = defaultConfig; + } + + instance = this; + } catch (ArgumentsParserException ex) { + throw new LimaTechnicalException("Can't read configuration", ex); + } + } + + public static LimaServiceConfig getInstance() { + return instance; + } + + public ApplicationConfig getConfig() { + return config; + } + + /** + * Instancie la bonne classe de nationalite en fonction du fichier de configuration. + * + * L'instance est conservée en cache. + * + * @return l'instance de rule + */ + public AccountingRules getAccountingRules() { + + if (accountingRules == null) { + loadAccountingRules(); + } + + return accountingRules; + } + + protected static void loadAccountingRules() { + Class<?> accountingRulesClass = config.getOptionAsClass(ServiceConfigOption.RULES_NATIONALTY.key); + if (accountingRulesClass == null) { + if (log.isErrorEnabled()) { + log.error("No accounting rules defined for:" + ServiceConfigOption.RULES_NATIONALTY.key); + } + accountingRules = new FranceAccountingRules(); + } else { + try { + accountingRules = (AccountingRules) accountingRulesClass.newInstance(); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't instantiate accounting rules", ex); + } + + } + } + } + + public Properties getFlatOptions() { + return config.getFlatOptions(); + } + + public String getApplicationVersion() { + return config.getOption(ServiceConfigOption.APPLICATION_VERSION.key); + } + + public void setAccountingRule(String accountingRule) { + LimaServiceConfig.config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule); + // clear cache + loadAccountingRules(); + } + + public File getDataDir() { + File datadir = config.getOptionAsFile(ServiceConfigOption.DATA_DIR.getKey()); + return datadir; + } + + public File getReportsDir() { + File reportsDir = config.getOptionAsFile(ServiceConfigOption.REPORTS_DIR.getKey()); + return reportsDir; + } + + public String getAddressServer() { + String serverAddress = config.getOption(ServiceConfigOption.SERVER_ADRESS.getKey()); + return serverAddress; + } + + public int getHttpPort() { + String httpPort = config.getOption(ServiceConfigOption.HTTP_PORT.getKey()); + Integer port = Integer.valueOf(httpPort); + return port; + } + + public String getScale() { + String scale = config.getOption(ServiceConfigOption.SCALE.getKey()); + return scale; + } + + public void setScale(String locale) { + config.setOption(ServiceConfigOption.SCALE.key, locale); + config.saveForUser(); + } + + public String getVatPDFUrl() { + String vatPDFUrl = config.getOption(ServiceConfigOption.VAT_PDF_URL.getKey()); + return vatPDFUrl; + } + + public void setVatPDFUrl(String url) { + config.setOption(ServiceConfigOption.VAT_PDF_URL.key, url); + config.saveForUser(); + } + +// /** +// * Load configuration with custom file name. +// */ +// protected void loadConfiguration() { +// try { +// config.parse(); +// } catch (ArgumentsParserException ex) { +// if (log.isErrorEnabled()) { +// log.error("Can't read configuration", ex); +// } +// } +// +// config.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, +// LimaCallaoEntityEnum.getImplementationClassesAsString()); +// } + + /** + * Lima option definition. + * <p/> + * Contains all lima configuration key, with defaut value and + * information for jaxx configuration frame ({@code #type}, + * {@code #transientBoolean}, {@code #finalBoolean}...) + */ + public enum ServiceConfigOption implements ConfigOptionDef { + +// CONFIG_FILE(CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima.properties", String.class, true, true), + APPLICATION_VERSION("application.version", n("application.version"), null, String.class, false, false), + DATA_DIR("lima.data.dir", n("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), + REPORTS_DIR("lima.reports.dir", n("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), + RULES_NATIONALTY("lima.rules", n("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), + HTTP_PORT("lima.httpport", n("lima.config.httpport.description"), "5462", String.class, false, false), + SERVER_ADRESS("lima.serveraddress", n("lima.config.serveraddress.description"), "", String.class, false, false), + SCALE("lima.scale", n("lima.config.scale.description"), "2", String.class, false, false), + VAT_PDF_URL("lima.report.vatpdfurl", n("lima.config.reportvatpdfurl.description"), "default", String.class, false, false); + + private final String key; + + private final String description; + + private String defaultValue; + + private final Class<?> type; + + private boolean transientBoolean; + + private boolean finalBoolean; + + ServiceConfigOption(String key, String description, String defaultValue, + Class<?> type, boolean transientBoolean, boolean finalBoolean) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this.finalBoolean = finalBoolean; + this.transientBoolean = transientBoolean; + } + + @Override + public boolean isFinal() { + return finalBoolean; + } + + @Override + public void setFinal(boolean finalBoolean) { + this.finalBoolean = finalBoolean; + } + + @Override + public boolean isTransient() { + return transientBoolean; + } + + @Override + public void setTransient(boolean transientBoolean) { + this.transientBoolean = transientBoolean; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public String getDescription() { + return t(description); + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + } + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -27,7 +27,7 @@ import org.apache.commons.lang.StringUtils; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.exceptions.AlreadyExistAccountException; import org.chorem.lima.business.exceptions.InvalidAccountNumberException; @@ -110,7 +110,7 @@ protected Account createNewAccount(Account account) throws InvalidAccountNumberException, NotNumberAccountNumberException, NotAllowedLabelException { // check rules before create the account - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); accountingRules.createAccountRules(account); // force uppercase account number @@ -194,7 +194,7 @@ @Override public void removeAccount(Account account) throws UsedAccountException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); // Check rules for account if have entries accountingRules.removeAccountRules(account); @@ -217,7 +217,7 @@ @Override public Account updateAccount(Account account) throws InvalidAccountNumberException, NotNumberAccountNumberException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); // DAO AccountTopiaDao accountDao = getDaoHelper().getAccountDao(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -37,7 +37,7 @@ import org.chorem.lima.beans.GeneralEntryBooksDatas; import org.chorem.lima.beans.GeneralEntryBooksDatasImpl; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.DocumentService; import org.chorem.lima.business.api.FinancialStatementService; import org.chorem.lima.business.api.IdentityService; @@ -100,7 +100,7 @@ protected String path; public DocumentServiceImpl() { - path = LimaConfig.getInstance().getReportsDir().getAbsolutePath(); + path = LimaServiceConfig.getInstance().getReportsDir().getAbsolutePath(); if (log.isDebugEnabled()) { log.debug("Path : " + path); @@ -718,7 +718,7 @@ String filePath = path + File.separator + DocumentsEnum.VAT.getFileName() + ".pdf"; - String path = LimaConfig.getInstance().getReportsDir().getAbsolutePath(); + String path = LimaServiceConfig.getInstance().getReportsDir().getAbsolutePath(); String filePathDefault = path + File.separator + DocumentsEnum.VAT.getFileName() + "_default.pdf"; @@ -726,7 +726,7 @@ PDDocument doc; InputStream reportsStream; - String vatPDFUrl = LimaConfig.getInstance().getVatPDFUrl(); + String vatPDFUrl = LimaServiceConfig.getInstance().getVatPDFUrl(); if (vatPDFUrl.equals("default")) { reportsStream = DocumentServiceImpl.class Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -26,7 +26,7 @@ package org.chorem.lima.business.ejb; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; import org.chorem.lima.business.exceptions.UsedEntryBookException; @@ -149,7 +149,7 @@ public void removeEntryBook(EntryBook entryBook) throws UsedEntryBookException { // check rule - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); accountingRules.removeEntryBookRules(entryBook); // re-attach to current transaction Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -26,7 +26,7 @@ package org.chorem.lima.business.ejb; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.exceptions.NotLockedClosedPeriodicEntryBooksException; import org.chorem.lima.business.exceptions.UnbalancedFinancialTransactionsException; @@ -95,7 +95,7 @@ @Override public ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws UnbalancedFinancialTransactionsException, UnfilledEntriesException, WithoutEntryBookFinancialTransactionsException, NotLockedClosedPeriodicEntryBooksException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); ClosedPeriodicEntryBook result; // check rules before create the account Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -34,7 +34,7 @@ import org.chorem.lima.beans.FinancialTransactionCondition; import org.chorem.lima.beans.LetteringFilter; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.exceptions.AfterLastFiscalPeriodException; @@ -107,7 +107,7 @@ public FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction) throws LockedFinancialPeriodException, LockedEntryBookException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); //check if the financial period is blocked accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialtransaction); @@ -315,7 +315,7 @@ } - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); //check rules accountingRules.addLetter(oldEntries); @@ -483,7 +483,7 @@ public void updateFinancialTransaction(FinancialTransaction financialTransaction) throws AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException, LockedFinancialPeriodException, LockedEntryBookException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); FinancialTransaction financialTransactionOld = transactionTopiaDao.forTopiaIdEquals(financialTransaction.getTopiaId()).findUnique(); @@ -492,9 +492,7 @@ financialTransactionOld.setEntryBook(financialTransaction.getEntryBook()); financialTransactionOld.setTransactionDate(financialTransaction.getTransactionDate()); - transactionTopiaDao.update(financialTransactionOld); - } /** @@ -506,7 +504,7 @@ throws LockedFinancialPeriodException, LockedEntryBookException { // check if the financial period is blocked - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialTransaction); FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); @@ -523,7 +521,7 @@ @Override public Entry createEntry(Entry entry) throws LockedFinancialPeriodException, LockedEntryBookException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); //check if the financial period is blocked accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction( @@ -541,7 +539,7 @@ @Override public void updateEntry(Entry entry) throws LockedEntryBookException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); @@ -563,7 +561,7 @@ @Override public void removeEntry(Entry entry) throws LockedFinancialPeriodException, LockedEntryBookException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); FinancialTransaction financialTransaction = entry.getFinancialTransaction(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -30,7 +30,7 @@ import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -115,7 +115,7 @@ FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); // fix begin date at midnight and end date at 23:59:59.999 Date beginDate = fiscalPeriod.getBeginDate(); @@ -227,7 +227,7 @@ public FiscalPeriod blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws AlreadyLockedFiscalPeriodException, LastUnlockedFiscalPeriodException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); if (fiscalPeriod.isLocked()) { throw new AlreadyLockedFiscalPeriodException(fiscalPeriod); @@ -489,7 +489,7 @@ @Override public void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) throws NoEmptyFiscalPeriodException { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); //get entities with TopiaDao FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -31,7 +31,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.DocumentService; import org.chorem.lima.business.api.HttpServerService; @@ -89,8 +89,8 @@ private static final SimpleDateFormat DATEFORMAT = new SimpleDateFormat("yyyy-MM-dd"); public HttpServerServiceImpl() { - path = LimaConfig.getInstance().getReportsDir().getAbsolutePath(); - port = LimaConfig.getInstance().getHttpPort(); + path = LimaServiceConfig.getInstance().getReportsDir().getAbsolutePath(); + port = LimaServiceConfig.getInstance().getHttpPort(); } /** start the server */ @@ -129,7 +129,7 @@ public class MainServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private String serverAddressConfig = LimaConfig.getInstance().getAddressServer(); + private String serverAddressConfig = LimaServiceConfig.getInstance().getAddressServer(); @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -266,7 +266,7 @@ + ":" + req.getServerPort(); } else { serverAdress += serverAddressConfig + ":" - + LimaConfig.getInstance().getHttpPort(); + + LimaServiceConfig.getInstance().getHttpPort(); } Calendar calendar = Calendar.getInstance(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -24,7 +24,7 @@ */ package org.chorem.lima.business.ejb; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.OptionsService; import javax.ejb.Remote; @@ -39,8 +39,8 @@ protected String vatPDFUrl; public OptionsServiceImpl() { - scale = LimaConfig.getInstance().getScale(); - vatPDFUrl = LimaConfig.getInstance().getVatPDFUrl(); + scale = LimaServiceConfig.getInstance().getScale(); + vatPDFUrl = LimaServiceConfig.getInstance().getVatPDFUrl(); } public int getScale() { @@ -52,7 +52,7 @@ } public void setScale(String scale) { - LimaConfig.getInstance().setScale(scale); + LimaServiceConfig.getInstance().setScale(scale); } public String getVatPDFUrl() { @@ -60,7 +60,7 @@ } public void setVatPDFUrl(String url) { - LimaConfig.getInstance().setVatPDFUrl(url); + LimaServiceConfig.getInstance().setVatPDFUrl(url); } } Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2014-09-25 15:25:32 UTC (rev 3922) @@ -1,3 +1,4 @@ +application.version= lima-Business.defaultaccountingrules.updateentryerror=Can't update entry \: financialperiod of this entrybook is closed lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror=Can't update financialtransaction \: this financialperiod of new entrybook is closed lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror=Can't update financialtransaction \: the new financialperiod of this entrybook is closed @@ -139,6 +140,7 @@ lima.reports.account.noaccount= lima.reports.account.noaccounttitle= lima.reports.accounts= +lima.services.application.version= lima.table.credit= lima.table.date= lima.table.debit= Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2014-09-25 15:25:32 UTC (rev 3922) @@ -1,3 +1,4 @@ +application.version= lima-Business.defaultaccountingrules.updateentryerror=Impossible de mettre à jour l'entrée \: la période financière de ce journal est bloquée lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror=Impossible de mettre à jour la transaction \: la période financière de ce nouveau journal est bloquée lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror=Impossible de mettre à jour la transaction \: la période financière de ce journal est bloquée @@ -134,6 +135,7 @@ lima.reports.account.noaccount= lima.reports.account.noaccounttitle= lima.reports.accounts= +lima.services.application.version= lima.table.credit= lima.table.date= lima.table.debit= Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -27,7 +27,6 @@ import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.accountingrules.TestAccountingRules; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.EntryService; @@ -88,6 +87,7 @@ }; protected static DateFormat df = DateFormat.getDateInstance(DateFormat.LONG, Locale.ENGLISH); + protected static final String LIMA_TEST_DEFAULT_CONF_FILENAME = "lima-test.properties"; protected AccountService accountService; protected EntryBookService entryBookService; @@ -114,9 +114,9 @@ public void initAbstractTest() throws Exception { setUpLocale(); Properties options = getTestConfiguration(); - LimaConfig config = new LimaTestsConfig("/lima-test.properties", options); - initServices(config); - context = getTestContext(options); + LimaServiceConfig limaTestConfig = new LimaTestsConfig(LIMA_TEST_DEFAULT_CONF_FILENAME, options); + initServices(limaTestConfig); + context = createNewTestApplicationContext(); } protected void setUpLocale() throws Exception { @@ -127,7 +127,7 @@ * Init services after i18n#init(). * @throws java.io.IOException */ - protected void initServices(LimaConfig config) throws IOException { + protected void initServices(LimaServiceConfig config) throws IOException { if(accountService == null) { LimaServiceFactory.initFactory(config.getConfig()); accountService = LimaServiceFactory.getService(AccountService.class); @@ -158,21 +158,11 @@ // load file manually (lima.properties) Properties testProperties = new Properties(); // override somes - testProperties.setProperty(LimaConfig.ServiceConfigOption.CONFIG_FILE.getKey(), "/lima-test.properties"); String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima-business-" + UUID.randomUUID().toString(); - testProperties.setProperty(LimaConfig.ServiceConfigOption.DATA_DIR.getKey(), testDir); - testProperties.setProperty(Environment.HBM2DDL_AUTO, "update"); - testProperties.setProperty(Environment.DIALECT, "org.hibernate.dialect.H2Dialect"); - testProperties.setProperty(Environment.DRIVER, "org.h2.Driver"); - + testProperties.setProperty(LimaServiceConfig.ServiceConfigOption.DATA_DIR.getKey(), testDir); testProperties.setProperty(Environment.URL, "jdbc:h2:file:" + testDir + File.separator + "data"); - testProperties.setProperty(Environment.USER, "sa"); - testProperties.setProperty(Environment.PASS, ""); testProperties.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); - - testProperties.setProperty("topia.persistence.classes", LimaCallaoEntityEnum.getImplementationClassesAsString()); - testProperties.setProperty(LimaConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), TestAccountingRules.class.getName()); return testProperties; } @@ -181,22 +171,23 @@ //context.dropSchema(); } + /** * Method to use only for class that need a context to be tester. * Only for DOA for now. * * @return a topia context */ - protected LimaCallaoTopiaApplicationContext getTestContext(Properties options) { + protected LimaCallaoTopiaApplicationContext getTestApplicationContext(Properties options) { log.info("Opening context to database : " + options.getProperty("hibernate.connection.url")); LimaCallaoTopiaApplicationContext result = TopiaApplicationContextCache.getContext(options, CREATE_CONTEXT_FUNCTION); return result; } - protected LimaCallaoTopiaApplicationContext createNewTestContext() { - Properties options = getTestConfiguration(); - LimaCallaoTopiaApplicationContext result = getTestContext(options); + protected LimaCallaoTopiaApplicationContext createNewTestApplicationContext() { + Properties options = LimaServiceConfig.getInstance().getFlatOptions(); + LimaCallaoTopiaApplicationContext result = getTestApplicationContext(options); return result; } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -32,6 +32,8 @@ import org.junit.Before; import org.junit.Test; +import java.util.List; + /** * Tests pour la gestion des timespans * <p/> @@ -48,7 +50,7 @@ @Before public void initTest() throws Exception { - initTestDatabase(); + //initTestDatabase(); } /** @@ -58,14 +60,14 @@ */ @Test public void blockClosedPeriodicEntryBookTest() throws Exception { - initTestWithFinancialTransaction(); // find one closed to close LimaCallaoTopiaPersistenceContext tcontext = context.newPersistenceContext(); ClosedPeriodicEntryBookTopiaDao dao = tcontext.getClosedPeriodicEntryBookDao(); - ClosedPeriodicEntryBook closedPeriodic = dao.findAll().get(0); + List<ClosedPeriodicEntryBook> closedPeriodics = dao.findAll(); tcontext.close(); + ClosedPeriodicEntryBook closedPeriodic = closedPeriodics.get(0); // block it Assert.assertFalse(closedPeriodic.isLocked()); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -23,10 +23,12 @@ package org.chorem.lima.business; -import org.chorem.lima.business.accountingrules.FranceAccountingRules; +import org.chorem.lima.business.accountingrules.DefaultAccountingRules; import org.junit.Assert; import org.junit.Test; +import java.util.Properties; + /** * Lima misc tests. * @@ -38,14 +40,19 @@ */ public class LimaMiscTest extends AbstractLimaTest { + protected Properties getTestConfiguration() { + Properties config = super.getTestConfiguration(); + config.setProperty(LimaServiceConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), DefaultAccountingRules.class.getName()); + return config; + } /** * Test que la regles de nationnalité par defaut est Default pour * la majorité des tests. */ @Test public void testDefaultRule() { - Assert.assertFalse(LimaConfig.getInstance().getAccountingRules() - instanceof FranceAccountingRules); + Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() + instanceof DefaultAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -22,38 +22,25 @@ * #L% */ -import org.apache.commons.lang3.StringUtils; -import org.chorem.lima.LimaTechnicalException; import org.nuiton.config.ApplicationConfig; -import org.nuiton.config.ArgumentsParserException; +import java.util.Map; import java.util.Properties; /** * Created by davidcosse on 11/06/14. */ -public class LimaTestsConfig extends LimaConfig { +public class LimaTestsConfig extends LimaServiceConfig { - public LimaTestsConfig(String configFileName, Properties properties) { - try { - accountingRules = null; - ApplicationConfig defaultConfig = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME); - defaultConfig.loadDefaultOptions(ServiceConfigOption.values()); - defaultConfig.parse(); - if (StringUtils.isNotBlank(configFileName)) { - Properties flatOptions = defaultConfig.getFlatOptions(false); - flatOptions.putAll(properties); - config = new ApplicationConfig(flatOptions, configFileName); - config.parse(); - } else { - if (log.isWarnEnabled()) { - log.warn("No specific configuration provided, using the default one"); - } - config = defaultConfig; - } - instance = this; - } catch (ArgumentsParserException ex) { - throw new LimaTechnicalException("Can't read configuration", ex); + public LimaTestsConfig(String configFileName, Properties limaTestConfig) { + super(configFileName); + Properties standardLimaConfig = config.getFlatOptions(); + + for (Map.Entry<Object, Object> entry : limaTestConfig.entrySet()) { + standardLimaConfig.setProperty((String)entry.getKey(),(String)entry.getValue()); } + config = new ApplicationConfig(standardLimaConfig); + instance = this; } + } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -24,7 +24,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.AccountServiceImplTest; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,16 +46,16 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link LimaConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -24,7 +24,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.EntryBookServiceImplTest; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,15 +46,15 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link LimaConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -24,7 +24,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.EntryBookServiceImplTest; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,15 +46,15 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link LimaConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -24,7 +24,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.FinancialTransactionServiceImplTest; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,15 +46,15 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link LimaConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -24,7 +24,7 @@ package org.chorem.lima.business.accountingrules; import org.chorem.lima.business.FiscalPeriodServiceImplTest; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,15 +46,15 @@ @Before public void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link LimaConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -23,9 +23,9 @@ package org.chorem.lima.business.accountingrules; +import org.chorem.lima.business.AbstractLimaTest; import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.ImportExportServiceTest; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.junit.Assert; import org.junit.Test; @@ -44,22 +44,21 @@ * Last update : $Date$ * By : $Author$ */ -public class ImportServiceRuleFrTest extends ImportExportServiceTest { +public class ImportServiceRuleFrTest extends AbstractLimaTest { protected Properties getTestConfiguration() { Properties config = super.getTestConfiguration(); - config.remove(LimaConfig.ServiceConfigOption.RULES_NATIONALTY.getKey()); - config.put(LimaConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), FranceAccountingRules.class.getName()); + config.setProperty(LimaServiceConfig.ServiceConfigOption.RULES_NATIONALTY.getKey(), FranceAccountingRules.class.getName()); return config; } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link LimaConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. */ @Test public void testRuleInstance() throws Exception { - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + AccountingRules accountingRules = LimaServiceConfig.getInstance().getAccountingRules(); Assert.assertTrue("accountingRules:" + accountingRules,accountingRules instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -23,7 +23,7 @@ package org.chorem.lima.business.accountingrules; -import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.ReportServiceImplTest; import org.junit.Assert; import org.junit.BeforeClass; @@ -50,15 +50,15 @@ @BeforeClass public static void installFrenchRule() throws Exception { - LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + LimaServiceConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans {@link LimaConfig}. + * elle peut être mise en cache dans {@link org.chorem.lima.business.LimaServiceConfig}. */ @Test public void testRuleInstance() { - Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + Assert.assertTrue(LimaServiceConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } } Modified: trunk/lima-business/src/test/resources/lima-test.properties =================================================================== --- trunk/lima-business/src/test/resources/lima-test.properties 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-business/src/test/resources/lima-test.properties 2014-09-25 15:25:32 UTC (rev 3922) @@ -31,3 +31,5 @@ hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver hibernate.hbm2ddl.auto=update +# Topia should not create the schema +topia.persistence.initSchema=false Added: trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -0,0 +1,20 @@ +package org.chorem.lima.entity; + +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +public class LimaCallaoTopiaApplicationContext extends AbstractLimaCallaoTopiaApplicationContext { + + public LimaCallaoTopiaApplicationContext(Properties properties) { + super(properties); + } + + public LimaCallaoTopiaApplicationContext(Map<String, String> configuration) { + super(configuration); + } + + public Set<org.nuiton.topia.persistence.TopiaPersistenceContext> getPersistenceContexts() { + return persistenceContexts; + } +} //LimaCallaoTopiaApplicationContext Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -1,162 +0,0 @@ -/* - * #%L - * Lima Swing - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima; - -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.context.DefaultApplicationContext; -import jaxx.runtime.context.JAXXContextEntryDef; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.ui.LimaDecoratorProvider; -import org.chorem.lima.ui.MainView; -import org.chorem.lima.ui.MainViewHandler; -import org.nuiton.decorator.DecoratorProvider; -import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.DefaultI18nInitializer; -import org.nuiton.i18n.init.I18nInitializer; -import org.nuiton.util.StringUtil; - -import java.util.Locale; - -/** @author chemit */ -public class LimaContext extends DefaultApplicationContext { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(LimaContext.class); - - /** - * l'intance partagée accessible après un appel à la méthode - * {@link #init()} - */ - protected static LimaContext instance; - - public static JAXXContextEntryDef<MainView> MAIN_UI_ENTRY_DEF = JAXXUtil.newContextEntryDef("mainUI", MainView.class); - - public static JAXXContextEntryDef<DecoratorProvider> DECORATOR_PROVIDER_DEF = JAXXUtil.newContextEntryDef("decoratorProvider", DecoratorProvider.class); - - public static JAXXContextEntryDef<LimaConfig> CONFIG_DEF = JAXXUtil.newContextEntryDef("limaConfig", LimaConfig.class); - - /** - * @return <code>true</code> si le context a été initialisé via la méthode - * {@link #init()}, <ocde>false</code> autrement. - */ - public static boolean isInit() { - return instance != null; - } - - /** - * Permet l'initialisation du contexte applicatif et positionne - * l'instance partagée. - * <p/> - * Note : Cette méthode ne peut être appelée qu'une seule fois. - * - * @return l'instance partagée - * @throws IllegalStateException si un contexte applicatif a déja été positionné. - */ - public static LimaContext init() throws IllegalStateException { - if (isInit()) { - throw new IllegalStateException("there is already a application context registred."); - } - instance = new LimaContext(); - instance.setContextValue(new MainViewHandler()); - CONFIG_DEF.setContextValue(instance, LimaConfig.getInstance()); - DECORATOR_PROVIDER_DEF.setContextValue(instance, new LimaDecoratorProvider()); - return instance; - } - - /** - * Récupération du contexte applicatif. - * - * @return l'instance partagé du contexte. - * @throws IllegalStateException si le contexte n'a pas été initialisé via - * la méthode {@link #init()} - */ - public static LimaContext get() throws IllegalStateException { - if (!isInit()) { - throw new IllegalStateException("no application context registred."); - } - return instance; - } - - public LimaConfig getConfig() { - return CONFIG_DEF.getContextValue(this); - } - - public DecoratorProvider getDecoratorProvider() { - return DECORATOR_PROVIDER_DEF.getContextValue(this); - } - - public void initI18n(LimaConfig config) { - - I18n.close(); - - I18nInitializer i18nInitializer = new DefaultI18nInitializer("lima"); - Locale locale = config.getLocale(); - I18n.init(i18nInitializer, locale); - - // Default Locale for DatePicker - Locale.setDefault(locale); - - long t00 = System.nanoTime(); - - if (log.isDebugEnabled()) { - log.debug("i18n language : " + locale); - log.debug("i18n loading time : " + - StringUtil.convertTime(t00, System.nanoTime())); - } - } - - public MainView getMainUI() { - return MAIN_UI_ENTRY_DEF.getContextValue(this); - } - - /** - * close the application's context. - * - * @throws Exception if any pb while closing - */ - public void close() throws Exception { - if (log.isDebugEnabled()) { - log.debug("closing context " + this); - } - - // fermeture du context principal - MainView mainUI = getMainUI(); - if (mainUI != null && mainUI.isVisible()) { - mainUI.setVisible(false); - mainUI.dispose(); - } - - if (log.isDebugEnabled()) { - log.debug("context closed " + this); - } - //System.exit(0); - } - - public static LimaContext getContext() { - return get(); - } -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -72,7 +72,7 @@ } // init root context - LimaContext context = init(args); + LimaSwingApplicationContext context = init(args); // do actions config = context.getConfig(); @@ -98,7 +98,7 @@ * @return le context de l'application * @throws Exception pour toute erreur pendant l'init */ - public static LimaContext init(String... args) throws Exception { + public static LimaSwingApplicationContext init(String... args) throws Exception { // update splash splash = new LimaSplash(); @@ -111,7 +111,7 @@ Runtime.getRuntime().addShutdownHook(new ShutdownHook()); // init root context - LimaContext context = LimaContext.init(); + LimaSwingApplicationContext context = LimaSwingApplicationContext.init(); LimaConfig config = context.getConfig(); config.parse(args); context.initI18n(config); @@ -119,7 +119,7 @@ return context; } - protected static void launch(LimaContext context) throws Exception { + protected static void launch(LimaSwingApplicationContext context) throws Exception { // prepare ui look&feel and load ui properties try { @@ -182,7 +182,7 @@ @Override public void run() { try { - LimaContext.get().close(); + LimaSwingApplicationContext.get().close(); LimaServiceFactory.destroy(); // force to kill main thread Copied: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java (from rev 3921, trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java) =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -0,0 +1,169 @@ +/* + * #%L + * Lima Swing + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima; + +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.context.DefaultApplicationContext; +import jaxx.runtime.context.JAXXContextEntryDef; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.ui.LimaDecoratorProvider; +import org.chorem.lima.ui.MainView; +import org.chorem.lima.ui.MainViewHandler; +import org.nuiton.decorator.DecoratorProvider; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.i18n.init.I18nInitializer; +import org.nuiton.util.StringUtil; + +import java.util.Locale; + +/** @author chemit */ +public class LimaSwingApplicationContext extends DefaultApplicationContext { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(LimaSwingApplicationContext.class); + + /** + * l'intance partagée accessible après un appel à la méthode + * {@link #init()} + */ + protected static LimaSwingApplicationContext instance; + + public static JAXXContextEntryDef<MainView> MAIN_UI_ENTRY_DEF = JAXXUtil.newContextEntryDef("mainUI", MainView.class); + + public static JAXXContextEntryDef<DecoratorProvider> DECORATOR_PROVIDER_DEF = JAXXUtil.newContextEntryDef("decoratorProvider", DecoratorProvider.class); + + public static JAXXContextEntryDef<LimaConfig> CONFIG_DEF = JAXXUtil.newContextEntryDef("limaConfig", LimaConfig.class); + + /** + * @return <code>true</code> si le context a été initialisé via la méthode + * {@link #init()}, <ocde>false</code> autrement. + */ + public static boolean isInit() { + return instance != null; + } + + /** + * Permet l'initialisation du contexte applicatif et positionne + * l'instance partagée. + * <p/> + * Note : Cette méthode ne peut être appelée qu'une seule fois. + * + * @return l'instance partagée + * @throws IllegalStateException si un contexte applicatif a déja été positionné. + */ + public static LimaSwingApplicationContext init() throws IllegalStateException { + if (isInit()) { + throw new IllegalStateException("there is already a application context registred."); + } + instance = new LimaSwingApplicationContext(); + instance.setContextValue(new MainViewHandler()); + CONFIG_DEF.setContextValue(instance, LimaConfig.getInstance()); + DECORATOR_PROVIDER_DEF.setContextValue(instance, new LimaDecoratorProvider()); + initApplicationContext(); + return instance; + } + + protected static void initApplicationContext() { + // TODO DCossé 25/09/14 revoir cette partie + new LimaServiceConfig(null); + } + + /** + * Récupération du contexte applicatif. + * + * @return l'instance partagé du contexte. + * @throws IllegalStateException si le contexte n'a pas été initialisé via + * la méthode {@link #init()} + */ + public static LimaSwingApplicationContext get() throws IllegalStateException { + if (!isInit()) { + throw new IllegalStateException("no application context registred."); + } + return instance; + } + + public LimaConfig getConfig() { + return CONFIG_DEF.getContextValue(this); + } + + public DecoratorProvider getDecoratorProvider() { + return DECORATOR_PROVIDER_DEF.getContextValue(this); + } + + public void initI18n(LimaConfig config) { + + I18n.close(); + + I18nInitializer i18nInitializer = new DefaultI18nInitializer("lima"); + Locale locale = config.getLocale(); + I18n.init(i18nInitializer, locale); + + // Default Locale for DatePicker + Locale.setDefault(locale); + + long t00 = System.nanoTime(); + + if (log.isDebugEnabled()) { + log.debug("i18n language : " + locale); + log.debug("i18n loading time : " + + StringUtil.convertTime(t00, System.nanoTime())); + } + } + + public MainView getMainUI() { + return MAIN_UI_ENTRY_DEF.getContextValue(this); + } + + /** + * close the application's context. + * + * @throws Exception if any pb while closing + */ + public void close() throws Exception { + if (log.isDebugEnabled()) { + log.debug("closing context " + this); + } + + // fermeture du context principal + MainView mainUI = getMainUI(); + if (mainUI != null && mainUI.isVisible()) { + mainUI.setVisible(false); + mainUI.dispose(); + } + + if (log.isDebugEnabled()) { + log.debug("context closed " + this); + } + //System.exit(0); + } + + public static LimaSwingApplicationContext getContext() { + return get(); + } +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaRendererUtil.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaRendererUtil.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaRendererUtil.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -26,7 +26,7 @@ import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorProvider; @@ -41,13 +41,13 @@ public class LimaRendererUtil { public static ListCellRenderer newDecoratorProviderListCellRenderer() { - DecoratorProvider decoratorProvider = LimaContext.get().getDecoratorProvider(); + DecoratorProvider decoratorProvider = LimaSwingApplicationContext.get().getDecoratorProvider(); return new DecoratorProviderListCellRenderer(decoratorProvider); } public static ListCellRenderer newDecoratorListCellRenderer(Class<?> type) { - DecoratorProvider decoratorProvider = LimaContext.get().getDecoratorProvider(); + DecoratorProvider decoratorProvider = LimaSwingApplicationContext.get().getDecoratorProvider(); Decorator<?> decorator = decoratorProvider.getDecoratorByType(type); return new DecoratorListCellRenderer(decorator); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-09-25 15:25:32 UTC (rev 3922) @@ -32,7 +32,7 @@ javax.swing.JButton jaxx.runtime.SwingUtil org.chorem.lima.LimaConfig - org.chorem.lima.LimaContext + org.chorem.lima.LimaSwingApplicationContext org.chorem.lima.enums.ImportExportEnum </import> @@ -43,7 +43,7 @@ } public LimaConfig getConfig() { - return LimaContext.CONFIG_DEF.getContextValue(getDelegateContext()); + return LimaSwingApplicationContext.CONFIG_DEF.getContextValue(getDelegateContext()); } public MainViewHandler getHandler() { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.business.api.HttpServerService; import org.chorem.lima.enums.ImportExportEnum; import org.chorem.lima.service.LimaServiceFactory; @@ -91,13 +91,13 @@ * @param rootContext le context applicatif * @return l'ui instancie et initialisee mais non visible encore */ - public MainView initUI(LimaContext rootContext) { + public MainView initUI(LimaSwingApplicationContext rootContext) { // show main ui MainView ui = new MainView(rootContext); swingSession = new SwingSession(getLimaStateFile(), false); - LimaContext.MAIN_UI_ENTRY_DEF.setContextValue(rootContext, ui); + LimaSwingApplicationContext.MAIN_UI_ENTRY_DEF.setContextValue(rootContext, ui); return ui; } @@ -119,10 +119,10 @@ config.setLocale(newLocale); // rechargement i18n - LimaContext.get().initI18n(config); + LimaSwingApplicationContext.get().initI18n(config); // on recharge l'ui - reloadUI(LimaContext.get()); + reloadUI(LimaSwingApplicationContext.get()); } /** @@ -141,7 +141,7 @@ return; } try { - LimaContext.get().close(); + LimaSwingApplicationContext.get().close(); Runtime.getRuntime().halt(0); @@ -301,16 +301,16 @@ * * @param rootContext le contexte applicatif */ - protected void reloadUI(LimaContext rootContext) { + protected void reloadUI(LimaSwingApplicationContext rootContext) { // must remove all properties listener on config - LimaContext.CONFIG_DEF.getContextValue(rootContext).removeJaxxPropertyChangeListener(); + LimaSwingApplicationContext.CONFIG_DEF.getContextValue(rootContext).removeJaxxPropertyChangeListener(); // scan main ui MainView ui = getUI(rootContext); if (ui != null) { - LimaContext.MAIN_UI_ENTRY_DEF.removeContextValue(rootContext); + LimaSwingApplicationContext.MAIN_UI_ENTRY_DEF.removeContextValue(rootContext); ui.dispose(); @@ -348,7 +348,7 @@ if (context instanceof MainView) { return (MainView) context; } - MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(context); + MainView ui = LimaSwingApplicationContext.MAIN_UI_ENTRY_DEF.getContextValue(context); return ui; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import javax.swing.*; import java.awt.event.KeyEvent; @@ -81,7 +81,7 @@ BigDecimal cellEditorValue; int pointIndex = stringValue.indexOf("."); if (pointIndex != -1) { - LimaConfig config = LimaContext.getContext().getConfig(); + LimaConfig config = LimaSwingApplicationContext.getContext().getConfig(); String actualDecimals = stringValue.substring(pointIndex, stringValue.length()-1); if (config.getScale() > actualDecimals.length()) { cellEditorValue = new BigDecimal(stringValue); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -25,7 +25,7 @@ package org.chorem.lima.ui.celleditor; import org.chorem.lima.LimaConfig; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import javax.swing.*; import java.awt.*; @@ -39,7 +39,7 @@ public static String format(BigDecimal value) { - LimaConfig config = LimaContext.getContext().getConfig(); + LimaConfig config = LimaSwingApplicationContext.getContext().getConfig(); StringBuilder scale = new StringBuilder(); for (int i = 0; i < config.getScale(); i++) { scale.append("0"); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import org.jdesktop.swingx.JXDatePicker; import javax.swing.*; @@ -61,7 +61,7 @@ /** constructor */ public DateTableCellEditor() { - datePicker = new JXDatePicker(LimaContext.getContext().getConfig().getLocale()); + datePicker = new JXDatePicker(LimaSwingApplicationContext.getContext().getConfig().getLocale()); datePicker.getEditor().addFocusListener(this); datePicker.getEditor().addAncestorListener(this); datePicker.setFormats( Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.ImportService; @@ -69,7 +69,7 @@ public void hyperlinkUpdate(HyperlinkEvent e) { if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { if (e.getDescription().equals("#accountschart")) { - MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view); + MainView ui = LimaSwingApplicationContext.MAIN_UI_ENTRY_DEF.getContextValue(view); ui.getHandler().showAccountView(ui); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.ImportService; @@ -71,7 +71,7 @@ public void hyperlinkUpdate(HyperlinkEvent e) { if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { if (e.getDescription().equals("#entrybookschart")) { - MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view); + MainView ui = LimaSwingApplicationContext.MAIN_UI_ENTRY_DEF.getContextValue(view); ui.getHandler().showEntryBookView(ui); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialTransactionService; @@ -83,10 +83,10 @@ if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { if (e.getDescription().equals("#financialtransactionunbalanced")) { - MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view); + MainView ui = LimaSwingApplicationContext.MAIN_UI_ENTRY_DEF.getContextValue(view); ui.getHandler().showTransactionUnbalancedView(ui); } else if (e.getDescription().equals("#financialtransactionbalanced")) { - MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view); + MainView ui = LimaSwingApplicationContext.MAIN_UI_ENTRY_DEF.getContextValue(view); ui.getHandler().showTransactionView(ui); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalYearsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalYearsPane.java 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalYearsPane.java 2014-09-25 15:25:32 UTC (rev 3922) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.ImportService; @@ -77,7 +77,7 @@ public void hyperlinkUpdate(HyperlinkEvent e) { if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { if (e.getDescription().equals("#fiscalperiodschart")) { - MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view); + MainView ui = LimaSwingApplicationContext.MAIN_UI_ENTRY_DEF.getContextValue(view); ui.getHandler().showFiscalPeriodView(ui); } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-19 15:21:43 UTC (rev 3921) +++ trunk/pom.xml 2014-09-25 15:25:32 UTC (rev 3922) @@ -173,7 +173,7 @@  <jettyPluginVersion>9.2.2.v20140723</jettyPluginVersion> <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-alpha-4</nuitonConfigVersion> + <nuitonConfigVersion>3.0-rc-1</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonProfilingVersion>3.0</nuitonProfilingVersion> <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> @@ -191,8 +191,8 @@ <itextVersion>4.2.1</itextVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> - <jaxxVersion>2.9</jaxxVersion> - <openEjbVersion>4.6.0.2</openEjbVersion> + <jaxxVersion>2.10</jaxxVersion> + <openEjbVersion>4.7.0</openEjbVersion> <slf4jVersion>1.7.7</slf4jVersion> <swingxVersion>1.6.5-1</swingxVersion> <pdfboxVersion>1.8.6</pdfboxVersion> @@ -330,9 +330,8 @@ <dependency> <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> + <artifactId>topia-service-flyway</artifactId> <version>${topiaVersion}</version> - <scope>compile</scope> </dependency> <dependency>

1 0

r3921 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/financialtransactionunbalanced resources/i18n
by sbavencoff＠users.chorem.org 19 Sep '14

19 Sep '14

Author: sbavencoff Date: 2014-09-19 17:21:43 +0200 (Fri, 19 Sep 2014) New Revision: 3921 Url: http://forge.chorem.org/projects/lima/repository/revisions/3921 Log: refs #875 #1043 : financial transaction unbalanced Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css 2014-09-19 15:21:43 UTC (rev 3921) @@ -0,0 +1,46 @@ +#toolbar { + floatable : false; +} + +#removeTransaction { + actionIcon : "delete-financial-transaction"; + toolTipText : "lima.entries.remove.transaction"; + enabled : "{isSelectedRow()}"; +} + +#addEntry { + actionIcon : "add-entry"; + toolTipText : "lima.entries.addEntry"; + enabled : "{isSelectedRow()}"; +} + +#removeEntry { + actionIcon : "delete-entry"; + toolTipText : "lima.entries.remove.entry"; + enabled : "{isSelectedRow()}"; +} + +#balanceButton { + actionIcon : "balance"; + toolTipText : "lima.entries.balance"; + enabled : "{!isBalance()}"; +} + +#fiscalPeriodLabel { + actionIcon : "choose-fiscal-year"; + labelFor : "{fiscalPeriodComboBox}"; +} + +#fiscalPeriodComboBox { + toolTipText : "lima.financialTransaction.fiscalYear"; + renderer : "{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}"; +} + +#refresh { + toolTipText : "lima.refresh.shortcut"; + actionIcon : "refresh"; +} + +#financialTransactionUnbalancedTable { + rowHeight : "22"; +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2014-09-19 14:50:34 UTC (rev 3920) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2014-09-19 15:21:43 UTC (rev 3921) @@ -23,7 +23,8 @@ #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> + <import> javax.swing.ListSelectionModel javax.swing.DefaultListSelectionModel @@ -31,6 +32,7 @@ org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel org.chorem.lima.ui.financialtransaction.FinancialTransactionDefaultTable </import> + <FinancialTransactionUnbalancedViewHandler id="handler" javaBean="new FinancialTransactionUnbalancedViewHandler(this)"/> @@ -42,7 +44,7 @@ <Boolean id="selectedRow" javaBean="false"/> <Boolean id="balance" javaBean="true"/> - <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> + <script> <![CDATA[ void $afterCompleteSetup() { @@ -50,54 +52,49 @@ } ]]> </script> - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> - <JButton toolTipText="{ t("lima.entries.remove.transaction") + " (Ctrl+Shift+Del)"}" - actionIcon='delete-financial-transaction' - enabled="{isSelectedRow()}" - onActionPerformed="getHandler().deleteSelectedTransaction()" /> - <JButton toolTipText ="{ t("lima.entries.addEntry") + " (Ctrl+N)"}" actionIcon='add-entry' - enabled="{isSelectedRow()}" - onActionPerformed="getHandler().addEntry()" /> - <JButton toolTipText="{ t("lima.entries.remove.entry") + " (Ctrl+Del)"}" actionIcon='delete-entry' - enabled="{isSelectedRow()}" - onActionPerformed="getHandler().deleteSelectedEntry()" /> - <JToolBar.Separator/> - <JButton toolTipText="{ t("lima.entries.balance") + " (Ctrl+B)"}" actionIcon='balance' - enabled="{!isBalance()}" - onActionPerformed="handler.balanceTransaction()" /> - <JToolBar.Separator/> - <JLabel id="fiscalPeriodLabel" - actionIcon='choose-fiscal-year' - labelFor='{fiscalPeriodComboBox}'/> - <JComboBox id="fiscalPeriodComboBox" model="{modelFiscalPeriod}" - toolTipText="lima.financialTransaction.fiscalYear" - renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" - onActionPerformed="getFinancialTransactionUnbalancedTableModel().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem()); - getHandler().refresh()" - editable="false"/> - <JToolBar.Separator/> - <JButton toolTipText="{ t("lima.refresh") + " (F5)"}" actionIcon='refresh' - onActionPerformed="getHandler().refresh()"/> + <JToolBar id="toolbar" + constraints="BorderLayout.PAGE_START"> - </JToolBar> - </cell> - </row> + <JButton id="removeTransaction" + onActionPerformed="handler.deleteSelectedTransaction()" /> - <row> - <cell fill="both" weightx="1" weighty="1" rows="1" > - <JScrollPane> - <FinancialTransactionUnbalancedTableModel - id="financialTransactionUnbalancedTableModel"/> - <FinancialTransactionUnbalancedTable - id="financialTransactionUnbalancedTable" - constructorParams='handler' - rowHeight="22" - selectionModel='{selectionModel}' - model="{getFinancialTransactionUnbalancedTableModel()}"/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file + <JButton id="addEntry" + onActionPerformed="handler.addEntry()" /> + + <JButton id="removeEntry" + onActionPerformed="handler.deleteSelectedEntry()" /> + + <JToolBar.Separator/> + + <JButton id="balanceButton" + onActionPerformed="handler.balanceTransaction()" /> + + <JToolBar.Separator/> + + <JLabel id="fiscalPeriodLabel"/> + + <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/> + + <JComboBox id="fiscalPeriodComboBox" + model="{fiscalPeriodComboBoxModel}" + onActionPerformed="getFinancialTransactionUnbalancedTableModel().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem()); getHandler().refresh()"/> + + <JToolBar.Separator/> + + <JButton id="refresh" + onActionPerformed="getHandler().refresh()"/> + + </JToolBar> + + <JScrollPane> + <FinancialTransactionUnbalancedTableModel + id="financialTransactionUnbalancedTableModel"/> + <FinancialTransactionUnbalancedTable + id="financialTransactionUnbalancedTable" + constructorParams='handler' + selectionModel='{selectionModel}' + model="{getFinancialTransactionUnbalancedTableModel()}"/> + </JScrollPane> + +</JPanel> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2014-09-19 14:50:34 UTC (rev 3920) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2014-09-19 15:21:43 UTC (rev 3921) @@ -386,7 +386,7 @@ tableModel.refresh(); table.clearSelection(); - FiscalPeriodComboBoxModel comboBoxModel = view.getModelFiscalPeriod(); + FiscalPeriodComboBoxModel comboBoxModel = view.getFiscalPeriodComboBoxModel(); comboBoxModel.refresh(); } } Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-19 14:50:34 UTC (rev 3920) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-19 15:21:43 UTC (rev 3921) @@ -614,6 +614,7 @@ lima.preferences=Preferences lima.quit=Exit lima.refresh=Refresh +lima.refresh.shortcut= lima.remove=Remove lima.remove.shortcut= lima.reports=Reports Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-19 14:50:34 UTC (rev 3920) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-19 15:21:43 UTC (rev 3921) @@ -525,6 +525,7 @@ lima.preferences=Préférences lima.quit=Quitter lima.refresh=Actualiser +lima.refresh.shortcut=Actualiser (F5) lima.remove=Supprimer lima.remove.shortcut="Supprimer (Suppr) lima.reports=Rapports

1 0

r3920 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/Filter/AccountCondition java/org/chorem/lima/ui/Filter/BigDecimalCondition java/org/chorem/lima/ui/Filter/StringCondition java/org/chorem/lima/ui/Filter/dateCondition java/org/chorem/lima/ui/Filter/dateIntervalCondition java/org/chorem/lima/ui/financialtransaction java/org/chorem/lima/ui/financialtransactionunbalanced resources/i18n
by sbavencoff＠users.chorem.org 19 Sep '14

19 Sep '14

Author: sbavencoff Date: 2014-09-19 16:50:34 +0200 (Fri, 19 Sep 2014) New Revision: 3920 Url: http://forge.chorem.org/projects/lima/repository/revisions/3920 Log: refs #875 #1043 : financial transaction view Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx 2014-09-19 14:50:34 UTC (rev 3920) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.financialtransaction.account" +<JInternalFrame title="lima.financialTransaction.account" preferredSize="{new Dimension(400, 100)}" onInternalFrameClosed="handler.delete()" layout="{new FlowLayout()}"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -34,7 +34,7 @@ public CreditConditionView() { super(); setHandler(new CreditConditionHandler(this)); - setTitle(t("lima.financialtransaction.credit")); + setTitle(t("lima.financialTransaction.credit")); getBigDecimaleditor().setBean(handler); getBigDecimaleditor().init(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -34,7 +34,7 @@ public DebitConditionView() { super(); setHandler(new DebitConditionHandler(this)); - setTitle(t("lima.financialtransaction.debit")); + setTitle(t("lima.financialTransaction.debit")); getBigDecimaleditor().setBean(handler); getBigDecimaleditor().init(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -34,6 +34,6 @@ public DescriptionConditionView() { super(); setHandler(new DescriptionConditionHandler(this)); - setTitle(t("lima.financialtransaction.description")); + setTitle(t("lima.financialTransaction.description")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -34,6 +34,6 @@ public LetteringConditionView() { super(); setHandler(new LetteringConditionHandler(this)); - setTitle(t("lima.financialtransaction.letter")); + setTitle(t("lima.financialTransaction.letter")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -34,7 +34,7 @@ public VoucherConditionView() { super(); setHandler(new VoucherConditionHandler(this)); - setTitle(t("lima.financialtransaction.voucher")); + setTitle(t("lima.financialTransaction.voucher")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx 2014-09-19 14:50:34 UTC (rev 3920) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.financialtransaction.date" +<JInternalFrame title="lima.financialTransaction.date" preferredSize="{new Dimension(200, 100)}" minimumSize="{new Dimension(200, 100)}" onInternalFrameClosed="handler.delete()" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx 2014-09-19 14:50:34 UTC (rev 3920) @@ -23,7 +23,7 @@ #L% --> -<JInternalFrame title="lima.financialtransaction.dateInterval" +<JInternalFrame title="lima.financialTransaction.dateInterval" preferredSize="{new Dimension(200, 100)}" minimumSize="{new Dimension(200, 100)}" onInternalFrameClosed="handler.delete()"> @@ -39,7 +39,7 @@ <Table> <row> <cell> - <JLabel text="lima.financialtransaction.dateInterval.in"/> + <JLabel text="lima.financialTransaction.dateInterval.in"/> </cell> <cell> <JAXXDatePicker id='beginDatePicker' @@ -50,7 +50,7 @@ </row> <row> <cell> - <JLabel text="lima.financialtransaction.dateInterval.to"/> + <JLabel text="lima.financialTransaction.dateInterval.to"/> </cell> <cell> <JAXXDatePicker id='endDatePicker' Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -37,7 +37,7 @@ public class AccountColumn extends AbstractColumn<FinancialTransactionTableModel> { public AccountColumn() { - super(Account.class, t("lima.financialtransaction.account"), true); + super(Account.class, t("lima.financialTransaction.account"), true); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -38,7 +38,7 @@ public class CreditColumn extends AbstractColumn<FinancialTransactionTableModel> { public CreditColumn() { - super(BigDecimal.class, t("lima.financialtransaction.credit"), true); + super(BigDecimal.class, t("lima.financialTransaction.credit"), true); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -39,7 +39,7 @@ public class DateColumn extends AbstractColumn<FinancialTransactionTableModel> { public DateColumn(){ - super(Date.class, t("lima.financialtransaction.date"), true); + super(Date.class, t("lima.financialTransaction.date"), true); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -38,7 +38,7 @@ public class DebitColumn extends AbstractColumn<FinancialTransactionTableModel> { public DebitColumn() { - super(BigDecimal.class, t("lima.financialtransaction.debit"), true); + super(BigDecimal.class, t("lima.financialTransaction.debit"), true); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -37,8 +37,8 @@ public class DescriptionColumn<T extends FinancialTransactionTableModel> extends AbstractColumn<T> { public DescriptionColumn() { - super(String.class, t("lima.financialtransaction.description"), true); - setCellEditor(new AutoCompleteTableCellEditor("lima.financialtransaction.description")); + super(String.class, t("lima.financialTransaction.description"), true); + setCellEditor(new AutoCompleteTableCellEditor("lima.financialTransaction.description")); } @Override public Object getValueAt(int row) { Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css 2014-09-19 14:50:34 UTC (rev 3920) @@ -0,0 +1,106 @@ +#toolbar { + floatable : false; +} + +#addTransaction { + actionIcon : "add-financial-transaction"; + toolTipText : "lima.entries.addTransaction"; +} + +#removeTransaction { + actionIcon : "delete-financial-transaction"; + toolTipText : "lima.entries.remove.transaction"; + enabled : "{isSelectedRow()}"; +} + +#copyTransaction { + actionIcon : "copy"; + toolTipText : "lima.entries.copy.transaction"; + enabled : "{isSelectedRow()}"; +} + +#pastTransaction { + actionIcon : "paste"; + toolTipText : "lima.entries.paste.transaction"; + enabled : "{isTransactionInClipBoard()}"; +} + +#addEntry { + actionIcon : "add-entry"; + toolTipText : "lima.entries.addEntry"; + enabled : "{isSelectedRow()}"; +} + +#removeEntry { + actionIcon : "delete-entry"; + toolTipText : "lima.entries.remove.entry"; + enabled : "{isSelectedRow()}"; +} + +#copyEntry { + actionIcon : "copy"; + toolTipText : "lima.entries.copy.entry"; + enabled : "{isSelectedRow()}"; +} + +#pasteEntry { + actionIcon : "paste"; + toolTipText : "lima.entries.paste.entry"; + enabled : "{isEntryInClipBoard() && isSelectedRow()}"; +} + +#assignEntries { + actionIcon : "assign-all-entries-in-transaction"; + toolTipText : "lima.entries.assign.entries"; + enabled : "{isAssignableInAllEntries() && isSelectedRow()}"; +} + +#balanceButton { + actionIcon : "balance"; + toolTipText : "lima.entries.balance"; + enabled : "{!isBalance()}"; +} + +#fiscalPeriodLabel { + actionIcon : "choose-fiscal-year"; + labelFor : "{fiscalPeriodComboBox}"; +} + +#fiscalPeriodComboBox { + toolTipText : "lima.financialTransaction.fiscalYear"; + renderer : "{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}"; +} + +#financialPeriodLabel { + actionIcon : "choose-fiscal-period"; + labelFor : "{financialPeriodComboBox}"; +} + +#financialPeriodComboBox { + toolTipText : "lima.financialTransaction.financialPeriod"; + renderer : "{new org.chorem.lima.ui.common.FinancialPeriodListRenderer()}"; +} + +#back { + actionIcon : "previous"; + toolTipText : "lima.financialTransaction.previousFinancialPeriod"; +} + +#next { + actionIcon : "next"; + toolTipText : "lima.financialTransaction.nextFinancialPeriod"; +} + +#entryBookLabel { + actionIcon : "choose-book"; + labelFor : "{entryBookComboBox}"; +} + +#entryBookComboBox { + toolTipText : "lima.financialTransaction.entryBook"; + renderer : "{new org.chorem.lima.ui.common.EntryBookListRenderer()}" +} + +#financialTransactionTable { + rowHeight : 22; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2014-09-19 14:50:34 UTC (rev 3920) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> <import> javax.swing.ListSelectionModel @@ -58,92 +58,84 @@ } ]]> </script> - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> - <JButton toolTipText="{ t("lima.entries.addTransaction") + " (Ctrl+Shift+N)"}" - actionIcon='add-financial-transaction' - onActionPerformed="handler.addFinancialTransaction()" /> - <JButton toolTipText="{ t("lima.entries.remove.transaction") + " (Ctrl+Shift+Del)"}" - actionIcon='delete-financial-transaction' - enabled="{isSelectedRow()}" - onActionPerformed="handler.deleteSelectedTransaction()" /> - <JButton toolTipText="{ t("lima.entries.copy.transaction") + " (Ctrl+Shift+C)"}" actionIcon='copy' - enabled="{isSelectedRow()}" - onActionPerformed="handler.copyTransaction()" /> - <JButton toolTipText="{ t("lima.entries.paste.transaction") + " (Ctrl+Shift+V)"}" actionIcon='paste' - enabled="{isTransactionInClipBoard()}" - onActionPerformed="handler.pasteTransaction()" /> + <JToolBar id="toolbar" + constraints="BorderLayout.PAGE_START"> - <JToolBar.Separator/> + <JButton id="addTransaction" + onActionPerformed="handler.addFinancialTransaction()" /> - <JButton toolTipText ="{ t("lima.entries.addEntry") + " (Ctrl+N)"}" actionIcon='add-entry' - enabled="{isSelectedRow()}" - onActionPerformed="handler.addEntry()" /> - <JButton toolTipText="{ t("lima.entries.remove.entry") + " (Ctrl+Del)"}" actionIcon='delete-entry' - enabled="{isSelectedRow()}" - onActionPerformed="handler.deleteSelectedEntry()" /> - <JButton toolTipText="{ t("lima.entries.copy.entry") + " (Ctrl+Alt+C)"}" actionIcon='copy' - enabled="{isSelectedRow()}" - onActionPerformed="handler.copyEntry()" /> - <JButton toolTipText="{ t("lima.entries.paste.entry") + " (Ctrl+Alt+V)"}" actionIcon='paste' - enabled="{isEntryInClipBoard() && isSelectedRow()}" - onActionPerformed="handler.pasteEntry()" /> - <JButton toolTipText="{ t("lima.entries.assign.entries") + " (Ctrl+Alt+A)"}" actionIcon='assign-all-entries-in-transaction' - enabled="{isAssignableInAllEntries() && isSelectedRow()}" - onActionPerformed="handler.assignAllEntries()" /> - <JToolBar.Separator/> - <JButton toolTipText="{ t("lima.entries.balance") + " (Ctrl+B)"}" actionIcon='balance' - enabled="{!isBalance()}" - onActionPerformed="handler.balanceTransaction()" /> + <JButton id="removeTransaction" + onActionPerformed="handler.deleteSelectedTransaction()" /> - <JToolBar.Separator/> + <JButton id="copyTransaction" + onActionPerformed="handler.copyTransaction()" /> - <JLabel actionIcon='choose-fiscal-year' - labelFor='{fiscalPeriodComboBox}'/> - <org.chorem.lima.ui.common.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/> - <JComboBox id="fiscalPeriodComboBox" model="{fiscalPeriodComboBoxModel}" - toolTipText="lima.financialtransaction.fiscalyear" - renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" - onItemStateChanged="handler.fiscalPeriodSelected(event)"/> + <JButton id="pastTransaction" + onActionPerformed="handler.pasteTransaction()" /> - <JLabel actionIcon='choose-fiscal-period' - labelFor='{financialPeriodComboBox}'/> - <org.chorem.lima.ui.common.FinancialPeriodComboBoxModel id="financialPeriodComboBoxModel"/> - <JComboBox id="financialPeriodComboBox" - model="{financialPeriodComboBoxModel}" - toolTipText="lima.financialtransaction.financialperiod" - renderer="{new org.chorem.lima.ui.common.FinancialPeriodListRenderer()}" - onItemStateChanged="handler.financialPeriodSelected(event)"/> - <JButton id="back" actionIcon="previous" - toolTipText="lima.financialtransaction.previousfinancialperiod" - onActionPerformed="handler.back(financialPeriodComboBox)"/> - <JButton id="next" actionIcon="next" - toolTipText="lima.financialtransaction.nextfinancialperiod" - onActionPerformed="handler.next(financialPeriodComboBox)"/> + <JToolBar.Separator/> - <JToolBar.Separator/> + <JButton id="addEntry" + onActionPerformed="handler.addEntry()" /> - <JLabel actionIcon="choose-book" - labelFor='{entryBookComboBox}'/> - <org.chorem.lima.ui.common.EntryBookComboBoxModel id="entryBookComboBoxModel"/> - <JComboBox id="entryBookComboBox" model="{entryBookComboBoxModel}" - toolTipText="lima.financialtransaction.entrybook" - renderer="{new org.chorem.lima.ui.common.EntryBookListRenderer()}" - onItemStateChanged="handler.entryBookSelected(event)"/> - </JToolBar> - </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <FinancialTransactionTableModel id="financialTransactionTableModel"/> - <FinancialTransactionTable - id="financialTransactionTable" rowHeight="22" - constructorParams='handler' - selectionModel='{selectionModel}' - model='{financialTransactionTableModel}'/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file + <JButton id="removeEntry" + onActionPerformed="handler.deleteSelectedEntry()" /> + + <JButton id="copyEntry" + onActionPerformed="handler.copyEntry()" /> + + <JButton id="pasteEntry" + onActionPerformed="handler.pasteEntry()" /> + + <JButton id="assignEntries" + onActionPerformed="handler.assignAllEntries()" /> + + <JToolBar.Separator/> + + <JButton id="balanceButton" + onActionPerformed="handler.balanceTransaction()" /> + + <JToolBar.Separator/> + + <JLabel id="fiscalPeriodLabel"/> + + <org.chorem.lima.ui.common.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/> + + <JComboBox id="fiscalPeriodComboBox" + model="{fiscalPeriodComboBoxModel}" + onItemStateChanged="handler.fiscalPeriodSelected(event)"/> + + <JLabel id="financialPeriodLabel"/> + + <org.chorem.lima.ui.common.FinancialPeriodComboBoxModel id="financialPeriodComboBoxModel"/> + + <JComboBox id="financialPeriodComboBox" + model="{financialPeriodComboBoxModel}" + onItemStateChanged="handler.financialPeriodSelected(event)"/> + + <JButton id="back" + onActionPerformed="handler.back(financialPeriodComboBox)"/> + + <JButton id="next" + onActionPerformed="handler.next(financialPeriodComboBox)"/> + + <JToolBar.Separator/> + + <JLabel id="entryBookLabel" /> + + <org.chorem.lima.ui.common.EntryBookComboBoxModel id="entryBookComboBoxModel"/> + + <JComboBox id="entryBookComboBox" + model="{entryBookComboBoxModel}" + onItemStateChanged="handler.entryBookSelected(event)"/> + </JToolBar> + + <JScrollPane constraints="BorderLayout.CENTER"> + <FinancialTransactionTableModel id="financialTransactionTableModel"/> + + <FinancialTransactionTable id="financialTransactionTable" + constructorParams='handler' + selectionModel='{selectionModel}' + model='{financialTransactionTableModel}'/> + </JScrollPane> +</JPanel> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -695,8 +695,8 @@ cellEditor.cancelCellEditing(); } int response = JOptionPane.showConfirmDialog( - view, t("lima.financialtransaction.messageremovetransaction"), - t("lima.financialtransaction.titleremovetransaction"), JOptionPane.YES_NO_OPTION); + view, t("lima.financialTransaction.messageremovetransaction"), + t("lima.financialTransaction.titleremovetransaction"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { try { @@ -740,8 +740,8 @@ cellEditor.cancelCellEditing(); } int response = JOptionPane.showConfirmDialog( - view, t("lima.financialtransaction.messageremoveentry"), - t("lima.financialtransaction.titleremoveentry"), JOptionPane.YES_NO_OPTION); + view, t("lima.financialTransaction.messageremoveentry"), + t("lima.financialTransaction.titleremoveentry"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { try { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java 2014-09-19 14:50:34 UTC (rev 3920) @@ -37,8 +37,8 @@ public class VoucherColumn extends AbstractColumn<FinancialTransactionTableModel> { public VoucherColumn() { - super(String.class, t("lima.financialtransaction.voucher"), true); - setCellEditor(new AutoCompleteTableCellEditor("lima.financialtransaction.voucher")); + super(String.class, t("lima.financialTransaction.voucher"), true); + setCellEditor(new AutoCompleteTableCellEditor("lima.financialTransaction.voucher")); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2014-09-19 14:50:34 UTC (rev 3920) @@ -73,7 +73,7 @@ actionIcon='choose-fiscal-year' labelFor='{fiscalPeriodComboBox}'/> <JComboBox id="fiscalPeriodComboBox" model="{modelFiscalPeriod}" - toolTipText="lima.financialtransaction.fiscalyear" + toolTipText="lima.financialTransaction.fiscalYear" renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" onActionPerformed="getFinancialTransactionUnbalancedTableModel().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem()); getHandler().refresh()" Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-19 14:50:34 UTC (rev 3920) @@ -330,46 +330,51 @@ lima.financialStatements.check= lima.financialStatements.check.nothing= lima.financialStatements.check.warn= +lima.financialTransaction.account= lima.financialTransaction.add.error.afterLastFiscalPeriod= lima.financialTransaction.add.error.beforeFirstFiscalPeriod= lima.financialTransaction.add.error.lockedEntryBook= lima.financialTransaction.add.error.lockedFinancialPeriod= +lima.financialTransaction.balance= +lima.financialTransaction.buttonback= +lima.financialTransaction.buttonnext= +lima.financialTransaction.credit= +lima.financialTransaction.date= +lima.financialTransaction.date.in= +lima.financialTransaction.date.to= +lima.financialTransaction.dateInterval= +lima.financialTransaction.dateInterval.in= +lima.financialTransaction.dateInterval.to= +lima.financialTransaction.debit= lima.financialTransaction.delete.error.lockedEntryBook= lima.financialTransaction.delete.error.lockedFinancialPeriod= +lima.financialTransaction.description= +lima.financialTransaction.entryBook= +lima.financialTransaction.entrybook= +lima.financialTransaction.financialPeriod= +lima.financialTransaction.financialperiod= +lima.financialTransaction.fiscalYear= +lima.financialTransaction.fiscalyear= +lima.financialTransaction.letter= lima.financialTransaction.lockedEntryBookException=Entry can not be added as entry book is locked for period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n lima.financialTransaction.lockedFinancialPeriodException=locked financial transaction +lima.financialTransaction.messageremoveentry= +lima.financialTransaction.messageremovetransaction= +lima.financialTransaction.nextFinancialPeriod= +lima.financialTransaction.nextfinancialperiod=Next period lima.financialTransaction.paste.error.afterLastFiscalPeriod= lima.financialTransaction.paste.error.beforeFirstFiscalPeriod= lima.financialTransaction.paste.error.lockedEntryBook= lima.financialTransaction.paste.error.lockedFinancialPeriod= +lima.financialTransaction.previousFinancialPeriod= +lima.financialTransaction.previousfinancialperiod=previous period +lima.financialTransaction.titleremoveentry= +lima.financialTransaction.titleremovetransaction= lima.financialTransaction.update.error.afterLastFiscalPeriod= lima.financialTransaction.update.error.beforeFirstFiscalPeriod= lima.financialTransaction.update.error.lockedEntryBook= lima.financialTransaction.update.error.lockedFinancialPeriod= -lima.financialtransaction.account= -lima.financialtransaction.balance= -lima.financialtransaction.buttonback= -lima.financialtransaction.buttonnext= -lima.financialtransaction.credit= -lima.financialtransaction.date= -lima.financialtransaction.date.in= -lima.financialtransaction.date.to= -lima.financialtransaction.dateInterval= -lima.financialtransaction.dateInterval.in= -lima.financialtransaction.dateInterval.to= -lima.financialtransaction.debit= -lima.financialtransaction.description= -lima.financialtransaction.entrybook= -lima.financialtransaction.financialperiod= -lima.financialtransaction.fiscalyear= -lima.financialtransaction.letter= -lima.financialtransaction.messageremoveentry= -lima.financialtransaction.messageremovetransaction= -lima.financialtransaction.nextfinancialperiod=Next period -lima.financialtransaction.previousfinancialperiod=previous period -lima.financialtransaction.titleremoveentry= -lima.financialtransaction.titleremovetransaction= -lima.financialtransaction.voucher= +lima.financialTransaction.voucher= lima.fiscalPeriod.add= lima.fiscalPeriod.add.beginAfterEndFiscalPeriod= lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-19 13:27:29 UTC (rev 3919) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-19 14:50:34 UTC (rev 3920) @@ -154,13 +154,13 @@ lima.endDate=Fin lima.enterEntries=Écritures lima.entries=Écritures -lima.entries.addEntry=Créer une entrée dans la transaction -lima.entries.addTransaction=Créer une transaction +lima.entries.addEntry=Créer une entrée dans la transaction (Ctrl+N) +lima.entries.addTransaction=Créer une transaction (Ctrl+Maj+N) lima.entries.assign.closed.entryBook.error=Impossible d'affecter cette valeur a l'ensemble des entrés de la transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.entries.assign.entries=Assigner cette valeur à toutes les entrées de la transaction -lima.entries.balance=Équilibrer la transaction avec cette entrée -lima.entries.copy.entry=Copier l'entrée -lima.entries.copy.transaction=Copier la transaction +lima.entries.assign.entries=Assigner cette valeur à toutes les entrées de la transaction (Ctrl+Alt+A) +lima.entries.balance=Équilibrer la transaction avec cette entrée (Ctrl+B) +lima.entries.copy.entry=Copier l'entrée (Ctrl+Alt+C) +lima.entries.copy.transaction=Copier la transaction (Ctrl+Maj+C) lima.entries.enter=Saisie des écritures lima.entries.letter.closed.entryBook.error=Impossible de modifier le lettrage des ces entrés car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.entries.letter.unbalanced.error=Impossible de lettrer ces écritures car leur solde n'est pas nul. @@ -170,10 +170,10 @@ lima.entries.lettering.radiobutton.list=Lettres existantes lima.entries.lettering.radiobutton.new=Nouvelle lettre lima.entries.lettering.remove=Supprimer une lettre -lima.entries.paste.entry=Coller l'entrée -lima.entries.paste.transaction=Coller la transaction -lima.entries.remove.entry=Supprimer l'entrée -lima.entries.remove.transaction=Supprimer la transaction +lima.entries.paste.entry=Coller l'entrée (Ctrl+Alt+V) +lima.entries.paste.transaction=Coller la transaction (Ctrl+Maj+V) +lima.entries.remove.entry=Supprimer l'entrée (Suppr) +lima.entries.remove.transaction=Supprimer la transaction (Ctrl+Suppr) lima.entries.search=Rechercher des écritures lima.entries.searchtransaction= lima.entries.searchunbalancedtransaction= @@ -296,44 +296,44 @@ lima.financialStatements.check=Vérification des comptes aux postes lima.financialStatements.check.nothing=Introuvable \: %s - %s \n lima.financialStatements.check.warn=Attention cette fonctionnalité n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas être présent au bilan et compte de résultat.\n Il est donc normal que des comptes sont marqués comme introuvable.\n\n +lima.financialTransaction.account=Compte lima.financialTransaction.add.error.afterLastFiscalPeriod=Impossible d'ajouter une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. lima.financialTransaction.add.error.beforeFirstFiscalPeriod=Impossible d'ajouter une transaction avant le %1$te %1$tB %1$tY début du premier exercice. lima.financialTransaction.add.error.lockedEntryBook=Impossible d'ajouter une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.financialTransaction.add.error.lockedFinancialPeriod=Impossible d'ajouter une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.financialTransaction.balance=Balance +lima.financialTransaction.buttonback=← +lima.financialTransaction.buttonnext=→ +lima.financialTransaction.credit=Crédit +lima.financialTransaction.date=Date +lima.financialTransaction.dateInterval=Interval de dates +lima.financialTransaction.dateInterval.in=Du +lima.financialTransaction.dateInterval.to=au +lima.financialTransaction.debit=Débit lima.financialTransaction.delete.error.lockedEntryBook=Impossible de supprimer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.financialTransaction.delete.error.lockedFinancialPeriod=Impossible de supprimer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.financialTransaction.description=Description +lima.financialTransaction.entryBook=Journal +lima.financialTransaction.financialPeriod=Périodes comptables +lima.financialTransaction.fiscalYear=Exercices +lima.financialTransaction.letter=Lettre lima.financialTransaction.lockedEntryBookException=Impossible d'ajouter une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY.\n lima.financialTransaction.lockedFinancialPeriodException=La période financière est bloquée\n +lima.financialTransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? +lima.financialTransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? +lima.financialTransaction.nextFinancialPeriod=Période suivante lima.financialTransaction.paste.error.afterLastFiscalPeriod=Impossible de copier une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. lima.financialTransaction.paste.error.beforeFirstFiscalPeriod=Impossible de copier une transaction avant le %1$te %1$tB %1$tY début du premier exercice. lima.financialTransaction.paste.error.lockedEntryBook=Impossible de copier une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.financialTransaction.paste.error.lockedFinancialPeriod=Impossible de copier une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.financialTransaction.previousFinancialPeriod=Période précédente +lima.financialTransaction.titleremoveentry=Suppression +lima.financialTransaction.titleremovetransaction=Suppression lima.financialTransaction.update.error.afterLastFiscalPeriod=Impossible de déplacer une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. lima.financialTransaction.update.error.beforeFirstFiscalPeriod=Impossible de déplacer une transaction avant le %1$te %1$tB %1$tY début du premier exercice. lima.financialTransaction.update.error.lockedEntryBook=Impossible de déplacer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.financialTransaction.update.error.lockedFinancialPeriod=Impossible de deplacer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.financialtransaction.account=Compte -lima.financialtransaction.balance=Balance -lima.financialtransaction.buttonback=← -lima.financialtransaction.buttonnext=→ -lima.financialtransaction.credit=Crédit -lima.financialtransaction.date=Date -lima.financialtransaction.dateInterval=Interval de dates -lima.financialtransaction.dateInterval.in=Du -lima.financialtransaction.dateInterval.to=au -lima.financialtransaction.debit=Débit -lima.financialtransaction.description=Description -lima.financialtransaction.entrybook=Journal -lima.financialtransaction.financialperiod=Périodes comptables -lima.financialtransaction.fiscalyear=Exercices -lima.financialtransaction.letter=Lettre -lima.financialtransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? -lima.financialtransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? -lima.financialtransaction.nextfinancialperiod=Période suivante -lima.financialtransaction.previousfinancialperiod=Période précédente -lima.financialtransaction.titleremoveentry=Suppression -lima.financialtransaction.titleremovetransaction=Suppression -lima.financialtransaction.voucher=Pièce comptable +lima.financialTransaction.voucher=Pièce comptable lima.fiscalPeriod.add=Nouvel exercice (Ctrl+A) lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=Le date de fin de l'exercice (%2$te/%2$tm/%2$tY) doit être postérieur à la date de début (%1$te/%1$tm/%1$tY) lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=Il existe déjà %1s exercices non clôturés.

1 0

r3919 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/vatchart resources/i18n resources/icons
by sbavencoff＠users.chorem.org 19 Sep '14

19 Sep '14

Author: sbavencoff Date: 2014-09-19 15:27:29 +0200 (Fri, 19 Sep 2014) New Revision: 3919 Url: http://forge.chorem.org/projects/lima/repository/revisions/3919 Log: refs #875 #1043 : VAT statement Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.css trunk/lima-swing/src/main/resources/icons/action-vatStatement-edit.png trunk/lima-swing/src/main/resources/icons/action-vatStatement-import.png trunk/lima-swing/src/main/resources/icons/action-vatStatement-new.png trunk/lima-swing/src/main/resources/icons/action-vatStatement-remove.png Removed: trunk/lima-swing/src/main/resources/icons/action-vatstatement-edit.png trunk/lima-swing/src/main/resources/icons/action-vatstatement-import.png trunk/lima-swing/src/main/resources/icons/action-vatstatement-new.png trunk/lima-swing/src/main/resources/icons/action-vatstatement-remove.png Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css 2014-09-19 13:27:29 UTC (rev 3919) @@ -0,0 +1,45 @@ +#vatStatementImportFormg { + title : "lima.vatStatement.import.form"; +} + +#nothingLabel { + text : "lima.vatStatement.nothing"; +} + +#shortened { + text : "lima.vatStatement.shortened"; + value : "{VatStatementsChartEnum.SHORTENED}"; + buttonGroup : "{getRadioButtons()}"; + selected : true; +} + +#vatBase { + text : "lima.vatStatement.base"; + value : "{VatStatementsChartEnum.BASE}"; + buttonGroup : "{getRadioButtons()}"; +} + +#developed { + text : "lima.vatStatement.developed"; + value : "{VatStatementsChartEnum.DEVELOPED}"; + buttonGroup : "{getRadioButtons()}"; +} + +#importCSV { + text : "lima.vatStatement.import"; + value : "{VatStatementsChartEnum.IMPORT}"; + buttonGroup : "{getRadioButtons()}"; +} + +#deleteVatStatementChart { + text : "lima.vatStatement.delete"; + selected : false; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx 2014-09-12 15:33:20 UTC (rev 3918) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx 2014-09-19 13:27:29 UTC (rev 3919) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true" +<JDialog id="vatStatementImportForm" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -48,45 +49,32 @@ <Table> <row> <cell> - <JLabel text='lima.charts.vatstatement.nothing'/> + <JLabel id="nothingLabel"/> </cell> </row> <row> <cell> - <JRadioButton text='lima.charts.vatstatement.shortened' - value='{VatStatementsChartEnum.SHORTENED}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + <JRadioButton id="shortened"/> </cell> </row> <row> <cell> - <JRadioButton text='lima.charts.vatstatement.base' - value='{VatStatementsChartEnum.BASE}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + <JRadioButton id="vatBase"/> </cell> </row> <row> <cell> - <JRadioButton text='lima.charts.vatstatement.developed' - value='{VatStatementsChartEnum.DEVELOPED}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + <JRadioButton id="developed"/> </cell> </row> <row> <cell> - <JRadioButton text='lima.importExport.import' - value='{VatStatementsChartEnum.IMPORT}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + <JRadioButton id="importCSV"/> </cell> </row> <row> <cell> - <JCheckBox id='deleteVatStatementChart' text='lima.vatstatement.delete' - selected='false'/> + <JCheckBox id='deleteVatStatementChart'/> </cell> </row> <row> @@ -94,11 +82,11 @@ <Table> <row> <cell fill="none"> - <JButton text="lima.cancel" + <JButton id="cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.ok" + <JButton id="ok" onActionPerformed="dispose()"/> </cell> </row> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css 2014-09-19 13:27:29 UTC (rev 3919) @@ -0,0 +1,44 @@ +#VatChartMovementForm { + title : "lima.vatStatement.movement"; +} + +#labelLabel { + text : "lima.vatStatement.label"; +} + +#labelTextField { + text : "{getVatStatement().getLabel()}"; +} + +#boxNameLabel { + text : "lima.vatStatement.boxName"; +} + +#boxNameTextField { + text : "{getVatStatement().getBoxName()}"; +} + +#accountsLabel { + text : "lima.vatStatement.accounts"; +} + +#accountsTextField { + text : "{getVatStatement().getAccounts()}"; +} + +#masterLabel { + text : "lima.vatStatement.master"; +} + +#masterTextField { + text : "{getVatStatement().getMasterVatStatement().getLabel()}"; + editable : false; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx 2014-09-12 15:33:20 UTC (rev 3918) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx 2014-09-19 13:27:29 UTC (rev 3919) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true" +<JDialog id="VatChartMovementForm" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -52,10 +53,10 @@ <row> <cell fill="horizontal"> - <JLabel text="lima.vatstatement.label"/> + <JLabel id="labelLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="labelTextField" text="{getVatStatement().getLabel()}"/> + <JTextField id="labelTextField"/> <Document javaBean="getLabelTextField().getDocument()" onInsertUpdate='getVatStatement().setLabel(getLabelTextField().getText())' onRemoveUpdate='getVatStatement().setLabel(getLabelTextField().getText())'/> @@ -63,11 +64,10 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.vatstatement.boxname"/> + <JLabel id="boxNameLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="boxNameTextField" - text="{getVatStatement().getBoxName()}"/> + <JTextField id="boxNameTextField"/> <Document javaBean="getBoxNameTextField().getDocument()" onInsertUpdate='getVatStatement().setBoxName(getBoxNameTextField().getText())' onRemoveUpdate='getVatStatement().setBoxName(getBoxNameTextField().getText())'/> @@ -75,11 +75,10 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.vatstatement.accounts"/> + <JLabel id="accountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="accountsTextField" - text="{getVatStatement().getAccounts()}"/> + <JTextField id="accountsTextField"/> <Document javaBean="getAccountsTextField().getDocument()" onInsertUpdate='getVatStatement().setAccounts(getAccountsTextField().getText())' onRemoveUpdate='getVatStatement().setAccounts(getAccountsTextField().getText())'/> @@ -87,19 +86,20 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.vatstatement.mastervatstatement"/> + <JLabel id="masterLabel"/> </cell> <cell fill="horizontal"> - <JTextField editable="{false}" id="masterVatStatementTextField" - text="{getVatStatement().getMasterVatStatement().getLabel()}"/> + <JTextField id="masterTextField"/> </cell> </row> <row> <cell fill="none"> - <JButton text="lima.cancel" onActionPerformed="performCancel()"/> + <JButton id="cancel" + onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.ok" onActionPerformed="dispose()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> </cell> </row> </Table> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.css 2014-09-19 13:27:29 UTC (rev 3919) @@ -0,0 +1,29 @@ +#toolbar { + floatable : false; +} + +#addVatStatementMovement { + toolTipText : "lima.vatStatement.movement.add"; + actionIcon : "vatStatement-new"; +} + +#updateButton { + toolTipText : "lima.update.shortcut"; + actionIcon : "vatStatement-edit"; + enabled : "{isSelectedRow()}"; +} + +#removeButton { + toolTipText : "lima.remove.shortcut"; + actionIcon : "vatStatement-remove"; + enabled : "{isSelectedRow()}"; +} + +#importButton { + toolTipText : "lima.importExport.import"; + actionIcon : "vatStatement-import"; +} + +#treeTable { + selectionMode : "{ListSelectionModel.SINGLE_SELECTION}"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-09-12 15:33:20 UTC (rev 3918) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-09-19 13:27:29 UTC (rev 3919) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> <import> javax.swing.ListSelectionModel @@ -37,48 +37,30 @@ ]]> </script> - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> + <JToolBar id="toolbar" + constraints="BorderLayout.PAGE_START"> - <JButton id="addVatStatementMovement" - toolTipText="{ t("lima.vatstatement.movement.add") + " (Ctrl+N)"}" - actionIcon='vatstatement-new' - onActionPerformed="handler.addVatStatementMovement()"/> + <JButton id="addVatStatementMovement" + onActionPerformed="handler.addVatStatementMovement()"/> - <JButton id="updateButton" - toolTipText="{ t("lima.update") + " (Ctrl+M)"}" - actionIcon='vatstatement-edit' - onActionPerformed="handler.updateVatStatement()" - enabled="{isSelectedRow()}"/> + <JButton id="updateButton" + onActionPerformed="handler.updateVatStatement()"/> - <JButton id="removeButton" - toolTipText="{ t("lima.remove") + " (Del)"}" - actionIcon='vatstatement-remove' - onActionPerformed="handler.removeVatStatement()" - enabled="{isSelectedRow()}"/> + <JButton id="removeButton" + onActionPerformed="handler.removeVatStatement()"/> - <JButton id="importButton" - actionIcon='vatstatement-import' - toolTipText="lima.importExport.import" - onActionPerformed="handler.importVatStatementChart()"/> + <JButton id="importButton" + onActionPerformed="handler.importVatStatementChart()"/> - </JToolBar> - </cell> - </row> + </JToolBar> - <row> - <cell fill="both" weightx="1" weighty="1" > - <JScrollPane> - <VatChartTreeTableModel id="vatTreeTableModel"/> - <VatChartTreeTable id="treeTable" - constructorParams="getHandler()" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}" - treeTableModel="{getVatTreeTableModel()}"/> - <ListSelectionModel - javaBean="getTreeTable().getSelectionModel()" - onValueChanged="setSelectedRow(treeTable.getSelectedRow() != -1)"/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file + <JScrollPane> + <VatChartTreeTableModel id="vatTreeTableModel"/> + <VatChartTreeTable id="treeTable" + constructorParams="getHandler()" + treeTableModel="{getVatTreeTableModel()}"/> + <ListSelectionModel + javaBean="getTreeTable().getSelectionModel()" + onValueChanged="setSelectedRow(treeTable.getSelectedRow() != -1)"/> + </JScrollPane> +</JPanel> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2014-09-12 15:33:20 UTC (rev 3918) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2014-09-19 13:27:29 UTC (rev 3919) @@ -246,7 +246,7 @@ int selectedRow = view.treeTable.getSelectedRow(); if (selectedRow != -1) { int n = JOptionPane.showConfirmDialog(view, - t("lima.charts.vatstatement.question.remove"), + t("lima.vatStatement.question.remove"), t("lima.confirmation"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -258,7 +258,7 @@ if (!treeTableModel.isLeaf(vatStatement)) { JOptionPane.showMessageDialog( view, - t("lima.charts.vatstatement.deleteparent"), + t("lima.vatStatement.deleteparent"), t("lima.info"), JOptionPane.INFORMATION_MESSAGE); } else { Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 15:33:20 UTC (rev 3918) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-19 13:27:29 UTC (rev 3919) @@ -75,13 +75,6 @@ lima.charts.fiscalperiod.update=Updated fiscal lima.charts.fiscalyear=Fiscal Years lima.charts.vatpdf=PDF structure -lima.charts.vatstatement=VAT statement chart -lima.charts.vatstatement.base=Base VAT statement chart -lima.charts.vatstatement.deleteparent=Delete subcategories before this line -lima.charts.vatstatement.developed=Developped VAT statement chart -lima.charts.vatstatement.nothing=No vat statement chart -lima.charts.vatstatement.question.remove=Do you really want to delete this line ? -lima.charts.vatstatement.shortened=Shortened vat statement chart lima.closed=Closed lima.closedPeriodicEntryBook.franceAccountingRules.unbalancedFinancialTransactionsException=Fiscal Period has unbalanced transactions. lima.closedPeriodicEntryBook.franceAccountingRules.withoutEntryBookFinancialTransactionsException=Can't block financialperiod / missing EntryBook in transactions @@ -667,15 +660,24 @@ lima.transaction=Transaction lima.update=Modify lima.update.shortcut= +lima.vatStatement=VAT statement chart +lima.vatStatement.accounts=List of accounts lima.vatStatement.alreadyExistVatStatement=FAILED \: The vatStatement %s already exists \! +lima.vatStatement.base=Base VAT statement chart +lima.vatStatement.boxName=PDF BoxName +lima.vatStatement.delete=Delete actual VAT statement chart before import new +lima.vatStatement.deleteparent=Delete subcategories before this line +lima.vatStatement.developed=Developped VAT statement chart +lima.vatStatement.import= +lima.vatStatement.label=Label +lima.vatStatement.master= +lima.vatStatement.movement= +lima.vatStatement.movement.add=Add movement +lima.vatStatement.nothing=No vat statement chart +lima.vatStatement.question.remove=Do you really want to delete this line ? +lima.vatStatement.shortened=Shortened vat statement chart lima.vatStatements= lima.vatreport.listerror=Can't get entries list -lima.vatstatement.accounts=List of accounts -lima.vatstatement.boxname=PDF BoxName -lima.vatstatement.delete=Delete actual VAT statement chart before import new -lima.vatstatement.label=Label -lima.vatstatement.mastervatstatement= -lima.vatstatement.movement.add=Add movement lima.wait= lima.warning.nimbus.landf=Could not find Numbus Look&Feel limaFinancialStatement.movement.form= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 15:33:20 UTC (rev 3918) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-19 13:27:29 UTC (rev 3919) @@ -56,13 +56,6 @@ lima.charts.fiscalperiod.create= lima.charts.fiscalyear=Exercices lima.charts.vatpdf=Import du pdf -lima.charts.vatstatement=Plan TVA -lima.charts.vatstatement.base=Plan TVA de base -lima.charts.vatstatement.deleteparent=Veuillez supprimer les sous-catégories de cette ligne -lima.charts.vatstatement.developed=Plan TVA développé -lima.charts.vatstatement.nothing=<html><center>Aucun plan TVA chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> -lima.charts.vatstatement.question.remove=Etes vous sur de vouloir supprimer cette ligne ? -lima.charts.vatstatement.shortened=Plan TVA abrégé lima.closed=Fermé lima.closedPeriodicEntryBook.franceAccountingRules.unbalancedFinancialTransactionsException=Impossible de bloquer la période financière / le journal, il contient des transactions non équilibrées. lima.closedPeriodicEntryBook.franceAccountingRules.withoutEntryBookFinancialTransactionsException=Impossible de bloquer la période financière / il manque un journal dans une transaction (%1$te/%1$tm/%1$tY) @@ -579,15 +572,24 @@ lima.transaction=Transaction lima.update=Modifier lima.update.shortcut=Modifier (Ctrl+M) +lima.vatStatement=Plan TVA +lima.vatStatement.accounts=Liste des comptes lima.vatStatement.alreadyExistVatStatement=u00C9chec \: Le plan %s exist déjà \! +lima.vatStatement.base=Plan TVA de base +lima.vatStatement.boxName=PDF BoxName +lima.vatStatement.delete=Supprimer le plan TVA actuel avant d'importer +lima.vatStatement.deleteparent=Veuillez supprimer les sous-catégories de cette ligne +lima.vatStatement.developed=Plan TVA développé +lima.vatStatement.import= +lima.vatStatement.label=Libellé +lima.vatStatement.master= +lima.vatStatement.movement= +lima.vatStatement.movement.add=Ajouter un regrouprement (Ctrl+N) +lima.vatStatement.nothing=<html><center>Aucun plan TVA chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> +lima.vatStatement.question.remove=Etes vous sur de vouloir supprimer cette ligne ? +lima.vatStatement.shortened=Plan TVA abrégé lima.vatStatements=Plan TVA lima.vatreport.listerror=Erreur lors de la récupération des données de la liste -lima.vatstatement.accounts=Liste des comptes -lima.vatstatement.boxname=PDF BoxName -lima.vatstatement.delete=Supprimer le plan TVA actuel avant d'importer -lima.vatstatement.label=Libellé -lima.vatstatement.mastervatstatement= -lima.vatstatement.movement.add=Ajouter un regrouprement lima.wait=Traitement en cours lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé limma.config.thousandseparator.description=Caractère de séparation entre les blocs de milliers Copied: trunk/lima-swing/src/main/resources/icons/action-vatStatement-edit.png (from rev 3918, trunk/lima-swing/src/main/resources/icons/action-vatstatement-edit.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-vatStatement-import.png (from rev 3918, trunk/lima-swing/src/main/resources/icons/action-vatstatement-import.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-vatStatement-new.png (from rev 3918, trunk/lima-swing/src/main/resources/icons/action-vatstatement-new.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-vatStatement-remove.png (from rev 3918, trunk/lima-swing/src/main/resources/icons/action-vatstatement-remove.png) =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-vatstatement-edit.png =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-vatstatement-import.png =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-vatstatement-new.png =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-vatstatement-remove.png =================================================================== (Binary files differ)

1 0

r3918 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/financialstatementchart resources/i18n resources/icons
by sbavencoff＠users.chorem.org 12 Sep '14

12 Sep '14

Author: sbavencoff Date: 2014-09-12 17:33:20 +0200 (Fri, 12 Sep 2014) New Revision: 3918 Url: http://forge.chorem.org/projects/lima/repository/revisions/3918 Log: refs #875 #1043 : Financial statement Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css trunk/lima-swing/src/main/resources/icons/action-financialStatement-add-header.png trunk/lima-swing/src/main/resources/icons/action-financialStatement-add-movement.png trunk/lima-swing/src/main/resources/icons/action-financialStatement-check.png trunk/lima-swing/src/main/resources/icons/action-financialStatement-edit.png trunk/lima-swing/src/main/resources/icons/action-financialStatement-import.png trunk/lima-swing/src/main/resources/icons/action-financialStatement-remove.png Removed: trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-header.png trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-movement.png trunk/lima-swing/src/main/resources/icons/action-financialstatement-check.png trunk/lima-swing/src/main/resources/icons/action-financialstatement-edit.png trunk/lima-swing/src/main/resources/icons/action-financialstatement-import.png trunk/lima-swing/src/main/resources/icons/action-financialstatement-remove.png Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2014-09-12 13:43:26 UTC (rev 3917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2014-09-12 15:33:20 UTC (rev 3918) @@ -217,7 +217,7 @@ errorHelper.showErrorMessage(t("lima.importExport.import.alreadyExistFinancialStatement", alreadyExistFinancialStatement.getFinancialStatementLabel(), alreadyExistFinancialStatement.getMasterLabel())); } catch (NotAllowedLabelException notAllowedLabel) { - errorHelper.showErrorMessage(t("lima.financialstatement.notAllowedLabel", + errorHelper.showErrorMessage(t("lima.financialStatement.notAllowedLabel", notAllowedLabel.getLabel())); } modelSupport.fireTreeStructureChanged(path); Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.css 2014-09-12 15:33:20 UTC (rev 3918) @@ -0,0 +1,41 @@ +#toolBar { + floatable : false; +} + +#addFinancialStatementHeader { + toolTipText : "lima.financialStatement.header.add"; + actionIcon : "financialStatement-add-header"; +} + +#addFinancialStatementMovement { + toolTipText : "lima.financialStatement.movement.add"; + actionIcon : "financialStatement-add-movement"; + enabled : "{isSelectedRow()}"; +} + +#updateButton { + toolTipText : "lima.update.shortcut"; + actionIcon : "financialStatement-edit"; + enabled : "{isSelectedRow()}"; +} + +#removeButton { + toolTipText : "lima.remove.shortcut"; + actionIcon : "financialStatement-remove"; + enabled : "{isSelectedRow()}"; +} + +#importButton { + toolTipText : "lima.importExport.import"; + actionIcon : "financialStatement-import"; +} + +#checkButton { + toolTipText : "lima.financialStatement.check"; + actionIcon : "financialStatement-check"; +} + +#treeTable { + selectionMode : "{ListSelectionModel.SINGLE_SELECTION}"; + highlighters : "{HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2014-09-12 13:43:26 UTC (rev 3917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2014-09-12 15:33:20 UTC (rev 3918) @@ -23,7 +23,7 @@ #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> <import> javax.swing.ListSelectionModel @@ -35,61 +35,37 @@ javaBean="new FinancialStatementChartViewHandler(this)"/> <Boolean id="selectedRow" javaBean="false"/> - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> - <JButton id="addFinancialStatementHeader" - toolTipText="{ t("lima.financialstatement.header.add") + " (Ctrl+Maj+N)"}" - actionIcon='financialstatement-add-header' - onActionPerformed="handler.addFinancialStatementHeader()"/> + <JToolBar id="toolBar" + constraints="BorderLayout.PAGE_START"> - <JButton id="addFinancialStatementMovement" - toolTipText="{ t("lima.financialstatement.movement.add") + " (Ctrl+N)"}" - actionIcon='financialstatement-add-movement' - onActionPerformed="handler.addFinancialStatementMovement()" - enabled="{isSelectedRow()}"/> + <JButton id="addFinancialStatementHeader" + onActionPerformed="handler.addFinancialStatementHeader()"/> - <JButton id="updateButton" - toolTipText="{ t("lima.update") + " (Ctrl+M)"}" - actionIcon='financialstatement-edit' - onActionPerformed="handler.updateFinancialStatement()" - enabled="{isSelectedRow()}"/> + <JButton id="addFinancialStatementMovement" + onActionPerformed="handler.addFinancialStatementMovement()"/> - <JButton id="removeButton" - toolTipText="{ t("lima.remove") + " (Del)"}" - actionIcon='financialstatement-remove' - onActionPerformed="handler.removeFinancialStatement()" - enabled="{isSelectedRow()}"/> + <JButton id="updateButton" + onActionPerformed="handler.updateFinancialStatement()"/> - <JButton id="importButton" - toolTipText="{ t("lima.importExport.import") + " (Ctrl+I)"}" - actionIcon='financialstatement-import' - onActionPerformed="handler.importFinancialStatementChart()"/> + <JButton id="removeButton" + onActionPerformed="handler.removeFinancialStatement()"/> - <JToolBar.Separator/> + <JButton id="importButton" + onActionPerformed="handler.importFinancialStatementChart()"/> - <JButton id="checkButton" - toolTipText="{ t("lima.financialstatement.check") + " (Ctrl+F)"}" - actionIcon='financialstatement-check' - onActionPerformed="handler.financialStatementChartCheck()"/> + <JToolBar.Separator/> - </JToolBar> - </cell> - </row> + <JButton id="checkButton" + onActionPerformed="handler.financialStatementChartCheck()"/> - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <FinancialStatementChartTreeTable id="treeTable" - constructorParams="getHandler()" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}" - treeTableModel="{new FinancialStatementChartTreeTableModel()}" - highlighters="{HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}"/> - <ListSelectionModel - javaBean="getTreeTable().getSelectionModel()" - onValueChanged="setSelectedRow(treeTable.getSelectedRow() != -1)"/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file + </JToolBar> + + <JScrollPane> + <FinancialStatementChartTreeTable id="treeTable" + constructorParams="getHandler()" + treeTableModel="{new FinancialStatementChartTreeTableModel()}"/> + <ListSelectionModel javaBean="getTreeTable().getSelectionModel()" + onValueChanged="setSelectedRow(treeTable.getSelectedRow() != -1)"/> + </JScrollPane> +</JPanel> \ No newline at end of file Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css 2014-09-12 15:33:20 UTC (rev 3918) @@ -0,0 +1,33 @@ +#financialStatementHeaderForm { + title : "lima.financialStatement.header.form"; +} + +#descriptionLabel { + text : "lima.financialStatement.label"; +} + +#descriptionTextField { + text : "{getFinancialStatement().getLabel()}"; +} + +#subAmountCheckBox { + text : "lima.financialStatement.subAmount"; + selected : "{getFinancialStatement().getSubAmount()}"; +} + +#headerAmountCheckBox { + text : "lima.financialStatement.headerAmount"; + selected : "{getFinancialStatement().getHeaderAmount()}"; +} + +#wayEnumEditor { + selectedItem : "{getFinancialStatement().getWay()}"; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2014-09-12 13:43:26 UTC (rev 3917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2014-09-12 15:33:20 UTC (rev 3918) @@ -23,7 +23,7 @@ #L% --> -<JDialog modal="true" +<JDialog id="financialStatementHeaderForm" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -61,46 +61,42 @@ <Table> <row> <cell fill="horizontal"> - <JLabel text="lima.financialstatement.label"/> + <JLabel id="descriptionLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="descriptionTextField" - text="{getFinancialStatement().getLabel()}"/> + <JTextField id="descriptionTextField"/> <Document javaBean="getDescriptionTextField().getDocument()" - onInsertUpdate='getFinancialStatement().setLabel(getDescriptionTextField().getText())' - onRemoveUpdate='getFinancialStatement().setLabel(getDescriptionTextField().getText())'/> + onInsertUpdate="getFinancialStatement().setLabel(getDescriptionTextField().getText())" + onRemoveUpdate="getFinancialStatement().setLabel(getDescriptionTextField().getText())"/> </cell> </row> <row> <cell> - <JCheckBox id='subAmountCheckBox' - text='lima.financialstatement.subamount' - selected="{getFinancialStatement().getSubAmount()}" + <JCheckBox id="subAmountCheckBox" onActionPerformed="getFinancialStatement().setSubAmount(subAmountCheckBox.isSelected())"/> </cell> </row> <row> <cell> - <JCheckBox id='headerAmountCheckBox' - text='lima.financialstatement.headeramount' - selected="{getFinancialStatement().getHeaderAmount()}" + <JCheckBox id="headerAmountCheckBox" onActionPerformed="getFinancialStatement().setHeaderAmount(headerAmountCheckBox.isSelected())"/> </cell> </row> <row> <cell> <EnumEditor id='wayEnumEditor' - selectedItem="{getFinancialStatement().getWay()}" constructorParams='org.chorem.lima.FinancialStatementWayEnum.class' onActionPerformed="getFinancialStatementWayValue()"/> </cell> </row> <row> <cell fill="none"> - <JButton text="lima.cancel" onActionPerformed="performCancel()"/> + <JButton id="cancel" + onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.ok" onActionPerformed="dispose()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> </cell> </row> </Table> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css 2014-09-12 15:33:20 UTC (rev 3918) @@ -0,0 +1,46 @@ +#financialStatementImportForm { + title : "lima.financialStatement.import.form"; +} + +#nothing { + text : "lima.charts.financialStatement.nothing"; +} + +#shortened { + text : "lima.charts.financialStatement.shortened"; + value : "{FinancialStatementsChartEnum.SHORTENED}"; + buttonGroup : "{getRadioButtons()}"; + selected : "true"; +} + +#statementBase { + text : "lima.charts.financialStatement.base"; + value : "{FinancialStatementsChartEnum.BASE}"; + buttonGroup : "{getRadioButtons()}"; +} + +#developed { + text : "lima.charts.financialStatement.developed"; + value : "{FinancialStatementsChartEnum.DEVELOPED}"; + buttonGroup : "{getRadioButtons()}"; +} + +#statementImport { + text : "lima.importExport.import"; + value : "{FinancialStatementsChartEnum.IMPORT}"; + buttonGroup : "{getRadioButtons()}"; +} + +#deleteFinancialStatementChart { + text : "lima.financialStatement.delete"; + selected : false; + +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2014-09-12 13:43:26 UTC (rev 3917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2014-09-12 15:33:20 UTC (rev 3918) @@ -23,7 +23,8 @@ #L% --> -<JDialog modal="true" +<JDialog id="financialStatementImportForm" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -49,45 +50,32 @@ <Table> <row> <cell> - <JLabel text='lima.charts.financialstatement.nothing'/> + <JLabel id="nothing"/> </cell> </row> <row> <cell> - <JRadioButton text='lima.charts.financialstatement.shortened' - value='{FinancialStatementsChartEnum.SHORTENED}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + <JRadioButton id="shortened" /> </cell> </row> <row> <cell> - <JRadioButton text='lima.charts.financialstatement.base' - value='{FinancialStatementsChartEnum.BASE}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + <JRadioButton id="statementBase"/> </cell> </row> <row> <cell> - <JRadioButton text='lima.charts.financialstatement.developed' - value='{FinancialStatementsChartEnum.DEVELOPED}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + <JRadioButton id="developed"/> </cell> </row> <row> <cell> - <JRadioButton text='lima.importExport.import' - value='{FinancialStatementsChartEnum.IMPORT}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + <JRadioButton id="statementImport"/> </cell> </row> <row> <cell> - <JCheckBox id='deleteFinancialStatementChart' - text='lima.financialstatement.delete' selected='false'/> + <JCheckBox id="deleteFinancialStatementChart"/> </cell> </row> <row> @@ -95,11 +83,11 @@ <Table> <row> <cell fill="none"> - <JButton text="lima.cancel" + <JButton id="cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.ok" + <JButton id="ok" onActionPerformed="dispose()"/> </cell> </row> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css 2014-09-12 15:33:20 UTC (rev 3918) @@ -0,0 +1,51 @@ +#financialStatementMovementForm { + title : "lima.financialStatement.movement.form"; +} + +#descriptionLabel { + text : "lima.financialStatement.label"; +} + +#descriptionTextField { + text : "{getFinancialStatement().getLabel()}"; +} + +#accountsLabel { + text : "lima.financialStatement.accounts"; +} + +#accountsTextField { + text : "{getFinancialStatement().getAccounts()}"; +} + +#debitAccountsLabel { + text : "lima.financialStatement.debitAccounts"; +} + +#debitAccountsTextField { + text : "{getFinancialStatement().getDebitAccounts()}"; +} + +#creditAccountsLabel { + text : "lima.financialStatement.creditAccounts"; +} + +#creditAccountsTextField { + text : "{getFinancialStatement().getCreditAccounts()}"; +} + +#provisionDeprecationAccountsLabel { + text : "lima.financialStatement.provisionDeprecationAccounts"; +} + +#provisionDeprecationAccountsTextField { + text : "{getFinancialStatement().getProvisionDeprecationAccounts()}"; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2014-09-12 13:43:26 UTC (rev 3917) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2014-09-12 15:33:20 UTC (rev 3918) @@ -23,7 +23,8 @@ #L% --> -<JDialog modal="true" +<JDialog id="financialStatementMovementForm" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -49,11 +50,10 @@ <Table> <row> <cell fill="horizontal"> - <JLabel text="lima.financialstatement.label"/> + <JLabel id="descriptionLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="descriptionTextField" - text="{getFinancialStatement().getLabel()}"/> + <JTextField id="descriptionTextField"/> <Document javaBean="getDescriptionTextField().getDocument()" onInsertUpdate='getFinancialStatement().setLabel(getDescriptionTextField().getText())' onRemoveUpdate='getFinancialStatement().setLabel(getDescriptionTextField().getText())'/> @@ -61,11 +61,10 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.financialstatement.accounts"/> + <JLabel id="accountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="accountsTextField" - text="{getFinancialStatement().getAccounts()}"/> + <JTextField id="accountsTextField"/> <Document javaBean="getAccountsTextField().getDocument()" onInsertUpdate='getFinancialStatement().setAccounts(getAccountsTextField().getText())' onRemoveUpdate='getFinancialStatement().setAccounts(getAccountsTextField().getText())'/> @@ -73,11 +72,10 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.financialstatement.debitaccounts"/> + <JLabel id="debitAccountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="debitAccountsTextField" - text="{getFinancialStatement().getDebitAccounts()}"/> + <JTextField id="debitAccountsTextField"/> <Document javaBean="getDebitAccountsTextField().getDocument()" onInsertUpdate='getFinancialStatement().setDebitAccounts(getDebitAccountsTextField().getText())' onRemoveUpdate='getFinancialStatement().setDebitAccounts(getDebitAccountsTextField().getText())'/> @@ -85,11 +83,10 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.financialstatement.creditaccounts"/> + <JLabel id="creditAccountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="creditAccountsTextField" - text="{getFinancialStatement().getCreditAccounts()}"/> + <JTextField id="creditAccountsTextField"/> <Document javaBean="getCreditAccountsTextField().getDocument()" onInsertUpdate='getFinancialStatement().setCreditAccounts(getCreditAccountsTextField().getText())' onRemoveUpdate='getFinancialStatement().setCreditAccounts(getCreditAccountsTextField().getText())'/> @@ -97,23 +94,23 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.financialstatement.provisiondeprecationaccounts"/> + <JLabel id="provisionDeprecationAccountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="provisionDeprecationAccountsTextField" - text="{getFinancialStatement().getProvisionDeprecationAccounts()}"/> - <Document - javaBean="getProvisionDeprecationAccountsTextField().getDocument()" - onInsertUpdate='getFinancialStatement().setProvisionDeprecationAccounts(getProvisionDeprecationAccountsTextField().getText())' - onRemoveUpdate='getFinancialStatement().setProvisionDeprecationAccounts(getProvisionDeprecationAccountsTextField().getText())'/> + <JTextField id="provisionDeprecationAccountsTextField"/> + <Document javaBean="getProvisionDeprecationAccountsTextField().getDocument()" + onInsertUpdate='getFinancialStatement().setProvisionDeprecationAccounts(getProvisionDeprecationAccountsTextField().getText())' + onRemoveUpdate='getFinancialStatement().setProvisionDeprecationAccounts(getProvisionDeprecationAccountsTextField().getText())'/> </cell> </row> <row> <cell fill="none"> - <JButton text="lima.cancel" onActionPerformed="performCancel()"/> + <JButton id="cancel" + onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.ok" onActionPerformed="dispose()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 13:43:26 UTC (rev 3917) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 15:33:20 UTC (rev 3918) @@ -56,6 +56,10 @@ lima.charts.account.number=Account Number lima.charts.account.question.remove=Do you really remove this account ? lima.charts.account.shortened=Shorthened accountchart +lima.charts.financialStatement.base= +lima.charts.financialStatement.developed= +lima.charts.financialStatement.nothing= +lima.charts.financialStatement.shortened= lima.charts.financialperiod=Financial Periods lima.charts.financialstatement=Financialstatement chart lima.charts.financialstatement.base=Base financialstatement chart @@ -308,7 +312,27 @@ lima.financialPeriod.period= lima.financialPeriod.status= lima.financialPeriods= +lima.financialStatement.accounts=Account list on debit and on credit +lima.financialStatement.addfinancialStatementHeadererror=Can't add financialStatementHeader lima.financialStatement.alreadyExistFinancialStatement=FAILED \: The financial statement %s already exists \! +lima.financialStatement.check=Check accounts passing to movement +lima.financialStatement.creditAccounts= +lima.financialStatement.creditaccounts=Account credit list +lima.financialStatement.debitAccounts= +lima.financialStatement.debitaccounts=Account debit list +lima.financialStatement.delete=Delete actual financialstatement chart before import new +lima.financialStatement.header.add=Add category +lima.financialStatement.header.form= +lima.financialStatement.headerAmount=Calculate amount on header +lima.financialStatement.import.form= +lima.financialStatement.label=Label +lima.financialStatement.movement.add=Add movement +lima.financialStatement.movement.form= +lima.financialStatement.notAllowedLabel=Not allowed label\: %s +lima.financialStatement.provisionDeprecationAccounts= +lima.financialStatement.provisiondeprecationaccounts=Provisions and deprecations accounts list +lima.financialStatement.subAmount=Calculate a subamount +lima.financialStatementreport.listerror=Can't get entries list lima.financialStatements= lima.financialStatements.check= lima.financialStatements.check.nothing= @@ -329,20 +353,6 @@ lima.financialTransaction.update.error.beforeFirstFiscalPeriod= lima.financialTransaction.update.error.lockedEntryBook= lima.financialTransaction.update.error.lockedFinancialPeriod= -lima.financialstatement.accounts=Account list on debit and on credit -lima.financialstatement.addfinancialStatementHeadererror=Can't add financialStatementHeader -lima.financialstatement.check=Check accounts passing to movement -lima.financialstatement.creditaccounts=Account credit list -lima.financialstatement.debitaccounts=Account debit list -lima.financialstatement.delete=Delete actual financialstatement chart before import new -lima.financialstatement.header.add=Add category -lima.financialstatement.headeramount=Calculate amount on header -lima.financialstatement.label=Label -lima.financialstatement.movement.add=Add movement -lima.financialstatement.notAllowedLabel=Not allowed label\: %s -lima.financialstatement.provisiondeprecationaccounts=Provisions and deprecations accounts list -lima.financialstatement.subamount=Calculate a subamount -lima.financialstatementreport.listerror=Can't get entries list lima.financialtransaction.account= lima.financialtransaction.balance= lima.financialtransaction.buttonback= @@ -668,5 +678,6 @@ lima.vatstatement.movement.add=Add movement lima.wait= lima.warning.nimbus.landf=Could not find Numbus Look&Feel +limaFinancialStatement.movement.form= limma.config.thousandseparator.description= limma.config.thousandseparator.label= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 13:43:26 UTC (rev 3917) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 15:33:20 UTC (rev 3918) @@ -45,12 +45,12 @@ lima.charts.account.number=Numéro de compte lima.charts.account.question.remove=Voulez-vous supprimer ce compte? lima.charts.account.shortened=Plan comptable abrégé +lima.charts.financialStatement=Plan BCR +lima.charts.financialStatement.base=Plan BCR de base +lima.charts.financialStatement.developed=Plan BCR développé +lima.charts.financialStatement.nothing=<html><center>Aucun plan BCR chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> +lima.charts.financialStatement.shortened=Plan BCR abrégé lima.charts.financialperiod=Périodes comptables -lima.charts.financialstatement=Plan BCR -lima.charts.financialstatement.base=Plan BCR de base -lima.charts.financialstatement.developed=Plan BCR développé -lima.charts.financialstatement.nothing=<html><center>Aucun plan BCR chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> -lima.charts.financialstatement.shortened=Plan BCR abrégé lima.charts.financialtransaction.question.removeentry=Voulez-vous supprimer cette ligne de transaction? lima.charts.financialtransaction.question.removetransaction=Voulez-vous supprimer cette transaction? lima.charts.fiscalperiod.create= @@ -281,7 +281,24 @@ lima.financialPeriod.period=Période lima.financialPeriod.status=Statut lima.financialPeriods=Périodes comptables +lima.financialStatement.accounts=Liste de comptes au crédit et au débit +lima.financialStatement.addfinancialStatementHeadererror=Erreur lors de l'ajout de l'entête sur la déclaration financière lima.financialStatement.alreadyExistFinancialStatement=u00C9chec \: Le mouvement %s exist déjà \! +lima.financialStatement.check=Vérification des comptes (Ctrl+F) +lima.financialStatement.creditAccounts=Liste de comptes au crédit +lima.financialStatement.debitAccounts=Liste de comptes au débit +lima.financialStatement.delete=Supprimer le plan BCR actuel avant d'importer +lima.financialStatement.header.add=Ajouter une catégorie (Ctrl+Maj+N) +lima.financialStatement.header.form=Catégorie +lima.financialStatement.headerAmount=Calculer le total en en-tete +lima.financialStatement.import.form=Importer +lima.financialStatement.label=Libellé +lima.financialStatement.movement.add=Ajouter un regrouprement (Ctrl+N) +lima.financialStatement.movement.form=Regroupement +lima.financialStatement.notAllowedLabel=Label non authorisé\: %s +lima.financialStatement.provisionDeprecationAccounts=Liste de comptes d'amortissement et provisions +lima.financialStatement.subAmount=Calculer un sous-total +lima.financialStatementreport.listerror=Erreur lors de la récupération des données de la liste lima.financialStatements=Plan BCR lima.financialStatements.check=Vérification des comptes aux postes lima.financialStatements.check.nothing=Introuvable \: %s - %s \n @@ -302,20 +319,6 @@ lima.financialTransaction.update.error.beforeFirstFiscalPeriod=Impossible de déplacer une transaction avant le %1$te %1$tB %1$tY début du premier exercice. lima.financialTransaction.update.error.lockedEntryBook=Impossible de déplacer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.financialTransaction.update.error.lockedFinancialPeriod=Impossible de deplacer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.financialstatement.accounts=Liste de comptes au crédit et au débit -lima.financialstatement.addfinancialStatementHeadererror=Erreur lors de l'ajout de l'entête sur la déclaration financière -lima.financialstatement.check= -lima.financialstatement.creditaccounts=Liste de comptes au crédit -lima.financialstatement.debitaccounts=Liste de comptes au débit -lima.financialstatement.delete=Supprimer le plan BCR actuel avant d'importer -lima.financialstatement.header.add=Ajouter une catégorie -lima.financialstatement.headeramount=Calculer le total en en-tete -lima.financialstatement.label=Libellé -lima.financialstatement.movement.add=Ajouter un regrouprement -lima.financialstatement.notAllowedLabel=Label non authorisé\: %s -lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions -lima.financialstatement.subamount=Calculer un sous-total -lima.financialstatementreport.listerror=Erreur lors de la récupération des données de la liste lima.financialtransaction.account=Compte lima.financialtransaction.balance=Balance lima.financialtransaction.buttonback=← Copied: trunk/lima-swing/src/main/resources/icons/action-financialStatement-add-header.png (from rev 3917, trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-header.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-financialStatement-add-movement.png (from rev 3917, trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-movement.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-financialStatement-check.png (from rev 3917, trunk/lima-swing/src/main/resources/icons/action-financialstatement-check.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-financialStatement-edit.png (from rev 3917, trunk/lima-swing/src/main/resources/icons/action-financialstatement-edit.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-financialStatement-import.png (from rev 3917, trunk/lima-swing/src/main/resources/icons/action-financialstatement-import.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-financialStatement-remove.png (from rev 3917, trunk/lima-swing/src/main/resources/icons/action-financialstatement-remove.png) =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-header.png =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-movement.png =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-financialstatement-check.png =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-financialstatement-edit.png =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-financialstatement-import.png =================================================================== (Binary files differ) Deleted: trunk/lima-swing/src/main/resources/icons/action-financialstatement-remove.png =================================================================== (Binary files differ)

1 0

r3917 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/fiscalperiod java/org/chorem/lima/ui/importexport resources/i18n
by sbavencoff＠users.chorem.org 12 Sep '14

12 Sep '14

Author: sbavencoff Date: 2014-09-12 15:43:26 +0200 (Fri, 12 Sep 2014) New Revision: 3917 Url: http://forge.chorem.org/projects/lima/repository/revisions/3917 Log: refs #875 #1043 : FiscalPeriod Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.css Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css 2014-09-12 13:43:26 UTC (rev 3917) @@ -0,0 +1,25 @@ +#periodFormDialog { + title : "lima.fiscalPeriod.form"; +} + +#beginDateLabel { + text : "lima.beginDate"; + labelFor : "{beginDatePicker}"; +} + +#beginDatePicker { + enabled : "{!isModifyPeriod()}"; +} + +#endDateLabel { + text : "lima.endDate"; + labelFor : "{endDatePicker}"; +} + +#cancelButton { + text : "lima.cancel"; +} + +#okButton { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true" +<JDialog id="periodFormDialog" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -48,16 +49,15 @@ <Table fill="both"> <row> <cell> - <JLabel text="lima.beginDate"/> + <JLabel id="beginDateLabel"/> </cell> <cell> - <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" - enabled="{!isModifyPeriod()}"/> + <org.jdesktop.swingx.JXDatePicker id="beginDatePicker"/> </cell> </row> <row> <cell> - <JLabel text="lima.endDate"/> + <JLabel id="endDateLabel"/> </cell> <cell> <org.jdesktop.swingx.JXDatePicker id="endDatePicker" /> @@ -68,11 +68,11 @@ <Table fill="none" anchor="center" weighty="1"> <row> <cell> - <JButton id="cancelButton" text="lima.cancel" + <JButton id="cancelButton" onActionPerformed="performCancel()"/> </cell> <cell> - <JButton id="okButton" text="lima.ok" + <JButton id="okButton" onActionPerformed="performOk()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2014-09-12 13:43:26 UTC (rev 3917) @@ -58,7 +58,7 @@ @Override protected void initColumn() { - addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, t("lima.fiscalperiod.begin"), false) { + addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, t("lima.fiscalPeriod.begin"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod = tableModel.get(row); @@ -66,7 +66,7 @@ } }); - addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, t("lima.fiscalperiod.end"), false) { + addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, t("lima.fiscalPeriod.end"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod = tableModel.get(row); @@ -74,13 +74,13 @@ } }); - addColumn(new AbstractColumn<FiscalPeriodTableModel>(String.class, t("lima.fiscalperiod.status"), false) { + addColumn(new AbstractColumn<FiscalPeriodTableModel>(String.class, t("lima.fiscalPeriod.status"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod = tableModel.get(row); - String status = t("lima.fiscalperiod.open"); + String status = t("lima.fiscalPeriod.open"); if (fiscalPeriod.isLocked()) { - status = t("lima.fiscalperiod.closed"); + status = t("lima.fiscalPeriod.closed"); } return status; } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.css 2014-09-12 13:43:26 UTC (rev 3917) @@ -0,0 +1,36 @@ +#toolBar { + floatable : false; +} + +#addButton { + toolTipText : "lima.fiscalPeriod.add"; + actionIcon : "fiscalPeriod-new"; +} + +#updateButton { + toolTipText : "lima.fiscalPeriod.update"; + actionIcon : "fiscalPeriod-edit"; + enabled : "{isDeleteEnabled()}"; +} + +#blockButton { + toolTipText : "lima.fiscalPeriod.block"; + actionIcon : "fiscalPeriod-close"; + enabled : "{isBlockEnabled()}"; +} + +#removeButton { + toolTipText : "lima.fiscalPeriod.delete"; + actionIcon : "fiscalPeriod-remove"; + enabled : "{isDeleteEnabled()}"; +} + +#fiscalPeriodTable { + sortable : false; + rowHeight : 24; + columnControlVisible : true; +} + +#selectionModel { + selectionMode : "{ListSelectionModel.SINGLE_SELECTION}"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -23,7 +23,7 @@ #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> <import> javax.swing.ListSelectionModel @@ -42,54 +42,32 @@ } ]]></script> - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> - <JButton id="addButton" - toolTipText="{ t("lima.charts.fiscalperiod.add") + " (Ctrl+N)"}" - actionIcon='fiscalPeriod-new' - onActionPerformed="handler.addFiscalPeriod()"/> + <JToolBar id="toolBar" + constraints="BorderLayout.PAGE_START"> - <JButton id="updateButton" - toolTipText="{ t("lima.charts.fiscalperiod.update") + " (Ctrl+M)"}" - actionIcon='fiscalPeriod-edit' - onActionPerformed="handler.updateFiscalPeriod()" - enabled="{isDeleteEnabled()}" /> + <JButton id="addButton" + onActionPerformed="handler.addFiscalPeriod()"/> - <JButton id="blockButton" - toolTipText="{ t("lima.charts.fiscalperiod.block") + " (Ctrl+B)"}" - actionIcon='fiscalPeriod-close' - onActionPerformed="handler.blockFiscalPeriod()" - enabled="{isBlockEnabled()}"/> + <JButton id="updateButton" + onActionPerformed="handler.updateFiscalPeriod()"/> - <JButton id="deleteButton" - toolTipText="{ t("lima.charts.fiscalperiod.delete") + " (Del)"}" - actionIcon='fiscalPeriod-remove' - onActionPerformed="handler.deleteFiscalPeriod()" - enabled="{isDeleteEnabled()}"/> + <JButton id="blockButton" + onActionPerformed="handler.blockFiscalPeriod()"/> - </JToolBar> - </cell> - </row> + <JButton id="removeButton" + onActionPerformed="handler.deleteFiscalPeriod()"/> - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <FiscalPeriodTableModel id="fiscalPeriodTableModel" /> - <FiscalPeriodTable id="fiscalPeriodTable" - constructorParams='handler' - sortable="false" - rowHeight="24" - columnControlVisible="true" - model="{fiscalPeriodTableModel}" - selectionModel='{selectionModel}'/> - <ListSelectionModel id="selectionModel" - initializer="new DefaultListSelectionModel()" - onValueChanged="handler.onSelectionChanged(event)" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> + </JToolBar> + <JScrollPane constraints="BorderLayout.CENTER"> + <FiscalPeriodTableModel id="fiscalPeriodTableModel" /> + <FiscalPeriodTable id="fiscalPeriodTable" + constructorParams='handler' + model="{fiscalPeriodTableModel}" + selectionModel='{selectionModel}'/> + <ListSelectionModel id="selectionModel" + initializer="new DefaultListSelectionModel()" + onValueChanged="handler.onSelectionChanged(event)"/> - </JScrollPane> - </cell> - </row> -</Table> + </JScrollPane> +</JPanel> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-09-12 13:43:26 UTC (rev 3917) @@ -183,7 +183,7 @@ AddPeriod addPeriodDialog = new AddPeriod(view); - addPeriodDialog.setTitle(t("lima.fiscalperiod.addfiscalperiodtitle")); + addPeriodDialog.setTitle(t("lima.fiscalPeriod.addfiscalperiodtitle")); addPeriodDialog.getBeginDatePicker().setDate(beginDate); addPeriodDialog.getEndDatePicker().setDate(endDate); addPeriodDialog.setLocationRelativeTo(view); @@ -229,7 +229,7 @@ int response = JOptionPane.YES_OPTION; if (nbMonth != 12) { response = JOptionPane.showConfirmDialog(view, - t("lima.fiscalperiod.addfiscalperiod.morethan12"), + t("lima.fiscalPeriod.addfiscalperiod.morethan12"), title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); } @@ -258,7 +258,7 @@ if (!selectedFiscalPeriod.isLocked()) { AddPeriod addPeriodDialog = new AddPeriod(view); - addPeriodDialog.setTitle(t("lima.fiscalperiod.modifyfiscalperiodtitle")); + addPeriodDialog.setTitle(t("lima.fiscalPeriod.modifyfiscalperiodtitle")); addPeriodDialog.getBeginDatePicker().setDate(selectedFiscalPeriod.getBeginDate()); addPeriodDialog.getEndDatePicker().setDate(selectedFiscalPeriod.getEndDate()); addPeriodDialog.setModifyPeriod(true); @@ -293,8 +293,8 @@ //check if the user want to delete the fiscal year int response = JOptionPane.showConfirmDialog(view, - t("lima.fiscalperiod.delete.confirmation"), - t("lima.fiscalperiod.delete.title"), JOptionPane.YES_NO_OPTION, + t("lima.fiscalPeriod.delete.confirmation"), + t("lima.fiscalPeriod.delete.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.YES_OPTION) { @@ -332,8 +332,8 @@ //check if the user want to block the fiscal year int answerBlock = JOptionPane.showConfirmDialog(view, - t("lima.fiscalperiod.block.confirmation"), - t("lima.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, + t("lima.fiscalPeriod.block.confirmation"), + t("lima.fiscalPeriod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (answerBlock == JOptionPane.YES_OPTION) { @@ -347,8 +347,8 @@ //check if the user wants to create a new fiscal year int answerCreate = JOptionPane.showConfirmDialog(view, - t("lima.fiscalperiod.block.newyear"), - t("lima.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, + t("lima.fiscalPeriod.block.newyear"), + t("lima.fiscalPeriod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); // create a new fiscal year @@ -363,16 +363,16 @@ if (selectedFiscalPeriod.equals(lastFiscalPeriod)) { JOptionPane.showMessageDialog(view, - t("lima.fiscalperiod.block.cantBalanceIfNextPeriodNotExist"), - t("lima.fiscalperiod.block.title"), + t("lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist"), + t("lima.fiscalPeriod.block.title"), JOptionPane.ERROR_MESSAGE); } else { //check if the user wants to report datas int answerRetainedEarnings = JOptionPane.showConfirmDialog(view, - t("lima.fiscalperiod.block.addretainedearnings"), - t("lima.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, + t("lima.fiscalPeriod.block.addretainedearnings"), + t("lima.fiscalPeriod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (answerRetainedEarnings == JOptionPane.YES_OPTION) { @@ -414,16 +414,16 @@ } else { JOptionPane.showMessageDialog(view, - t("lima.fiscalperiod.block.cantBalanceNotBook"), - t("lima.fiscalperiod.block.title"), + t("lima.fiscalPeriod.block.cantBalanceNotBook"), + t("lima.fiscalPeriod.block.title"), JOptionPane.ERROR_MESSAGE); } } else { JOptionPane.showMessageDialog(view, - t("lima.fiscalperiod.block.cantBlockNotBalance"), - t("lima.fiscalperiod.block.title"), + t("lima.fiscalPeriod.block.cantBlockNotBalance"), + t("lima.fiscalPeriod.block.title"), JOptionPane.ERROR_MESSAGE); } } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css 2014-09-12 13:43:26 UTC (rev 3917) @@ -0,0 +1,49 @@ +#retainedEarningsEntryBookFormDialog { + title : "lima.fiscalPeriod.block.retainedEarnings"; +} + +#selectedEntryBook { + text : "lima.entryBook"; + selected : true; + buttonGroup : "EntryBookGroup"; + +} + +#entryBookSelectorLabel { + text : "lima.entryBook"; +} + +#entryBookComboBox { + editable : "false"; +} + +#newEntryBook { + text : "lima.fiscalPeriod.entryBooks.create"; + selected : false; + buttonGroup : "EntryBookGroup"; +} + +#codeLabel { + text : "lima.code"; +} + +#codeField { + text : "{getEntryBook().getCode()}"; +} + +#labelLabel { + text : "lima.label"; +} + +#LabelField { + editable : "{isAddState()}"; + text : "{getEntryBook().getLabel()}"; +} + +#cancelButton { + text : "lima.cancel"; +} + +#okButton { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.fiscalperiod.block.retainedearningstitle" modal="true" +<JDialog id="retainedEarningsEntryBookFormDialog" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -53,8 +54,8 @@ protected void performNew() { if (selectedEntryBook.isSelected()) { entryBookComboBox.setEnabled(true); - entryBookLabelField.setEditable(false); - entryBookCodeField.setEditable(false); + labelField.setEditable(false); + codeField.setEditable(false); if (getEntryBookComboBox().getSelectedItem() != null) { getEntryBook().setCode(((EntryBook)getEntryBookComboBox().getSelectedItem()).getCode().trim()); getEntryBook().setLabel(((EntryBook)getEntryBookComboBox().getSelectedItem()).getLabel().trim()); @@ -63,10 +64,10 @@ } } else { entryBookComboBox.setEnabled(false); - entryBookLabelField.setEditable(true); - entryBookCodeField.setEditable(true); - getEntryBook().setCode(getEntryBookCodeField().getText()); - getEntryBook().setLabel(getEntryBookLabelField().getText()); + labelField.setEditable(true); + codeField.setEditable(true); + getEntryBook().setCode(getCodeField().getText()); + getEntryBook().setLabel(getLabelField().getText()); } } @@ -79,67 +80,57 @@ <Table> <row> <cell anchor="west"> - <JRadioButton - id="selectedEntryBook" - text="lima.entryBook" - selected="true" - buttonGroup="EntryBookGroup" - onActionPerformed="performNew()"/> + <JRadioButton id="selectedEntryBook" + onActionPerformed="performNew()"/> </cell> </row> <row> <cell> - <JLabel id="entryBookSelectorLabel" text="lima.entryBook"/> + <JLabel id="entryBookSelectorLabel" /> </cell> <cell> <org.chorem.lima.ui.combobox.EntryBookComboBoxModel id="modelEntryBookComboBox"/> <JComboBox id="entryBookComboBox" model="{getModelEntryBookComboBox()}" renderer="{new EntryBookListRenderer()}" - editable="false" onItemStateChanged="getEntryBook().setCode(((EntryBook)getEntryBookComboBox().getSelectedItem()).getCode()); getEntryBook().setLabel(((EntryBook)getEntryBookComboBox().getSelectedItem()).getLabel())"/> </cell> </row> <row> <cell anchor="west"> - <JRadioButton - id="newEntryBook" - text="lima.fiscalperiod.entrybooks.create" - selected="false" - buttonGroup="EntryBookGroup" + <JRadioButton id="newEntryBook" onActionPerformed="performNew()"/> </cell> </row> <row> <cell> - <JLabel text="lima.code"/> + <JLabel id="codeLabel"/> </cell> <cell> - <JTextField id="entryBookCodeField" text="{getEntryBook().getCode()}"/> - <Document javaBean="getEntryBookCodeField().getDocument()" - onInsertUpdate='getEntryBook().setCode(getEntryBookCodeField().getText())' - onRemoveUpdate='getEntryBook().setCode(getEntryBookCodeField().getText())'/> + <JTextField id="codeField"/> + <Document javaBean="getCodeField().getDocument()" + onInsertUpdate='getEntryBook().setCode(getCodeField().getText())' + onRemoveUpdate='getEntryBook().setCode(getCodeField().getText())'/> </cell> </row> <row> <cell> - <JLabel text="lima.label"/> + <JLabel id="labelLabel"/> </cell> <cell> - <JTextField id="entryBookLabelField" editable='{isAddState()}' - text="{getEntryBook().getLabel()}"/> - <Document javaBean="getEntryBookLabelField().getDocument()" - onInsertUpdate='getEntryBook().setLabel(getEntryBookLabelField().getText())' - onRemoveUpdate='getEntryBook().setLabel(getEntryBookLabelField().getText())'/> + <JTextField id="labelField"/> + <Document javaBean="getLabelField().getDocument()" + onInsertUpdate='getEntryBook().setLabel(getLabelField().getText())' + onRemoveUpdate='getEntryBook().setLabel(getLabelField().getText())'/> </cell> </row> <row> <cell> - <JButton id="cancelButton" text="lima.cancel" + <JButton id="cancelButton" onActionPerformed="performCancel()"/> </cell> <cell> - <JButton id="okButton" text="lima.ok" + <JButton id="okButton" onActionPerformed="dispose()"/> </cell> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.css 2014-09-12 13:43:26 UTC (rev 3917) @@ -0,0 +1,7 @@ +#waitDialog { + title : "lima.wait"; +} + +#waitLabel { + text : "lima.retainedEarnings.wait"; +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -21,15 +21,18 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true" id="waitDialog" title="lima.importExport.waittitle"> +<JDialog id="waitDialog" + modal="true"> <Table> <row> <cell> - <org.jdesktop.swingx.JXBusyLabel id='busylabel' busy='true'/> + <org.jdesktop.swingx.JXBusyLabel id="busylabel" + busy="true"/> </cell> <cell> - <JLabel text='lima.retainedEarnings.wait'/> + <JLabel id="waitLabel" /> </cell> </row> </Table> + </JDialog> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -23,7 +23,7 @@ #L% --> -<JDialog modal="true" id="waitDialog" title="lima.importExport.waittitle"> +<JDialog modal="true" id="waitDialog" title="lima.wait"> <Table> <row> <cell> Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 13:43:26 UTC (rev 3917) @@ -367,56 +367,60 @@ lima.financialtransaction.titleremoveentry= lima.financialtransaction.titleremovetransaction= lima.financialtransaction.voucher= +lima.fiscalPeriod.add= lima.fiscalPeriod.add.beginAfterEndFiscalPeriod= lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod= lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod= lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod= lima.fiscalPeriod.add.moreOneUnlockFiscalPeriod= lima.fiscalPeriod.add.notBeginNextDayOfLastFiscalPeriod= +lima.fiscalPeriod.addfiscalperiod.addfiscalperiodtitle= +lima.fiscalPeriod.addfiscalperiod.endAfterBegin= +lima.fiscalPeriod.addfiscalperiod.morethan12= +lima.fiscalPeriod.addfiscalperiodtitle= +lima.fiscalPeriod.begin= +lima.fiscalPeriod.block= +lima.fiscalPeriod.block.addretainedearnings= +lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist= +lima.fiscalPeriod.block.cantBalanceNotBook= +lima.fiscalPeriod.block.cantBlockNotBalance= +lima.fiscalPeriod.block.confirmation= lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod= lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod= lima.fiscalPeriod.block.error.lockedFinancialPeriod=Fiscal period from %3$te %3$tB %3$tY to %4$te %4$tB %4$tY is closed. lima.fiscalPeriod.block.error.lockedFiscalPeriod=Fiscal period closed %s -lima.fiscalPeriod.buttonback= -lima.fiscalPeriod.buttonnext= +lima.fiscalPeriod.block.newyear= +lima.fiscalPeriod.block.retainedEarnings= +lima.fiscalPeriod.block.title= +lima.fiscalPeriod.buttonback=← +lima.fiscalPeriod.buttonnext=→ +lima.fiscalPeriod.closed= +lima.fiscalPeriod.closure= lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException=Fiscal period ending date must be after the begining one, begin\: %1$tm/%1$te/%1$tY end\: %1$tm/%1$te/%1$tY.\n +lima.fiscalPeriod.delete= +lima.fiscalPeriod.delete.confirmation= lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod= +lima.fiscalPeriod.delete.title= +lima.fiscalPeriod.end= +lima.fiscalPeriod.entryBooks.create= +lima.fiscalPeriod.fiscalperiod= +lima.fiscalPeriod.fiscalperiod.begin= +lima.fiscalPeriod.fiscalperiod.end= +lima.fiscalPeriod.fiscalperiod.status= +lima.fiscalPeriod.form= lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException=Master account is not a digit between 1 to 8 \: %s"\n lima.fiscalPeriod.franceAccountingRules.lastUnlockedFiscalPeriodException=Current fiscal period must not be closed. lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException=The ante fiscal period is not locked\: concerned fiscal period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.noEmptyFiscalPeriodException=The fiscal period is not empty \! lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodException=The new fiscal period must adjoining the last\: concerned fiscal period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException=Account Number that doesn't start with 4 have to be numeric\: %s"\n +lima.fiscalPeriod.modifyfiscalperiodtitle= +lima.fiscalPeriod.open= +lima.fiscalPeriod.remove= +lima.fiscalPeriod.status= +lima.fiscalPeriod.unbalancedtransactions=Fiscal Period has unbalanced transactions +lima.fiscalPeriod.update= lima.fiscalYears= -lima.fiscalperiod.addfiscalperiod.addfiscalperiodtitle= -lima.fiscalperiod.addfiscalperiod.endAfterBegin= -lima.fiscalperiod.addfiscalperiod.morethan12= -lima.fiscalperiod.addfiscalperiodtitle= -lima.fiscalperiod.begin= -lima.fiscalperiod.block.addretainedearnings= -lima.fiscalperiod.block.cantBalanceIfNextPeriodNotExist= -lima.fiscalperiod.block.cantBalanceNotBook= -lima.fiscalperiod.block.cantBlockNotBalance= -lima.fiscalperiod.block.confirmation= -lima.fiscalperiod.block.newyear= -lima.fiscalperiod.block.retainedearningstitle= -lima.fiscalperiod.block.title= -lima.fiscalperiod.buttonback=← -lima.fiscalperiod.buttonnext=→ -lima.fiscalperiod.closed= -lima.fiscalperiod.closure= -lima.fiscalperiod.delete.confirmation= -lima.fiscalperiod.delete.title= -lima.fiscalperiod.end= -lima.fiscalperiod.entrybooks.create= -lima.fiscalperiod.fiscalperiod= -lima.fiscalperiod.fiscalperiod.begin= -lima.fiscalperiod.fiscalperiod.end= -lima.fiscalperiod.fiscalperiod.status= -lima.fiscalperiod.modifyfiscalperiodtitle= -lima.fiscalperiod.open= -lima.fiscalperiod.status= -lima.fiscalperiod.unbalancedtransactions=Fiscal Period has unbalanced transactions lima.fullscreen= lima.generateHtml= lima.help= @@ -539,7 +543,6 @@ lima.importExport.vatStatement=VTA transactions import completed. lima.importExport.vatstatements=VAT chart lima.importExport.wait=Job in progress… -lima.importExport.waittitle= lima.info=Information lima.init.closed=Lima closed at %1$s lima.init.errorclosing=Error during Lima close @@ -663,6 +666,7 @@ lima.vatstatement.label=Label lima.vatstatement.mastervatstatement= lima.vatstatement.movement.add=Add movement +lima.wait= lima.warning.nimbus.landf=Could not find Numbus Look&Feel limma.config.thousandseparator.description= limma.config.thousandseparator.label= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 13:43:26 UTC (rev 3917) @@ -53,11 +53,7 @@ lima.charts.financialstatement.shortened=Plan BCR abrégé lima.charts.financialtransaction.question.removeentry=Voulez-vous supprimer cette ligne de transaction? lima.charts.financialtransaction.question.removetransaction=Voulez-vous supprimer cette transaction? -lima.charts.fiscalperiod.add=Nouvel exercice -lima.charts.fiscalperiod.block=Cloturer un exercice -lima.charts.fiscalperiod.create=Choisissez la date de début et de fin du nouvel exercice -lima.charts.fiscalperiod.delete=Supprimer un exercice -lima.charts.fiscalperiod.update=Modifier la date de fin de l'exercice +lima.charts.fiscalperiod.create= lima.charts.fiscalyear=Exercices lima.charts.vatpdf=Import du pdf lima.charts.vatstatement=Plan TVA @@ -342,48 +338,53 @@ lima.financialtransaction.titleremoveentry=Suppression lima.financialtransaction.titleremovetransaction=Suppression lima.financialtransaction.voucher=Pièce comptable +lima.fiscalPeriod.add=Nouvel exercice (Ctrl+A) lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=Le date de fin de l'exercice (%2$te/%2$tm/%2$tY) doit être postérieur à la date de début (%1$te/%1$tm/%1$tY) lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=Il existe déjà %1s exercices non clôturés. lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod=La date de début de l'exercice doit suivre la date de fin de l'exercice précédent le %1$te/%1$tm/%1$tY +lima.fiscalPeriod.addfiscalperiod.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? +lima.fiscalPeriod.addfiscalperiodtitle=Nouvel exercice +lima.fiscalPeriod.begin=Début +lima.fiscalPeriod.block=Cloturer un exercice (Ctrl+C) +lima.fiscalPeriod.block.addretainedearnings=Reporter à nouveau? +lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist=Impossible de créer le report à nouveaux. L'exercice fiscal suivant n'existe pas +lima.fiscalPeriod.block.cantBalanceNotBook=Impossible de créer le report à nouveaux. aucun journal n'est selectioné. +lima.fiscalPeriod.block.cantBlockNotBalance=Impossible de clôturer un exercice non equilibré +lima.fiscalPeriod.block.confirmation=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=L'exercice est déjà clôturés lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=L'exercice prédent doit être clôturé lima.fiscalPeriod.block.error.lockedFinancialPeriod=La période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. lima.fiscalPeriod.block.error.lockedFiscalPeriod=L'exercice ést clôturé %s +lima.fiscalPeriod.block.newyear=Voulez vous créer un nouvel exercice? +lima.fiscalPeriod.block.retainedEarnings=Report à nouveau +lima.fiscalPeriod.block.title=Cloture de l'exercice lima.fiscalPeriod.buttonback=← lima.fiscalPeriod.buttonnext=→ +lima.fiscalPeriod.closed=Cloturé +lima.fiscalPeriod.closure=Cloture +lima.fiscalPeriod.create=Choisissez la date de début et de fin du nouvel exercice lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException=La date de début doit être avant la date de fin, debut\: %1$te/%1$tm/%1$tY fin\: %1$te/%1$tm/%1$tY.\n +lima.fiscalPeriod.delete=Supprimer un exercice (Suppr) +lima.fiscalPeriod.delete.confirmation=Ètes vous sûre de vouloir supprimer cette période ? Cette action est irréversible \! lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod=Impossible de supprimer un exercice avec des transactions (%1$s). +lima.fiscalPeriod.delete.title=Suppression de l'exercice +lima.fiscalPeriod.end=Fin +lima.fiscalPeriod.entryBooks.create=Création d'un nouveau journal +lima.fiscalPeriod.fiscalperiod=Exercice +lima.fiscalPeriod.form=Exercice lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException=Le numéro du compte général n'est pas compris entre 1 et 8 \: %s\n lima.fiscalPeriod.franceAccountingRules.lastUnlockedFiscalPeriodException=Impossible de clore la dernière période fiscale ouverte. lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException=Le nombre maximal d'exercices ouverts est déjà ateint\: periode fiscale concernée du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.noEmptyFiscalPeriodException=La période fiscale à supprimer n'est pas vide \! lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodException=La nouvelle période fiscale doit suivre la précédente\: periode fiscale concernée du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException=Un numéro de compte ne commençant pas par 4 doit être numérique \: %s\n +lima.fiscalPeriod.modifyfiscalperiodtitle=Modification de l'exercice +lima.fiscalPeriod.open=Ouvert +lima.fiscalPeriod.remove= +lima.fiscalPeriod.status=Statut +lima.fiscalPeriod.unbalancedtransactions=La période fiscale contient des transactions non équilibrées +lima.fiscalPeriod.update=Modifier la date de fin de l'exercice (Ctrl+M) lima.fiscalYears=Exercices -lima.fiscalperiod.addfiscalperiod.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? -lima.fiscalperiod.addfiscalperiodtitle=Nouvel exercice -lima.fiscalperiod.begin=Début -lima.fiscalperiod.block.addretainedearnings=Reporter à nouveau? -lima.fiscalperiod.block.cantBalanceIfNextPeriodNotExist=Impossible de créer le report à nouveaux. L'exercice fiscal suivant n'existe pas -lima.fiscalperiod.block.cantBalanceNotBook=Impossible de créer le report à nouveaux. aucun journal n'est selectioné. -lima.fiscalperiod.block.cantBlockNotBalance=Impossible de clôturer un exercice non equilibré -lima.fiscalperiod.block.confirmation=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! -lima.fiscalperiod.block.newyear=Voulez vous créer un nouvel exercice? -lima.fiscalperiod.block.retainedearningstitle=Report à nouveau -lima.fiscalperiod.block.title=Cloture de l'exercice -lima.fiscalperiod.buttonback=← -lima.fiscalperiod.buttonnext=→ -lima.fiscalperiod.closed=Cloturé -lima.fiscalperiod.closure=Cloture -lima.fiscalperiod.delete.confirmation=Ètes vous sûre de vouloir supprimer cette période ? Cette action est irréversible \! -lima.fiscalperiod.delete.title=Suppression de l'exercice -lima.fiscalperiod.end=Fin -lima.fiscalperiod.entrybooks.create=Création d'un nouveau journal -lima.fiscalperiod.fiscalperiod=Exercice -lima.fiscalperiod.modifyfiscalperiodtitle=Modification de l'exercice -lima.fiscalperiod.open=Ouvert -lima.fiscalperiod.status=Statut -lima.fiscalperiod.unbalancedtransactions=La période fiscale contient des transactions non équilibrées lima.generateHtml=HTML lima.help=Aide lima.help.about=À Propos @@ -475,7 +476,6 @@ lima.importExport.usevatpdf=Êtes-vous sûr de vouloir utiliser ce pdf pour la déclaration de TVA ? lima.importExport.vatStatement=des transactions de tva terminé. lima.importExport.wait=Traitement en cours… -lima.importExport.waittitle=Traitement en cours lima.info=Information lima.init.closed=Lima fermé à %1$s lima.init.errorclosing=Erreur lors de la fermeture @@ -585,6 +585,7 @@ lima.vatstatement.label=Libellé lima.vatstatement.mastervatstatement= lima.vatstatement.movement.add=Ajouter un regrouprement +lima.wait=Traitement en cours lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé limma.config.thousandseparator.description=Caractère de séparation entre les blocs de milliers limma.config.thousandseparator.label=Séparateur de milliers

1 0

r3916 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/financialperiod resources/i18n
by sbavencoff＠users.chorem.org 12 Sep '14

12 Sep '14

Author: sbavencoff Date: 2014-09-12 12:26:43 +0200 (Fri, 12 Sep 2014) New Revision: 3916 Url: http://forge.chorem.org/projects/lima/repository/revisions/3916 Log: refs #875 #1043 : FinancialPeriod Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.css Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2014-09-12 10:09:47 UTC (rev 3915) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2014-09-12 10:26:43 UTC (rev 3916) @@ -52,7 +52,7 @@ @Override protected void initColumn() { - addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, t("lima.financialperiod.begin"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, t("lima.financialPeriod.begin"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); @@ -61,7 +61,7 @@ } }); - addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, t("lima.financialperiod.end"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, t("lima.financialPeriod.end"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); @@ -70,7 +70,7 @@ } }); - addColumn(new AbstractColumn<FinancialPeriodTableModel>(EntryBook.class, t("lima.financialperiod.entrybook"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(EntryBook.class, t("lima.financialPeriod.entrybook"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); @@ -78,7 +78,7 @@ } }); - addColumn(new AbstractColumn<FinancialPeriodTableModel>(String.class, t("lima.financialperiod.status"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(String.class, t("lima.financialPeriod.status"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.css 2014-09-12 10:26:43 UTC (rev 3916) @@ -0,0 +1,16 @@ +#toolBar { + floatable : false; +} + +#blockButton { + toolTipText : "lima.financialPeriod.block"; + actionIcon : "financialPeriod-close"; + enabled : "{isSelectedPeriod()}"; +} + +#financialPeriodTable { + sortable : false; + rowHeight : 24; + selectionMode : "{ListSelectionModel.SINGLE_INTERVAL_SELECTION}"; + columnControlVisible : true; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2014-09-12 10:09:47 UTC (rev 3915) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2014-09-12 10:26:43 UTC (rev 3916) @@ -23,7 +23,7 @@ #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> <import> javax.swing.ListSelectionModel org.chorem.lima.entity.FiscalPeriod @@ -42,36 +42,21 @@ } ]]></script> - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> + <JToolBar id="toolBar" + constraints="BorderLayout.PAGE_START"> - <JButton id="blockButton" - toolTipText="{ t("lima.financialperiod.block") + " (Ctrl+C)"}" - actionIcon='financialPeriod-close' - onActionPerformed="handler.blockFinancialPeriod()" - enabled="{isSelectedPeriod()}"/> + <JButton id="blockButton" + onActionPerformed="handler.blockFinancialPeriod()"/> - </JToolBar> - </cell> - </row> - - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <FinancialPeriodTableModel id="financialPeriodTableModel"/> - <FinancialPeriodTable - id="financialPeriodTable" - sortable="false" - rowHeight="24" - constructorParams="getHandler()" - model="{financialPeriodTableModel}" - selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" - columnControlVisible="true"/> - <ListSelectionModel - javaBean="financialPeriodTable.getSelectionModel()" - onValueChanged="setSelectedPeriod(financialPeriodTable.getSelectedRow() != -1)"/> - </JScrollPane> - </cell> - </row> -</Table> + </JToolBar> + <JScrollPane constraints="BorderLayout.CENTER"> + <FinancialPeriodTableModel id="financialPeriodTableModel"/> + <FinancialPeriodTable + id="financialPeriodTable" + constructorParams="getHandler()" + model="{financialPeriodTableModel}"/> + <ListSelectionModel + javaBean="financialPeriodTable.getSelectionModel()" + onValueChanged="setSelectedPeriod(financialPeriodTable.getSelectedRow() != -1)"/> + </JScrollPane> +</JPanel> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-09-12 10:09:47 UTC (rev 3915) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-09-12 10:26:43 UTC (rev 3916) @@ -125,8 +125,8 @@ // blocked it ClosedPeriodicEntryBook closedPeriodicEntryBook = model.get(selectedRow); - int response = JOptionPane.showConfirmDialog(view, t("lima.financialperiod.blockmessage"), - t("lima.financialperiod.blocktitle"), + int response = JOptionPane.showConfirmDialog(view, t("lima.financialPeriod.blockmessage"), + t("lima.financialPeriod.blocktitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { @@ -134,50 +134,50 @@ closedPeriodicEntryBook = financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); model.setValue(selectedRow, closedPeriodicEntryBook); } catch (UnbalancedFinancialTransactionsException e) { - StringBuilder message = new StringBuilder(t("lima.financialperiod.block.error.unbalanced.main")); + StringBuilder message = new StringBuilder(t("lima.financialPeriod.block.error.unbalanced.main")); for (FinancialTransaction transaction : e.getFinancialTransactions()) { message.append("\n - "); - message.append(t("lima.financialperiod.block.error.unbalanced.transaction", + message.append(t("lima.financialPeriod.block.error.unbalanced.transaction", transaction.getTransactionDate(), BigDecimalTableCellRenderer.format(transaction.getAmountDebit()), BigDecimalTableCellRenderer.format(transaction.getAmountCredit()))); } errorHelper.showErrorMessage(message.toString()); } catch (UnfilledEntriesException e) { - StringBuilder message = new StringBuilder(t("lima.financialperiod.block.error.unfilled.main")); + StringBuilder message = new StringBuilder(t("lima.financialPeriod.block.error.unfilled.main")); for (Entry entry : e.getEntries()) { message.append("\n - "); - message.append(t("lima.financialperiod.block.error.unfilled.entry", + message.append(t("lima.financialPeriod.block.error.unfilled.entry", entry.getFinancialTransaction().getTransactionDate(), BigDecimalTableCellRenderer.format(entry.getAmount()))); if (entry.getAccount() == null) { message.append("\n - "); - message.append(t("lima.financialperiod.block.error.unfilled.noAccount")); + message.append(t("lima.financialPeriod.block.error.unfilled.noAccount")); } if (StringUtils.isBlank(entry.getVoucher())) { message.append("\n - " ); - message.append(t("lima.financialperiod.block.error.unfilled.noVoucher")); + message.append(t("lima.financialPeriod.block.error.unfilled.noVoucher")); } if (StringUtils.isBlank(entry.getDescription())) { message.append("\n - "); - message.append(t("lima.financialperiod.block.error.unfilled.noDescription")); + message.append(t("lima.financialPeriod.block.error.unfilled.noDescription")); } } errorHelper.showErrorMessage(message.toString()); } catch (WithoutEntryBookFinancialTransactionsException e) { - StringBuilder message = new StringBuilder(t("lima.financialperiod.block.error.withoutEntryBook.main")); + StringBuilder message = new StringBuilder(t("lima.financialPeriod.block.error.withoutEntryBook.main")); for (FinancialTransaction transaction : e.getFinancialTransactions()) { message.append("\n - "); - message.append(t("lima.financialperiod.block.error.withoutEntryBook.transaction", + message.append(t("lima.financialPeriod.block.error.withoutEntryBook.transaction", transaction.getTransactionDate(), BigDecimalTableCellRenderer.format(transaction.getAmountCredit()))); } errorHelper.showErrorMessage(message.toString()); } catch (NotLockedClosedPeriodicEntryBooksException e) { - StringBuilder message = new StringBuilder(t("lima.financialperiod.block.error.noLockedPreviousEntryBook.main")); + StringBuilder message = new StringBuilder(t("lima.financialPeriod.block.error.noLockedPreviousEntryBook.main")); for (ClosedPeriodicEntryBook previousClosedPeriodicEntryBook : e.getClosedPeriodicEntryBooks()) { message.append("\n - "); - message.append(t("lima.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook", + message.append(t("lima.financialPeriod.block.error.noLockedPreviousEntryBook.previousEntryBook", previousClosedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), previousClosedPeriodicEntryBook.getFinancialPeriod().getEndDate())); } Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 10:09:47 UTC (rev 3915) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 10:26:43 UTC (rev 3916) @@ -284,6 +284,29 @@ lima.filter.entrybook= lima.filter.letter= lima.filter.voucher= +lima.financialPeriod.begin= +lima.financialPeriod.block= +lima.financialPeriod.block.error.NoLockedPreviousEntryBook.main= +lima.financialPeriod.block.error.entry= +lima.financialPeriod.block.error.noLockedPreviousEntryBook.main= +lima.financialPeriod.block.error.noLockedPreviousEntryBook.previousEntryBook= +lima.financialPeriod.block.error.unbalanced.main= +lima.financialPeriod.block.error.unbalanced.transaction= +lima.financialPeriod.block.error.unfilled.entry= +lima.financialPeriod.block.error.unfilled.main= +lima.financialPeriod.block.error.unfilled.noAccount= +lima.financialPeriod.block.error.unfilled.noDescription= +lima.financialPeriod.block.error.unfilled.noVoucher= +lima.financialPeriod.block.error.unfilled.noVouchier= +lima.financialPeriod.block.error.withoutEntryBook.main= +lima.financialPeriod.block.error.withoutEntryBook.transaction= +lima.financialPeriod.blockmessage= +lima.financialPeriod.blocktitle= +lima.financialPeriod.closure= +lima.financialPeriod.end= +lima.financialPeriod.entrybook= +lima.financialPeriod.period= +lima.financialPeriod.status= lima.financialPeriods= lima.financialStatement.alreadyExistFinancialStatement=FAILED \: The financial statement %s already exists \! lima.financialStatements= @@ -306,29 +329,6 @@ lima.financialTransaction.update.error.beforeFirstFiscalPeriod= lima.financialTransaction.update.error.lockedEntryBook= lima.financialTransaction.update.error.lockedFinancialPeriod= -lima.financialperiod.begin= -lima.financialperiod.block= -lima.financialperiod.block.error.NoLockedPreviousEntryBook.main= -lima.financialperiod.block.error.entry= -lima.financialperiod.block.error.noLockedPreviousEntryBook.main= -lima.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook= -lima.financialperiod.block.error.unbalanced.main= -lima.financialperiod.block.error.unbalanced.transaction= -lima.financialperiod.block.error.unfilled.entry= -lima.financialperiod.block.error.unfilled.main= -lima.financialperiod.block.error.unfilled.noAccount= -lima.financialperiod.block.error.unfilled.noDescription= -lima.financialperiod.block.error.unfilled.noVoucher= -lima.financialperiod.block.error.unfilled.noVouchier= -lima.financialperiod.block.error.withoutEntryBook.main= -lima.financialperiod.block.error.withoutEntryBook.transaction= -lima.financialperiod.blockmessage= -lima.financialperiod.blocktitle= -lima.financialperiod.closure= -lima.financialperiod.end= -lima.financialperiod.entrybook= -lima.financialperiod.period= -lima.financialperiod.status= lima.financialstatement.accounts=Account list on debit and on credit lima.financialstatement.addfinancialStatementHeadererror=Can't add financialStatementHeader lima.financialstatement.check=Check accounts passing to movement Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 10:09:47 UTC (rev 3915) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 10:26:43 UTC (rev 3916) @@ -264,6 +264,26 @@ lima.filter.entrybook=Ajouter un filtre sur les journaux lima.filter.letter=Ajouter un filtre sur les lettres lima.filter.voucher=Ajouter un filtre sur les pièces comptables +lima.financialPeriod.begin=Début +lima.financialPeriod.block=Cloturer une période (Ctrl+C) +lima.financialPeriod.block.error.noLockedPreviousEntryBook.main=Impossible de clôturer cette période car les périodes précedentes ne sont pas clôturer \: +lima.financialPeriod.block.error.noLockedPreviousEntryBook.previousEntryBook=période du %1$te %1$tB %1$tY au %2$te %2$tB %2$tY +lima.financialPeriod.block.error.unbalanced.main=Impossible de clôturer cette période car elle contient des transactions non équilibrées \: +lima.financialPeriod.block.error.unbalanced.transaction=transaction du %1$te/%1$tm/%1$tY d'un débit de %2$s et d'un crédit de %3$s +lima.financialPeriod.block.error.unfilled.entry=entré du %1$te/%1$tm/%1$tY pour un montant de %2$s \: +lima.financialPeriod.block.error.unfilled.main=Impossible de clôturer cette période car elle contient des entrés incomplétes \: +lima.financialPeriod.block.error.unfilled.noAccount=n'a pas de compte +lima.financialPeriod.block.error.unfilled.noDescription=n'a pas de description +lima.financialPeriod.block.error.unfilled.noVoucher=n'a pas de pièce comptable +lima.financialPeriod.block.error.withoutEntryBook.main=Impossible de clôturer cette période car elle contient des transactions sans journal +lima.financialPeriod.block.error.withoutEntryBook.transaction=transaction du %1$te/%1$tm/%1$tY d'un montant de %2$s, +lima.financialPeriod.blockmessage=Êtes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! +lima.financialPeriod.blocktitle=Clôture +lima.financialPeriod.closure=Clôture +lima.financialPeriod.end=Fin +lima.financialPeriod.entrybook=Journal +lima.financialPeriod.period=Période +lima.financialPeriod.status=Statut lima.financialPeriods=Périodes comptables lima.financialStatement.alreadyExistFinancialStatement=u00C9chec \: Le mouvement %s exist déjà \! lima.financialStatements=Plan BCR @@ -286,26 +306,6 @@ lima.financialTransaction.update.error.beforeFirstFiscalPeriod=Impossible de déplacer une transaction avant le %1$te %1$tB %1$tY début du premier exercice. lima.financialTransaction.update.error.lockedEntryBook=Impossible de déplacer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.financialTransaction.update.error.lockedFinancialPeriod=Impossible de deplacer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.financialperiod.begin=Début -lima.financialperiod.block=Cloturer une période -lima.financialperiod.block.error.noLockedPreviousEntryBook.main=Impossible de clôturer cette période car les périodes précedentes ne sont pas clôturer \: -lima.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook=période du %1$te %1$tB %1$tY au %2$te %2$tB %2$tY -lima.financialperiod.block.error.unbalanced.main=Impossible de clôturer cette période car elle contient des transactions non équilibrées \: -lima.financialperiod.block.error.unbalanced.transaction=transaction du %1$te/%1$tm/%1$tY d'un débit de %2$s et d'un crédit de %3$s -lima.financialperiod.block.error.unfilled.entry=entré du %1$te/%1$tm/%1$tY pour un montant de %2$s \: -lima.financialperiod.block.error.unfilled.main=Impossible de clôturer cette période car elle contient des entrés incomplétes \: -lima.financialperiod.block.error.unfilled.noAccount=n'a pas de compte -lima.financialperiod.block.error.unfilled.noDescription=n'a pas de description -lima.financialperiod.block.error.unfilled.noVoucher=n'a pas de pièce comptable -lima.financialperiod.block.error.withoutEntryBook.main=Impossible de clôturer cette période car elle contient des transactions sans journal -lima.financialperiod.block.error.withoutEntryBook.transaction=transaction du %1$te/%1$tm/%1$tY d'un montant de %2$s, -lima.financialperiod.blockmessage=Êtes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! -lima.financialperiod.blocktitle=Clôture -lima.financialperiod.closure=Clôture -lima.financialperiod.end=Fin -lima.financialperiod.entrybook=Journal -lima.financialperiod.period=Période -lima.financialperiod.status=Statut lima.financialstatement.accounts=Liste de comptes au crédit et au débit lima.financialstatement.addfinancialStatementHeadererror=Erreur lors de l'ajout de l'entête sur la déclaration financière lima.financialstatement.check=

1 0

r3915 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/account java/org/chorem/lima/ui/entrybook java/org/chorem/lima/ui/fiscalperiod resources/i18n
by sbavencoff＠users.chorem.org 12 Sep '14

12 Sep '14

Author: sbavencoff Date: 2014-09-12 12:09:47 +0200 (Fri, 12 Sep 2014) New Revision: 3915 Url: http://forge.chorem.org/projects/lima/repository/revisions/3915 Log: refs #875 #1043 : EntryBook Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.css Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css 2014-09-12 10:09:47 UTC (rev 3915) @@ -10,11 +10,13 @@ #updateButton { toolTipText : "lima.update.shortcut"; actionIcon : "account-edit"; + enabled : "{isSelectedRow()}"; } #removeButton { toolTipText : "lima.remove.shortcut"; actionIcon : "account-remove"; + enabled : "{isSelectedRow()}"; } #importButton { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2014-09-12 10:09:47 UTC (rev 3915) @@ -48,12 +48,10 @@ onActionPerformed="handler.addAccount()"/> <JButton id="updateButton" - onActionPerformed="handler.updateAccount()" - enabled="{isSelectedRow()}"/> + onActionPerformed="handler.updateAccount()"/> <JButton id="removeButton" - onActionPerformed="handler.removeAccount()" - enabled="{isSelectedRow()}"/> + onActionPerformed="handler.removeAccount()"/> <JButton id="importButton" onActionPerformed="handler.importAccountsChart()"/> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css 2014-09-12 10:09:47 UTC (rev 3915) @@ -0,0 +1,30 @@ +#entryBookFormDialog { + title : "lima.entryBook.form"; +} + +#codeLabel { + text : "lima.entryBook.code"; + labelFor : "{codeTextField}"; +} + +#codeTextField { + text : "{getEntryBook().getCode()}"; + enabled : "{isAddState()}"; +} + +#labelLabel { + text : "lima.entryBook.label"; + labelFor : "{labelTextField}"; +} + +#labelTextField{ + text : "{getEntryBook().getLabel()}"; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2014-09-12 10:09:47 UTC (rev 3915) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.entrybook.entrybooktile" modal="true" +<JDialog id="entryBookFormDialog" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -35,7 +36,7 @@ <script> <![CDATA[ - getRootPane().setDefaultButton(okButton); + getRootPane().setDefaultButton(ok); protected void performCancel() { setEntryBook(null); dispose(); @@ -46,34 +47,33 @@ <Table> <row> <cell> - <JLabel text="lima.entrybook.code"/> + <JLabel id="codeLabel"/> </cell> <cell> - <JTextField id="entryBookCodeField" text="{getEntryBook().getCode()}" enabled='{isAddState()}' /> - <Document javaBean="getEntryBookCodeField().getDocument()" - onInsertUpdate='getEntryBook().setCode(getEntryBookCodeField().getText())' - onRemoveUpdate='getEntryBook().setCode(getEntryBookCodeField().getText())'/> + <JTextField id="codeTextField" /> + <Document javaBean="getCodeTextField().getDocument()" + onInsertUpdate='getEntryBook().setCode(getCodeTextField().getText())' + onRemoveUpdate='getEntryBook().setCode(getCodeTextField().getText())'/> </cell> </row> <row> <cell> - <JLabel text="lima.entrybook.label"/> + <JLabel id="labelLabel"/> </cell> <cell> - <JTextField id="entryBookLabelField" - text="{getEntryBook().getLabel()}"/> - <Document javaBean="getEntryBookLabelField().getDocument()" - onInsertUpdate='getEntryBook().setLabel(getEntryBookLabelField().getText())' - onRemoveUpdate='getEntryBook().setLabel(getEntryBookLabelField().getText())'/> + <JTextField id="labelTextField"/> + <Document javaBean="getLabelTextField().getDocument()" + onInsertUpdate='getEntryBook().setLabel(getLabelTextField().getText())' + onRemoveUpdate='getEntryBook().setLabel(getLabelTextField().getText())'/> </cell> </row> <row> <cell> - <JButton id="cancelButton" text="lima.cancel" + <JButton id="cancel" onActionPerformed="performCancel()"/> </cell> <cell> - <JButton id="okButton" text="lima.ok" + <JButton id="ok" onActionPerformed="dispose()"/> </cell> </row> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css 2014-09-12 10:09:47 UTC (rev 3915) @@ -0,0 +1,24 @@ +#entryBookImportForm { + title : "lima.entryBook.import.form"; +} + +#entryBooksDefault { + text : "lima.entryBook.default"; + value : "{EntryBooksChartEnum.DEFAULT}"; + buttonGroup : "{buttonGroup}"; + selected : true; +} + +#entryBooksImport { + text : "lima.entryBook.import"; + value : "{EntryBooksChartEnum.IMPORT}"; + buttonGroup : "{buttonGroup}"; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx 2014-09-12 10:09:47 UTC (rev 3915) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.entrybook.importtitle" modal="true" +<JDialog id="entryBookImportForm" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -35,7 +36,7 @@ <script> <![CDATA[ - getRootPane().setDefaultButton(okButton); + getRootPane().setDefaultButton(ok); protected void performCancel() { buttonGroup.setSelectedValue(null); dispose(); @@ -46,15 +47,10 @@ <Table> <row> <cell> - <JRadioButton text='lima.entrybook.default' - value='{EntryBooksChartEnum.DEFAULT}' - buttonGroup="{buttonGroup}" - selected='true'/> + <JRadioButton id="entryBooksDefault"/> </cell> <cell> - <JRadioButton text='lima.entrybook.import' - value='{EntryBooksChartEnum.IMPORT}' - buttonGroup="{buttonGroup}"/> + <JRadioButton id="entryBooksImport"/> </cell> </row> <row> @@ -62,11 +58,11 @@ <Table> <row> <cell fill="none"> - <JButton text="lima.cancel" + <JButton id="cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="okButton" text="lima.ok" + <JButton id="ok" onActionPerformed="dispose()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2014-09-12 10:09:47 UTC (rev 3915) @@ -48,13 +48,13 @@ @Override protected void initColumn() { - addColumn(new AbstractColumn<EntryBookTableModel>(String.class, t("lima.entrybook.code"), false) { + addColumn(new AbstractColumn<EntryBookTableModel>(String.class, t("lima.entryBook.code"), false) { @Override public Object getValueAt(int row) { return tableModel.get(row).getCode(); } }); - addColumn(new AbstractColumn<EntryBookTableModel>(String.class, t("lima.entrybook.label"), false) { + addColumn(new AbstractColumn<EntryBookTableModel>(String.class, t("lima.entryBook.label"), false) { @Override public Object getValueAt(int row) { return tableModel.get(row).getLabel(); Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.css 2014-09-12 10:09:47 UTC (rev 3915) @@ -0,0 +1,32 @@ +#toolBar { + floatable : false; +} + +#addButton { + toolTipText : "lima.entryBook.add"; + actionIcon : "entryBook-new"; +} + +#updateButton { + toolTipText : "lima.entryBook.update"; + actionIcon : "entryBook-edit"; + enabled : "{isSelectedRow()}"; +} + +#removeButton { + toolTipText : "lima.entryBook.remove"; + actionIcon : "entryBook-remove"; + enabled : "{isSelectedRow()}"; +} + +#importButton { + toolTipText : "lima.importExport.import"; + actionIcon : "entryBook-import"; +} + +#entryBooksTable { + rowHeight : 24; + selectionMode : "{ListSelectionModel.SINGLE_SELECTION}"; + highlighters : "{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(233,233,233))}"; + columnControlVisible : true; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2014-09-12 10:09:47 UTC (rev 3915) @@ -23,7 +23,7 @@ #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> <import> java.awt.Dimension @@ -40,49 +40,29 @@ } ]]></script> - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> + <JToolBar id="toolBar" + constraints="BorderLayout.PAGE_START"> - <JButton id="addButton" - toolTipText="{ t("lima.entrybook.add") + " (Ctrl+N)"}" - actionIcon='entryBook-new' - onActionPerformed="handler.addEntryBook()"/> + <JButton id="addButton" + onActionPerformed="handler.addEntryBook()"/> - <JButton id="updateButton" - toolTipText="{ t("lima.entrybook.update") + " (Ctrl+M)"}" - actionIcon='entryBook-edit' - onActionPerformed="handler.updateEntryBook()" - enabled="{isSelectedRow()}"/> + <JButton id="updateButton" + onActionPerformed="handler.updateEntryBook()"/> - <JButton id="removeButton" - toolTipText="{ t("lima.entrybook.remove") + " (Del)"}" - actionIcon='entryBook-remove' - onActionPerformed="handler.deleteEntryBook()" - enabled="{isSelectedRow()}"/> + <JButton id="removeButton" + onActionPerformed="handler.deleteEntryBook()"/> - <JButton id="importButton" - actionIcon='entryBook-import' - toolTipText="lima.importExport.import" - onActionPerformed="handler.importEntryBooks()"/> + <JButton id="importButton" + onActionPerformed="handler.importEntryBooks()"/> - </JToolBar> - </cell> - </row> + </JToolBar> - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <EntryBookTableModel id="entryBookTableModel" /> - <EntryBookTable id="entryBooksTable" rowHeight="24" - constructorParams="getHandler()" - highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(233,233,233))}" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}" - columnControlVisible="true" - model="{entryBookTableModel}"/> - <ListSelectionModel javaBean="getEntryBooksTable().getSelectionModel()" - onValueChanged="setSelectedRow(entryBooksTable.getSelectedRow() != -1)"/> - </JScrollPane> - </cell> - </row> -</Table> + <JScrollPane constraints="BorderLayout.CENTER"> + <EntryBookTableModel id="entryBookTableModel" /> + <EntryBookTable id="entryBooksTable" rowHeight="24" + constructorParams="getHandler()" + model="{entryBookTableModel}"/> + <ListSelectionModel javaBean="getEntryBooksTable().getSelectionModel()" + onValueChanged="setSelectedRow(entryBooksTable.getSelectedRow() != -1)"/> + </JScrollPane> +</JPanel> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-09-12 10:09:47 UTC (rev 3915) @@ -244,8 +244,8 @@ EntryBook selectedEntryBook = entryBookTableModel.get(selectedRow); int response = JOptionPane.showConfirmDialog(view, - t("lima.entrybook.deletemessage", selectedEntryBook.getLabel()), - t("lima.entrybook.deletetitle"), JOptionPane.YES_NO_OPTION, + t("lima.entryBook.deletemessage", selectedEntryBook.getLabel()), + t("lima.entryBook.deletetitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2014-09-12 10:09:47 UTC (rev 3915) @@ -81,7 +81,7 @@ <cell anchor="west"> <JRadioButton id="selectedEntryBook" - text="lima.entrybook" + text="lima.entryBook" selected="true" buttonGroup="EntryBookGroup" onActionPerformed="performNew()"/> @@ -89,7 +89,7 @@ </row> <row> <cell> - <JLabel id="entryBookSelectorLabel" text="lima.entrybook"/> + <JLabel id="entryBookSelectorLabel" text="lima.entryBook"/> </cell> <cell> <org.chorem.lima.ui.combobox.EntryBookComboBoxModel id="modelEntryBookComboBox"/> Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 10:09:47 UTC (rev 3915) @@ -220,26 +220,28 @@ lima.entry.paste.error.lockedEntryBook= lima.entry.paste.error.lockedFinancialPeriod= lima.entry.update.closed.entryBook.error= +lima.entryBook=EntryBook +lima.entryBook.add= lima.entryBook.alreadyExistEntryBookException=An entry book with code %s already exists. +lima.entryBook.code= +lima.entryBook.default= lima.entryBook.delete.used.error=Can't delete entry book %2$s (%1$s) because exist financcial transactions in this entry book. -lima.entryBooks= -lima.entrybook=EntryBook -lima.entrybook.add= -lima.entrybook.code= -lima.entrybook.default= -lima.entrybook.deletemessage= -lima.entrybook.deletetitle= -lima.entrybook.entrybooktile= -lima.entrybook.import= -lima.entrybook.importtitle= -lima.entrybook.label= -lima.entrybook.remove= -lima.entrybook.update= -lima.entrybooks=EntryBooks -lima.entrybooksreports.documentcreationerror=Enable to create document -lima.entrybooksreports.documentcreationfiscalerror=Can't create document on an open fiscal year -lima.entrybooksreports.documentcreationfiscaltitle= -lima.entrybooksreports.listerror=Can't get entries list +lima.entryBook.deletemessage= +lima.entryBook.deletetitle= +lima.entryBook.entrybooktile= +lima.entryBook.form= +lima.entryBook.import= +lima.entryBook.import.form= +lima.entryBook.importtitle= +lima.entryBook.label= +lima.entryBook.remove= +lima.entryBook.remove.shortcut= +lima.entryBook.update= +lima.entryBooks=EntryBooks +lima.entryBooksreports.documentcreationerror=Enable to create document +lima.entryBooksreports.documentcreationfiscalerror=Can't create document on an open fiscal year +lima.entryBooksreports.documentcreationfiscaltitle= +lima.entryBooksreports.listerror=Can't get entries list lima.enum.comboboxaccount.account=Account lima.enum.comboboxaccount.accountlist=Account list lima.enum.comboboxaccount.allaccount=All accounts Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 09:07:40 UTC (rev 3914) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 10:09:47 UTC (rev 3915) @@ -201,26 +201,25 @@ lima.entry.paste.error.lockedEntryBook=Impossible de copier une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.entry.paste.error.lockedFinancialPeriod=Impossible de copier une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. lima.entry.update.closed.entryBook.error=Impossible de modifier cette entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entryBook=Journal +lima.entryBook.add=Ajout de journal (Ctrl+A) lima.entryBook.alreadyExistEntryBookException=Un journal avec comme code % existe déjà. +lima.entryBook.code=Code +lima.entryBook.default=Journaux par défault lima.entryBook.delete.used.error=Imposible de supprimer le journal %2$s (%1$s) car Il existe des transactioins sur ce journal. +lima.entryBook.deletemessage=Êtes vous sûr de vouloir supprimer le journal %s ? +lima.entryBook.deletetitle=Suppression de journal +lima.entryBook.form=Journal +lima.entryBook.import=Importer +lima.entryBook.import.form=Import +lima.entryBook.label=Libellé +lima.entryBook.remove=Supprimer (Suppr) +lima.entryBook.update=Modifier (Ctrl+M) lima.entryBooks=Journaux -lima.entrybook=Journal -lima.entrybook.add=Ajout de journal -lima.entrybook.code=Code -lima.entrybook.default=Journaux par défault -lima.entrybook.deletemessage=Êtes vous sûr de vouloir supprimer le journal %s ? -lima.entrybook.deletetitle=Suppression de journal -lima.entrybook.entrybooktile=Journal -lima.entrybook.import=Importer -lima.entrybook.importtitle=Import -lima.entrybook.label=Libellé -lima.entrybook.remove=Supprimer -lima.entrybook.update=Modifier -lima.entrybooks=Journaux -lima.entrybooksreports.documentcreationerror=Erreur lors de la création du document -lima.entrybooksreports.documentcreationfiscalerror=Impossible de créer un document quand la période fiscale est ouverte -lima.entrybooksreports.documentcreationfiscaltitle= -lima.entrybooksreports.listerror=Erreur lors de la récupération des données de la liste +lima.entryBooksreports.documentcreationerror=Erreur lors de la création du document +lima.entryBooksreports.documentcreationfiscalerror=Impossible de créer un document quand la période fiscale est ouverte +lima.entryBooksreports.documentcreationfiscaltitle= +lima.entryBooksreports.listerror=Erreur lors de la récupération des données de la liste lima.enum.comboboxaccount.account=Compte lima.enum.comboboxaccount.accountlist=Liste de comptes lima.enum.comboboxaccount.allaccount=Tous les comptes

1 0

r3914 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondit
by sbavencoff＠users.chorem.org 12 Sep '14

12 Sep '14

Author: sbavencoff Date: 2014-09-12 11:07:40 +0200 (Fri, 12 Sep 2014) New Revision: 3914 Url: http://forge.chorem.org/projects/lima/repository/revisions/3914 Log: refs #875 #1043 : Accounts, remove "ui" and "common" in i18n keys Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/TypeEntry.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -802,8 +802,8 @@ if (beginDate != null && endDate != null && accountFormat != null) { - String subTitleFirstpart = t("lima.ui.fiscalperiod.fiscalperiod") + " : " + simpleDateFormat.format(beginDate) + " - " + simpleDateFormat.format(endDate); - String subTitleSecPart = t("lima.ui.financialtransaction.account") + " : " + accountFormat.getAccountNumber() + " - " + accountFormat.getLabel(); + String subTitleFirstpart = t("lima.fiscalperiod.fiscalperiod") + " : " + simpleDateFormat.format(beginDate) + " - " + simpleDateFormat.format(endDate); + String subTitleSecPart = t("lima.financialtransaction.account") + " : " + accountFormat.getAccountNumber() + " - " + accountFormat.getLabel(); accountReport += constructSubTitleHtml(subTitleFirstpart, subTitleSecPart); results = reportService.generateAccountsReports(accountFormat, true, Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -227,7 +227,7 @@ amountsCalculation(secondEntryDebitSubtract, sameAccountEntry, costOrProductEntry); } - String accountRegularization = t("lima.ui.lettering.accountRegularization"); + String accountRegularization = t("lima.lettering.accountRegularization"); if (log.isDebugEnabled()) { log.debug("accountRegularization : " + accountRegularization); Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2014-09-12 09:07:40 UTC (rev 3914) @@ -132,7 +132,10 @@ lima.config.scale.description=Scale lima.config.serveraddress.description=Server Address lima.configFileName.description= +lima.financialtransaction.account= +lima.fiscalperiod.fiscalperiod= lima.importexport.import.alreadyExistFinancialStatement= +lima.lettering.accountRegularization= lima.reports.account.noaccount= lima.reports.account.noaccounttitle= lima.reports.accounts= @@ -145,7 +148,4 @@ lima.table.letter= lima.table.number= lima.table.voucher= -lima.ui.financialtransaction.account= -lima.ui.fiscalperiod.fiscalperiod= -lima.ui.lettering.accountRegularization= llima.importexport.import.alreadyExistFinancialStatement= Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2014-09-12 09:07:40 UTC (rev 3914) @@ -127,7 +127,10 @@ lima.config.scale.description=Précision lima.config.serveraddress.description=Addresse serveur lima.configFileName.description= +lima.financialtransaction.account= +lima.fiscalperiod.fiscalperiod= lima.importexport.import.alreadyExistFinancialStatement= +lima.lettering.accountRegularization= lima.reports.account.noaccount= lima.reports.account.noaccounttitle= lima.reports.accounts= @@ -140,8 +143,5 @@ lima.table.letter= lima.table.number= lima.table.voucher= -lima.ui.financialtransaction.account= -lima.ui.fiscalperiod.fiscalperiod= lima.ui.importexport.import.exceptions.reason=Reason\:% -lima.ui.lettering.accountRegularization= llima.importexport.import.alreadyExistFinancialStatement= Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.ui.financialtransaction.account" +<JInternalFrame title="lima.financialtransaction.account" preferredSize="{new Dimension(400, 100)}" onInternalFrameClosed="handler.delete()" layout="{new FlowLayout()}"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -34,7 +34,7 @@ public CreditConditionView() { super(); setHandler(new CreditConditionHandler(this)); - setTitle(t("lima.ui.financialtransaction.credit")); + setTitle(t("lima.financialtransaction.credit")); getBigDecimaleditor().setBean(handler); getBigDecimaleditor().init(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -34,7 +34,7 @@ public DebitConditionView() { super(); setHandler(new DebitConditionHandler(this)); - setTitle(t("lima.ui.financialtransaction.debit")); + setTitle(t("lima.financialtransaction.debit")); getBigDecimaleditor().setBean(handler); getBigDecimaleditor().init(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -34,6 +34,6 @@ public DescriptionConditionView() { super(); setHandler(new DescriptionConditionHandler(this)); - setTitle(t("lima.ui.financialtransaction.description")); + setTitle(t("lima.financialtransaction.description")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -34,6 +34,6 @@ public LetteringConditionView() { super(); setHandler(new LetteringConditionHandler(this)); - setTitle(t("lima.ui.financialtransaction.letter")); + setTitle(t("lima.financialtransaction.letter")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -34,7 +34,7 @@ public VoucherConditionView() { super(); setHandler(new VoucherConditionHandler(this)); - setTitle(t("lima.ui.financialtransaction.voucher")); + setTitle(t("lima.financialtransaction.voucher")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.ui.financialtransaction.date" +<JInternalFrame title="lima.financialtransaction.date" preferredSize="{new Dimension(200, 100)}" minimumSize="{new Dimension(200, 100)}" onInternalFrameClosed="handler.delete()" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -23,7 +23,7 @@ #L% --> -<JInternalFrame title="lima.ui.financialtransaction.dateInterval" +<JInternalFrame title="lima.financialtransaction.dateInterval" preferredSize="{new Dimension(200, 100)}" minimumSize="{new Dimension(200, 100)}" onInternalFrameClosed="handler.delete()"> @@ -39,7 +39,7 @@ <Table> <row> <cell> - <JLabel text="lima.ui.financialtransaction.dateInterval.in"/> + <JLabel text="lima.financialtransaction.dateInterval.in"/> </cell> <cell> <JAXXDatePicker id='beginDatePicker' @@ -50,7 +50,7 @@ </row> <row> <cell> - <JLabel text="lima.ui.financialtransaction.dateInterval.to"/> + <JLabel text="lima.financialtransaction.dateInterval.to"/> </cell> <cell> <JAXXDatePicker id='endDatePicker' Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css 2014-09-12 09:07:40 UTC (rev 3914) @@ -21,7 +21,7 @@ */ #mainView { - title : "lima.ui.mainview.title"; + title : "lima.mainview.title"; width : 800; height : 600; resizable : true; @@ -31,18 +31,18 @@ #file{ text : "lima.file"; mnemonic : "F"; } -#csv { text : "lima.importexport.csv"; } +#csv { text : "lima.importExport.csv"; } -#csvImport { text : "lima.importexport.import"; actionIcon : "import"; } -#csvImportAll { text : "lima.importexport.all"; } +#csvImport { text : "lima.importExport.import"; actionIcon : "import"; } +#csvImportAll { text : "lima.importExport.all"; } #csvImportAccounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } #csvImportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #csvImportFinancialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } #csvImportVatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } #csvImportEntries { text : "lima.entries"; actionIcon : "entries" } -#csvExport { text : "lima.importexport.export"; actionIcon : "export"; } -#csvExportAll { text : "lima.importexport.all"; } +#csvExport { text : "lima.importExport.export"; actionIcon : "export"; } +#csvExportAll { text : "lima.importExport.all"; } #csvExportAccounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } #csvExportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #csvExportFinancialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } @@ -50,14 +50,14 @@ #csvExportEntries { text : "lima.entries"; actionIcon : "entries" } -#ebp { text : "lima.importexport.ebp"; } +#ebp { text : "lima.importExport.ebp"; } -#ebpImport { text : "lima.importexport.import"; actionIcon : "import"; } +#ebpImport { text : "lima.importExport.import"; actionIcon : "import"; } #ebpImportAccounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } #ebpImportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #ebpImportEntries { text : "lima.entries"; actionIcon : "entries" } -#ebpExport { text : "lima.importexport.export"; actionIcon : "export"; } +#ebpExport { text : "lima.importExport.export"; actionIcon : "export"; } #ebpExportAccounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } #ebpExportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #ebpExportEntries { text : "lima.entries"; actionIcon : "entries" } @@ -65,7 +65,7 @@ #documents { text : "lima.documents" } #identity { text : "lima.identity"; actionIcon : "identity"; } #preferences { text : "lima.preferences"; actionIcon : "config"; } -#quit { text : "lima.common.quit"; actionIcon : "quit"; mnemonic : "Q"; } +#quit { text : "lima.quit"; actionIcon : "quit"; mnemonic : "Q"; } #structure { text : "lima.structure"; mnemonic : "S"; } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css 2014-09-12 09:07:40 UTC (rev 3914) @@ -0,0 +1,29 @@ +#accountFormDailog { + title : "lima.account.add.form"; +} + +#numberLabel { + text : "lima.charts.account.number"; + labelFor : "{numberTextField}"; +} + +#numberTextField { + text : "{getAccount().getAccountNumber()}"; +} + +#descriptionLabel { + text : "lima.label"; + labelFor : "{descriptionTextField}"; +} + +#descriptionTextField{ + text : "{getAccount().getLabel()}"; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -23,8 +23,10 @@ #L% --> -<JDialog title="lima.ui.account.addaccounttitle" modal="true" - defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="dispose()"> +<JDialog id="accountFormDailog" + modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="dispose()"> <import> javax.swing.text.Document @@ -45,11 +47,10 @@ <row> <cell fill="horizontal"> - <JLabel text="lima.charts.account.number" labelFor='{numberTextField}'/> + <JLabel id="numberLabel" /> </cell> <cell fill="horizontal"> - <JTextField id="numberTextField" - text="{account.getAccountNumber()}"/> + <JTextField id="numberTextField"/> <Document initializer="numberTextField.getDocument()" onInsertUpdate='account.setAccountNumber(numberTextField.getText())' onRemoveUpdate='account.setAccountNumber(numberTextField.getText())'/> @@ -57,10 +58,10 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.common.label" labelFor='{descriptionTextField}'/> + <JLabel id="descriptionLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="descriptionTextField" text="{getAccount().getLabel()}"/> + <JTextField id="descriptionTextField"/> <Document initializer="descriptionTextField.getDocument()" onInsertUpdate='account.setLabel(descriptionTextField.getText())' onRemoveUpdate='account.setLabel(descriptionTextField.getText())'/> @@ -69,8 +70,9 @@ <row> <cell columns="2"> <JPanel layout='{new GridLayout(1,0)}'> - <JButton text="lima.cancel" onActionPerformed="dispose()"/> - <JButton id="ok" text="lima.ok" + <JButton id="cancel" + onActionPerformed="dispose()"/> + <JButton id="ok" onActionPerformed="handler.addAccount(this)"/> </JPanel> </cell> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css 2014-09-12 09:07:40 UTC (rev 3914) @@ -0,0 +1,46 @@ +#accountImportDialog { + title : "lima.account.import" +} + +#description { + text : "lima.account.import.description" +} + +#shortened { + text : "lima.charts.account.shortened"; + value : "{AccountsChartEnum.SHORTENED}"; + buttonGroup : buttonGroup; + selected : true; +} + +#accountsBase { + text : "lima.charts.account.base"; + value : "{AccountsChartEnum.BASE}"; + buttonGroup : buttonGroup; +} + +#developed { + text : "lima.charts.account.developed"; + value : "{AccountsChartEnum.DEVELOPED}"; + buttonGroup : buttonGroup; +} + +#importcsv { + text : "lima.charts.account.importcsv"; + value : "{AccountsChartEnum.IMPORT}"; + buttonGroup : buttonGroup; +} + +#importebp { + text : "lima.charts.account.importebp"; + value : "{AccountsChartEnum.IMPORTEBP}"; + buttonGroup : buttonGroup; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.ui.account.importtitle" modal="true" +<JDialog id="accountImportDialog" + modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -46,43 +47,32 @@ <Table> <row> <cell> - <JLabel text='lima.opening.accounts'/> + <JLabel id="description"/> </cell> </row> <row> <cell anchor="west"> - <JRadioButton text='lima.ui.account.shortened' - value='{AccountsChartEnum.SHORTENED}' - buttonGroup="{buttonGroup}" - selected='true'/> + <JRadioButton id="shortened"/> </cell> </row> <row> <cell anchor="west"> - <JRadioButton text='lima.ui.account.base' - value='{AccountsChartEnum.BASE}' - buttonGroup="{buttonGroup}"/> + <JRadioButton id="accountsBase"/> </cell> </row> <row> <cell anchor="west"> - <JRadioButton text='lima.ui.account.developed' - value='{AccountsChartEnum.DEVELOPED}' - buttonGroup="{buttonGroup}"/> + <JRadioButton id="developed"/> </cell> </row> <row> <cell anchor="west"> - <JRadioButton text='lima.ui.importexport.importcsv' - value='{AccountsChartEnum.IMPORT}' - buttonGroup="{buttonGroup}"/> + <JRadioButton id="importcsv"/> </cell> </row> <row> <cell anchor="west"> - <JRadioButton text='lima.ui.importexport.importebp' - value='{AccountsChartEnum.IMPORTEBP}' - buttonGroup="{buttonGroup}"/> + <JRadioButton id="importebp"/> </cell> </row> <row> @@ -90,11 +80,11 @@ <Table> <row> <cell fill="none"> - <JButton text="lima.ui.common.cancel" + <JButton id="cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.ui.common.ok" + <JButton id="ok" onActionPerformed="dispose()"/> </cell> </row> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css 2014-09-12 09:07:40 UTC (rev 3914) @@ -0,0 +1,30 @@ +#toolBar { + floatable : false; +} + +#addButton { + toolTipText : "lima.account.add"; + actionIcon : "account-new"; +} + +#updateButton { + toolTipText : "lima.update.shortcut"; + actionIcon : "account-edit"; +} + +#removeButton { + toolTipText : "lima.remove.shortcut"; + actionIcon : "account-remove"; +} + +#importButton { + toolTipText : "lima.importExport.import"; + actionIcon : "account-import"; +} + +#accountsTreeTable { + selectionMode : "{ListSelectionModel.SINGLE_SELECTION}"; + treeCellRenderer : "{new AccountTreeTableRenderer()}"; + highlighters : "{HighlighterFactory.createSimpleStriping(new java.awt.Color(233,233,233))}"; + +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -23,7 +23,8 @@ #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> + <import> javax.swing.ListSelectionModel org.jdesktop.swingx.JXTreeTable @@ -40,46 +41,28 @@ } ]]></script> - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> + <JToolBar id="toolBar" + constraints="BorderLayout.PAGE_START"> - <JButton id="addButton" - toolTipText="{ t("lima.ui.account.addaccount") + " (Ctrl+N)"}" - actionIcon='account-new' - onActionPerformed="handler.addAccount()"/> + <JButton id="addButton" + onActionPerformed="handler.addAccount()"/> - <JButton id="updateButton" - toolTipText="{ t("lima.ui.common.update") + " (Ctrl+M)"}" - actionIcon='account-edit' - onActionPerformed="handler.updateAccount()" - enabled="{isSelectedRow()}"/> + <JButton id="updateButton" + onActionPerformed="handler.updateAccount()" + enabled="{isSelectedRow()}"/> - <JButton id="removeButton" - toolTipText="{ t("lima.ui.common.remove") + " (Del)"}" - actionIcon='account-remove' - onActionPerformed="handler.removeAccount()" - enabled="{isSelectedRow()}"/> + <JButton id="removeButton" + onActionPerformed="handler.removeAccount()" + enabled="{isSelectedRow()}"/> - <JButton id="importButton" - actionIcon='account-import' - toolTipText="lima.ui.importexport.import" - onActionPerformed="handler.importAccountsChart()"/> + <JButton id="importButton" + onActionPerformed="handler.importAccountsChart()"/> - </JToolBar> - </cell> - </row> + </JToolBar> - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <JXTreeTable id="accountsTreeTable" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}" - treeCellRenderer="{new AccountTreeTableRenderer()}" - highlighters="{HighlighterFactory.createSimpleStriping(new java.awt.Color(233,233,233))}"/> - <ListSelectionModel initializer='accountsTreeTable.getSelectionModel()' - onValueChanged="setSelectedRow(accountsTreeTable.getSelectedRow() != -1)"/> - </JScrollPane> - </cell> - </row> -</Table> + <JScrollPane constraints="BorderLayout.CENTER"> + <JXTreeTable id="accountsTreeTable"/> + <ListSelectionModel initializer='accountsTreeTable.getSelectionModel()' + onValueChanged="setSelectedRow(accountsTreeTable.getSelectedRow() != -1)"/> + </JScrollPane> +</JPanel> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -282,9 +282,9 @@ model.insertNodeInto(newNode, node, node.getChildCount()); treeTable.expandPath(new TreePath(model.getPathToRoot(node))); } catch (AlreadyExistAccountException e) { - errorHelper.showErrorMessage(t("lima.ui.account.add.error.alreadyExist", e.getAccountNumber())); + errorHelper.showErrorMessage(t("lima.account.add.error.alreadyExist", e.getAccountNumber())); } catch (InvalidAccountNumberException e) { - errorHelper.showErrorMessage(t("lima.ui.account.add.error.InvalidAccountNumber", e.getAccountNumber())); + errorHelper.showErrorMessage(t("lima.account.add.error.InvalidAccountNumber", e.getAccountNumber())); } catch (NotNumberAccountNumberException e) { errorHelper.showErrorMessage(t("lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException", e.getAccountNumber())); } catch (NotAllowedLabelException e) { @@ -396,7 +396,7 @@ model.valueForPathChanged(treePath, account); } catch (InvalidAccountNumberException e) { - errorHelper.showErrorMessage(t("lima.ui.account.update.error.invalidAccountNumber", e.getAccountNumber())); + errorHelper.showErrorMessage(t("lima.account.update.error.invalidAccountNumber", e.getAccountNumber())); } catch (NotNumberAccountNumberException e) { errorHelper.showErrorMessage(t("lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException", e.getAccountNumber())); } finally { @@ -418,8 +418,8 @@ Account account = (Account)lastNode.getUserObject(); int response = JOptionPane.showConfirmDialog(view, - t("lima.ui.account.removeaccountconfirm", account.getAccountNumber()), - t("lima.ui.account.removeaccounttitle"), + t("lima.account.removeaccountconfirm", account.getAccountNumber()), + t("lima.account.removeaccounttitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { @@ -437,7 +437,7 @@ // remove node model.removeNodeFromParent(lastNode); } catch (UsedAccountException e) { - errorHelper.showErrorMessage(t("lima.ui.account.remove.error.usedAccount", e.getAccountNumber())); + errorHelper.showErrorMessage(t("lima.account.remove.error.usedAccount", e.getAccountNumber())); } } } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css 2014-09-12 09:07:40 UTC (rev 3914) @@ -0,0 +1,30 @@ +#updateAccountFormDialog { + title : "lima.account.update.form"; +} + +#numberLabel { + text : "lima.charts.account.number"; + labelFor : "{numberTextField}"; +} + +#numberTextField { + text : "{getAccount().getAccountNumber()}"; + enabled : false; +} + +#descriptionLabel { + text : "lima.label"; + labelFor : "{descriptionTextField}"; +} + +#descriptionTextField{ + text : "{getAccount().getLabel()}"; +} + +#cancel { + text : "lima.cancel"; +} + +#ok { + text : "lima.ok"; +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -22,8 +22,10 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.ui.account.updateaccounttitle" modal="true" - defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="dispose()"> +<JDialog id="updateAccountFormDialog" + modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="dispose()"> <import> javax.swing.text.Document @@ -37,7 +39,7 @@ <script> <![CDATA[ - getRootPane().setDefaultButton(okButton); + getRootPane().setDefaultButton(ok); ]]> </script> @@ -45,20 +47,18 @@ <row> <cell fill="horizontal"> - <JLabel text="lima.ui.account.number" labelFor='{numberTextField}'/> + <JLabel id="numberLabel" /> </cell> <cell fill="horizontal"> - <JTextField id="numberTextField" - enabled="false" - text="{getAccount().getAccountNumber()}"/> + <JTextField id="numberTextField"/> </cell> </row> <row> <cell fill="horizontal"> - <JLabel text="lima.ui.account.label" labelFor='{descriptionTextField}'/> + <JLabel id="descriptionLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="descriptionTextField" text="{getAccount().getLabel()}"/> + <JTextField id="descriptionTextField"/> <Document initializer="descriptionTextField.getDocument()" onInsertUpdate='account.setLabel(descriptionTextField.getText())' onRemoveUpdate='account.setLabel(descriptionTextField.getText())'/> @@ -67,8 +67,9 @@ <row> <cell columns="2"> <JPanel layout='{new GridLayout(1,0)}'> - <JButton text="lima.ui.common.cancel" onActionPerformed="dispose()"/> - <JButton id="okButton" text="lima.ui.common.ok" + <JButton id="cancel" + onActionPerformed="dispose()"/> + <JButton id="ok" onActionPerformed="handler.updateAccount(this)"/> </JPanel> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -179,7 +179,7 @@ @Override public String getColumnName(int column) { - String result = t("lima.ui.nonaffect"); + String result = t("lima.nonaffect"); if (column >= 0 && column < columns.size()) { result = columns.get(column).getColumnName(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -230,7 +230,7 @@ financialTransactionService.updateEntry(entry); updated = true; } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.update.closed.entryBook.error", + errorHelper.showErrorMessage(t("lima.entry.update.closed.entryBook.error", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -250,17 +250,17 @@ update = true; } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.update.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.update.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.update.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.update.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.update.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.update.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.update.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.financialTransaction.update.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.ui.entrybook.entrybooktile" modal="true" +<JDialog title="lima.entrybook.entrybooktile" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -46,7 +46,7 @@ <Table> <row> <cell> - <JLabel text="lima.ui.entrybook.code"/> + <JLabel text="lima.entrybook.code"/> </cell> <cell> <JTextField id="entryBookCodeField" text="{getEntryBook().getCode()}" enabled='{isAddState()}' /> @@ -57,7 +57,7 @@ </row> <row> <cell> - <JLabel text="lima.ui.entrybook.label"/> + <JLabel text="lima.entrybook.label"/> </cell> <cell> <JTextField id="entryBookLabelField" @@ -69,11 +69,11 @@ </row> <row> <cell> - <JButton id="cancelButton" text="lima.ui.common.cancel" + <JButton id="cancelButton" text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell> - <JButton id="okButton" text="lima.ui.common.ok" + <JButton id="okButton" text="lima.ok" onActionPerformed="dispose()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.ui.entrybook.importtitle" modal="true" +<JDialog title="lima.entrybook.importtitle" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -46,13 +46,13 @@ <Table> <row> <cell> - <JRadioButton text='lima.ui.entrybook.default' + <JRadioButton text='lima.entrybook.default' value='{EntryBooksChartEnum.DEFAULT}' buttonGroup="{buttonGroup}" selected='true'/> </cell> <cell> - <JRadioButton text='lima.ui.entrybook.import' + <JRadioButton text='lima.entrybook.import' value='{EntryBooksChartEnum.IMPORT}' buttonGroup="{buttonGroup}"/> </cell> @@ -62,11 +62,11 @@ <Table> <row> <cell fill="none"> - <JButton text="lima.ui.common.cancel" + <JButton text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="okButton" text="lima.ui.common.ok" + <JButton id="okButton" text="lima.ok" onActionPerformed="dispose()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -48,13 +48,13 @@ @Override protected void initColumn() { - addColumn(new AbstractColumn<EntryBookTableModel>(String.class, t("lima.ui.entrybook.code"), false) { + addColumn(new AbstractColumn<EntryBookTableModel>(String.class, t("lima.entrybook.code"), false) { @Override public Object getValueAt(int row) { return tableModel.get(row).getCode(); } }); - addColumn(new AbstractColumn<EntryBookTableModel>(String.class, t("lima.ui.entrybook.label"), false) { + addColumn(new AbstractColumn<EntryBookTableModel>(String.class, t("lima.entrybook.label"), false) { @Override public Object getValueAt(int row) { return tableModel.get(row).getLabel(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -45,25 +45,25 @@ <JToolBar floatable="false"> <JButton id="addButton" - toolTipText="{ t("lima.ui.entrybook.add") + " (Ctrl+N)"}" + toolTipText="{ t("lima.entrybook.add") + " (Ctrl+N)"}" actionIcon='entryBook-new' onActionPerformed="handler.addEntryBook()"/> <JButton id="updateButton" - toolTipText="{ t("lima.ui.entrybook.update") + " (Ctrl+M)"}" + toolTipText="{ t("lima.entrybook.update") + " (Ctrl+M)"}" actionIcon='entryBook-edit' onActionPerformed="handler.updateEntryBook()" enabled="{isSelectedRow()}"/> <JButton id="removeButton" - toolTipText="{ t("lima.ui.entrybook.remove") + " (Del)"}" + toolTipText="{ t("lima.entrybook.remove") + " (Del)"}" actionIcon='entryBook-remove' onActionPerformed="handler.deleteEntryBook()" enabled="{isSelectedRow()}"/> <JButton id="importButton" actionIcon='entryBook-import' - toolTipText="lima.ui.importexport.import" + toolTipText="lima.importExport.import" onActionPerformed="handler.importEntryBooks()"/> </JToolBar> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -244,8 +244,8 @@ EntryBook selectedEntryBook = entryBookTableModel.get(selectedRow); int response = JOptionPane.showConfirmDialog(view, - t("lima.ui.entrybook.deletemessage", selectedEntryBook.getLabel()), - t("lima.ui.entrybook.deletetitle"), JOptionPane.YES_NO_OPTION, + t("lima.entrybook.deletemessage", selectedEntryBook.getLabel()), + t("lima.entrybook.deletetitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { @@ -253,7 +253,7 @@ entryBookService.removeEntryBook(selectedEntryBook); entryBookTableModel.remove(selectedEntryBook); } catch (UsedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.entryBook.delete.used.error", e.getEntryBook().getCode(), e.getEntryBook().getLabel())); + errorHelper.showErrorMessage(t("lima.entryBook.delete.used.error", e.getEntryBook().getCode(), e.getEntryBook().getLabel())); } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -52,7 +52,7 @@ @Override protected void initColumn() { - addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, t("lima.ui.financialperiod.begin"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, t("lima.financialperiod.begin"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); @@ -61,7 +61,7 @@ } }); - addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, t("lima.ui.financialperiod.end"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, t("lima.financialperiod.end"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); @@ -70,7 +70,7 @@ } }); - addColumn(new AbstractColumn<FinancialPeriodTableModel>(EntryBook.class, t("lima.ui.financialperiod.entrybook"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(EntryBook.class, t("lima.financialperiod.entrybook"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); @@ -78,13 +78,13 @@ } }); - addColumn(new AbstractColumn<FinancialPeriodTableModel>(String.class, t("lima.ui.financialperiod.status"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(String.class, t("lima.financialperiod.status"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); - String status = t("lima.common.open"); + String status = t("lima.open"); if (closedPeriodicEntryBook.isLocked()) { - status = t("lima.common.closed"); + status = t("lima.closed"); } return status; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -47,7 +47,7 @@ <JToolBar floatable="false"> <JButton id="blockButton" - toolTipText="{ t("lima.ui.financialperiod.block") + " (Ctrl+C)"}" + toolTipText="{ t("lima.financialperiod.block") + " (Ctrl+C)"}" actionIcon='financialPeriod-close' onActionPerformed="handler.blockFinancialPeriod()" enabled="{isSelectedPeriod()}"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -125,8 +125,8 @@ // blocked it ClosedPeriodicEntryBook closedPeriodicEntryBook = model.get(selectedRow); - int response = JOptionPane.showConfirmDialog(view, t("lima.ui.financialperiod.blockmessage"), - t("lima.ui.financialperiod.blocktitle"), + int response = JOptionPane.showConfirmDialog(view, t("lima.financialperiod.blockmessage"), + t("lima.financialperiod.blocktitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { @@ -134,50 +134,50 @@ closedPeriodicEntryBook = financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); model.setValue(selectedRow, closedPeriodicEntryBook); } catch (UnbalancedFinancialTransactionsException e) { - StringBuilder message = new StringBuilder(t("lima.ui.financialperiod.block.error.unbalanced.main")); + StringBuilder message = new StringBuilder(t("lima.financialperiod.block.error.unbalanced.main")); for (FinancialTransaction transaction : e.getFinancialTransactions()) { message.append("\n - "); - message.append(t("lima.ui.financialperiod.block.error.unbalanced.transaction", + message.append(t("lima.financialperiod.block.error.unbalanced.transaction", transaction.getTransactionDate(), BigDecimalTableCellRenderer.format(transaction.getAmountDebit()), BigDecimalTableCellRenderer.format(transaction.getAmountCredit()))); } errorHelper.showErrorMessage(message.toString()); } catch (UnfilledEntriesException e) { - StringBuilder message = new StringBuilder(t("lima.ui.financialperiod.block.error.unfilled.main")); + StringBuilder message = new StringBuilder(t("lima.financialperiod.block.error.unfilled.main")); for (Entry entry : e.getEntries()) { message.append("\n - "); - message.append(t("lima.ui.financialperiod.block.error.unfilled.entry", + message.append(t("lima.financialperiod.block.error.unfilled.entry", entry.getFinancialTransaction().getTransactionDate(), BigDecimalTableCellRenderer.format(entry.getAmount()))); if (entry.getAccount() == null) { message.append("\n - "); - message.append(t("lima.ui.financialperiod.block.error.unfilled.noAccount")); + message.append(t("lima.financialperiod.block.error.unfilled.noAccount")); } if (StringUtils.isBlank(entry.getVoucher())) { message.append("\n - " ); - message.append(t("lima.ui.financialperiod.block.error.unfilled.noVoucher")); + message.append(t("lima.financialperiod.block.error.unfilled.noVoucher")); } if (StringUtils.isBlank(entry.getDescription())) { message.append("\n - "); - message.append(t("lima.ui.financialperiod.block.error.unfilled.noDescription")); + message.append(t("lima.financialperiod.block.error.unfilled.noDescription")); } } errorHelper.showErrorMessage(message.toString()); } catch (WithoutEntryBookFinancialTransactionsException e) { - StringBuilder message = new StringBuilder(t("lima.ui.financialperiod.block.error.withoutEntryBook.main")); + StringBuilder message = new StringBuilder(t("lima.financialperiod.block.error.withoutEntryBook.main")); for (FinancialTransaction transaction : e.getFinancialTransactions()) { message.append("\n - "); - message.append(t("lima.ui.financialperiod.block.error.withoutEntryBook.transaction", + message.append(t("lima.financialperiod.block.error.withoutEntryBook.transaction", transaction.getTransactionDate(), BigDecimalTableCellRenderer.format(transaction.getAmountCredit()))); } errorHelper.showErrorMessage(message.toString()); } catch (NotLockedClosedPeriodicEntryBooksException e) { - StringBuilder message = new StringBuilder(t("lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.main")); + StringBuilder message = new StringBuilder(t("lima.financialperiod.block.error.noLockedPreviousEntryBook.main")); for (ClosedPeriodicEntryBook previousClosedPeriodicEntryBook : e.getClosedPeriodicEntryBooks()) { message.append("\n - "); - message.append(t("lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook", + message.append(t("lima.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook", previousClosedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), previousClosedPeriodicEntryBook.getFinancialPeriod().getEndDate())); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -214,7 +214,7 @@ financialStatementService.createFinancialStatement( parentFinancialStatementHeader, financialStatement); } catch (AlreadyExistFinancialStatement alreadyExistFinancialStatement) { - errorHelper.showErrorMessage(t("lima.importexport.import.alreadyExistFinancialStatement", + errorHelper.showErrorMessage(t("lima.importExport.import.alreadyExistFinancialStatement", alreadyExistFinancialStatement.getFinancialStatementLabel(), alreadyExistFinancialStatement.getMasterLabel())); } catch (NotAllowedLabelException notAllowedLabel) { errorHelper.showErrorMessage(t("lima.financialstatement.notAllowedLabel", Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -51,19 +51,19 @@ enabled="{isSelectedRow()}"/> <JButton id="updateButton" - toolTipText="{ t("lima.common.update") + " (Ctrl+M)"}" + toolTipText="{ t("lima.update") + " (Ctrl+M)"}" actionIcon='financialstatement-edit' onActionPerformed="handler.updateFinancialStatement()" enabled="{isSelectedRow()}"/> <JButton id="removeButton" - toolTipText="{ t("lima.common.remove") + " (Del)"}" + toolTipText="{ t("lima.remove") + " (Del)"}" actionIcon='financialstatement-remove' onActionPerformed="handler.removeFinancialStatement()" enabled="{isSelectedRow()}"/> <JButton id="importButton" - toolTipText="{ t("lima.ui.importexport.import") + " (Ctrl+I)"}" + toolTipText="{ t("lima.importExport.import") + " (Ctrl+I)"}" actionIcon='financialstatement-import' onActionPerformed="handler.importFinancialStatementChart()"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -340,7 +340,7 @@ if (selectedRow != -1) { int n = JOptionPane.showConfirmDialog(view, t("lima.charts.account.question.remove"), - t("lima.common.confirmation"), + t("lima.confirmation"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (n == JOptionPane.YES_OPTION) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -78,7 +78,7 @@ </row> <row> <cell> - <JRadioButton text='lima.ui.importexport.import' + <JRadioButton text='lima.importExport.import' value='{FinancialStatementsChartEnum.IMPORT}' buttonGroup="{getRadioButtons()}" selected='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -37,7 +37,7 @@ public class AccountColumn extends AbstractColumn<FinancialTransactionTableModel> { public AccountColumn() { - super(Account.class, t("lima.ui.financialtransaction.account"), true); + super(Account.class, t("lima.financialtransaction.account"), true); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -38,7 +38,7 @@ public class CreditColumn extends AbstractColumn<FinancialTransactionTableModel> { public CreditColumn() { - super(BigDecimal.class, t("lima.ui.financialtransaction.credit"), true); + super(BigDecimal.class, t("lima.financialtransaction.credit"), true); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -39,7 +39,7 @@ public class DateColumn extends AbstractColumn<FinancialTransactionTableModel> { public DateColumn(){ - super(Date.class, t("lima.ui.financialtransaction.date"), true); + super(Date.class, t("lima.financialtransaction.date"), true); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -38,7 +38,7 @@ public class DebitColumn extends AbstractColumn<FinancialTransactionTableModel> { public DebitColumn() { - super(BigDecimal.class, t("lima.ui.financialtransaction.debit"), true); + super(BigDecimal.class, t("lima.financialtransaction.debit"), true); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -37,8 +37,8 @@ public class DescriptionColumn<T extends FinancialTransactionTableModel> extends AbstractColumn<T> { public DescriptionColumn() { - super(String.class, t("lima.ui.financialtransaction.description"), true); - setCellEditor(new AutoCompleteTableCellEditor("lima.ui.financialtransaction.description")); + super(String.class, t("lima.financialtransaction.description"), true); + setCellEditor(new AutoCompleteTableCellEditor("lima.financialtransaction.description")); } @Override public Object getValueAt(int row) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -103,7 +103,7 @@ labelFor='{fiscalPeriodComboBox}'/> <org.chorem.lima.ui.common.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/> <JComboBox id="fiscalPeriodComboBox" model="{fiscalPeriodComboBoxModel}" - toolTipText="lima.ui.financialtransaction.fiscalyear" + toolTipText="lima.financialtransaction.fiscalyear" renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" onItemStateChanged="handler.fiscalPeriodSelected(event)"/> @@ -112,14 +112,14 @@ <org.chorem.lima.ui.common.FinancialPeriodComboBoxModel id="financialPeriodComboBoxModel"/> <JComboBox id="financialPeriodComboBox" model="{financialPeriodComboBoxModel}" - toolTipText="lima.ui.financialtransaction.financialperiod" + toolTipText="lima.financialtransaction.financialperiod" renderer="{new org.chorem.lima.ui.common.FinancialPeriodListRenderer()}" onItemStateChanged="handler.financialPeriodSelected(event)"/> <JButton id="back" actionIcon="previous" - toolTipText="lima.ui.financialtransaction.previousfinancialperiod" + toolTipText="lima.financialtransaction.previousfinancialperiod" onActionPerformed="handler.back(financialPeriodComboBox)"/> <JButton id="next" actionIcon="next" - toolTipText="lima.ui.financialtransaction.nextfinancialperiod" + toolTipText="lima.financialtransaction.nextfinancialperiod" onActionPerformed="handler.next(financialPeriodComboBox)"/> <JToolBar.Separator/> @@ -128,7 +128,7 @@ labelFor='{entryBookComboBox}'/> <org.chorem.lima.ui.common.EntryBookComboBoxModel id="entryBookComboBoxModel"/> <JComboBox id="entryBookComboBox" model="{entryBookComboBoxModel}" - toolTipText="lima.ui.financialtransaction.entrybook" + toolTipText="lima.financialtransaction.entrybook" renderer="{new org.chorem.lima.ui.common.EntryBookListRenderer()}" onItemStateChanged="handler.entryBookSelected(event)"/> </JToolBar> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -450,17 +450,17 @@ selectionModel.setSelectionInterval(index, index); table.editCellAt(index, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.paste.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.paste.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.paste.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.paste.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.paste.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.paste.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.paste.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.financialTransaction.paste.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -505,17 +505,17 @@ table.changeSelection(index, 1, false, false); table.editCellAt(index, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.paste.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entry.paste.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.paste.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entry.paste.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.paste.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entry.paste.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.paste.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entry.paste.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -556,17 +556,17 @@ table.changeSelection(addIndex, 1, false, false); table.editCellAt(addIndex, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.add.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.add.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.add.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.add.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.add.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.add.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.add.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.financialTransaction.add.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -660,17 +660,17 @@ table.changeSelection(row, 1, false, false); table.editCellAt(row, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.add.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entry.add.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.add.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entry.add.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.add.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entry.add.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.add.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entry.add.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -695,8 +695,8 @@ cellEditor.cancelCellEditing(); } int response = JOptionPane.showConfirmDialog( - view, t("lima.ui.financialtransaction.messageremovetransaction"), - t("lima.ui.financialtransaction.titleremovetransaction"), JOptionPane.YES_NO_OPTION); + view, t("lima.financialtransaction.messageremovetransaction"), + t("lima.financialtransaction.titleremovetransaction"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { try { @@ -712,11 +712,11 @@ table.editCellAt(indexSelectedRow, 1); } } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.delete.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.delete.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -740,8 +740,8 @@ cellEditor.cancelCellEditing(); } int response = JOptionPane.showConfirmDialog( - view, t("lima.ui.financialtransaction.messageremoveentry"), - t("lima.ui.financialtransaction.titleremoveentry"), JOptionPane.YES_NO_OPTION); + view, t("lima.financialtransaction.messageremoveentry"), + t("lima.financialtransaction.titleremoveentry"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { try { @@ -757,11 +757,11 @@ table.editCellAt(indexSelectedRow, 1); } } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.delete.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.delete.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -811,7 +811,7 @@ tableModel.fireTableRowsUpdated(firstRow, lastRow); table.editCellAt(selectedRow, selectedColumn); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.entries.assign.closed.entryBook.error", + errorHelper.showErrorMessage(t("lima.entries.assign.closed.entryBook.error", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -37,8 +37,8 @@ public class VoucherColumn extends AbstractColumn<FinancialTransactionTableModel> { public VoucherColumn() { - super(String.class, t("lima.ui.financialtransaction.voucher"), true); - setCellEditor(new AutoCompleteTableCellEditor("lima.ui.financialtransaction.voucher")); + super(String.class, t("lima.financialtransaction.voucher"), true); + setCellEditor(new AutoCompleteTableCellEditor("lima.financialtransaction.voucher")); } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -90,7 +90,7 @@ actionIcon='filter-transaction-credit' onActionPerformed="getHandler().addCreditCondition()"/> <JToolBar.Separator/> - <JButton toolTipText="{ t("lima.ui.common.refresh") + " (F5)"}" actionIcon='refresh' + <JButton toolTipText="{ t("lima.refresh") + " (F5)"}" actionIcon='refresh' onActionPerformed="getHandler().refresh()"/> </JToolBar> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -73,13 +73,13 @@ actionIcon='choose-fiscal-year' labelFor='{fiscalPeriodComboBox}'/> <JComboBox id="fiscalPeriodComboBox" model="{modelFiscalPeriod}" - toolTipText="lima.ui.financialtransaction.fiscalyear" + toolTipText="lima.financialtransaction.fiscalyear" renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" onActionPerformed="getFinancialTransactionUnbalancedTableModel().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem()); getHandler().refresh()" editable="false"/> <JToolBar.Separator/> - <JButton toolTipText="{ t("lima.ui.common.refresh") + " (F5)"}" actionIcon='refresh' + <JButton toolTipText="{ t("lima.refresh") + " (F5)"}" actionIcon='refresh' onActionPerformed="getHandler().refresh()"/> </JToolBar> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -182,17 +182,17 @@ table.changeSelection(row, 1, false, false); table.editCellAt(row, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.add.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entry.add.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.add.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entry.add.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.add.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entry.add.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.entry.add.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entry.add.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -226,7 +226,7 @@ String message = t("lima.charts.financialtransaction.question.removeentry"); int response = JOptionPane.showConfirmDialog(view, message, - t("lima.common.confirmation"), JOptionPane.YES_NO_OPTION); + t("lima.confirmation"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { try { @@ -244,11 +244,11 @@ table.editCellAt(indexSelectedRow, 1); } } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.delete.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.delete.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -283,7 +283,7 @@ String message = t("lima.charts.financialtransaction.question.removetransaction"); int response = JOptionPane.showConfirmDialog(view, message, - t("lima.common.confirmation"), JOptionPane.YES_NO_OPTION); + t("lima.confirmation"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { try { @@ -301,11 +301,11 @@ table.editCellAt(indexSelectedRow, 1); } } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.delete.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.financialTransaction.delete.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -58,7 +58,7 @@ @Override protected void initColumn() { - addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, t("lima.ui.fiscalperiod.begin"), false) { + addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, t("lima.fiscalperiod.begin"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod = tableModel.get(row); @@ -66,7 +66,7 @@ } }); - addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, t("lima.ui.fiscalperiod.end"), false) { + addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, t("lima.fiscalperiod.end"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod = tableModel.get(row); @@ -74,13 +74,13 @@ } }); - addColumn(new AbstractColumn<FiscalPeriodTableModel>(String.class, t("lima.ui.fiscalperiod.status"), false) { + addColumn(new AbstractColumn<FiscalPeriodTableModel>(String.class, t("lima.fiscalperiod.status"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod = tableModel.get(row); - String status = t("lima.ui.fiscalperiod.open"); + String status = t("lima.fiscalperiod.open"); if (fiscalPeriod.isLocked()) { - status = t("lima.ui.fiscalperiod.closed"); + status = t("lima.fiscalperiod.closed"); } return status; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -183,7 +183,7 @@ AddPeriod addPeriodDialog = new AddPeriod(view); - addPeriodDialog.setTitle(t("lima.ui.fiscalperiod.addfiscalperiodtitle")); + addPeriodDialog.setTitle(t("lima.fiscalperiod.addfiscalperiodtitle")); addPeriodDialog.getBeginDatePicker().setDate(beginDate); addPeriodDialog.getEndDatePicker().setDate(endDate); addPeriodDialog.setLocationRelativeTo(view); @@ -197,14 +197,14 @@ fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); tableModel.addValue(fiscalPeriod); } catch (BeginAfterEndFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.fiscalPeriod.add.error.beginAfterEndFiscalPeriod", + errorHelper.showErrorMessage(t("lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod", e.getFiscalPeriod().getBeginDate(), e.getFiscalPeriod().getEndDate())); } catch (MoreOneUnlockFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod", + errorHelper.showErrorMessage(t("lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod", e.getCountUnlockFiscalPeriod())); } catch (NotBeginNextDayOfLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod", e.getFiscalPeriod().getEndDate())); } } @@ -219,7 +219,7 @@ if (!addPeriodDialog.isValidate()) { return false; } else if (endDate.before(beginDate)) { - errorHelper.showErrorMessage(t("lima.ui.fiscalPeriod.add.error.beginAfterEndFiscalPeriod", + errorHelper.showErrorMessage(t("lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod", beginDate, endDate)); return false; @@ -229,7 +229,7 @@ int response = JOptionPane.YES_OPTION; if (nbMonth != 12) { response = JOptionPane.showConfirmDialog(view, - t("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), + t("lima.fiscalperiod.addfiscalperiod.morethan12"), title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); } @@ -258,7 +258,7 @@ if (!selectedFiscalPeriod.isLocked()) { AddPeriod addPeriodDialog = new AddPeriod(view); - addPeriodDialog.setTitle(t("lima.ui.fiscalperiod.modifyfiscalperiodtitle")); + addPeriodDialog.setTitle(t("lima.fiscalperiod.modifyfiscalperiodtitle")); addPeriodDialog.getBeginDatePicker().setDate(selectedFiscalPeriod.getBeginDate()); addPeriodDialog.getEndDatePicker().setDate(selectedFiscalPeriod.getEndDate()); addPeriodDialog.setModifyPeriod(true); @@ -293,8 +293,8 @@ //check if the user want to delete the fiscal year int response = JOptionPane.showConfirmDialog(view, - t("lima.ui.fiscalperiod.delete.confirmation"), - t("lima.ui.fiscalperiod.delete.title"), JOptionPane.YES_NO_OPTION, + t("lima.fiscalperiod.delete.confirmation"), + t("lima.fiscalperiod.delete.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.YES_OPTION) { @@ -305,7 +305,7 @@ view.setBlockEnabled(false); view.setDeleteEnabled(false); } catch (NoEmptyFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.fiscalPeriod.delete.error.noEmptyFiscalPeriod", + errorHelper.showErrorMessage(t("lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod", e.getFinancialTransactions().size())); } } @@ -332,8 +332,8 @@ //check if the user want to block the fiscal year int answerBlock = JOptionPane.showConfirmDialog(view, - t("lima.ui.fiscalperiod.block.confirmation"), - t("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, + t("lima.fiscalperiod.block.confirmation"), + t("lima.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (answerBlock == JOptionPane.YES_OPTION) { @@ -347,8 +347,8 @@ //check if the user wants to create a new fiscal year int answerCreate = JOptionPane.showConfirmDialog(view, - t("lima.ui.fiscalperiod.block.newyear"), - t("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, + t("lima.fiscalperiod.block.newyear"), + t("lima.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); // create a new fiscal year @@ -363,16 +363,16 @@ if (selectedFiscalPeriod.equals(lastFiscalPeriod)) { JOptionPane.showMessageDialog(view, - t("lima.ui.fiscalperiod.block.cantBalanceIfNextPeriodNotExist"), - t("lima.ui.fiscalperiod.block.title"), + t("lima.fiscalperiod.block.cantBalanceIfNextPeriodNotExist"), + t("lima.fiscalperiod.block.title"), JOptionPane.ERROR_MESSAGE); } else { //check if the user wants to report datas int answerRetainedEarnings = JOptionPane.showConfirmDialog(view, - t("lima.ui.fiscalperiod.block.addretainedearnings"), - t("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, + t("lima.fiscalperiod.block.addretainedearnings"), + t("lima.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (answerRetainedEarnings == JOptionPane.YES_OPTION) { @@ -414,16 +414,16 @@ } else { JOptionPane.showMessageDialog(view, - t("lima.ui.fiscalperiod.block.cantBalanceNotBook"), - t("lima.ui.fiscalperiod.block.title"), + t("lima.fiscalperiod.block.cantBalanceNotBook"), + t("lima.fiscalperiod.block.title"), JOptionPane.ERROR_MESSAGE); } } else { JOptionPane.showMessageDialog(view, - t("lima.ui.fiscalperiod.block.cantBlockNotBalance"), - t("lima.ui.fiscalperiod.block.title"), + t("lima.fiscalperiod.block.cantBlockNotBalance"), + t("lima.fiscalperiod.block.title"), JOptionPane.ERROR_MESSAGE); } } @@ -436,11 +436,11 @@ view.setBlockEnabled(false); view.setDeleteEnabled(false); } catch (LastUnlockedFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.fiscalPeriod.block.error.lastUnlockedFiscalPeriod", + errorHelper.showErrorMessage(t("lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod", e.getFiscalPeriod().getBeginDate(), e.getFiscalPeriod().getEndDate())); } catch (AlreadyLockedFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod")); + errorHelper.showErrorMessage(t("lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod")); } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.ui.fiscalperiod.block.retainedearningstitle" modal="true" +<JDialog title="lima.fiscalperiod.block.retainedearningstitle" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> @@ -81,7 +81,7 @@ <cell anchor="west"> <JRadioButton id="selectedEntryBook" - text="lima.common.entrybook" + text="lima.entrybook" selected="true" buttonGroup="EntryBookGroup" onActionPerformed="performNew()"/> @@ -89,7 +89,7 @@ </row> <row> <cell> - <JLabel id="entryBookSelectorLabel" text="lima.common.entrybook"/> + <JLabel id="entryBookSelectorLabel" text="lima.entrybook"/> </cell> <cell> <org.chorem.lima.ui.combobox.EntryBookComboBoxModel id="modelEntryBookComboBox"/> @@ -104,7 +104,7 @@ <cell anchor="west"> <JRadioButton id="newEntryBook" - text="lima.ui.fiscalperiod.entrybooks.create" + text="lima.fiscalperiod.entrybooks.create" selected="false" buttonGroup="EntryBookGroup" onActionPerformed="performNew()"/> @@ -112,7 +112,7 @@ </row> <row> <cell> - <JLabel text="lima.common.code"/> + <JLabel text="lima.code"/> </cell> <cell> <JTextField id="entryBookCodeField" text="{getEntryBook().getCode()}"/> @@ -123,7 +123,7 @@ </row> <row> <cell> - <JLabel text="lima.common.label"/> + <JLabel text="lima.label"/> </cell> <cell> <JTextField id="entryBookLabelField" editable='{isAddState()}' Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -21,14 +21,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true" id="waitDialog" title="lima.ui.importexport.waittitle"> +<JDialog modal="true" id="waitDialog" title="lima.importExport.waittitle"> <Table> <row> <cell> <org.jdesktop.swingx.JXBusyLabel id='busylabel' busy='true'/> </cell> <cell> - <JLabel text='lima.ui.retainedEarnings.wait'/> + <JLabel text='lima.retainedEarnings.wait'/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -262,8 +262,8 @@ if (verboseMode) { ImportExportResults results = get(); if (importMode && results == null) { - JOptionPane.showMessageDialog(viewComponent, t("lima.ui.importexport.importerror"), - t("lima.ui.importexport.importtitle"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(viewComponent, t("lima.importExport.importerror"), + t("lima.importExport.importtitle"), JOptionPane.ERROR_MESSAGE); } else { if (importMode) { @@ -300,7 +300,7 @@ List<ExportException> exportExceptions = result.getExportExceptions(); if (exportExceptions != null && !exportExceptions.isEmpty()) { - message.append(t("lima.ui.importexport.export.exceptions")); + message.append(t("lima.importExport.export.exceptions")); } } @@ -309,15 +309,15 @@ protected void ComputeImportResultMessage(List<ImportResult> resultList) { StringBuilder message = new StringBuilder(); - message.append(t("lima.ui.importexport.import.terminated")); + message.append(t("lima.importExport.import.terminated")); StringBuilder errorMessage = null; for (ImportResult result : resultList) { Class fromSource = result.getFromSource(); message.append("Import "); message.append(getFromSourceMessage(fromSource)); - message.append(t("lima.ui.importexport.import.nbCreated", result.getNbCreated())); - message.append(t("lima.ui.importexport.import.nbUpdated", result.getNbUpdated())); - message.append(t("lima.ui.importexport.import.nbIgnored", result.getNbIgnored())); + message.append(t("lima.importExport.import.nbCreated", result.getNbCreated())); + message.append(t("lima.importExport.import.nbUpdated", result.getNbUpdated())); + message.append(t("lima.importExport.import.nbIgnored", result.getNbIgnored())); Map<Integer, LimaException> exceptionsByLine = result.getAllExceptionsByLine(); errorMessage = displayErrorMessage(exceptionsByLine); @@ -339,7 +339,7 @@ log.debug(message.toString()); } - String title = importMode ? t("lima.ui.importexport.import.terminated") : t("lima.ui.importexport.export.terminated"); + String title = importMode ? t("lima.importExport.import.terminated") : t("lima.importExport.export.terminated"); JOptionPane.showMessageDialog( waitView, message.toString(), @@ -351,7 +351,7 @@ StringBuilder result = new StringBuilder(); if (exceptionsByLine != null) { for (Map.Entry<Integer, LimaException> e:exceptionsByLine.entrySet()) { - result.append(t("lima.ui.importexport.import.line", e.getKey())); + result.append(t("lima.importExport.import.line", e.getKey())); LimaException importException = e.getValue(); if (importException instanceof InvalidAccountNumberException) { result.append(t("lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException", ((InvalidAccountNumberException) importException).getAccountNumber())); @@ -409,21 +409,21 @@ if (fromSource == null) { message = "BACKUP"+"\n"; } else if (fromSource.equals(Account.class)){ - message = t("lima.ui.importexport.account")+"\n"; + message = t("lima.importExport.account")+"\n"; } else if (fromSource.equals(EntryBook.class)) { - message = t("lima.ui.importexport.entrybook")+"\n"; + message = t("lima.importExport.entrybook")+"\n"; } else if (fromSource.equals(Entry.class)) { - message = t("lima.ui.importexport.entry")+"\n"; + message = t("lima.importExport.entry")+"\n"; } else if (fromSource.equals(FinancialStatement.class)) { - message = t("lima.ui.importexport.financialStatement")+"\n"; + message = t("lima.importExport.financialStatement")+"\n"; } else if (fromSource.equals(FinancialTransaction.class)) { - message = t("lima.ui.importexport.financialTransaction")+"\n"; + message = t("lima.importExport.financialTransaction")+"\n"; } else if (fromSource.equals(FiscalPeriod.class)) { - message = t("lima.ui.importexport.fiscalPeriod")+"\n"; + message = t("lima.importExport.fiscalPeriod")+"\n"; } else if (fromSource.equals(Identity.class)) { - message = t("lima.ui.importexport.identity")+"\n"; + message = t("lima.importExport.identity")+"\n"; } else if (fromSource.equals(VatStatement.class)) { - message = t("lima.ui.importexport.vatStatement")+"\n"; + message = t("lima.importExport.vatStatement")+"\n"; } else { throw new LimaTechnicalException("Source not know"); } @@ -449,7 +449,7 @@ if (importExportMethod.getEncodingOption()) { JPanel panel = new JPanel(); panel.setLayout(new BorderLayout()); - panel.add(new JLabel(t("lima.importexport.choiceencoding")), BorderLayout.WEST); + panel.add(new JLabel(t("lima.importExport.choiceencoding")), BorderLayout.WEST); panel.add(comboBox, BorderLayout.CENTER); ((Container) chooser.getComponent(2)).add(panel, BorderLayout.SOUTH); } @@ -457,16 +457,16 @@ String approveButtonText; if (importMode) { chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); - approveButtonText = t("lima.ui.importexport.import"); + approveButtonText = t("lima.importExport.import"); chooser.setDialogTitle(approveButtonText); chooser.setApproveButtonText(approveButtonText); } else if (importExportMethod.equals(ImportExportEnum.CSV_ALL_EXPORT)) { - approveButtonText = t("lima.ui.importexport.export"); + approveButtonText = t("lima.importExport.export"); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); chooser.setDialogTitle(approveButtonText); chooser.setApproveButtonText(approveButtonText); } else { - approveButtonText = t("lima.ui.importexport.export"); + approveButtonText = t("lima.importExport.export"); chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); chooser.setDialogTitle(approveButtonText); chooser.setApproveButtonText(approveButtonText); @@ -566,8 +566,8 @@ export.flush(); } catch (IOException e) { - errorHelper.showErrorMessage(t("lima.ui.importexport.export.failed")); - log.error(t("lima.ui.importexport.export.failed"), e); + errorHelper.showErrorMessage(t("lima.importExport.export.failed")); + log.error(t("lima.importExport.export.failed"), e); } finally { IOUtils.closeQuietly(export); IOUtils.closeQuietly(result); @@ -615,7 +615,7 @@ } } } catch (Exception e) { - result.addInitException(new ImportFileException(t("lima.ui.importexport.import.extractFileError"))); + result.addInitException(new ImportFileException(t("lima.importExport.import.extractFileError"))); log.error(e.getStackTrace()); } finally { IOUtils.closeQuietly(zipInputStream); @@ -659,7 +659,7 @@ if(log.isInfoEnabled()) { log.info(ex); } - result.addInitException(new ImportFileException(t("lima.ui.importexport.import.extractFileError"))); + result.addInitException(new ImportFileException(t("lima.importExport.import.extractFileError"))); } finally { IOUtils.closeQuietly(entryBooksStream); IOUtils.closeQuietly(transactionsStream); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -23,14 +23,14 @@ #L% --> -<JDialog modal="true" id="waitDialog" title="lima.ui.importexport.waittitle"> +<JDialog modal="true" id="waitDialog" title="lima.importExport.waittitle"> <Table> <row> <cell> <org.jdesktop.swingx.JXBusyLabel id='busylabel' busy='true'/> </cell> <cell> - <JLabel text='lima.ui.importexport.wait'/> + <JLabel text='lima.importExport.wait'/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -55,19 +55,19 @@ <JToolBar floatable="false"> <JButton id="lettered" - toolTipText="{ t("lima.ui.lettering.buttonLettered") + " (Ctrl+L)"}" + toolTipText="{ t("lima.lettering.buttonLettered") + " (Ctrl+L)"}" enabled="{editModel.isLettred()}" actionIcon='lettering' onActionPerformed="handler.addLetter()"/> <JButton id="noLettered" - toolTipText="{ t("lima.ui.lettering.buttonNoLettered") + " (Del)"}" + toolTipText="{ t("lima.lettering.buttonNoLettered") + " (Del)"}" enabled="{editModel.isUnLettred()}" actionIcon='un-lettering' onActionPerformed="handler.removeLetter()"/> <JButton id="round" - toolTipText="{ t("lima.ui.lettering.buttonEqualize") + " (Ctrl+B)"}" + toolTipText="{ t("lima.lettering.buttonEqualize") + " (Ctrl+B)"}" enabled="{editModel.isEqualized()}" actionIcon='balance' onActionPerformed="handler.roundAndCreateEntry()"/> @@ -79,24 +79,24 @@ <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> <JComboBox id="accountComboBox" model="{accountComboBoxModel}" - toolTipText="lima.ui.lettering.account" + toolTipText="lima.lettering.account" renderer="{new org.chorem.lima.ui.common.AccountListRenderer()}" onItemStateChanged="handler.setAccount((Account)accountComboBoxModel.getSelectedItem())" /> <JButton id="back" actionIcon="previous" - toolTipText="lima.ui.account.buttonback" + toolTipText="lima.account.buttonback" onActionPerformed="handler.back(accountComboBox)"/> <JButton id="next" actionIcon="next" - toolTipText="lima.ui.account.buttonnext" + toolTipText="lima.account.buttonnext" onActionPerformed="handler.next(accountComboBox)"/> <JToolBar.Separator/> - <JLabel text="lima.ui.lettering.beginFinancialPeriod" + <JLabel text="lima.lettering.beginFinancialPeriod" labelFor='{pickerDebut}'/> <JXDatePicker id="pickerDebut" onActionPerformed="handler.setDateStart(pickerDebut.getDate())"/> - <JLabel text="lima.ui.lettering.endFinancialPeriod" + <JLabel text="lima.lettering.endFinancialPeriod" labelFor="{pickerFin}"/> <JXDatePicker id="pickerFin" onActionPerformed="handler.setDateEnd(pickerFin.getDate())"/> @@ -108,13 +108,13 @@ <EnumEditor id='lettredEntryComboBox' genericType='TypeEntry' constructorParams='TypeEntry.class' - toolTipText="lima.ui.lettering.entry" + toolTipText="lima.lettering.entry" onItemStateChanged="handler.setTypeEntry(lettredEntryComboBox.getSelectedItem())" /> <JToolBar.Separator/> <JButton id="refresh" - toolTipText="{ t("lima.ui.lettering.buttonRefresh") + " (F5)"}" + toolTipText="{ t("lima.lettering.buttonRefresh") + " (F5)"}" actionIcon='refresh' onActionPerformed="handler.updateAllEntries()"/> @@ -124,7 +124,7 @@ <row> <cell fill="horizontal" > <JToolBar floatable="false"> - <JLabel text="lima.ui.lettering.selectDebit" + <JLabel text="lima.lettering.selectDebit" labelFor='{debitTexttField}'/> <JTextField id="debitTexttField" enabled="false" @@ -133,7 +133,7 @@ <JToolBar.Separator/> - <JLabel text="lima.ui.lettering.selectCredit" + <JLabel text="lima.lettering.selectCredit" labelFor='{creditTextField}'/> <JTextField id="creditTextField" enabled="false" @@ -142,7 +142,7 @@ <JToolBar.Separator/> - <JLabel text="lima.ui.lettering.selectSolde" + <JLabel text="lima.lettering.selectSolde" labelFor='{soldeTextField}'/> <JTextField id="soldeTextField" enabled="false" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -326,7 +326,7 @@ List<Account> allAccounts = accountService.getAllAccounts(); Account seeAllAccounts = new AccountImpl(); seeAllAccounts.setAccountNumber("-"); - seeAllAccounts.setLabel(t("lima.ui.list.seeAll")); + seeAllAccounts.setLabel(t("lima.list.seeAll")); allAccounts.add(seeAllAccounts); view.getAccountComboBoxModel().setObjects(allAccounts); @@ -434,11 +434,11 @@ * */ view.getLettringSelectionModel().selectRoundedAndNewEntries(selectedRows[0], selectedRows[1], newSameAccountEntry); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.ui.lettering.roundAndCreateEntry.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.lettering.roundAndCreateEntry.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.lettering.roundAndCreateEntry.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -503,7 +503,7 @@ } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.ui.entries.letter.closed.entryBook.error", + errorHelper.showErrorMessage(t("lima.entries.letter.closed.entryBook.error", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -511,7 +511,7 @@ } catch (UnbalancedEntriesException e) { - errorHelper.showErrorMessage(t("lima.ui.entries.letter.unbalanced.error")); + errorHelper.showErrorMessage(t("lima.entries.letter.unbalanced.error")); } onButtonModeChanged(ButtonMode.DELETTRED); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/TypeEntry.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/TypeEntry.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/TypeEntry.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -54,13 +54,13 @@ switch (this) { case LETTERED: - result = t("lima.ui.lettering.checkLettredEntry"); + result = t("lima.lettering.checkLettredEntry"); break; case NO_LETTERED: - result = t("lima.ui.lettering.checkNoLettredEntry"); + result = t("lima.lettering.checkNoLettredEntry"); break; case ALL: - result = t("lima.ui.lettering.checkAll"); + result = t("lima.lettering.checkAll"); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css 2014-09-12 09:07:40 UTC (rev 3914) @@ -3,6 +3,6 @@ } #importEntryBook { - text : "lima.importexport.defaultentrybooks"; + text : "lima.importExport.defaultentrybooks"; selected : true; } \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -179,7 +179,7 @@ view.getFiscalperiodsIcon().setBorder(BorderFactory.createLineBorder(green, 2)); panel.add(fsPanel); panel.validate(); - view.getOk().setText(t("lima.ui.opening.end")); + view.getOk().setText(t("lima.opening.end")); view.repaint(); step++; break; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -77,7 +77,7 @@ </row> <row> <cell> - <JRadioButton text='lima.ui.importexport.import' + <JRadioButton text='lima.importExport.import' value='{VatStatementsChartEnum.IMPORT}' buttonGroup="{getRadioButtons()}" selected='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -181,10 +181,10 @@ vatStatementService.createVatStatement( parentVatStatementHeader, vatStatement); } catch (AlreadyExistVatStatementException alreadyExistVatStatement) { - errorHelper.showErrorMessage(t("lima.importexport.import.alreadyExistFinancialStatement", + errorHelper.showErrorMessage(t("lima.importExport.import.alreadyExistFinancialStatement", alreadyExistVatStatement.getVatStatementLabel(), alreadyExistVatStatement.getMasterLabel())); } catch (NotAllowedLabelException notAllowedLabel) { - errorHelper.showErrorMessage(t("lima.importexport.import.alreadyExistFinancialStatement", + errorHelper.showErrorMessage(t("lima.importExport.import.alreadyExistFinancialStatement", notAllowedLabel.getLabel())); } modelSupport.fireTreeStructureChanged(path); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-09-12 09:07:40 UTC (rev 3914) @@ -47,20 +47,20 @@ onActionPerformed="handler.addVatStatementMovement()"/> <JButton id="updateButton" - toolTipText="{ t("lima.common.update") + " (Ctrl+M)"}" + toolTipText="{ t("lima.update") + " (Ctrl+M)"}" actionIcon='vatstatement-edit' onActionPerformed="handler.updateVatStatement()" enabled="{isSelectedRow()}"/> <JButton id="removeButton" - toolTipText="{ t("lima.common.remove") + " (Del)"}" + toolTipText="{ t("lima.remove") + " (Del)"}" actionIcon='vatstatement-remove' onActionPerformed="handler.removeVatStatement()" enabled="{isSelectedRow()}"/> <JButton id="importButton" actionIcon='vatstatement-import' - toolTipText="lima.ui.importexport.import" + toolTipText="lima.importExport.import" onActionPerformed="handler.importVatStatementChart()"/> </JToolBar> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -247,7 +247,7 @@ if (selectedRow != -1) { int n = JOptionPane.showConfirmDialog(view, t("lima.charts.vatstatement.question.remove"), - t("lima.common.confirmation"), + t("lima.confirmation"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (n == JOptionPane.YES_OPTION) { @@ -259,7 +259,7 @@ JOptionPane.showMessageDialog( view, t("lima.charts.vatstatement.deleteparent"), - t("lima.common.info"), + t("lima.info"), JOptionPane.INFORMATION_MESSAGE); } else { treeTableModel.removeVatStatementObject( Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java 2014-09-12 09:07:40 UTC (rev 3914) @@ -78,7 +78,7 @@ public void showErrorDialog(Component parent, String message, Throwable cause) { JXErrorPane pane = new JXErrorPane(); - ErrorInfo info = new ErrorInfo(t("lima.common.error"), + ErrorInfo info = new ErrorInfo(t("lima.error"), t("lima.error.errorpane.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); @@ -102,7 +102,7 @@ */ public void showErrorMessage(String message) { JOptionPane.showMessageDialog(null, message, - t("lima.ui.common.error"), JOptionPane.ERROR_MESSAGE); + t("lima.error"), JOptionPane.ERROR_MESSAGE); } Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-09-12 09:07:40 UTC (rev 3914) @@ -1,5 +1,3 @@ -= --= Date= Fitre= Piece= @@ -13,16 +11,42 @@ lima.Filter.letter= lima.Filter.voucher= lima.about.translate.content=<h3>How to translate Lima</h3>You can help us to translate or improve label in Lima.<br/><ul><li>Get the <strong>lima-i18n.csv</strong> file in the <strong>i18n</strong> directory</li><li>open it in Libre office (separator caracter is <strong>Tab</strong>)</li><li>Do you work \:)</li><li>At last, send us back the modified file</li></ul><br/>We will apply the patch before next release. +lima.account=Account +lima.account.add= +lima.account.add.error.InvalidAccountNumber= +lima.account.add.error.alreadyExist= +lima.account.add.form= +lima.account.base= +lima.account.buttonback=← +lima.account.buttonnext=→ +lima.account.developed= +lima.account.import= +lima.account.import.description= +lima.account.label= +lima.account.number= +lima.account.remove.error.usedAccount= +lima.account.removeaccountconfirm= +lima.account.removeaccounttitle= +lima.account.shortened= +lima.account.update.error.invalidAccountNumber= +lima.account.update.form= lima.accounts= lima.accounts.plan= lima.accountsreports.listerror=Can't get entries list lima.action.commandline.help=Show help in console lima.all.NotAllowedLabel= lima.all.notAllowedLabel=Not allowed char "\\" found in account name %s. +lima.amount=Amount +lima.amountcredit=Credit amount +lima.amountdebit=Debit amount +lima.autocomplete=Autocomplete +lima.balance=Balance lima.balance.documentcreationerror=Enable to create document lima.balance.documentcreationfiscalerror=Can't create document on an open fiscal year lima.balance.listerror=Can't get entries list lima.beginDate=Begin +lima.buttonback=← +lima.buttonnext=→ lima.cancel=Cancel lima.charts.account=Accounts chart lima.charts.account.base=Base accountchart @@ -54,41 +78,10 @@ lima.charts.vatstatement.nothing=No vat statement chart lima.charts.vatstatement.question.remove=Do you really want to delete this line ? lima.charts.vatstatement.shortened=Shortened vat statement chart +lima.closed=Closed lima.closedPeriodicEntryBook.franceAccountingRules.unbalancedFinancialTransactionsException=Fiscal Period has unbalanced transactions. lima.closedPeriodicEntryBook.franceAccountingRules.withoutEntryBookFinancialTransactionsException=Can't block financialperiod / missing EntryBook in transactions -lima.common.account=Account -lima.common.amount=Amount -lima.common.amountcredit=Credit amount -lima.common.amountdebit=Debit amount -lima.common.autocomplete=Autocomplete -lima.common.balance=Balance -lima.common.buttonback=← -lima.common.buttonnext=→ -lima.common.closed=Closed -lima.common.code=Code -lima.common.confirmation=Confirmation -lima.common.cop= -lima.common.copy=Copy -lima.common.entry=Entry -lima.common.entrybook=EntryBook -lima.common.entrybooks=EntryBooks -lima.common.error=Error -lima.common.filter=Filter -lima.common.generateHtml= -lima.common.info=Information -lima.common.label=Label -lima.common.movmentedfilter=Accounts filtered -lima.common.new=New -lima.common.open=Open -lima.common.paste=Paste -lima.common.quit=Exit -lima.common.remove=Remove -lima.common.search=Search -lima.common.solde=Solde -lima.common.soldecredit=Credit solde -lima.common.soldedebit=Debit solde -lima.common.transaction=Transaction -lima.common.update=Modify +lima.code=Code lima.config.category.directories=Directories lima.config.category.directories.description=Directories used by LIMA lima.config.category.directories.table= @@ -182,6 +175,9 @@ lima.config.ui.flaunchui.label= lima.config.ui.fullscreen.description=FullScreen lima.config.ui.fullscreen.label= +lima.confirmation=Confirmation +lima.cop= +lima.copy=Copy lima.data.bigDecimal.decimalSeparator= lima.data.bigDecimal.scale= lima.documents=Documents… @@ -190,11 +186,14 @@ lima.entries=Entries lima.entries.addEntry=New entry lima.entries.addTransaction=New transaction +lima.entries.assign.closed.entryBook.error= lima.entries.assign.entries=Assign this value in all entries in transaction lima.entries.balance=Balance transaction with this entry lima.entries.copy.entry=Copy entry lima.entries.copy.transaction=Copy transaction lima.entries.enter= +lima.entries.letter.closed.entryBook.error= +lima.entries.letter.unbalanced.error= lima.entries.lettering=Lettering lima.entries.lettering.add=Add letter lima.entries.lettering.noletterselected=Error \: No selected letter @@ -210,9 +209,34 @@ lima.entries.searchunbalancedtransaction=Incorrect transactions lima.entries.unbalanced= lima.entries.writetransaction=Write entries +lima.entry=Entry +lima.entry.add.error.afterLastFiscalPeriod= +lima.entry.add.error.beforeFirstFiscalPeriod= +lima.entry.add.error.lockedEntryBook= +lima.entry.add.error.lockedFinancialPeriod= +lima.entry.add.error.noFinancialPeriod=Any fiscal period are difined. +lima.entry.paste.error.afterLastFiscalPeriod= +lima.entry.paste.error.beforeFirstFiscalPeriod= +lima.entry.paste.error.lockedEntryBook= +lima.entry.paste.error.lockedFinancialPeriod= +lima.entry.update.closed.entryBook.error= lima.entryBook.alreadyExistEntryBookException=An entry book with code %s already exists. +lima.entryBook.delete.used.error=Can't delete entry book %2$s (%1$s) because exist financcial transactions in this entry book. lima.entryBooks= -lima.entrybooksreports.documentcreationerror=Enable to create document +lima.entrybook=EntryBook +lima.entrybook.add= +lima.entrybook.code= +lima.entrybook.default= +lima.entrybook.deletemessage= +lima.entrybook.deletetitle= +lima.entrybook.entrybooktile= +lima.entrybook.import= +lima.entrybook.importtitle= +lima.entrybook.label= +lima.entrybook.remove= +lima.entrybook.update= +lima.entrybooks=EntryBooks +lima.entrybooksreports.documentcreationerror=Enable to create document lima.entrybooksreports.documentcreationfiscalerror=Can't create document on an open fiscal year lima.entrybooksreports.documentcreationfiscaltitle= lima.entrybooksreports.listerror=Can't get entries list @@ -235,10 +259,12 @@ lima.enum.comboboxperiod.fiscalperiod=Fiscal period lima.enum.comboboxperiod.period=Period lima.enum.list.entryBook= +lima.error=Error lima.error.errorpane.htmlmessage=<html><body><b>An application error happened</b>\:<br/>%s</body></html> lima.file= lima.filer.condition.sensitive.case= lima.filer.condition.string= +lima.filter=Filter lima.filter.account= lima.filter.amount= lima.filter.condition.all= @@ -262,8 +288,45 @@ lima.financialStatements.check= lima.financialStatements.check.nothing= lima.financialStatements.check.warn= +lima.financialTransaction.add.error.afterLastFiscalPeriod= +lima.financialTransaction.add.error.beforeFirstFiscalPeriod= +lima.financialTransaction.add.error.lockedEntryBook= +lima.financialTransaction.add.error.lockedFinancialPeriod= +lima.financialTransaction.delete.error.lockedEntryBook= +lima.financialTransaction.delete.error.lockedFinancialPeriod= lima.financialTransaction.lockedEntryBookException=Entry can not be added as entry book is locked for period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n lima.financialTransaction.lockedFinancialPeriodException=locked financial transaction +lima.financialTransaction.paste.error.afterLastFiscalPeriod= +lima.financialTransaction.paste.error.beforeFirstFiscalPeriod= +lima.financialTransaction.paste.error.lockedEntryBook= +lima.financialTransaction.paste.error.lockedFinancialPeriod= +lima.financialTransaction.update.error.afterLastFiscalPeriod= +lima.financialTransaction.update.error.beforeFirstFiscalPeriod= +lima.financialTransaction.update.error.lockedEntryBook= +lima.financialTransaction.update.error.lockedFinancialPeriod= +lima.financialperiod.begin= +lima.financialperiod.block= +lima.financialperiod.block.error.NoLockedPreviousEntryBook.main= +lima.financialperiod.block.error.entry= +lima.financialperiod.block.error.noLockedPreviousEntryBook.main= +lima.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook= +lima.financialperiod.block.error.unbalanced.main= +lima.financialperiod.block.error.unbalanced.transaction= +lima.financialperiod.block.error.unfilled.entry= +lima.financialperiod.block.error.unfilled.main= +lima.financialperiod.block.error.unfilled.noAccount= +lima.financialperiod.block.error.unfilled.noDescription= +lima.financialperiod.block.error.unfilled.noVoucher= +lima.financialperiod.block.error.unfilled.noVouchier= +lima.financialperiod.block.error.withoutEntryBook.main= +lima.financialperiod.block.error.withoutEntryBook.transaction= +lima.financialperiod.blockmessage= +lima.financialperiod.blocktitle= +lima.financialperiod.closure= +lima.financialperiod.end= +lima.financialperiod.entrybook= +lima.financialperiod.period= +lima.financialperiod.status= lima.financialstatement.accounts=Account list on debit and on credit lima.financialstatement.addfinancialStatementHeadererror=Can't add financialStatementHeader lima.financialstatement.check=Check accounts passing to movement @@ -278,7 +341,44 @@ lima.financialstatement.provisiondeprecationaccounts=Provisions and deprecations accounts list lima.financialstatement.subamount=Calculate a subamount lima.financialstatementreport.listerror=Can't get entries list +lima.financialtransaction.account= +lima.financialtransaction.balance= +lima.financialtransaction.buttonback= +lima.financialtransaction.buttonnext= +lima.financialtransaction.credit= +lima.financialtransaction.date= +lima.financialtransaction.date.in= +lima.financialtransaction.date.to= +lima.financialtransaction.dateInterval= +lima.financialtransaction.dateInterval.in= +lima.financialtransaction.dateInterval.to= +lima.financialtransaction.debit= +lima.financialtransaction.description= +lima.financialtransaction.entrybook= +lima.financialtransaction.financialperiod= +lima.financialtransaction.fiscalyear= +lima.financialtransaction.letter= +lima.financialtransaction.messageremoveentry= +lima.financialtransaction.messageremovetransaction= +lima.financialtransaction.nextfinancialperiod=Next period +lima.financialtransaction.previousfinancialperiod=previous period +lima.financialtransaction.titleremoveentry= +lima.financialtransaction.titleremovetransaction= +lima.financialtransaction.voucher= +lima.fiscalPeriod.add.beginAfterEndFiscalPeriod= +lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod= +lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod= +lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod= +lima.fiscalPeriod.add.moreOneUnlockFiscalPeriod= +lima.fiscalPeriod.add.notBeginNextDayOfLastFiscalPeriod= +lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod= +lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod= +lima.fiscalPeriod.block.error.lockedFinancialPeriod=Fiscal period from %3$te %3$tB %3$tY to %4$te %4$tB %4$tY is closed. +lima.fiscalPeriod.block.error.lockedFiscalPeriod=Fiscal period closed %s +lima.fiscalPeriod.buttonback= +lima.fiscalPeriod.buttonnext= lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException=Fiscal period ending date must be after the begining one, begin\: %1$tm/%1$te/%1$tY end\: %1$tm/%1$te/%1$tY.\n +lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod= lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException=Master account is not a digit between 1 to 8 \: %s"\n lima.fiscalPeriod.franceAccountingRules.lastUnlockedFiscalPeriodException=Current fiscal period must not be closed. lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException=The ante fiscal period is not locked\: concerned fiscal period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n @@ -286,7 +386,37 @@ lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodException=The new fiscal period must adjoining the last\: concerned fiscal period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException=Account Number that doesn't start with 4 have to be numeric\: %s"\n lima.fiscalYears= +lima.fiscalperiod.addfiscalperiod.addfiscalperiodtitle= +lima.fiscalperiod.addfiscalperiod.endAfterBegin= +lima.fiscalperiod.addfiscalperiod.morethan12= +lima.fiscalperiod.addfiscalperiodtitle= +lima.fiscalperiod.begin= +lima.fiscalperiod.block.addretainedearnings= +lima.fiscalperiod.block.cantBalanceIfNextPeriodNotExist= +lima.fiscalperiod.block.cantBalanceNotBook= +lima.fiscalperiod.block.cantBlockNotBalance= +lima.fiscalperiod.block.confirmation= +lima.fiscalperiod.block.newyear= +lima.fiscalperiod.block.retainedearningstitle= +lima.fiscalperiod.block.title= +lima.fiscalperiod.buttonback=← +lima.fiscalperiod.buttonnext=→ +lima.fiscalperiod.closed= +lima.fiscalperiod.closure= +lima.fiscalperiod.delete.confirmation= +lima.fiscalperiod.delete.title= +lima.fiscalperiod.end= +lima.fiscalperiod.entrybooks.create= +lima.fiscalperiod.fiscalperiod= +lima.fiscalperiod.fiscalperiod.begin= +lima.fiscalperiod.fiscalperiod.end= +lima.fiscalperiod.fiscalperiod.status= +lima.fiscalperiod.modifyfiscalperiodtitle= +lima.fiscalperiod.open= +lima.fiscalperiod.status= lima.fiscalperiod.unbalancedtransactions=Fiscal Period has unbalanced transactions +lima.fullscreen= +lima.generateHtml= lima.help= lima.help.about= lima.help.about.title=About Lima... @@ -363,22 +493,83 @@ lima.import.entries.noFiscalPeriodFoundException=No fiscal period found.\n lima.import.noDataToImportException=No data to import. lima.import.unknownError=Unknown error. -lima.importexport.all= -lima.importexport.choiceencoding= -lima.importexport.csv= -lima.importexport.defaultentrybooks= -lima.importexport.ebp= -lima.importexport.export= -lima.importexport.export.terminated= -lima.importexport.import= -lima.importexport.import.alreadyExistFinancialStatement=Category with name %s exists for parent %s.\n -lima.importexport.import.alreadyExistVatStatement=VAT statement with name %s exists for parents %s.\n -lima.importexport.import.notAllowedLabel=Not allowed char in label\: %s.\n -lima.importexport.usevatpdf= +lima.importExport.account=Accounts import completed. +lima.importExport.accountcharts=Accounts chart +lima.importExport.all=All +lima.importExport.choiceencoding= +lima.importExport.csv=Import/Export CSV +lima.importExport.defaultentrybooks=Defaults entrybooks +lima.importExport.ebp=Import/Export EBP +lima.importExport.entries=Entries +lima.importExport.entry=Entries import completed. +lima.importExport.entryBook= +lima.importExport.entrybook=Entry books import completed. +lima.importExport.entrybooks=Entry books +lima.importExport.export=Export +lima.importExport.export.exceptions=Export failed.\n +lima.importExport.export.failed=Export failed \! +lima.importExport.export.import.exceptions=Export has failed. +lima.importExport.export.terminated=Export terminated +lima.importExport.financialStatement=Financial transactions import completed. +lima.importExport.financialTransaction= +lima.importExport.financialstatements=FinancialStatements chart +lima.importExport.financialtransactions=Moves +lima.importExport.fiscalPeriod=Fiscal periods import completed. +lima.importExport.identity=Identity import completed. +lima.importExport.import= +lima.importExport.import.alreadyExistFinancialStatement=Category with name %s exists for parent %s.\n +lima.importExport.import.alreadyExistVatStatement=VAT statement with name %s exists for parents %s.\n +lima.importExport.import.backupException=could not import backup. +lima.importExport.import.extractFileError=Could not extract file. +lima.importExport.import.line=Line %d\: +lima.importExport.import.nbCreated=%d created\n +lima.importExport.import.nbIgnored=%d ignored\n +lima.importExport.import.nbUpdated=%d updated\n +lima.importExport.import.notAllowedLabel=Not allowed char in label\: %s.\n +lima.importExport.import.terminated=Import terminated\n +lima.importExport.import.vatpdfimport=The PDF has been imported. It can be found inside the Lima resources directory +lima.importExport.importcsv= +lima.importExport.importebp= +lima.importExport.importerror=An error has occured during import +lima.importExport.importtitle= +lima.importExport.no.result=No result found. +lima.importExport.usevatpdf= +lima.importExport.vatStatement=VTA transactions import completed. +lima.importExport.vatstatements=VAT chart +lima.importExport.wait=Job in progress… +lima.importExport.waittitle= +lima.info=Information lima.init.closed=Lima closed at %1$s lima.init.errorclosing=Error during Lima close +lima.label=Label lima.ledger.documentcreationerror=Enable to create document +lima.lettering.account=Accounts +lima.lettering.accountRegularization=Lettering regularization +lima.lettering.actions=Actions +lima.lettering.beginFinancialPeriod=From +lima.lettering.buttonAuto=Auto +lima.lettering.buttonEqualize=Equalize +lima.lettering.buttonLettered=To Letter +lima.lettering.buttonNoLettered=To Unletter +lima.lettering.buttonRefresh=Refresh +lima.lettering.checkAll=All +lima.lettering.checkLettredEntry=Lettered +lima.lettering.checkLettredEntrye= +lima.lettering.checkNoLettredEntry=Unlettered +lima.lettering.checkNoLettredEntrye= +lima.lettering.endFinancialPeriod=To +lima.lettering.entry=Entries lima.lettering.listerror=Can't get entries list +lima.lettering.period=Periods +lima.lettering.roundAndCreateEntry.error.lockedEntryBook= +lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod= +lima.lettering.selectCredit= +lima.lettering.selectDebit= +lima.lettering.selectEntry=Actual selection +lima.lettering.selectSolde=Balance +lima.list.seeAll=ALL +lima.locale= +lima.mainview.title=Lutin Invoice Monitoring and Accounting lima.menu.file=File lima.menu.help=Help lima.menu.help.about=About @@ -390,17 +581,28 @@ lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Support email lima.misc.supportemail.label= -lima.ok=OK +lima.movmentedfilter=Accounts filtered +lima.new=New +lima.nonaffect= +lima.ok=Ok +lima.open=Open lima.openejb.remotemode.description= lima.openejb.remotemode.label= lima.opening= -lima.opening.accounts=Import accounts from\: -lima.opening.close= -lima.opening.entrybook= -lima.opening.import= -lima.opening.next= -lima.opening.welcome= +lima.opening.accounts=<html><center>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> +lima.opening.close=Close +lima.opening.end=Finish +lima.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> +lima.opening.import=Import a CSV backup +lima.opening.next=Next +lima.opening.title= +lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html> +lima.paste=Paste lima.preferences=Preferences +lima.quit=Exit +lima.refresh=Refresh +lima.remove=Remove +lima.remove.shortcut= lima.reports=Reports lima.reports.account.noaccount= lima.reports.account.noaccounttitle= @@ -410,12 +612,20 @@ lima.reports.financialstatement=Financialstatements lima.reports.ledger=Ledger lima.reports.vat=Edit VAT +lima.retainedEarnings.wait= +lima.search=Search +lima.solde=Solde +lima.soldecredit=Credit solde +lima.soldedebit=Debit solde lima.splash.1=Loading services... lima.splash.2="Loading accounting... lima.splash.3=Ready \! lima.structure=Structure lima.table.account=Account lima.table.balance=Balance +lima.table.cell.colorSelectionFocus= +lima.table.cell.comportmentEditingCell= +lima.table.cell.selectAllEditingCell= lima.table.credit=Credit lima.table.date= lima.table.debit=Debit @@ -439,249 +649,9 @@ lima.tooltip.Filter= lima.tooltip.filter=<html>Regular expression \:<br/>- accounts interval i..j <br/>- accounts list i,j,k <br/>- Exclude an account -i</html> lima.tooltip.lettering=<html>Add a letter on many entries <br/>Select many rows with combination ctrl + click</html> -lima.ui.account= -lima.ui.account.add.error.InvalidAccountNumber= -lima.ui.account.add.error.alreadyExist= -lima.ui.account.addaccount= -lima.ui.account.addaccounttitle= -lima.ui.account.base= -lima.ui.account.buttonback=← -lima.ui.account.buttonnext=→ -lima.ui.account.developed= -lima.ui.account.importtitle= -lima.ui.account.label= -lima.ui.account.number= -lima.ui.account.remove.error.usedAccount= -lima.ui.account.removeaccountconfirm= -lima.ui.account.removeaccounttitle= -lima.ui.account.shortened= -lima.ui.account.update.error.invalidAccountNumber= -lima.ui.account.updateaccounttitle= -lima.ui.accounts= -lima.ui.common.amountcredit= -lima.ui.common.amountdebit= -lima.ui.common.cancel=Cancel -lima.ui.common.error=Error -lima.ui.common.ok=Ok -lima.ui.common.refresh=Refresh -lima.ui.common.remove=Remove -lima.ui.common.solde= -lima.ui.common.update=Update -lima.ui.entries= -lima.ui.entries.assign.closed.entryBook.error= -lima.ui.entries.letter.closed.entryBook.error= -lima.ui.entries.letter.unbalanced.error= -lima.ui.entry.add.error.afterLastFiscalPeriod= -lima.ui.entry.add.error.beforeFirstFiscalPeriod= -lima.ui.entry.add.error.lockedEntryBook= -lima.ui.entry.add.error.lockedFinancialPeriod= -lima.ui.entry.add.error.noFinancialPeriod=Any fiscal period are difined. -lima.ui.entry.paste.error.afterLastFiscalPeriod= -lima.ui.entry.paste.error.beforeFirstFiscalPeriod= -lima.ui.entry.paste.error.lockedEntryBook= -lima.ui.entry.paste.error.lockedFinancialPeriod= -lima.ui.entry.update.closed.entryBook.error= -lima.ui.entryBook.delete.used.error=Can't delete entry book %2$s (%1$s) because exist financcial transactions in this entry book. -lima.ui.entryBooks= -lima.ui.entrybook.add= -lima.ui.entrybook.code= -lima.ui.entrybook.default= -lima.ui.entrybook.deletemessage= -lima.ui.entrybook.deletetitle= -lima.ui.entrybook.entrybooktile= -lima.ui.entrybook.import= -lima.ui.entrybook.importtitle= -lima.ui.entrybook.label= -lima.ui.entrybook.remove= -lima.ui.entrybook.update= -lima.ui.financialPeriods= -lima.ui.financialStatements= -lima.ui.financialTransaction.add.error.afterLastFiscalPeriod= -lima.ui.financialTransaction.add.error.beforeFirstFiscalPeriod= -lima.ui.financialTransaction.add.error.lockedEntryBook= -lima.ui.financialTransaction.add.error.lockedFinancialPeriod= -lima.ui.financialTransaction.delete.error.lockedEntryBook= -lima.ui.financialTransaction.delete.error.lockedFinancialPeriod= -lima.ui.financialTransaction.paste.error.afterLastFiscalPeriod= -lima.ui.financialTransaction.paste.error.beforeFirstFiscalPeriod= -lima.ui.financialTransaction.paste.error.lockedEntryBook= -lima.ui.financialTransaction.paste.error.lockedFinancialPeriod= -lima.ui.financialTransaction.update.error.afterLastFiscalPeriod= -lima.ui.financialTransaction.update.error.beforeFirstFiscalPeriod= -lima.ui.financialTransaction.update.error.lockedEntryBook= -lima.ui.financialTransaction.update.error.lockedFinancialPeriod= -lima.ui.financialperiod.begin= -lima.ui.financialperiod.block= -lima.ui.financialperiod.block.error.NoLockedPreviousEntryBook.main= -lima.ui.financialperiod.block.error.entry= -lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.main= -lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook= -lima.ui.financialperiod.block.error.unbalanced.main= -lima.ui.financialperiod.block.error.unbalanced.transaction= -lima.ui.financialperiod.block.error.unfilled.entry= -lima.ui.financialperiod.block.error.unfilled.main= -lima.ui.financialperiod.block.error.unfilled.noAccount= -lima.ui.financialperiod.block.error.unfilled.noDescription= -lima.ui.financialperiod.block.error.unfilled.noVoucher= -lima.ui.financialperiod.block.error.unfilled.noVouchier= -lima.ui.financialperiod.block.error.withoutEntryBook.main= -lima.ui.financialperiod.block.error.withoutEntryBook.transaction= -lima.ui.financialperiod.blockmessage= -lima.ui.financialperiod.blocktitle= -lima.ui.financialperiod.closure= -lima.ui.financialperiod.end= -lima.ui.financialperiod.entrybook= -lima.ui.financialperiod.period= -lima.ui.financialperiod.status= -lima.ui.financialtransaction.account= -lima.ui.financialtransaction.balance= -lima.ui.financialtransaction.buttonback= -lima.ui.financialtransaction.buttonnext= -lima.ui.financialtransaction.credit= -lima.ui.financialtransaction.date= -lima.ui.financialtransaction.date.in= -lima.ui.financialtransaction.date.to= -lima.ui.financialtransaction.dateInterval= -lima.ui.financialtransaction.dateInterval.in= -lima.ui.financialtransaction.dateInterval.to= -lima.ui.financialtransaction.debit= -lima.ui.financialtransaction.description= -lima.ui.financialtransaction.entrybook= -lima.ui.financialtransaction.financialperiod= -lima.ui.financialtransaction.fiscalyear= -lima.ui.financialtransaction.letter= -lima.ui.financialtransaction.messageremoveentry= -lima.ui.financialtransaction.messageremovetransaction= -lima.ui.financialtransaction.nextfinancialperiod=Next period -lima.ui.financialtransaction.previousfinancialperiod=previous period -lima.ui.financialtransaction.titleremoveentry= -lima.ui.financialtransaction.titleremovetransaction= -lima.ui.financialtransaction.voucher= -lima.ui.fiscalPeriod.add.beginAfterEndFiscalPeriod= -lima.ui.fiscalPeriod.add.error.beginAfterEndFiscalPeriod= -lima.ui.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod= -lima.ui.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod= -lima.ui.fiscalPeriod.add.moreOneUnlockFiscalPeriod= -lima.ui.fiscalPeriod.add.notBeginNextDayOfLastFiscalPeriod= -lima.ui.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod= -lima.ui.fiscalPeriod.block.error.lastUnlockedFiscalPeriod= -lima.ui.fiscalPeriod.block.error.lockedFinancialPeriod=Fiscal period from %3$te %3$tB %3$tY to %4$te %4$tB %4$tY is closed. -lima.ui.fiscalPeriod.block.error.lockedFiscalPeriod=Fiscal period closed %s -lima.ui.fiscalPeriod.buttonback= -lima.ui.fiscalPeriod.buttonnext= -lima.ui.fiscalPeriod.delete.error.noEmptyFiscalPeriod= -lima.ui.fiscalYears= -lima.ui.fiscalperiod.addfiscalperiod.addfiscalperiodtitle= -lima.ui.fiscalperiod.addfiscalperiod.endAfterBegin= -lima.ui.fiscalperiod.addfiscalperiod.morethan12= -lima.ui.fiscalperiod.addfiscalperiodtitle= -lima.ui.fiscalperiod.begin= -lima.ui.fiscalperiod.block.addretainedearnings= -lima.ui.fiscalperiod.block.cantBalanceIfNextPeriodNotExist= -lima.ui.fiscalperiod.block.cantBalanceNotBook= -lima.ui.fiscalperiod.block.cantBlockNotBalance= -lima.ui.fiscalperiod.block.confirmation= -lima.ui.fiscalperiod.block.newyear= -lima.ui.fiscalperiod.block.retainedearningstitle= -lima.ui.fiscalperiod.block.title= -lima.ui.fiscalperiod.buttonback=← -lima.ui.fiscalperiod.buttonnext=→ -lima.ui.fiscalperiod.closed= -lima.ui.fiscalperiod.closure= -lima.ui.fiscalperiod.delete.confirmation= -lima.ui.fiscalperiod.delete.title= -lima.ui.fiscalperiod.end= -lima.ui.fiscalperiod.entrybooks.create= -lima.ui.fiscalperiod.fiscalperiod= -lima.ui.fiscalperiod.fiscalperiod.begin= -lima.ui.fiscalperiod.fiscalperiod.end= -lima.ui.fiscalperiod.fiscalperiod.status= -lima.ui.fiscalperiod.modifyfiscalperiodtitle= -lima.ui.fiscalperiod.open= -lima.ui.fiscalperiod.status= -lima.ui.fullscreen= -lima.ui.home.entryBooks.info= -lima.ui.home.entryBooks.info.one= -lima.ui.importexport.account=Accounts import completed. -lima.ui.importexport.accountcharts=Accounts chart -lima.ui.importexport.all=All -lima.ui.importexport.csv=Import/Export CSV -lima.ui.importexport.defaultentrybooks=Defaults entrybooks -lima.ui.importexport.ebp=Import/Export EBP -lima.ui.importexport.entries=Entries -lima.ui.importexport.entry=Entries import completed. -lima.ui.importexport.entryBook= -lima.ui.importexport.entrybook=Entry books import completed. -lima.ui.importexport.entrybooks=Entry books -lima.ui.importexport.export=Export -lima.ui.importexport.export.exceptions=Export failed.\n -lima.ui.importexport.export.failed=Export failed \! -lima.ui.importexport.export.import.exceptions=Export has failed. -lima.ui.importexport.export.terminated=Export terminated -lima.ui.importexport.financialStatement=Financial transactions import completed. -lima.ui.importexport.financialTransaction= -lima.ui.importexport.financialstatements=FinancialStatements chart -lima.ui.importexport.financialtransactions=Moves -lima.ui.importexport.fiscalPeriod=Fiscal periods import completed. -lima.ui.importexport.identity=Identity import completed. -lima.ui.importexport.import= -lima.ui.importexport.import.backupException=could not import backup. -lima.ui.importexport.import.extractFileError=Could not extract file. -lima.ui.importexport.import.line=Line %d\: -lima.ui.importexport.import.nbCreated=%d created\n -lima.ui.importexport.import.nbIgnored=%d ignored\n -lima.ui.importexport.import.nbUpdated=%d updated\n -lima.ui.importexport.import.terminated=Import terminated\n -lima.ui.importexport.import.vatpdfimport=The PDF has been imported. It can be found inside the Lima resources directory -lima.ui.importexport.importcsv= -lima.ui.importexport.importebp= -lima.ui.importexport.importerror=An error has occured during import -lima.ui.importexport.importtitle= -lima.ui.importexport.no.result=No result found. -lima.ui.importexport.vatStatement=VTA transactions import completed. -lima.ui.importexport.vatstatements=VAT chart -lima.ui.importexport.wait=Job in progress… -lima.ui.importexport.waittitle= -lima.ui.lettering.account=Accounts -lima.ui.lettering.accountRegularization=Lettering regularization -lima.ui.lettering.actions=Actions -lima.ui.lettering.beginFinancialPeriod=From -lima.ui.lettering.buttonAuto=Auto -lima.ui.lettering.buttonEqualize=Equalize -lima.ui.lettering.buttonLettered=To Letter -lima.ui.lettering.buttonNoLettered=To Unletter -lima.ui.lettering.buttonRefresh=Refresh -lima.ui.lettering.checkAll=All -lima.ui.lettering.checkLettredEntry=Lettered -lima.ui.lettering.checkLettredEntrye= -lima.ui.lettering.checkNoLettredEntry=Unlettered -lima.ui.lettering.checkNoLettredEntrye= -lima.ui.lettering.endFinancialPeriod=To -lima.ui.lettering.entry=Entries -lima.ui.lettering.period=Periods -lima.ui.lettering.roundAndCreateEntry.error.lockedEntryBook= -lima.ui.lettering.roundAndCreateEntry.error.lockedFinancialPeriod= -lima.ui.lettering.selectCredit= -lima.ui.lettering.selectDebit= -lima.ui.lettering.selectEntry=Actual selection -lima.ui.lettering.selectSolde=Balance -lima.ui.list.seeAll=ALL -lima.ui.locale= -lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting -lima.ui.nonaffect= -lima.ui.opening.accounts=<html><center>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> -lima.ui.opening.close=Close -lima.ui.opening.end=Finish -lima.ui.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> -lima.ui.opening.import=Import a CSV backup -lima.ui.opening.next=Next -lima.ui.opening.title= -lima.ui.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html> -lima.ui.retainedEarnings.wait= -lima.ui.table.cell.colorSelectionFocus= -lima.ui.table.cell.comportmentEditingCell= -lima.ui.table.cell.selectAllEditingCell= -lima.ui.vatStatements= +lima.transaction=Transaction +lima.update=Modify +lima.update.shortcut= lima.vatStatement.alreadyExistVatStatement=FAILED \: The vatStatement %s already exists \! lima.vatStatements= lima.vatreport.listerror=Can't get entries list Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-11 15:02:49 UTC (rev 3913) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-09-12 09:07:40 UTC (rev 3914) @@ -1,23 +1,47 @@ -= --= lima-business.document.entrybooks= lima-business.document.generalentrybook= +lima.account=Compte +lima.account.add=Nouveau compte (Ctrl+A) +lima.account.add.error.InvalidAccountNumber=Le numéro du compt %1$s n'est pas valide +lima.account.add.error.alreadyExist=Le compt %1$s existe déjà +lima.account.add.form=Ajout d'un compte +lima.account.base=Plan comptable de base +lima.account.buttonback=← +lima.account.buttonnext=→ +lima.account.developed=Plan comptable développé +lima.account.import=Importer +lima.account.import.description=Sélectionnez un plan par défaut ou un plan personnalisé. +lima.account.label=Libellé +lima.account.number=Numéro de compte +lima.account.remove.error.usedAccount=Il exist des transactions sur ce compte +lima.account.removeaccountconfirm=Voulez-vous supprimer le compte %s ? +lima.account.removeaccounttitle=Suppression d'un compte +lima.account.shortened=Plan comptable abrégé +lima.account.update.error.invalidAccountNumber=Le numéro du compte %1$s n'est pas valide +lima.account.update.form=Modification d'un compte lima.accounts=Comptes lima.accounts.plan=Plan comptable lima.accountsreports.listerror=Erreur lors de la récupération des données de la liste lima.action.commandline.help=Afficher l'aide en console lima.all.NotAllowedLabel= lima.all.notAllowedLabel=Le caractère "\\" n'est pas authorisé, trouvé sur le compte %s. +lima.amount=Montant +lima.amountcredit=Total Crédit +lima.amountdebit=Total Débit +lima.autocomplete=Autocomplétion +lima.balance=Équilibrer lima.balance.documentcreationerror=Erreur lors de la création du document lima.balance.documentcreationfiscalerror=Impossible de créer le document quand la période fiscale est ouverte lima.balance.listerror=Erreur lors de la récupération des données de la liste lima.beginDate=Début +lima.buttonback=← +lima.buttonnext=→ lima.cancel=Annuler lima.charts.account=Plan comptable lima.charts.account.base=Plan comptable de base lima.charts.account.developed=Plan comptable développé -lima.charts.account.importcsv= -lima.charts.account.importebp= +lima.charts.account.importcsv=Plan comptable personnalisé au format CSV +lima.charts.account.importebp=Plan comptable personnalisé au format EBP lima.charts.account.number=Numéro de compte lima.charts.account.question.remove=Voulez-vous supprimer ce compte? lima.charts.account.shortened=Plan comptable abrégé @@ -43,40 +67,10 @@ lima.charts.vatstatement.nothing=<html><center>Aucun plan TVA chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> lima.charts.vatstatement.question.remove=Etes vous sur de vouloir supprimer cette ligne ? lima.charts.vatstatement.shortened=Plan TVA abrégé +lima.closed=Fermé lima.closedPeriodicEntryBook.franceAccountingRules.unbalancedFinancialTransactionsException=Impossible de bloquer la période financière / le journal, il contient des transactions non équilibrées. lima.closedPeriodicEntryBook.franceAccountingRules.withoutEntryBookFinancialTransactionsException=Impossible de bloquer la période financière / il manque un journal dans une transaction (%1$te/%1$tm/%1$tY) -lima.common.account=Compte -lima.common.amount=Montant -lima.common.amountcredit=Total Crédit -lima.common.amountdebit=Total Débit -lima.common.autocomplete=Autocomplétion -lima.common.balance=Équilibrer -lima.common.buttonback=← -lima.common.buttonnext=→ -lima.common.closed=Fermé -lima.common.code=Code -lima.common.confirmation=Confirmation -lima.common.copy=Copier -lima.common.entry=Entrée -lima.common.entrybook=Journal -lima.common.entrybooks=Journaux -lima.common.error=Erreur -lima.common.filter=Filtrer -lima.common.generateHtml=HTML -lima.common.info=Information -lima.common.label=Libellé -lima.common.movmentedfilter=Comptes mouvementés -lima.common.new=Nouveau -lima.common.open=Ouvert -lima.common.paste=Coller -lima.common.quit=Quitter -lima.common.remove=Supprimer -lima.common.search=Rechercher -lima.common.solde=Solde -lima.common.soldecredit=Solde Créditeur -lima.common.soldedebit=Solde Débiteur -lima.common.transaction=Transaction -lima.common.update=Modifier +lima.code=Code lima.config.category.directories=Répertoires lima.config.category.directories.description=Répertoires utilisés par Lima lima.config.category.other=Autre @@ -165,17 +159,22 @@ lima.config.ui.flaunchui.label= lima.config.ui.fullscreen.description=demarrer l'application en mode plein écran lima.config.ui.fullscreen.label=Plein écran +lima.confirmation=Confirmation +lima.copy=Copier lima.documents=Documents… lima.endDate=Fin lima.enterEntries=Écritures lima.entries=Écritures lima.entries.addEntry=Créer une entrée dans la transaction lima.entries.addTransaction=Créer une transaction +lima.entries.assign.closed.entryBook.error=Impossible d'affecter cette valeur a l'ensemble des entrés de la transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.entries.assign.entries=Assigner cette valeur à toutes les entrées de la transaction lima.entries.balance=Équilibrer la transaction avec cette entrée lima.entries.copy.entry=Copier l'entrée lima.entries.copy.transaction=Copier la transaction lima.entries.enter=Saisie des écritures +lima.entries.letter.closed.entryBook.error=Impossible de modifier le lettrage des ces entrés car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.letter.unbalanced.error=Impossible de lettrer ces écritures car leur solde n'est pas nul. lima.entries.lettering=Lettrage lima.entries.lettering.add=Ajouter une lettre lima.entries.lettering.noletterselected=Erreur \: Aucune lettre sélectionnée. @@ -191,8 +190,33 @@ lima.entries.searchunbalancedtransaction= lima.entries.unbalanced=Entrées incorrectes lima.entries.writetransaction= +lima.entry=Entrée +lima.entry.add.error.afterLastFiscalPeriod=Impossible d'ajouter une entré car la date de la transaction est après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.entry.add.error.beforeFirstFiscalPeriod=Impossible d'ajouter une entré car la date de la transaction est avant le %1$te %1$tB %1$tY début du premier exercice. +lima.entry.add.error.lockedEntryBook=Impossible d'ajouter une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entry.add.error.lockedFinancialPeriod=Impossible d'ajouter une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.entry.add.error.noFinancialPeriod=Aucune période fiscale n'est définie. +lima.entry.paste.error.afterLastFiscalPeriod=Impossible de copier une entré car la date de la transaction est après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.entry.paste.error.beforeFirstFiscalPeriod=Impossible de copier une entré car la date de la transaction est avant le %1$te %1$tB %1$tY début du premier exercice. +lima.entry.paste.error.lockedEntryBook=Impossible de copier une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entry.paste.error.lockedFinancialPeriod=Impossible de copier une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.entry.update.closed.entryBook.error=Impossible de modifier cette entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.entryBook.alreadyExistEntryBookException=Un journal avec comme code % existe déjà. +lima.entryBook.delete.used.error=Imposible de supprimer le journal %2$s (%1$s) car Il existe des transactioins sur ce journal. lima.entryBooks=Journaux +lima.entrybook=Journal +lima.entrybook.add=Ajout de journal +lima.entrybook.code=Code +lima.entrybook.default=Journaux par défault +lima.entrybook.deletemessage=Êtes vous sûr de vouloir supprimer le journal %s ? +lima.entrybook.deletetitle=Suppression de journal +lima.entrybook.entrybooktile=Journal +lima.entrybook.import=Importer +lima.entrybook.importtitle=Import +lima.entrybook.label=Libellé +lima.entrybook.remove=Supprimer +lima.entrybook.update=Modifier +lima.entrybooks=Journaux lima.entrybooksreports.documentcreationerror=Erreur lors de la création du document lima.entrybooksreports.documentcreationfiscalerror=Impossible de créer un document quand la période fiscale est ouverte lima.entrybooksreports.documentcreationfiscaltitle= @@ -219,9 +243,11 @@ lima.enum.list.financialperiod=Périodes Financières lima.enum.list.fiscalperiod=Exercices lima.enum.list.period=Périodes +lima.error=Erreur lima.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> lima.file=Fichier lima.filer.condition.sensitive.case=sensible à la case +lima.filter=Filtrer lima.filter.account=Ajouter un filtre sur les comptes lima.filter.amount=Ajouter un filtre sur les montants lima.filter.condition.all=Valide toutes les conditions @@ -245,8 +271,42 @@ lima.financialStatements.check=Vérification des comptes aux postes lima.financialStatements.check.nothing=Introuvable \: %s - %s \n lima.financialStatements.check.warn=Attention cette fonctionnalité n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas être présent au bilan et compte de résultat.\n Il est donc normal que des comptes sont marqués comme introuvable.\n\n +lima.financialTransaction.add.error.afterLastFiscalPeriod=Impossible d'ajouter une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.financialTransaction.add.error.beforeFirstFiscalPeriod=Impossible d'ajouter une transaction avant le %1$te %1$tB %1$tY début du premier exercice. +lima.financialTransaction.add.error.lockedEntryBook=Impossible d'ajouter une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.financialTransaction.add.error.lockedFinancialPeriod=Impossible d'ajouter une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.financialTransaction.delete.error.lockedEntryBook=Impossible de supprimer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.financialTransaction.delete.error.lockedFinancialPeriod=Impossible de supprimer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. lima.financialTransaction.lockedEntryBookException=Impossible d'ajouter une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY.\n lima.financialTransaction.lockedFinancialPeriodException=La période financière est bloquée\n +lima.financialTransaction.paste.error.afterLastFiscalPeriod=Impossible de copier une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.financialTransaction.paste.error.beforeFirstFiscalPeriod=Impossible de copier une transaction avant le %1$te %1$tB %1$tY début du premier exercice. +lima.financialTransaction.paste.error.lockedEntryBook=Impossible de copier une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.financialTransaction.paste.error.lockedFinancialPeriod=Impossible de copier une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.financialTransaction.update.error.afterLastFiscalPeriod=Impossible de déplacer une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.financialTransaction.update.error.beforeFirstFiscalPeriod=Impossible de déplacer une transaction avant le %1$te %1$tB %1$tY début du premier exercice. +lima.financialTransaction.update.error.lockedEntryBook=Impossible de déplacer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.financialTransaction.update.error.lockedFinancialPeriod=Impossible de deplacer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.financialperiod.begin=Début +lima.financialperiod.block=Cloturer une période +lima.financialperiod.block.error.noLockedPreviousEntryBook.main=Impossible de clôturer cette période car les périodes précedentes ne sont pas clôturer \: +lima.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook=période du %1$te %1$tB %1$tY au %2$te %2$tB %2$tY +lima.financialperiod.block.error.unbalanced.main=Impossible de clôturer cette période car elle contient des transactions non équilibrées \: +lima.financialperiod.block.error.unbalanced.transaction=transaction du %1$te/%1$tm/%1$tY d'un débit de %2$s et d'un crédit de %3$s +lima.financialperiod.block.error.unfilled.entry=entré du %1$te/%1$tm/%1$tY pour un montant de %2$s \: +lima.financialperiod.block.error.unfilled.main=Impossible de clôturer cette période car elle contient des entrés incomplétes \: +lima.financialperiod.block.error.unfilled.noAccount=n'a pas de compte +lima.financialperiod.block.error.unfilled.noDescription=n'a pas de description +lima.financialperiod.block.error.unfilled.noVoucher=n'a pas de pièce comptable +lima.financialperiod.block.error.withoutEntryBook.main=Impossible de clôturer cette période car elle contient des transactions sans journal +lima.financialperiod.block.error.withoutEntryBook.transaction=transaction du %1$te/%1$tm/%1$tY d'un montant de %2$s, +lima.financialperiod.blockmessage=Êtes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! +lima.financialperiod.blocktitle=Clôture +lima.financialperiod.closure=Clôture +lima.financialperiod.end=Fin +lima.financialperiod.entrybook=Journal +lima.financialperiod.period=Période +lima.financialperiod.status=Statut lima.financialstatement.accounts=Liste de comptes au crédit et au débit lima.financialstatement.addfinancialStatementHeadererror=Erreur lors de l'ajout de l'entête sur la déclaration financière lima.financialstatement.check= @@ -261,7 +321,39 @@ lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions lima.financialstatement.subamount=Calculer un sous-total lima.financialstatementreport.listerror=Erreur lors de la récupération des données de la liste +lima.financialtransaction.account=Compte +lima.financialtransaction.balance=Balance +lima.financialtransaction.buttonback=← +lima.financialtransaction.buttonnext=→ +lima.financialtransaction.credit=Crédit +lima.financialtransaction.date=Date +lima.financialtransaction.dateInterval=Interval de dates +lima.financialtransaction.dateInterval.in=Du +lima.financialtransaction.dateInterval.to=au +lima.financialtransaction.debit=Débit +lima.financialtransaction.description=Description +lima.financialtransaction.entrybook=Journal +lima.financialtransaction.financialperiod=Périodes comptables +lima.financialtransaction.fiscalyear=Exercices +lima.financialtransaction.letter=Lettre +lima.financialtransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? +lima.financialtransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? +lima.financialtransaction.nextfinancialperiod=Période suivante +lima.financialtransaction.previousfinancialperiod=Période précédente +lima.financialtransaction.titleremoveentry=Suppression +lima.financialtransaction.titleremovetransaction=Suppression +lima.financialtransaction.voucher=Pièce comptable +lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=Le date de fin de l'exercice (%2$te/%2$tm/%2$tY) doit être postérieur à la date de début (%1$te/%1$tm/%1$tY) +lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=Il existe déjà %1s exercices non clôturés. +lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod=La date de début de l'exercice doit suivre la date de fin de l'exercice précédent le %1$te/%1$tm/%1$tY +lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=L'exercice est déjà clôturés +lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=L'exercice prédent doit être clôturé +lima.fiscalPeriod.block.error.lockedFinancialPeriod=La période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.fiscalPeriod.block.error.lockedFiscalPeriod=L'exercice ést clôturé %s +lima.fiscalPeriod.buttonback=← +lima.fiscalPeriod.buttonnext=→ lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException=La date de début doit être avant la date de fin, debut\: %1$te/%1$tm/%1$tY fin\: %1$te/%1$tm/%1$tY.\n +lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod=Impossible de supprimer un exercice avec des transactions (%1$s). lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException=Le numéro du compte général n'est pas compris entre 1 et 8 \: %s\n lima.fiscalPeriod.franceAccountingRules.lastUnlockedFiscalPeriodException=Impossible de clore la dernière période fiscale ouverte. lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException=Le nombre maximal d'exercices ouverts est déjà ateint\: periode fiscale concernée du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY.\n @@ -269,7 +361,31 @@ lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodException=La nouvelle période fiscale doit suivre la précédente\: periode fiscale concernée du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException=Un numéro de compte ne commençant pas par 4 doit être numérique \: %s\n lima.fiscalYears=Exercices +lima.fiscalperiod.addfiscalperiod.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? +lima.fiscalperiod.addfiscalperiodtitle=Nouvel exercice +lima.fiscalperiod.begin=Début +lima.fiscalperiod.block.addretainedearnings=Reporter à nouveau? +lima.fiscalperiod.block.cantBalanceIfNextPeriodNotExist=Impossible de créer le report à nouveaux. L'exercice fiscal suivant n'existe pas +lima.fiscalperiod.block.cantBalanceNotBook=Impossible de créer le report à nouveaux. aucun journal n'est selectioné. +lima.fiscalperiod.block.cantBlockNotBalance=Impossible de clôturer un exercice non equilibré +lima.fiscalperiod.block.confirmation=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! +lima.fiscalperiod.block.newyear=Voulez vous créer un nouvel exercice? +lima.fiscalperiod.block.retainedearningstitle=Report à nouveau +lima.fiscalperiod.block.title=Cloture de l'exercice +lima.fiscalperiod.buttonback=← +lima.fiscalperiod.buttonnext=→ +lima.fiscalperiod.closed=Cloturé +lima.fiscalperiod.closure=Cloture +lima.fiscalperiod.delete.confirmation=Ètes vous sûre de vouloir supprimer cette période ? Cette action est irréversible \! +lima.fiscalperiod.delete.title=Suppression de l'exercice +lima.fiscalperiod.end=Fin +lima.fiscalperiod.entrybooks.create=Création d'un nouveau journal +lima.fiscalperiod.fiscalperiod=Exercice +lima.fiscalperiod.modifyfiscalperiodtitle=Modification de l'exercice +lima.fiscalperiod.open=Ouvert +lima.fiscalperiod.status=Statut lima.fiscalperiod.unbalancedtransactions=La période fiscale contient des transactions non équilibrées +lima.generateHtml=HTML lima.help=Aide lima.help.about=À Propos lima.help.about.title=À propos de Lima... @@ -321,36 +437,101 @@ lima.import.entries.noFiscalPeriodFoundException=Aucune periode fiscale trouvée.\n lima.import.noDataToImportException=Aucune donnée à importer. lima.import.unknownError=Erreur inconnue. -lima.importexport.all=Tout -lima.importexport.choiceencoding=Choix de l'encodage -lima.importexport.csv=Import/Export CSV -lima.importexport.defaultentrybooks=Journaux par défaut -lima.importexport.ebp=Import/Export EBP -lima.importexport.export=Exporter -lima.importexport.export.terminated=Export terminé -lima.importexport.import=Importer -lima.importexport.import.alreadyExistFinancialStatement=La transaction financière %s existe déjà sur le parent %s.\n -lima.importexport.import.alreadyExistVatStatement=La transaction de TVA %s existe déjà sur le parent %s.\n -lima.importexport.import.notAllowedLabel=Label non contenant un caractère interdit %s.\n -lima.importexport.usevatpdf=Êtes-vous sûr de vouloir utiliser ce pdf pour la déclaration de TVA ? +lima.importExport.account=des comptes terminé. +lima.importExport.all=Tout +lima.importExport.choiceencoding=Choix de l'encodage +lima.importExport.csv=Import/Export CSV +lima.importExport.defaultentrybooks=Journaux par défaut +lima.importExport.ebp=Import/Export EBP +lima.importExport.entry=des entrées terminé. +lima.importExport.entrybook=des journaux terminé. +lima.importExport.entrybooks=Journaux +lima.importExport.export=Exporter +lima.importExport.export.action=Export +lima.importExport.export.exceptions=Echec de l'export.\n +lima.importExport.export.failed=Echec de l'export \! +lima.importExport.export.terminated=Export terminé +lima.importExport.financialStatement=des déclaration financière terminé. +lima.importExport.financialTransaction=des transaction financière terminé. +lima.importExport.fiscalPeriod=des periodes fiscales terminé. +lima.importExport.identity=de l'identité terminé. +lima.importExport.import=Importer +lima.importExport.import.action=Import +lima.importExport.import.alreadyExistFinancialStatement=La transaction financière %s existe déjà sur le parent %s.\n +lima.importExport.import.alreadyExistVatStatement=La transaction de TVA %s existe déjà sur le parent %s.\n +lima.importExport.import.backupException=Echec de l'import du backup. +lima.importExport.import.extractFileError=Le fichier n'est correct +lima.importExport.import.line=Ligne %d\: +lima.importExport.import.nbCreated=%d créés\n +lima.importExport.import.nbIgnored=%d ignorés\n +lima.importExport.import.nbUpdated=%d mis à jours\n +lima.importExport.import.notAllowedLabel=Label non contenant un caractère interdit %s.\n +lima.importExport.import.terminated=Import terminé\n +lima.importExport.import.vatpdfimport=Le PDF a bien été importé dans le répertoire des ressources de Lima +lima.importExport.importcsv=Import/Export CSV +lima.importExport.importebp=Import/Export EBP +lima.importExport.importerror=Une erreur est survenue lors de l'import +lima.importExport.importtitle=Erreur d'import +lima.importExport.no.result=Aucun résultat trouvé. +lima.importExport.usevatpdf=Êtes-vous sûr de vouloir utiliser ce pdf pour la déclaration de TVA ? +lima.importExport.vatStatement=des transactions de tva terminé. +lima.importExport.wait=Traitement en cours… +lima.importExport.waittitle=Traitement en cours +lima.info=Information lima.init.closed=Lima fermé à %1$s lima.init.errorclosing=Erreur lors de la fermeture +lima.label=Libellé lima.ledger.documentcreationerror=Erreur lors de la création du document +lima.lettering.account=Comptes +lima.lettering.accountRegularization=Régularisation lettrage +lima.lettering.actions=Actions +lima.lettering.beginFinancialPeriod=De +lima.lettering.buttonAuto=Auto +lima.lettering.buttonEqualize=Equilibrer +lima.lettering.buttonLettered=Lettrer +lima.lettering.buttonNoLettered=Délettrer +lima.lettering.buttonRefresh=Rafraîchir +lima.lettering.checkAll=Toutes +lima.lettering.checkLettredEntry=Lettrées +lima.lettering.checkLettredEntrye= +lima.lettering.checkNoLettredEntry=Non-lettrées +lima.lettering.checkNoLettredEntrye= +lima.lettering.endFinancialPeriod=A +lima.lettering.entry=Écritures lima.lettering.listerror=Erreur lors de la récupération des données de la liste +lima.lettering.period=Périodes +lima.lettering.roundAndCreateEntry.error.lockedEntryBook=Impossible de modifier le lettrage d'une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod=Impossible de modifier le lettrage d'une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.lettering.selectCredit=Crédit +lima.lettering.selectDebit=Débit +lima.lettering.selectEntry=Sélection courante +lima.lettering.selectSolde=Solde +lima.list.seeAll=TOUS +lima.mainview.title=Lutin Invoice Monitoring and Accounting lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Adresse email de support lima.misc.supportemail.label=support +lima.movmentedfilter=Comptes mouvementés +lima.new=Nouveau +lima.nonaffect=N.R lima.ok=OK +lima.open=Ouvert lima.openejb.remotemode.description= lima.openejb.remotemode.label= lima.opening=Initialisation lima.opening.accounts=<html><center>Veuillez sélectionner un plan par défault, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> lima.opening.close=Fermer +lima.opening.end=Terminer lima.opening.entrybook=<html>Cochez la case pour importer les journaux par défaut \:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> lima.opening.import=Importer une sauvegarde CSV lima.opening.next=Suivant lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants<br/>Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV<br/><br/><br/><br/></center></html> +lima.paste=Coller lima.preferences=Préférences +lima.quit=Quitter +lima.refresh=Actualiser +lima.remove=Supprimer +lima.remove.shortcut="Supprimer (Suppr) lima.reports=Rapports lima.reports.account.noaccount= lima.reports.account.noaccounttitle= @@ -360,6 +541,11 @@ lima.reports.financialstatement=Bilan et Compte de résultat lima.reports.ledger=Grand Livre lima.reports.vat=Edition TVA +lima.retainedEarnings.wait=Report à nouveaux... +lima.search=Rechercher +lima.solde=Solde +lima.soldecredit=Solde Créditeur +lima.soldedebit=Solde Débiteur lima.splash.1=Chargement des services lima.splash.2=Chargement de la comptabilité lima.splash.3=Application prête \! @@ -388,205 +574,9 @@ lima.tooltip.Filter= lima.tooltip.filter=<html>Expression régulière \:<br/>- intervalle de compte i..j <br/>- liste de compte i,j,k <br/>- Exclure un compte -i</html> lima.tooltip.lettering=<html>Pour ajouter une lettre à plusieurs écritures <br/>Sélectionner plusieurs lignes avec la combinaison ctrl + click</html> -lima.ui.account.add.error.InvalidAccountNumber=Le numéro du compt %1$s n'est pas valide -lima.ui.account.add.error.alreadyExist=Le compt %1$s existe déjà -lima.ui.account.addaccount=Nouveau compte -lima.ui.account.addaccounttitle=Ajout d'un compte -lima.ui.account.base=Plan comptable de base -lima.ui.account.buttonback=← -lima.ui.account.buttonnext=→ -lima.ui.account.developed=Plan comptable développé -lima.ui.account.importtitle=Importer -lima.ui.account.label=Libellé -lima.ui.account.number=Numéro de compte -lima.ui.account.remove.error.usedAccount=Il exist des transactions sur ce compte -lima.ui.account.removeaccountconfirm=Voulez-vous supprimer le compte %s ? -lima.ui.account.removeaccounttitle=Suppression d'un compte -lima.ui.account.shortened=Plan comptable abrégé -lima.ui.account.update.error.invalidAccountNumber=Le numéro du compte %1$s n'est pas valide -lima.ui.account.updateaccounttitle=Modification d'un compte -lima.ui.common.amountcredit=Total Crédit -lima.ui.common.amountdebit=Total Débit -lima.ui.common.cancel=Annuler -lima.ui.common.error=Erreur -lima.ui.common.ok=Ok -lima.ui.common.refresh=Actualiser -lima.ui.common.remove=Supprimer -lima.ui.common.solde=Solde -lima.ui.common.update=Modifier -lima.ui.entries.assign.closed.entryBook.error=Impossible d'affecter cette valeur a l'ensemble des entrés de la transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.entries.letter.closed.entryBook.error=Impossible de modifier le lettrage des ces entrés car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.entries.letter.unbalanced.error=Impossible de lettrer ces écritures car leur solde n'est pas nul. -lima.ui.entry.add.error.afterLastFiscalPeriod=Impossible d'ajouter une entré car la date de la transaction est après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.ui.entry.add.error.beforeFirstFiscalPeriod=Impossible d'ajouter une entré car la date de la transaction est avant le %1$te %1$tB %1$tY début du premier exercice. -lima.ui.entry.add.error.lockedEntryBook=Impossible d'ajouter une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.entry.add.error.lockedFinancialPeriod=Impossible d'ajouter une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.ui.entry.add.error.noFinancialPeriod=Aucune période fiscale n'est définie. -lima.ui.entry.paste.error.afterLastFiscalPeriod=Impossible de copier une entré car la date de la transaction est après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.ui.entry.paste.error.beforeFirstFiscalPeriod=Impossible de copier une entré car la date de la transaction est avant le %1$te %1$tB %1$tY début du premier exercice. -lima.ui.entry.paste.error.lockedEntryBook=Impossible de copier une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.entry.paste.error.lockedFinancialPeriod=Impossible de copier une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.ui.entry.update.closed.entryBook.error=Impossible de modifier cette entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.entryBook.delete.used.error=Imposible de supprimer le journal %2$s (%1$s) car Il existe des transactioins sur ce journal. -lima.ui.entrybook.add=Ajout de journal -lima.ui.entrybook.code=Code -lima.ui.entrybook.default=Journaux par défault -lima.ui.entrybook.deletemessage=Êtes vous sûr de vouloir supprimer le journal %s ? -lima.ui.entrybook.deletetitle=Suppression de journal -lima.ui.entrybook.entrybooktile=Journal -lima.ui.entrybook.import=Importer -lima.ui.entrybook.importtitle=Import -lima.ui.entrybook.label=Libellé -lima.ui.entrybook.remove=Supprimer -lima.ui.entrybook.update=Modifier -lima.ui.financialTransaction.add.error.afterLastFiscalPeriod=Impossible d'ajouter une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.ui.financialTransaction.add.error.beforeFirstFiscalPeriod=Impossible d'ajouter une transaction avant le %1$te %1$tB %1$tY début du premier exercice. -lima.ui.financialTransaction.add.error.lockedEntryBook=Impossible d'ajouter une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.financialTransaction.add.error.lockedFinancialPeriod=Impossible d'ajouter une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.ui.financialTransaction.delete.error.lockedEntryBook=Impossible de supprimer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.financialTransaction.delete.error.lockedFinancialPeriod=Impossible de supprimer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.ui.financialTransaction.paste.error.afterLastFiscalPeriod=Impossible de copier une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.ui.financialTransaction.paste.error.beforeFirstFiscalPeriod=Impossible de copier une transaction avant le %1$te %1$tB %1$tY début du premier exercice. -lima.ui.financialTransaction.paste.error.lockedEntryBook=Impossible de copier une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.financialTransaction.paste.error.lockedFinancialPeriod=Impossible de copier une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.ui.financialTransaction.update.error.afterLastFiscalPeriod=Impossible de déplacer une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.ui.financialTransaction.update.error.beforeFirstFiscalPeriod=Impossible de déplacer une transaction avant le %1$te %1$tB %1$tY début du premier exercice. -lima.ui.financialTransaction.update.error.lockedEntryBook=Impossible de déplacer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.financialTransaction.update.error.lockedFinancialPeriod=Impossible de deplacer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.ui.financialperiod.begin=Début -lima.ui.financialperiod.block=Cloturer une période -lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.main=Impossible de clôturer cette période car les périodes précedentes ne sont pas clôturer \: -lima.ui.financialperiod.block.error.noLockedPreviousEntryBook.previousEntryBook=période du %1$te %1$tB %1$tY au %2$te %2$tB %2$tY -lima.ui.financialperiod.block.error.unbalanced.main=Impossible de clôturer cette période car elle contient des transactions non équilibrées \: -lima.ui.financialperiod.block.error.unbalanced.transaction=transaction du %1$te/%1$tm/%1$tY d'un débit de %2$s et d'un crédit de %3$s -lima.ui.financialperiod.block.error.unfilled.entry=entré du %1$te/%1$tm/%1$tY pour un montant de %2$s \: -lima.ui.financialperiod.block.error.unfilled.main=Impossible de clôturer cette période car elle contient des entrés incomplétes \: -lima.ui.financialperiod.block.error.unfilled.noAccount=n'a pas de compte -lima.ui.financialperiod.block.error.unfilled.noDescription=n'a pas de description -lima.ui.financialperiod.block.error.unfilled.noVoucher=n'a pas de pièce comptable -lima.ui.financialperiod.block.error.withoutEntryBook.main=Impossible de clôturer cette période car elle contient des transactions sans journal -lima.ui.financialperiod.block.error.withoutEntryBook.transaction=transaction du %1$te/%1$tm/%1$tY d'un montant de %2$s, -lima.ui.financialperiod.blockmessage=Êtes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! -lima.ui.financialperiod.blocktitle=Clôture -lima.ui.financialperiod.closure=Clôture -lima.ui.financialperiod.end=Fin -lima.ui.financialperiod.entrybook=Journal -lima.ui.financialperiod.period=Période -lima.ui.financialperiod.status=Statut -lima.ui.financialtransaction.account=Compte -lima.ui.financialtransaction.balance=Balance -lima.ui.financialtransaction.buttonback=← -lima.ui.financialtransaction.buttonnext=→ -lima.ui.financialtransaction.credit=Crédit -lima.ui.financialtransaction.date=Date -lima.ui.financialtransaction.dateInterval=Interval de dates -lima.ui.financialtransaction.dateInterval.in=Du -lima.ui.financialtransaction.dateInterval.to=au -lima.ui.financialtransaction.debit=Débit -lima.ui.financialtransaction.description=Description -lima.ui.financialtransaction.entrybook=Journal -lima.ui.financialtransaction.financialperiod=Périodes comptables -lima.ui.financialtransaction.fiscalyear=Exercices -lima.ui.financialtransaction.letter=Lettre -lima.ui.financialtransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? -lima.ui.financialtransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? -lima.ui.financialtransaction.nextfinancialperiod=Période suivante -lima.ui.financialtransaction.previousfinancialperiod=Période précédente -lima.ui.financialtransaction.titleremoveentry=Suppression -lima.ui.financialtransaction.titleremovetransaction=Suppression -lima.ui.financialtransaction.voucher=Pièce comptable -lima.ui.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=Le date de fin de l'exercice (%2$te/%2$tm/%2$tY) doit être postérieur à la date de début (%1$te/%1$tm/%1$tY) -lima.ui.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=Il existe déjà %1s exercices non clôturés. -lima.ui.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod=La date de début de l'exercice doit suivre la date de fin de l'exercice précédent le %1$te/%1$tm/%1$tY -lima.ui.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=L'exercice est déjà clôturés -lima.ui.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=L'exercice prédent doit être clôturé -lima.ui.fiscalPeriod.block.error.lockedFinancialPeriod=La période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.ui.fiscalPeriod.block.error.lockedFiscalPeriod=L'exercice ést clôturé %s -lima.ui.fiscalPeriod.buttonback=← -lima.ui.fiscalPeriod.buttonnext=→ -lima.ui.fiscalPeriod.delete.error.noEmptyFiscalPeriod=Impossible de supprimer un exercice avec des transactions (%1$s). -lima.ui.fiscalperiod.addfiscalperiod.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? -lima.ui.fiscalperiod.addfiscalperiodtitle=Nouvel exercice -lima.ui.fiscalperiod.begin=Début -lima.ui.fiscalperiod.block.addretainedearnings=Reporter à nouveau? -lima.ui.fiscalperiod.block.cantBalanceIfNextPeriodNotExist=Impossible de créer le report à nouveaux. L'exercice fiscal suivant n'existe pas -lima.ui.fiscalperiod.block.cantBalanceNotBook=Impossible de créer le report à nouveaux. aucun journal n'est selectioné. -lima.ui.fiscalperiod.block.cantBlockNotBalance=Impossible de clôturer un exercice non equilibré -lima.ui.fiscalperiod.block.confirmation=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! -lima.ui.fiscalperiod.block.newyear=Voulez vous créer un nouvel exercice? -lima.ui.fiscalperiod.block.retainedearningstitle=Report à nouveau -lima.ui.fiscalperiod.block.title=Cloture de l'exercice -lima.ui.fiscalperiod.buttonback=← -lima.ui.fiscalperiod.buttonnext=→ -lima.ui.fiscalperiod.closed=Cloturé -lima.ui.fiscalperiod.closure=Cloture -lima.ui.fiscalperiod.delete.confirmation=Ètes vous sûre de vouloir supprimer cette période ? Cette action est irréversible \! -lima.ui.fiscalperiod.delete.title=Suppression de l'exercice -lima.ui.fiscalperiod.end=Fin -lima.ui.fiscalperiod.entrybooks.create=Création d'un nouveau journal -lima.ui.fiscalperiod.fiscalperiod=Exercice -lima.ui.fiscalperiod.modifyfiscalperiodtitle=Modification de l'exercice -lima.ui.fiscalperiod.open=Ouvert -lima.ui.fiscalperiod.status=Statut -lima.ui.importexport.account=des comptes terminé. -lima.ui.importexport.entry=des entrées terminé. -lima.ui.importexport.entrybook=des journaux terminé. -lima.ui.importexport.entrybooks=Journaux -lima.ui.importexport.export=Exporter -lima.ui.importexport.export.action=Export -lima.ui.importexport.export.exceptions=Echec de l'export.\n -lima.ui.importexport.export.failed=Echec de l'export \! -lima.ui.importexport.export.terminated=Export terminé\n -lima.ui.importexport.financialStatement=des déclaration financière terminé. -lima.ui.importexport.financialTransaction=des transaction financière terminé. -lima.ui.importexport.fiscalPeriod=des periodes fiscales terminé. -lima.ui.importexport.identity=de l'identité terminé. -lima.ui.importexport.import=Importer -lima.ui.importexport.import.action=Import -lima.ui.importexport.import.backupException=Echec de l'import du backup. -lima.ui.importexport.import.extractFileError=Le fichier n'est correct -lima.ui.importexport.import.line=Ligne %d\: -lima.ui.importexport.import.nbCreated=%d créés\n -lima.ui.importexport.import.nbIgnored=%d ignorés\n -lima.ui.importexport.import.nbUpdated=%d mis à jours\n -lima.ui.importexport.import.terminated=Import terminé\n -lima.ui.importexport.import.vatpdfimport=Le PDF a bien été importé dans le répertoire des ressources de Lima -lima.ui.importexport.importcsv=Import/Export CSV -lima.ui.importexport.importebp=Import/Export EBP -lima.ui.importexport.importerror=Une erreur est survenue lors de l'import -lima.ui.importexport.importtitle=Erreur d'import -lima.ui.importexport.no.result=Aucun résultat trouvé. -lima.ui.importexport.vatStatement=des transactions de tva terminé. -lima.ui.importexport.wait=Traitement en cours… -lima.ui.importexport.waittitle=Traitement en cours -lima.ui.lettering.account=Comptes -lima.ui.lettering.accountRegularization=Régularisation lettrage -lima.ui.lettering.actions=Actions -lima.ui.lettering.beginFinancialPeriod=De -lima.ui.lettering.buttonAuto=Auto -lima.ui.lettering.buttonEqualize=Equilibrer -lima.ui.lettering.buttonLettered=Lettrer -lima.ui.lettering.buttonNoLettered=Délettrer -lima.ui.lettering.buttonRefresh=Rafraîchir -lima.ui.lettering.checkAll=Toutes -lima.ui.lettering.checkLettredEntry=Lettrées -lima.ui.lettering.checkLettredEntrye= -lima.ui.lettering.checkNoLettredEntry=Non-lettrées -lima.ui.lettering.checkNoLettredEntrye= -lima.ui.lettering.endFinancialPeriod=A -lima.ui.lettering.entry=Écritures -lima.ui.lettering.period=Périodes -lima.ui.lettering.roundAndCreateEntry.error.lockedEntryBook=Impossible de modifier le lettrage d'une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.ui.lettering.roundAndCreateEntry.error.lockedFinancialPeriod=Impossible de modifier le lettrage d'une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.ui.lettering.selectCredit=Crédit -lima.ui.lettering.selectDebit=Débit -lima.ui.lettering.selectEntry=Sélection courante -lima.ui.lettering.selectSolde=Solde -lima.ui.list.seeAll=TOUS -lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting -lima.ui.nonaffect=N.R -lima.ui.opening.end=Terminer -lima.ui.retainedEarnings.wait=Report à nouveaux... +lima.transaction=Transaction +lima.update=Modifier +lima.update.shortcut=Modifier (Ctrl+M) lima.vatStatement.alreadyExistVatStatement=u00C9chec \: Le plan %s exist déjà \! lima.vatStatements=Plan TVA lima.vatreport.listerror=Erreur lors de la récupération des données de la liste

1 0