- Sammoa-commits - mailman.cloud.codelutin.com

r555 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util
by fdesbois＠users.forge.codelutin.com Sept. 7, 2012

Sept. 7, 2012

Author: fdesbois Date: 2012-09-07 14:51:11 +0200 (Fri, 07 Sep 2012) New Revision: 555 Url: http://forge.codelutin.com/repositories/revision/sammoa/555 Log: fixes #1475: resolve issue with selection on new row Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableDataChangeListener.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableDataChangeListener.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableDataChangeListener.java 2012-09-07 12:42:43 UTC (rev 554) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableDataChangeListener.java 2012-09-07 12:51:11 UTC (rev 555) @@ -117,8 +117,10 @@ tableModel.fireTableRowsInserted(rowIndex, rowIndex + diff - 1); if (firstEditableColumn != NO_COLUMN_INDEX_TO_EDIT_ON_INSERT) { - table.changeSelection(rowIndex, firstEditableColumn, false, false); - table.editCellAt(rowIndex, firstEditableColumn); + int viewRowIndex = table.convertRowIndexToView(rowIndex); + int viewColIndex = table.convertColumnIndexToView(firstEditableColumn); + table.changeSelection(viewRowIndex, viewColIndex, false, false); + table.editCellAt(viewRowIndex, viewColIndex); } }

1 0

r554 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight
by fdesbois＠users.forge.codelutin.com Sept. 7, 2012

Sept. 7, 2012

Author: fdesbois Date: 2012-09-07 14:42:43 +0200 (Fri, 07 Sep 2012) New Revision: 554 Url: http://forge.codelutin.com/repositories/revision/sammoa/554 Log: fixes #1476 : block edition for validated transect Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java 2012-09-07 12:42:30 UTC (rev 553) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java 2012-09-07 12:42:43 UTC (rev 554) @@ -104,7 +104,8 @@ @Override public boolean isCellEditable(int rowIndex, int columnIndex) { TransectColumn column = TransectColumn.valueOf(columnIndex); - return column.isEditable(); + TransectFlightModel bean = getTransectFlights().get(rowIndex); + return column.isEditable(bean); } @Override @@ -333,8 +334,8 @@ SammoaUtil.setPropertyValue(bean, value, beanProperties); } - public boolean isEditable() { - boolean result = editable; + public boolean isEditable(TransectFlightModel bean) { + boolean result = !bean.isValid() && editable; return result; }

1 0

r553 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by fdesbois＠users.forge.codelutin.com Sept. 7, 2012

Sept. 7, 2012

Author: fdesbois Date: 2012-09-07 14:42:30 +0200 (Fri, 07 Sep 2012) New Revision: 553 Url: http://forge.codelutin.com/repositories/revision/sammoa/553 Log: Replace Beta by RC Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/BetaLayerUI.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/BetaLayerUI.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/BetaLayerUI.java 2012-09-07 11:43:11 UTC (rev 552) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/BetaLayerUI.java 2012-09-07 12:42:30 UTC (rev 553) @@ -63,6 +63,6 @@ g2.translate(35, 20); g2.setFont(new Font("Dialog", Font.BOLD, 16)); g2.setColor(Color.BLACK); - g2.drawString("Beta version", 10, 10); + g2.drawString("RC version", 10, 10); } }

1 0

r552 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action
by fdesbois＠users.forge.codelutin.com Sept. 7, 2012

Sept. 7, 2012

Author: fdesbois Date: 2012-09-07 13:43:11 +0200 (Fri, 07 Sep 2012) New Revision: 552 Url: http://forge.codelutin.com/repositories/revision/sammoa/552 Log: fixes #1465 : resolve issue with deleted on nextTransect + improve action bindings Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BaseFlightAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java 2012-09-07 11:43:11 UTC (rev 552) @@ -356,8 +356,9 @@ isOffEffort(), "You can call begin() only if flight is running (started, not ended, not on effort)"); Preconditions.checkState( - nextTransect != null, "You can't call begin() if no transect is selected. " + - "Call setNextTransect() method first"); + nextTransect != null && !nextTransect.isDeleted(), + "You can't call begin() if no transect is selected or if it is " + + "deleted. Call setNextTransect() method first"); TopiaContext tx = beginTransaction(); try { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-09-07 11:43:11 UTC (rev 552) @@ -613,7 +613,7 @@ // use it as next one boolean result = Routes.isAnyMatchTransectFlight( getModel().getRoutes(), transectFlight); - return !result; + return !transectFlight.isDeleted() && !result; } }); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BaseFlightAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BaseFlightAction.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BaseFlightAction.java 2012-09-07 11:43:11 UTC (rev 552) @@ -23,16 +23,23 @@ */ package fr.ulr.sammoa.ui.swing.flight.action; +import com.google.common.base.Splitter; import fr.ulr.sammoa.application.flightController.FlightController; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.flight.FlightUIHandler; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; +import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.JAXXContext; +import org.jdesktop.beans.AbstractBean; +import org.nuiton.topia.persistence.TopiaEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.swing.AbstractAction; import javax.swing.Icon; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.Iterator; /** * Created: 03/07/12 @@ -41,6 +48,9 @@ */ public abstract class BaseFlightAction extends AbstractAction { + /** Logger. */ + private static final Logger logger = LoggerFactory.getLogger(BaseFlightAction.class); + protected JAXXContext context; public BaseFlightAction(String name, Icon icon, JAXXContext context) { @@ -76,17 +86,94 @@ protected void bindModelProperties(String... properties) { for (String property : properties) { - getModel().addPropertyChangeListener(property, enabledListener); + EnabledListener enabledListener = new EnabledListener(property); + getModel().addPropertyChangeListener(enabledListener.getProperty(), enabledListener); } } - protected PropertyChangeListener enabledListener = new PropertyChangeListener() { + protected class EnabledListener implements PropertyChangeListener { + protected String property; + + protected EnabledListener embeddedListener; + + public EnabledListener(String property) { + + if (logger.isDebugEnabled()) { + logger.debug("[{}] New EnabledListener for property '{}'", + BaseFlightAction.this.getClass().getSimpleName(), + property); + } + + // Init embeddedListener for nestedProperty + if (property.contains(".")) { + Iterator<String> it = + Splitter.on(".").limit(2).split(property).iterator(); + + // First element is the property + this.property = it.next(); + + // Next property is the nested one + String nestedProperty = it.next(); + if (logger.isDebugEnabled()) { + logger.debug("[{}] Add embedded EnabledListener for " + + "nestedProperty '{}', this EnabledListener " + + "attached to '{}'", + new Object[] { + BaseFlightAction.this.getClass().getSimpleName(), + nestedProperty, + this.property + }); + } + this.embeddedListener = new EnabledListener(nestedProperty); + + // Attach embedded on the current value from model + Object currentValue = + SammoaUtil.getPropertyValue(getModel(), this.property); + attachEmbeddedListener(null, currentValue); + + } else { + this.property = property; + } + } + + public String getProperty() { + return property; + } + @Override public void propertyChange(PropertyChangeEvent evt) { + if (embeddedListener != null) { + attachEmbeddedListener(evt.getOldValue(), evt.getNewValue()); + } setEnabled(checkEnabled()); } - }; + protected void attachEmbeddedListener(Object oldValue, Object newValue) { + + if (oldValue != null) { + if (oldValue instanceof TopiaEntity) { + TopiaEntity entity = (TopiaEntity) oldValue; + entity.removePropertyChangeListener(embeddedListener.getProperty(), embeddedListener); + + } else if (oldValue instanceof AbstractBean) { + AbstractBean entity = (AbstractBean) oldValue; + entity.removePropertyChangeListener(embeddedListener.getProperty(), embeddedListener); + } + } + + if (newValue != null) { + if (newValue instanceof TopiaEntity) { + TopiaEntity entity = (TopiaEntity) newValue; + entity.addPropertyChangeListener(embeddedListener.getProperty(), embeddedListener); + + } else if (newValue instanceof AbstractBean) { + AbstractBean entity = (AbstractBean) newValue; + entity.addPropertyChangeListener(embeddedListener.getProperty(), embeddedListener); + } + } + } + } + protected abstract boolean checkEnabled(); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java 2012-09-07 11:43:11 UTC (rev 552) @@ -50,7 +50,7 @@ bindModelProperties( FlightUIModel.PROPERTY_FLIGHT_STATE, FlightUIModel.PROPERTY_CURRENT_ROUTE, - FlightUIModel.PROPERTY_NEXT_TRANSECT + FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted" ); } @@ -67,6 +67,7 @@ TransectFlight nextTransect = getModel().getNextTransect(); boolean isReadyForLeg = nextTransect != null + && !nextTransect.isDeleted() && getModel().getFlightState() == FlightState.OFF_EFFORT; return isCircleBack || isReadyForLeg; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java 2012-09-07 11:43:11 UTC (rev 552) @@ -44,7 +44,8 @@ public NextAction(JAXXContext context) { super(_("sammoa.action.next"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.next.tip")); - bindModelProperties(FlightUIModel.PROPERTY_FLIGHT_STATE, FlightUIModel.PROPERTY_NEXT_TRANSECT); + bindModelProperties(FlightUIModel.PROPERTY_FLIGHT_STATE, + FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted"); } @Override @@ -55,6 +56,7 @@ @Override protected boolean checkEnabled() { return getModel().getFlightState() == FlightState.ON_EFFORT - && getModel().getNextTransect() != null; + && getModel().getNextTransect() != null + && !getModel().getNextTransect().isDeleted(); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2012-09-07 11:43:11 UTC (rev 552) @@ -31,15 +31,11 @@ import fr.ulr.sammoa.persistence.Validable; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import jaxx.runtime.JAXXContext; -import org.jdesktop.beans.AbstractBean; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.Resource; import org.nuiton.validator.bean.list.BeanListValidator; import org.nuiton.validator.bean.list.BeanListValidatorEvent; import org.nuiton.validator.bean.list.BeanListValidatorListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Map; /** @@ -109,47 +105,47 @@ return getValidator(Observation.class); } - protected <E extends TopiaEntity & Validable> void bindValidableEntity(String propertyName, - Class<E> propertyClass) { - - getModel().addPropertyChangeListener(propertyName, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - TopiaEntity oldValue = (TopiaEntity) evt.getOldValue(); - if (oldValue != null) { - oldValue.removePropertyChangeListener( - "deleted", enabledListener); - } - TopiaEntity newValue = (TopiaEntity) evt.getNewValue(); - if (newValue != null) { - newValue.addPropertyChangeListener( - "deleted", enabledListener); - } - enabledListener.propertyChange(evt); - } - }); - } - - protected <E extends AbstractBean & Validable> void bindValidableModel(String propertyName, - Class<E> propertyClass) { - - getModel().addPropertyChangeListener(propertyName, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - AbstractBean oldValue = (AbstractBean) evt.getOldValue(); - if (oldValue != null) { - oldValue.removePropertyChangeListener( - "deleted", enabledListener); - } - AbstractBean newValue = (AbstractBean) evt.getNewValue(); - if (newValue != null) { - newValue.addPropertyChangeListener( - "deleted", enabledListener); - } - enabledListener.propertyChange(evt); - } - }); - } +// protected <E extends TopiaEntity & Validable> void bindValidableEntity(String propertyName, +// Class<E> propertyClass) { +// +// getModel().addPropertyChangeListener(propertyName, new PropertyChangeListener() { +// +// @Override +// public void propertyChange(PropertyChangeEvent evt) { +// TopiaEntity oldValue = (TopiaEntity) evt.getOldValue(); +// if (oldValue != null) { +// oldValue.removePropertyChangeListener( +// "deleted", enabledListener); +// } +// TopiaEntity newValue = (TopiaEntity) evt.getNewValue(); +// if (newValue != null) { +// newValue.addPropertyChangeListener( +// "deleted", enabledListener); +// } +// enabledListener.propertyChange(evt); +// } +// }); +// } +// +// protected <E extends AbstractBean & Validable> void bindValidableModel(String propertyName, +// Class<E> propertyClass) { +// +// getModel().addPropertyChangeListener(propertyName, new PropertyChangeListener() { +// +// @Override +// public void propertyChange(PropertyChangeEvent evt) { +// AbstractBean oldValue = (AbstractBean) evt.getOldValue(); +// if (oldValue != null) { +// oldValue.removePropertyChangeListener( +// "deleted", enabledListener); +// } +// AbstractBean newValue = (AbstractBean) evt.getNewValue(); +// if (newValue != null) { +// newValue.addPropertyChangeListener( +// "deleted", enabledListener); +// } +// enabledListener.propertyChange(evt); +// } +// }); +// } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java 2012-09-07 11:43:11 UTC (rev 552) @@ -50,7 +50,7 @@ public ValidObservationAction(JAXXContext context) { super(_("sammoa.action.validObservation"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validObservation.tip")); - bindValidableEntity(FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, Observation.class); + bindModelProperties(FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN + ".deleted"); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2012-09-07 11:43:11 UTC (rev 552) @@ -24,7 +24,6 @@ */ import fr.ulr.sammoa.application.FlightService; -import fr.ulr.sammoa.persistence.Observation; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.Routes; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; @@ -54,8 +53,8 @@ public ValidRouteAction(JAXXContext context) { super(_("sammoa.action.validRoute"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validRoute.tip")); - bindValidableEntity(FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, Observation.class); - bindValidableEntity(FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, Route.class); + bindModelProperties(FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN + ".deleted", + FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN + ".deleted"); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-09-07 08:48:22 UTC (rev 551) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-09-07 11:43:11 UTC (rev 552) @@ -24,7 +24,6 @@ */ import fr.ulr.sammoa.application.FlightService; -import fr.ulr.sammoa.persistence.Observation; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.TransectFlight; import fr.ulr.sammoa.persistence.TransectFlights; @@ -56,9 +55,9 @@ public ValidTransectAction(JAXXContext context) { super(_("sammoa.action.validTransect"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validTransect.tip")); - bindValidableEntity(FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, Observation.class); - bindValidableEntity(FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, Route.class); - bindValidableModel(FlightUIModel.PROPERTY_TRANSECT_FLIGHT_EDIT_BEAN, TransectFlightModel.class); + bindModelProperties(FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN + ".deleted", + FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN + ".deleted", + FlightUIModel.PROPERTY_TRANSECT_FLIGHT_EDIT_BEAN + ".deleted"); } @Override

1 0

r551 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home
by fdesbois＠users.forge.codelutin.com Sept. 7, 2012

Sept. 7, 2012

Author: fdesbois Date: 2012-09-07 10:48:22 +0200 (Fri, 07 Sep 2012) New Revision: 551 Url: http://forge.codelutin.com/repositories/revision/sammoa/551 Log: fixes #1458: NPE on flights copy Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java 2012-09-06 15:01:45 UTC (rev 550) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java 2012-09-07 08:48:22 UTC (rev 551) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; @@ -81,7 +80,8 @@ } public void setFlights(List<Flight> flights) { - List<Flight> oldValue = ImmutableList.copyOf(getFlights()); + // Note: Can't use ImmutableList for copy, the list contains the null flight + List<Flight> oldValue = Lists.newArrayList(getFlights()); this.flights = flights; firePropertyChange(PROPERTY_FLIGHTS, oldValue, flights); }

1 0

r550 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar
by bpoussin＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: bpoussin Date: 2012-09-06 17:01:45 +0200 (Thu, 06 Sep 2012) New Revision: 550 Url: http://forge.codelutin.com/repositories/revision/sammoa/550 Log: amelioration de la position de l'heure courante Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 14:45:25 UTC (rev 549) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 15:01:45 UTC (rev 550) @@ -119,8 +119,13 @@ row.add(buttons); row.add(progress); - row.add(time); + Box timeBox = Box.createVerticalBox(); + timeBox.add(time); + timeBox.add(Box.createVerticalGlue()); + + row.add(timeBox); + // And add them to this component. setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); this.add(row);

1 0

r549 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar
by bpoussin＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: bpoussin Date: 2012-09-06 16:45:25 +0200 (Thu, 06 Sep 2012) New Revision: 549 Url: http://forge.codelutin.com/repositories/revision/sammoa/549 Log: utilisation de la version longue de date format Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 14:42:21 UTC (rev 548) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 14:45:25 UTC (rev 549) @@ -178,7 +178,7 @@ start = date.getTime(); } int value = progress.getValue(); - String timeString = dateFormat.format(start + value); + String timeString = longDateFormat.format(start + value); time.setText(timeString); } });

1 0

r548 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar
by bpoussin＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: bpoussin Date: 2012-09-06 16:42:21 +0200 (Thu, 06 Sep 2012) New Revision: 548 Url: http://forge.codelutin.com/repositories/revision/sammoa/548 Log: bouton stop/start l'un sur l'autre affichage du temps courant en HH:mm:ss Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 14:41:36 UTC (rev 547) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 14:42:21 UTC (rev 548) @@ -81,9 +81,10 @@ protected JButton stop; // The Stop button protected JSlider progress; // Shows and sets current position in sound protected JLabel time; // Displays audioPosition as a number - protected JLabel maxTime; - protected int timePad; // le nombre de caratere a ajouter pour le temps + protected FastDateFormat dateFormat = FastDateFormat.getInstance("HH:mm"); + protected FastDateFormat longDateFormat = FastDateFormat.getInstance("HH:mm:ss"); + // Create a SoundPlayer component for the specified file. public SoundPlayer() { this(null); @@ -107,16 +108,18 @@ progress.setPaintTicks(true); progress.setPaintLabels(true); - time = new JLabel("0.0"); // Shows position as a # - maxTime = new JLabel("/0.0"); // Shows position as a # + time = new JLabel("00:00:00"); // Shows position as a # // put those controls in a row - Box row = Box.createHorizontalBox( ); - row.add(play); - row.add(stop); + Box row = Box.createHorizontalBox(); + + Box buttons = Box.createVerticalBox(); + buttons.add(play); + buttons.add(stop); + + row.add(buttons); row.add(progress); row.add(time); - row.add(maxTime); // And add them to this component. setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); @@ -169,9 +172,13 @@ progress.addChangeListener(new ChangeListener( ) { public void stateChanged(ChangeEvent e) { // changement du text de position - int value = progress.getValue( ); - String timeString = value/1000 + "." + (value%1000)/100; - timeString = StringUtils.leftPad(timeString, timePad, '0'); + Date date = getAudioReader().getStartDate(); + long start = 0; + if (date != null) { + start = date.getTime(); + } + int value = progress.getValue(); + String timeString = dateFormat.format(start + value); time.setText(timeString); } }); @@ -206,7 +213,7 @@ break; } } - FastDateFormat dateFormat = FastDateFormat.getInstance("HH:mm"); + /** * On met a la seconde dans le slider */ @@ -221,11 +228,6 @@ progress.setValue((int)getAudioReader().getPosition()); progress.setMaximum(max); - // Affichage du temps - String maxTimeString = (max/1000) + "." + (audioLength % 1000) / 100; - maxTime.setText("/" + maxTimeString); - timePad = maxTimeString.length(); - // calcul de l'espace entre chaque affichage de l'heure en fonction de la longueur du slider double width = progress.getSize().getWidth(); long step = audioLength * 100 / (long)width; // on minimum tous les 100px

1 0

r547 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by bpoussin＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: bpoussin Date: 2012-09-06 16:41:36 +0200 (Thu, 06 Sep 2012) New Revision: 547 Url: http://forge.codelutin.com/repositories/revision/sammoa/547 Log: modification du nom par defaut pour le fichier d'enregistrement Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-06 10:06:56 UTC (rev 546) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-06 14:41:36 UTC (rev 547) @@ -87,7 +87,7 @@ /** delay par defaut de chevauchement d'enregistrement */ protected int delay = 0; - protected JTextField filenameField = new JTextField("/tmp/junkk.wav"); + protected JTextField filenameField = new JTextField("Test.wav"); protected JTextArea informationArea = new JTextArea(); protected JButton captureBtn = new JButton("Capture");

1 0

r546 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: maven-release Date: 2012-09-06 12:06:56 +0200 (Thu, 06 Sep 2012) New Revision: 546 Url: http://forge.codelutin.com/repositories/revision/sammoa/546 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-06 10:06:49 UTC (rev 545) +++ trunk/pom.xml 2012-09-06 10:06:56 UTC (rev 546) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc1</version> + <version>1.0-rc2-SNAPSHOT</version> <modules> <module>sammoa-persistence</module> @@ -81,12 +81,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-09-06 10:06:49 UTC (rev 545) +++ trunk/sammoa-application/pom.xml 2012-09-06 10:06:56 UTC (rev 546) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc1</version> + <version>1.0-rc2-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-09-06 10:06:49 UTC (rev 545) +++ trunk/sammoa-persistence/pom.xml 2012-09-06 10:06:56 UTC (rev 546) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc1</version> + <version>1.0-rc2-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-09-06 10:06:49 UTC (rev 545) +++ trunk/sammoa-ui-swing/pom.xml 2012-09-06 10:06:56 UTC (rev 546) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc1</version> + <version>1.0-rc2-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0