r3700 - in trunk: lima-callao/src/main/java/org/chorem/lima/beans lima-swing lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition lima-swing/src/main/java/org/chorem/lima/ui/celleditor
Author: tchemit Date: 2013-08-02 18:38:54 +0200 (Fri, 02 Aug 2013) New Revision: 3700 Url: http://chorem.org/projects/lima/repository/revisions/3700 Log: fix API Modified: trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodCondition.java trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodCondition.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodCondition.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodCondition.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -31,9 +31,12 @@ /** * @author Sylvain Bavencoff <bavencoff@codelutin.com> + * @since 0.7 */ public class FiscalPeriodCondition implements Condition, Serializable { + private static final long serialVersionUID = 1L; + protected List<FiscalPeriod> fiscalPeriods; public List<FiscalPeriod> getFiscalPeriods() { Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) @@ -34,6 +34,10 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.bundleOutputName>lima</i18n.bundleOutputName> + + <!-- uses some sun.xxx classes --> + <signatureArtifactId>java16-sun</signatureArtifactId> + <signatureVersion>1.10</signatureVersion> </properties> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -89,7 +90,7 @@ public void setEntryBook(ListSelectionEvent event) { JList entryBookList = view.getEntryBookList(); - List selectedValuesList = entryBookList.getSelectedValuesList(); + List selectedValuesList = Lists.newArrayList(entryBookList.getSelectedValues()); condition.setEntryBooks(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -92,7 +93,7 @@ public void setFinancialPeriod(ListSelectionEvent event) { JList financialPeriodList = view.getFinancialPeriodList(); - List selectedValuesList = financialPeriodList.getSelectedValuesList(); + List selectedValuesList = Lists.newArrayList(financialPeriodList.getSelectedValues()); condition.setFinancialPeriods(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -76,7 +77,7 @@ public Object[] getFiscalPeriodList() { FiscalPeriodService fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodService.class); Object[] result = {}; - List<FiscalPeriod> periods = null; + List<FiscalPeriod> periods; try { periods = fiscalPeriodService.getAllFiscalPeriods(); result = periods.toArray(); @@ -90,7 +91,7 @@ public void setFiscalPeriod(ListSelectionEvent event) { JList fiscalPeriodList = view.getFiscalPeriodList(); - List selectedValuesList = fiscalPeriodList.getSelectedValuesList(); + List selectedValuesList = Lists.newArrayList(fiscalPeriodList.getSelectedValues()); condition.setFiscalPeriods(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -59,6 +59,7 @@ foreground = table.getSelectionForeground(); background = table.getSelectionBackground(); } else { + //FIXME tchemit-2013-08_02 Do not use sun. classes Color alternateColor = DefaultLookup.getColor(myCell, myCell.getUI(), "Table.alternateRowColor"); if (alternateColor != null) { @@ -91,9 +92,11 @@ if (hasFocus) { Border border = null; if (isSelected) { + //FIXME tchemit-2013-08_02 Do not use sun. classes border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.focusSelectedCellHighlightBorder"); } if (border == null) { + //FIXME tchemit-2013-08_02 Do not use sun. classes border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.focusCellHighlightBorder"); } myCell.setBorder(border); @@ -102,6 +105,7 @@ foreground = Color.BLACK; } } else { + //FIXME tchemit-2013-08_02 Do not use sun. classes Border border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.cellNoFocusBorder"); if (border == null) { border = new EmptyBorder(1, 1, 1, 1);
participants (1)
-
tchemit@users.chorem.org