Author: athimel Date: 2013-05-03 16:59:15 +0200 (Fri, 03 May 2013) New Revision: 3674 Url: http://chorem.org/projects/lima/repository/revisions/3674 Log: Fix easy Sonar blocker issues Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2013-05-03 14:29:35 UTC (rev 3673) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2013-05-03 14:59:15 UTC (rev 3674) @@ -427,9 +427,9 @@ LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false), LIMA_STATE_FILE("lima.ui.state.file", n_("lima.config.state.file"), "${lima.data.dir}/limaState.xml", String.class, false, false), COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", n_("lima.config.colorselectionfocus"), "#000000", Color.class, false, false), - COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell",n_("lima.config.comportmenteditingcell"), "ALL", comportmentEditingCellEnum.class, false, false); + COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell",n_("lima.config.comportmenteditingcell"), "ALL", ComportmentEditingCellEnum.class, false, false); - public enum comportmentEditingCellEnum {ALL, NOTHING} + public enum ComportmentEditingCellEnum {ALL, NOTHING} public final String key; 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 2013-05-03 14:29:35 UTC (rev 3673) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2013-05-03 14:59:15 UTC (rev 3674) @@ -78,7 +78,7 @@ protected BigDecimal solde = BigDecimal.ZERO; protected LettringSelectionModel lettringSelectionModel; protected LetteringEditModel editModel; - protected enum buttonMode {DELETTRED, LETTRED, EQUALIZED, ALL} + protected enum ButtonMode {DELETTRED, LETTRED, EQUALIZED, ALL} private static final Log log = LogFactory.getLog(LetteringViewHandler.class); public LetteringViewHandler(LetteringView view) { @@ -113,7 +113,7 @@ log.debug("balanceAndActions"); } if (view.getTable().getSelectedRows().length == 0) { - onButtonModeChanged(buttonMode.ALL); + onButtonModeChanged(ButtonMode.ALL); onBalanceChanged(null); } else if (!letteringNotExist(view.getTable().getSelectedRow())) { @@ -122,7 +122,7 @@ setValuesForSelectedEntries(); //For U.I. buttons (Lettering and unlettering) - onButtonModeChanged(buttonMode.DELETTRED); + onButtonModeChanged(ButtonMode.DELETTRED); } else { if (log.isDebugEnabled()) { log.debug("unlettred entries"); @@ -144,13 +144,13 @@ if ( secondSelectedEntry.getDebit() != firstSelectedEntry.getDebit() && (firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ZERO) >0 && firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ONE) <0) ) { - onButtonModeChanged(buttonMode.EQUALIZED); + onButtonModeChanged(ButtonMode.EQUALIZED); } }else { if (log.isDebugEnabled()) { log.debug("!2 rows selected"); } - onButtonModeChanged(buttonMode.ALL); + onButtonModeChanged(ButtonMode.ALL); } //Unlettred entries @@ -161,12 +161,12 @@ log.debug("Rows selected"); } setValuesForSelectedEntries(); - onButtonModeChanged(buttonMode.LETTRED); + onButtonModeChanged(ButtonMode.LETTRED); } else { if (log.isDebugEnabled()) { log.debug("No Rows selected"); } - onButtonModeChanged(buttonMode.ALL); + onButtonModeChanged(ButtonMode.ALL); } } } @@ -185,7 +185,7 @@ return emptyOrNull; } - public void onButtonModeChanged(buttonMode buttonMode) { + public void onButtonModeChanged(ButtonMode buttonMode) { switch (buttonMode) { case DELETTRED : @@ -402,13 +402,13 @@ public void addLetter() { String newLetters = financialTransactionService.getNextLetters(); changeLetter(newLetters); - onButtonModeChanged(buttonMode.DELETTRED); + onButtonModeChanged(ButtonMode.DELETTRED); } /**Remove a group of three letters to n entries*/ public void removeLetter() { changeLetter(null); - onButtonModeChanged(buttonMode.LETTRED); + onButtonModeChanged(ButtonMode.LETTRED); } /**Add or remove a group of three letters to n entries*/