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

r571 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application
by fdesbois＠users.forge.codelutin.com 11 Sep '12

11 Sep '12

Author: fdesbois Date: 2012-09-11 16:17:14 +0200 (Tue, 11 Sep 2012) New Revision: 571 Url: http://forge.codelutin.com/repositories/revision/sammoa/571 Log: fixes #1482 : use greater weighty for panel with flights Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx 2012-09-11 13:10:44 UTC (rev 570) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx 2012-09-11 14:17:14 UTC (rev 571) @@ -86,7 +86,7 @@ </row>  <row> - <cell fill='both' weightx='1.0' columns='3'> + <cell fill='both' weightx='1.0' weighty='2.0' columns='3'> <JPanel id='loadImportFileResultPanel' layout='{new BorderLayout()}' decorator='boxed'> <JLabel id='loadImportFileResultInfo'

1 0

r570 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation
by fdesbois＠users.forge.codelutin.com 11 Sep '12

11 Sep '12

Author: fdesbois Date: 2012-09-11 15:10:44 +0200 (Tue, 11 Sep 2012) New Revision: 570 Url: http://forge.codelutin.com/repositories/revision/sammoa/570 Log: fixes #1473 : clean AudioCheck Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java 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/flight/bar/validation/SoundPlayer.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java 2012-09-11 10:08:46 UTC (rev 569) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java 2012-09-11 13:10:44 UTC (rev 570) @@ -38,12 +38,4 @@ * @param audioPosition la nouvelle position en milliseconds */ public void positionChanged(AudioReader source, long audioPosition); - - /** - * @param source La source de l'evenement - * @param audioLength la nouvelle taille en milliseconds - * @deprecated no longer used - */ - @Deprecated - public void audioChanged(AudioReader source, long audioLength); } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java 2012-09-11 10:08:46 UTC (rev 569) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java 2012-09-11 13:10:44 UTC (rev 570) @@ -182,10 +182,7 @@ } // Get the clip length in microseconds and convert to milliseconds audioLength = (int)(clip.getMicrosecondLength( )/1000); - for (AudioPositionListener l : audioPositionListener) { - l.audioChanged(this, audioLength); - } - this.startDate = recordingDate; + startDate = recordingDate; setState(DeviceState.READY); logger.debug(String.format("Sound file '%s' loaded", file)); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java 2012-09-11 10:08:46 UTC (rev 569) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java 2012-09-11 13:10:44 UTC (rev 570) @@ -25,16 +25,17 @@ package fr.ulr.sammoa.application.device.audio; import com.google.common.base.Preconditions; +import com.google.common.base.Throwables; import com.google.common.collect.Sets; import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; import fr.ulr.sammoa.application.device.DeviceStateListener; import fr.ulr.sammoa.application.device.DeviceTechnicalException; -import java.io.File; -import java.io.IOException; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; @@ -42,10 +43,11 @@ import javax.sound.sampled.DataLine; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.TargetDataLine; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.util.Set; +import java.util.Timer; +import java.util.TimerTask; /** * Classe permettant l'enregistrement d'un fichier audio. Par defaut la @@ -289,8 +291,14 @@ targetDataLine.open(audioFormat); targetDataLine.start(); stream = new AudioInputStream(targetDataLine); - stream = AudioSystem.getAudioInputStream(encoding, stream); - + try { + stream = AudioSystem.getAudioInputStream(encoding, stream); + } catch (Exception eee) { + // Clean TargetDataLine if error occurs on audioInputStream + targetDataLine.stop(); + targetDataLine.close(); + throw Throwables.propagate(eee); + } } /** 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-11 10:08:46 UTC (rev 569) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-11 13:10:44 UTC (rev 570) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.base.Throwables; import fr.ulr.sammoa.application.device.audio.SammoaAudioReader; import fr.ulr.sammoa.application.device.audio.SammoaAudioRecorder; import fr.ulr.sammoa.ui.swing.flight.bar.validation.SoundPlayer; @@ -47,6 +46,8 @@ import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; import java.util.Date; @@ -192,9 +193,11 @@ new ActionListener(){ public void actionPerformed( ActionEvent e){ - captureBtn.setEnabled(false); - stopBtn.setEnabled(true); - captureAudio(); + boolean audioRecording = captureAudio(); + if (audioRecording) { + captureBtn.setEnabled(false); + stopBtn.setEnabled(true); + } } }); @@ -216,16 +219,36 @@ playerPanel.getAudioReader().load(file, new Date()); } }); + + addWindowListener(new WindowAdapter() { + + @Override + public void windowClosed(WindowEvent e) { + if (recorder != null) { + recorder.close(); + } + } + }); } - protected void captureAudio(){ - try{ - File file = new File(filenameField.getText()); - recorder = new SammoaAudioRecorder( - getSampleRate(), getSampleSizeInBits(), getCompression(), 0); + protected boolean captureAudio(){ + File file = new File(filenameField.getText()); + if (recorder != null) { + recorder.close(); + } + recorder = new SammoaAudioRecorder( + getSampleRate(), getSampleSizeInBits(), getCompression(), 0); + try { recorder.record(file, true); - }catch (Exception eee) { + return true; + + } catch (Exception eee) { + // Close only on error, otherwise no recording will be launch + recorder.close(); + logger.error("Can't capture audio", eee); + SammoaUtil.showErrorMessage(this, "Can't capture audio : " + eee.getMessage()); + return false; } } @@ -278,19 +301,27 @@ r1.stop(); r2.stop(); delay = 5; - SammoaUtil.showSuccessMessage(this, "The recording delay is set to " + - "5 seconds between each recording, " + - "you can update this value from" + - " configuration interface"); + if (logger.isInfoEnabled()) { + logger.info("The recording delay is set to 5 seconds between " + + "each recording, you can update this value from" + + " configuration interface"); + } + } catch(IOException ex) { - throw Throwables.propagate(ex); + if (logger.isErrorEnabled()) { + logger.error("Can't check audio line", ex); + } + SammoaUtil.showErrorMessage(this, "Can't check audio line : " + ex.getMessage()); } catch(LineUnavailableException ex) { delay = 0; - logger.error("Can't record multiple file in same time", ex); - SammoaUtil.showErrorMessage(this, "Can't record multiple file in " + - "same time, 0 second delay " + - "between recording must be used"); + if (logger.isDebugEnabled()) { + logger.debug("Can't record multiple file at the same time", ex); + } + if (logger.isInfoEnabled()) { + logger.info("Can't record multiple file at the same time, 0 " + + "second delay between recording must be used"); + } } finally { r1.close(); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/SoundPlayer.java 2012-09-11 10:08:46 UTC (rev 569) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/SoundPlayer.java 2012-09-11 13:10:44 UTC (rev 570) @@ -32,8 +32,6 @@ import fr.ulr.sammoa.application.device.audio.SammoaAudioReader; import org.apache.commons.lang3.time.FastDateFormat; -import javax.sound.sampled.LineUnavailableException; -import javax.sound.sampled.UnsupportedAudioFileException; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; @@ -48,7 +46,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.File; -import java.io.IOException; import java.util.Date; import java.util.Hashtable; @@ -73,7 +70,7 @@ protected AudioReader reader; // le fichier charge acutellement au niveau de l'ui (config du slider - protected File currentFile; +// protected File currentFile; // The following fields are for the GUI protected JButton play; // The Play button @@ -323,8 +320,7 @@ } // The main method just creates a SoundPlayer in a Frame and displays it - public static void main(String[] args) - throws IOException, UnsupportedAudioFileException, LineUnavailableException { + public static void main(String[] args) { SoundPlayer player; File file; @@ -347,8 +343,4 @@ f.pack(); f.setVisible(true); } - - public void audioChanged(AudioReader source, long audioLength) { - // A SUPPRIMER - } } \ No newline at end of file

1 0

r569 - in trunk/sammoa-ui-swing/src/main: java/fr/ulr/sammoa/ui/swing/flight/effort resources/i18n
by fdesbois＠users.forge.codelutin.com 11 Sep '12

11 Sep '12

Author: fdesbois Date: 2012-09-11 12:08:46 +0200 (Tue, 11 Sep 2012) New Revision: 569 Url: http://forge.codelutin.com/repositories/revision/sammoa/569 Log: fixes #1469 : allow LEG transect edition Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/RouteTableModel.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-10 15:55:43 UTC (rev 568) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-11 10:08:46 UTC (rev 569) @@ -24,10 +24,10 @@ */ import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; +import com.google.common.base.Objects; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import fr.ulr.sammoa.application.DecoratorService; import fr.ulr.sammoa.application.FlightService; import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; @@ -415,14 +415,22 @@ UIDecoratorService decoratorService = context.getService(UIDecoratorService.class); - TableCellRenderer stringRenderer = table.getDefaultRenderer(String.class); - // TransectFlight { + TableCellRenderer tableRenderer = + decoratorService.newTableCellRender(TransectFlightModel.class); TableCellRenderer renderer = new TransectFlightCellRenderer( - stringRenderer, decoratorService, getModel()); + tableRenderer, getModel()); + JComboBox comboBox = new JComboBox(); + ListCellRenderer listRenderer = + decoratorService.newListCellRender(TransectFlightModel.class); + comboBox.setRenderer(listRenderer); + TableCellEditor editor = new TransectFlightCellEditor( + comboBox, getModel()); + table.setDefaultRenderer(TransectFlight.class, renderer); + table.setDefaultEditor(TransectFlight.class, editor); } table.addHighlighter(SammoaUtil.newBackgroundColorHighlighter( @@ -878,19 +886,92 @@ } }; + /** + * Editor for type {@link TransectFlight}. This will use the + * {@link DefaultCellEditor} with {@link JComboBox} as editor component. + * <p/> + * The model used is the list of {@link TransectFlightModel} from + * {@link FlightUIModel}. So we need to convert {@link TransectFlightModel} + * to {@link TransectFlight} and listen the model change on property + * {@link FlightUIModel#PROPERTY_TRANSECT_FLIGHTS}. + * <p/> + * We also want to ensure the change by asking a user question to confirm it. + */ + private static class TransectFlightCellEditor extends DefaultCellEditor + implements PropertyChangeListener { + + protected FlightUIModel model; + + protected TransectFlight initValue; + + public TransectFlightCellEditor(JComboBox comboBox, + FlightUIModel model) { + super(comboBox); + this.model = model; + SwingUtil.fillComboBox(comboBox, model.getTransectFlights(), null); + model.addPropertyChangeListener(FlightUIModel.PROPERTY_TRANSECT_FLIGHTS, this); + } + + @Override + public Component getTableCellEditorComponent(JTable table, + Object value, + boolean isSelected, + int row, + int column) { + + initValue = (TransectFlight) value; + TransectFlightModel modelValue = TransectFlightModel.findTransectFlightModel( + model.getTransectFlights(), initValue); + + return super.getTableCellEditorComponent(table, modelValue, isSelected, row, column); + } + + @Override + public TransectFlight getCellEditorValue() { + TransectFlightModel modelValue = (TransectFlightModel) super.getCellEditorValue(); + return modelValue == null ? null : modelValue.getSource(); + } + + @Override + public boolean stopCellEditing() { + boolean result; + + TransectFlight value = getCellEditorValue(); + if (Objects.equal(value, initValue) + || SammoaUtil.askQuestion(editorComponent, _( + "sammoa.confirmDialog.changeRouteTransect.message", + value.getTransect().getName()))) { + + result = super.stopCellEditing(); + + } else { + cancelCellEditing(); + result = true; + } + return result; + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + + List<TransectFlightModel> newValue = + (List<TransectFlightModel>) evt.getNewValue(); + + if (newValue != null) { + SwingUtil.fillComboBox((JComboBox) editorComponent, newValue, null); + } + } + } + private static class TransectFlightCellRenderer implements TableCellRenderer { protected TableCellRenderer delegate; - protected Decorator<TransectFlightModel> decorator; - protected FlightUIModel model; public TransectFlightCellRenderer(TableCellRenderer delegate, - DecoratorService decoratorService, FlightUIModel model) { this.delegate = delegate; - this.decorator = decoratorService.getDecoratorByType(TransectFlightModel.class); this.model = model; } @@ -907,14 +988,11 @@ if (value != null) { TransectFlight transectFlight = (TransectFlight) value; - // Retrieve the transect params from matching TransectFlightModel - TransectFlightModel transectFlightModel = - TransectFlightModel.findTransectFlightModel(model.getTransectFlights(), - transectFlight); - - newValue = decorator.toString(transectFlightModel); + newValue = TransectFlightModel.findTransectFlightModel( + model.getTransectFlights(), transectFlight); } - return delegate.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column); + return delegate.getTableCellRendererComponent( + table, newValue, isSelected, hasFocus, row, column); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/RouteTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/RouteTableModel.java 2012-09-10 15:55:43 UTC (rev 568) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/RouteTableModel.java 2012-09-11 10:08:46 UTC (rev 569) @@ -136,7 +136,15 @@ } }, ROUTE_TYPE(false, RouteType.class, Route.PROPERTY_ROUTE_TYPE), - TRANSECT(false, TransectFlight.class, Route.PROPERTY_TRANSECT_FLIGHT), + TRANSECT(true, TransectFlight.class, Route.PROPERTY_TRANSECT_FLIGHT) { + + @Override + public boolean isEditable(Route bean, boolean validationMode) { + return super.isEditable(bean, validationMode) + && bean.getRouteType() == RouteType.LEG + && validationMode; + } + }, SEA_STATE(true, int.class, Route.PROPERTY_SEA_STATE), SWELL(true, int.class, Route.PROPERTY_SWELL), TURBIDITY(true, int.class, Route.PROPERTY_TURBIDITY), Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-10 15:55:43 UTC (rev 568) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-11 10:08:46 UTC (rev 569) @@ -72,6 +72,7 @@ sammoa.config.category.other.description=Other sammoa.config.category.shortcuts=Shortcuts sammoa.config.category.shortcuts.description=List of all the shortcuts +sammoa.confirmDialog.changeRouteTransect.message=Are you sure you want to change the LEG transect by %s ? sammoa.confirmDialog.deleteTransect.message=The flight is not started, do you want to definitely delete this flight's transect ? sammoa.confirmDialog.flightInProgress.message.exit=A flight is in progress, are you sure you want to quit ? sammoa.confirmDialog.flightInProgress.message.showHome=A flight is in progress, are you sure you want to go back to the home screen ?

1 0

r568 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util
by fdesbois＠users.forge.codelutin.com 10 Sep '12

10 Sep '12

Author: fdesbois Date: 2012-09-10 17:55:43 +0200 (Mon, 10 Sep 2012) New Revision: 568 Url: http://forge.codelutin.com/repositories/revision/sammoa/568 Log: fixes #1470: improve refresh for crossingNumber and realNbTimes Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.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/TransectFlightModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/ValidationBarHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/RouteTableModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java 2012-09-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java 2012-09-10 15:55:43 UTC (rev 568) @@ -80,8 +80,19 @@ decoratorProvider = new DecoratorProvider() { @Override protected void loadDecorators() { - registerJXPathDecorator(Route.class, "${routeType}$s ${beginTime}$tH:%2$tM:%2$tS"); - registerJXPathDecorator(Observation.class, "Obs_${observationNumber}$s ${observationTime}$tH:%2$tM:%2$tS"); + registerDecorator(new Decorator<Route>(Route.class) { + + @Override + public String toString(Object bean) { + Route route = (Route) bean; + String result = route.getRouteType().name(); + if (route.getEffortNumber() != null) { + result += " " + route.getEffortNumber(); + } + return result; + } + }); + registerJXPathDecorator(Observation.class, "Sighting ${observationNumber}$s"); registerJXPathDecorator(Transect.class, "${name}$s"); registerJXPathDecorator(Observer.class, "${initials}$s"); registerMultiJXPathDecorator(Strate.class, "${code}$s##${name}$s", "##", " - "); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2012-09-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2012-09-10 15:55:43 UTC (rev 568) @@ -563,6 +563,10 @@ return result; } + public Long getTransectRealNbTimes(Transect transect) { + return getTransectRealNbTimes(Lists.newArrayList(transect)).get(transect); + } + public Map<Transect, Long> getTransectRealNbTimes(Collection<Transect> transects) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java 2012-09-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java 2012-09-10 15:55:43 UTC (rev 568) @@ -29,6 +29,7 @@ import fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.persistence.Strate; import fr.ulr.sammoa.ui.swing.flight.StrateModel; +import fr.ulr.sammoa.ui.swing.flight.TransectFlightModel; import fr.ulr.sammoa.ui.swing.flight.TransectModel; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; @@ -53,6 +54,7 @@ // add extra ui decorators decoratorProvider.registerJXPathDecorator(TransectModel.class, "${source/name}$s"); + decoratorProvider.registerJXPathDecorator(TransectFlightModel.class, "${transect/source/name}$s (${crossingNumber}$d)"); decoratorProvider.registerDecorator(new Decorator<StrateModel>(StrateModel.class) { private static final long serialVersionUID = 1L; 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-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-09-10 15:55:43 UTC (rev 568) @@ -658,6 +658,9 @@ getModel().addPropertyChangeListener( FlightUIModel.PROPERTY_NEXT_TRANSECT, nextTransectListener); + getModel().addPropertyChangeListener( + FlightUIModel.PROPERTY_TRANSECT_FLIGHTS, removeTransectListener); + transectUi = new TransectUI(context); transectUi.addComponentListener(transectUIListener); @@ -1180,6 +1183,35 @@ } }; + protected PropertyChangeListener removeTransectListener = new PropertyChangeListener() { + + // Update transectRealNbTimes on transectFlight removal + + @Override + public void propertyChange(PropertyChangeEvent evt) { + + if (evt instanceof IndexedPropertyChangeEvent) { + int index = ((IndexedPropertyChangeEvent) evt).getIndex(); + + // REMOVE case + if (SammoaUtil.isCollectionRemoveEvent(evt)) { + + List<TransectFlightModel> oldList = + (List<TransectFlightModel>) evt.getOldValue(); + + TransectFlightModel model = oldList.get(index); + + TransectModel transectModel = model.getTransect(); + FlightService service = context.getService(FlightService.class); + Long value = service.getTransectRealNbTimes(transectModel.getSource()); + + int realNbTimes = Objects.firstNonNull(value, 0).intValue(); + transectModel.setRealNbTimes(realNbTimes); + } + } + } + }; + protected PropertyChangeListener transectFlightListener = new PropertyChangeListener() { @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectFlightModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectFlightModel.java 2012-09-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectFlightModel.java 2012-09-10 15:55:43 UTC (rev 568) @@ -167,6 +167,12 @@ return flightModel.getFlight(); } + public static TransectFlightModel findTransectFlightModel(Iterable<TransectFlightModel> transectFlightModels, + TransectFlight transectFlight) { + return Iterables.find( + transectFlightModels, new WithTransectFlightPredicate(transectFlight)); + } + public static int indexOfTransectFlight(Iterable<TransectFlightModel> transectFlightModels, TransectFlight transectFlight) { return Iterables.indexOf( Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/ValidationBarHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/ValidationBarHandler.java 2012-09-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/ValidationBarHandler.java 2012-09-10 15:55:43 UTC (rev 568) @@ -26,24 +26,20 @@ import fr.ulr.sammoa.application.device.audio.AudioReader; import fr.ulr.sammoa.application.flightController.FlightController; -import fr.ulr.sammoa.persistence.Observation; -import fr.ulr.sammoa.persistence.Route; +import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.flight.FlightUI; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; -import fr.ulr.sammoa.ui.swing.flight.TransectFlightModel; +import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; +import javax.swing.JButton; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import static org.nuiton.i18n.I18n._; - /** @author fdesbois <fdesbois(a)codelutin.com> */ public class ValidationBarHandler { -// private static final Logger logger = -// LoggerFactory.getLogger(ValidationBarHandler.class); - protected final ValidationBar ui; public ValidationBarHandler(ValidationBar ui) { @@ -67,61 +63,43 @@ ui.getSoundPlayer().setReader(audioReader); getModel().addPropertyChangeListener( - FlightUIModel.PROPERTY_TRANSECT_FLIGHT_EDIT_BEAN, validTransectListener); + FlightUIModel.PROPERTY_TRANSECT_FLIGHT_EDIT_BEAN, + new ValidableChangeListener(ui, ui.getValidTransectButton())); getModel().addPropertyChangeListener( - FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, validRouteListener); + FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, + new ValidableChangeListener(ui, ui.getValidRouteButton())); getModel().addPropertyChangeListener( - FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, validObservationListener); + FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, + new ValidableChangeListener(ui, ui.getValidObservationButton())); } - protected PropertyChangeListener validTransectListener = new PropertyChangeListener() { + private static class ValidableChangeListener implements PropertyChangeListener { - @Override - public void propertyChange(PropertyChangeEvent evt) { + protected SammoaUIContext context; - TransectFlightModel newValue = (TransectFlightModel) evt.getNewValue(); + protected JButton button; - String text = null; - if (newValue != null) { - text = newValue.getTransect().getSource().getName(); - } - ui.getValidTransectButton().setText(text); + private ValidableChangeListener(JAXXObject jaxxObject, + JButton button) { + this.context = jaxxObject.getContextValue(SammoaUIContext.class); + this.button = button; } - }; - protected PropertyChangeListener validRouteListener = new PropertyChangeListener() { - @Override public void propertyChange(PropertyChangeEvent evt) { + Object newValue = evt.getNewValue(); - Route newValue = (Route) evt.getNewValue(); - - String text = null; + String text; if (newValue != null) { - text = newValue.getRouteType().name(); - if (newValue.getEffortNumber() != null) { - text += " " + newValue.getEffortNumber(); - } - } - ui.getValidRouteButton().setText(text); - } - }; + UIDecoratorService service = context.getService(UIDecoratorService.class); + text = service.getDecorator(newValue).toString(newValue); - protected PropertyChangeListener validObservationListener = new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - - Observation newValue = (Observation) evt.getNewValue(); - - String text = null; - if (newValue != null) { - text = _("sammoa.validable.observation") - + " " + newValue.getObservationNumber(); + } else { + text = null; } - ui.getValidObservationButton().setText(text); + button.setText(text); } - }; + } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-10 15:55:43 UTC (rev 568) @@ -27,6 +27,7 @@ import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import fr.ulr.sammoa.application.DecoratorService; import fr.ulr.sammoa.application.FlightService; import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; @@ -43,6 +44,7 @@ import fr.ulr.sammoa.persistence.Position; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.Routes; +import fr.ulr.sammoa.persistence.TransectFlight; import fr.ulr.sammoa.ui.swing.SammoaColors; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.UIDecoratorService; @@ -408,8 +410,21 @@ } } - // Highlighters + // Renderers/Editors/Highlighters { + UIDecoratorService decoratorService = + context.getService(UIDecoratorService.class); + + TableCellRenderer stringRenderer = table.getDefaultRenderer(String.class); + + // TransectFlight + { + TableCellRenderer renderer = new TransectFlightCellRenderer( + stringRenderer, decoratorService, getModel()); + + table.setDefaultRenderer(TransectFlight.class, renderer); + } + table.addHighlighter(SammoaUtil.newBackgroundColorHighlighter( new RouteForSelectedTransectFlightHighlightPredicate(getModel()), SammoaColors.ROUTE_FOR_TRANSECT_ROW_COLOR) @@ -863,6 +878,46 @@ } }; + private static class TransectFlightCellRenderer implements TableCellRenderer { + + protected TableCellRenderer delegate; + + protected Decorator<TransectFlightModel> decorator; + + protected FlightUIModel model; + + public TransectFlightCellRenderer(TableCellRenderer delegate, + DecoratorService decoratorService, + FlightUIModel model) { + this.delegate = delegate; + this.decorator = decoratorService.getDecoratorByType(TransectFlightModel.class); + this.model = model; + } + + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + + Object newValue = value; + + if (value != null) { + TransectFlight transectFlight = (TransectFlight) value; + + // Retrieve the transect params from matching TransectFlightModel + TransectFlightModel transectFlightModel = + TransectFlightModel.findTransectFlightModel(model.getTransectFlights(), + transectFlight); + + newValue = decorator.toString(transectFlightModel); + } + return delegate.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column); + } + } + private static class ObservationPositionCellRenderer implements TableCellRenderer { protected TableCellRenderer delegate; @@ -961,40 +1016,6 @@ } } -// public static class DeletedRowHighlightPredicate<T extends Deletable> extends AbstractRowHighlightPredicate { -// -// protected FlightUIModel UIModel; -// -// protected Class<T> referenceClass; -// -// public DeletedRowHighlightPredicate(FlightUIModel UIModel, -// Class<T> referenceClass) { -// this.UIModel = UIModel; -// this.referenceClass = referenceClass; -// } -// -// @Override -// protected boolean isHighlighted(int rowIndex) { -// boolean result = getValueAt(rowIndex).isDeleted(); -// return result; -// } -// -// @Override -// protected T getValueAt(int rowIndex) { -// List<T> list; -// if (Route.class.isAssignableFrom(referenceClass)) { -// list = (List<T>) UIModel.getRoutes(); -// -// } else if (Observation.class.isAssignableFrom(referenceClass)) { -// list = (List<T>) UIModel.getObservations(); -// -// } else { -// throw new IllegalStateException("Not supported type " + referenceClass.getName()); -// } -// return list.get(rowIndex); -// } -// } - public static class RouteForSelectedTransectFlightHighlightPredicate extends AbstractRowHighlightPredicate { protected FlightUIModel UIModel; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/RouteTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/RouteTableModel.java 2012-09-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/RouteTableModel.java 2012-09-10 15:55:43 UTC (rev 568) @@ -27,7 +27,6 @@ import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.RouteType; -import fr.ulr.sammoa.persistence.Transect; import fr.ulr.sammoa.persistence.TransectFlight; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; @@ -137,31 +136,7 @@ } }, ROUTE_TYPE(false, RouteType.class, Route.PROPERTY_ROUTE_TYPE), - TRANSECT(false, String.class, - Route.PROPERTY_TRANSECT_FLIGHT, - TransectFlight.PROPERTY_TRANSECT, - Transect.PROPERTY_NAME - ) { - @Override - public Object getValue(Route bean, RouteTableModel model) { - Object result; - TransectFlight transectFlight = bean.getTransectFlight(); - if (transectFlight != null) { - - Transect transect = transectFlight.getTransect(); - -// int index = model.getFlight().getTransectFlightIndex(transectFlight); -// result = transect.getName() + " (" + index + ")"; - - int crossingNumber = transectFlight.getCrossingNumber(); - result = transect.getName() + " (" + crossingNumber + ")"; - - } else { - result = null; - } - return result; - } - }, + TRANSECT(false, TransectFlight.class, Route.PROPERTY_TRANSECT_FLIGHT), SEA_STATE(true, int.class, Route.PROPERTY_SEA_STATE), SWELL(true, int.class, Route.PROPERTY_SWELL), TURBIDITY(true, int.class, Route.PROPERTY_TURBIDITY), Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java 2012-09-10 15:53:25 UTC (rev 567) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java 2012-09-10 15:55:43 UTC (rev 568) @@ -24,6 +24,7 @@ */ package fr.ulr.sammoa.ui.swing.util; +import com.ezware.oxbow.swingbits.util.Preconditions; import com.google.common.base.Joiner; import com.google.common.base.Predicates; import com.google.common.base.Throwables; @@ -55,8 +56,10 @@ import java.awt.Dimension; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.beans.PropertyChangeEvent; import java.io.File; import java.lang.reflect.InvocationTargetException; +import java.util.Collection; /** * Created: 14/06/12 @@ -131,6 +134,20 @@ return result; } + public static boolean isCollectionRemoveEvent(PropertyChangeEvent event) { + boolean result = false; + if (event.getOldValue() != null && event.getNewValue() != null) { + Preconditions.checkArgument(event.getOldValue() instanceof Collection); + Preconditions.checkArgument(event.getNewValue() instanceof Collection); + + int oldSize = ((Collection) event.getOldValue()).size(); + int newSize = ((Collection) event.getNewValue()).size(); + + result = oldSize > newSize; + } + return result; + } + public static <T> TableSelectionListener<T> addTableSelectionListener(JTable table, SelectionModelAdapter<T> selectionModelAdapter) { TableSelectionListener<T> result =

1 0

r567 - in trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight: action effort
by fdesbois＠users.forge.codelutin.com 10 Sep '12

10 Sep '12

Author: fdesbois Date: 2012-09-10 17:53:25 +0200 (Mon, 10 Sep 2012) New Revision: 567 Url: http://forge.codelutin.com/repositories/revision/sammoa/567 Log: little cleaning 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/ValidTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 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-10 13:33:34 UTC (rev 566) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2012-09-10 15:53:25 UTC (rev 567) @@ -93,7 +93,6 @@ validatorIsAdjusting = true; - getModel().setCurrentRoute(routeChanged); getModel().setRouteEditBean(routeChanged); getModel().setObservationEditBean(null); 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-10 13:33:34 UTC (rev 566) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-09-10 15:53:25 UTC (rev 567) @@ -129,7 +129,6 @@ // Keep the route selected if (routeEditBean != null && !routeEditBean.isDeleted()) { - getModel().setCurrentRoute(routeEditBean); getModel().setRouteEditBean(routeEditBean); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-10 13:33:34 UTC (rev 566) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-10 15:53:25 UTC (rev 567) @@ -360,51 +360,25 @@ // FlightController # change current route getModel().addPropertyChangeListener( - FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, - new PropertyChangeListener() { + FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Route route = (Route) evt.getNewValue(); - getParentUI().getHandler().getFlightController().setCurrentRoute(route); + @Override + public void propertyChange(PropertyChangeEvent evt) { + onRouteChangedForValidation( + (Route) evt.getOldValue(), + (Route) evt.getNewValue()); + } + }); - if (route == null) { - // no unselect but ensure valid button (a select will cause a loop) - getModel().setObservationEditBean(null); - - } else { - - // Set audio position - setAudioReaderPositionDate(route.getBeginTime()); - - // Remove observationEditBean if not in route - Observation previousObservation = getModel().getObservationEditBean(); - if (previousObservation != null - && !Observations.inRoute(previousObservation, route, getModel().getRoutes(), true)) { - - // no unselect but ensure valid button (a select will cause a loop) - getModel().setObservationEditBean(null); - } - } - } - } - ); - // Refresh matching routes from selected transectFlight getModel().addPropertyChangeListener( FlightUIModel.PROPERTY_TRANSECT_FLIGHT_EDIT_BEAN, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - - TransectFlightModel oldValue = (TransectFlightModel) evt.getOldValue(); - if (oldValue != null) { - fireRoutesUpdated(oldValue, false); - } - TransectFlightModel newValue = (TransectFlightModel) evt.getNewValue(); - if (newValue != null) { - fireRoutesUpdated(newValue, true); - } + onTransectFlightChangedForValidation( + (TransectFlightModel) evt.getOldValue(), + (TransectFlightModel) evt.getNewValue()); } }); } @@ -549,53 +523,28 @@ // Refresh matching observations from selected route getModel().addPropertyChangeListener( - FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, - new PropertyChangeListener() { + FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + @Override + public void propertyChange(PropertyChangeEvent evt) { + onRouteChanged((Route) evt.getOldValue(), + (Route) evt.getNewValue()); + } + }); - Route oldValue = (Route) evt.getOldValue(); - if (oldValue != null) { - fireObservationsUpdated(oldValue, false); - } - Route newValue = (Route) evt.getNewValue(); - if (newValue != null) { - fireObservationsUpdated(newValue, true); - } - } - }); - if (getModel().isValidationMode()) { - // For validation, time change is listening to properly select the route getModel().addPropertyChangeListener( - FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, - new PropertyChangeListener() { + FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + @Override + public void propertyChange(PropertyChangeEvent evt) { + onObservationChangedForValidation( + (Observation) evt.getOldValue(), + (Observation) evt.getNewValue()); + } + }); - Observation oldValue = (Observation) evt.getNewValue(); - if (oldValue != null) { - oldValue.removePropertyChangeListener( - Observation.PROPERTY_OBSERVATION_TIME, - observationTimeChangeListener); - } - Observation newValue = (Observation) evt.getNewValue(); - if (newValue != null) { - newValue.addPropertyChangeListener( - Observation.PROPERTY_OBSERVATION_TIME, - observationTimeChangeListener); - - selectRouteByObservation(newValue); - - // Set audio position - setAudioReaderPositionDate(newValue.getObservationTime()); - } - } - }); - } else { flightController.getDeviceManager(GpsHandler.class).addDeviceStateListener(this); flightController.getDeviceManager(AudioRecorder.class).addDeviceStateListener(this); @@ -840,6 +789,72 @@ SammoaUtil.selectTableRow(ui.getRouteTable(), routeIndex); } + private void onRouteChanged(Route oldValue, Route newValue) { + + if (oldValue != null) { + fireObservationsUpdated(oldValue, false); + } + if (newValue != null) { + fireObservationsUpdated(newValue, true); + } + } + + private void onTransectFlightChangedForValidation(TransectFlightModel oldValue, + TransectFlightModel newValue) { + if (oldValue != null) { + fireRoutesUpdated(oldValue, false); + } + if (newValue != null) { + fireRoutesUpdated(newValue, true); + } + } + + private void onRouteChangedForValidation(Route oldValue, + Route newValue) { + + getParentUI().getHandler().getFlightController().setCurrentRoute(newValue); + + if (newValue == null) { + // no unselect but ensure valid button (a select will cause a loop) + getModel().setObservationEditBean(null); + + } else { + + // Set audio position + setAudioReaderPositionDate(newValue.getBeginTime()); + + // Remove observationEditBean if not in route + Observation previousObservation = getModel().getObservationEditBean(); + if (previousObservation != null + && !Observations.inRoute(previousObservation, newValue, getModel().getRoutes(), true)) { + + // no unselect but ensure valid button (a select will cause a loop) + getModel().setObservationEditBean(null); + } + } + } + + private void onObservationChangedForValidation(Observation oldValue, + Observation newValue) { + + if (oldValue != null) { + oldValue.removePropertyChangeListener( + Observation.PROPERTY_OBSERVATION_TIME, + observationTimeChangeListener); + } + + if (newValue != null) { + newValue.addPropertyChangeListener( + Observation.PROPERTY_OBSERVATION_TIME, + observationTimeChangeListener); + + selectRouteByObservation(newValue); + + // Set audio position + setAudioReaderPositionDate(newValue.getObservationTime()); + } + } + private PropertyChangeListener observationTimeChangeListener = new PropertyChangeListener() { @Override

1 0

r566 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence
by fdesbois＠users.forge.codelutin.com 10 Sep '12

10 Sep '12

Author: fdesbois Date: 2012-09-10 15:33:34 +0200 (Mon, 10 Sep 2012) New Revision: 566 Url: http://forge.codelutin.com/repositories/revision/sammoa/566 Log: fixes #1464 : Rewrite all the algorithm for closestPoint and beforeDate Added: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DatesTest.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-10 11:10:56 UTC (rev 565) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-10 13:33:34 UTC (rev 566) @@ -121,7 +121,7 @@ } // Create a new location if no one is available for the newTime - if (!locationTime.equals(newTime)) { + if (!locationTime.isEqual(newTime)) { result = new GeoPointImpl(location.getLatitude(), location.getLongitude()); result.setSpeed(location.getSpeed()); Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java 2012-09-10 11:10:56 UTC (rev 565) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java 2012-09-10 13:33:34 UTC (rev 566) @@ -24,10 +24,14 @@ * #L% */ +import com.google.common.base.Function; +import com.google.common.collect.Iterables; +import com.google.common.collect.Ordering; import org.joda.time.DateTime; import org.joda.time.Interval; import java.util.Date; +import java.util.Iterator; /** * Created: 31/08/12 @@ -52,6 +56,25 @@ return new DateTime(date); } + public static Date getBeforeDate(Date date, Iterable<Date> source) { + + Date result = null; + if (!Iterables.isEmpty(source)) { + + Iterator<Date> dates = Ordering.natural().sortedCopy(source).iterator(); + + Date current = dates.next(); + + while (current != null && !current.after(date)) { + // Current is before or equal to date + result = current; + // Go to next date + current = dates.hasNext() ? dates.next() : null; + } + } + return result; + } + public static Date newDateWithoutMillis() { return DateTime.now().withMillisOfSecond(0).toDate(); } @@ -64,6 +87,16 @@ return interval.contains(toDateTime(date)); } + public static Function<Date, DateTime> toDateTime() { + return new Function<Date, DateTime>() { + + @Override + public DateTime apply(Date input) { + return toDateTime(input); + } + }; + } + // public static Predicate<Date> inInterval(Interval interval) { // return new InIntervalPredicate(interval); // } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2012-09-10 11:10:56 UTC (rev 565) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2012-09-10 13:33:34 UTC (rev 566) @@ -25,16 +25,12 @@ import com.google.common.base.Function; import com.google.common.base.Objects; -import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; -import com.google.common.collect.Lists; +import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; -import org.joda.time.DateTime; -import org.joda.time.Interval; -import java.util.Comparator; import java.util.Date; import java.util.List; @@ -91,129 +87,86 @@ return TO_DATE_FUNCTION; } - public static Comparator<GeoPoint> orderByDate() { - return BY_DATE_COMPARATOR; + public static List<GeoPoint> getClosestPoints(List<GeoPoint> geoPoints, + Iterable<Date> dates) { + + return FluentIterable.from(dates) + .transform(toClosestGeoPoint(geoPoints)) + .toImmutableList(); } - public static List<GeoPoint> getClosestPoints(List<GeoPoint> geoPoints, Iterable<Date> dates) { + public static GeoPoint getClosestPoint(List<GeoPoint> geoPoints, + Date date) { - List<GeoPoint> result = Lists.newArrayList(); + return toClosestGeoPoint(geoPoints).apply(date); + } - if (!geoPoints.isEmpty()) { + public static Function<Date, GeoPoint> toClosestGeoPoint(List<GeoPoint> list) { + return new ToClosestPointFunction(list); + } - List<GeoPoint> source = - Ordering.from(orderByDate()).sortedCopy(geoPoints); + public static Predicate<GeoPoint> withDate(Date date) { + return new WithDatePredicate(date); + } - List<Date> geoPointDates = Lists.transform(source, toDate()); + private static Function<GeoPoint, Date> TO_DATE_FUNCTION = new Function<GeoPoint, Date>() { - int index = 0; - for (Date date : dates) { + @Override + public Date apply(GeoPoint input) { + return input.getRecordTime(); + } + }; - // We continue starting from the previous index to avoid loop on all the date list - index = getBeforeDateIndex(index > 0 ? index - 1 : 0, geoPointDates, date); + private static Predicate<GeoPoint> IS_COORDINATES_EMPTY_PREDICATE = new Predicate<GeoPoint>() { - if (index != -1) { - result.add(geoPoints.get(index)); - } else { - result.add(newEmptyGeoPoint(date)); - } - } + @Override + public boolean apply(GeoPoint input) { + return isCoordinatesEmpty(input); } - return result; - } + }; - public static GeoPoint getClosestPoint(List<GeoPoint> geoPoints, Date date) { + private static class WithDatePredicate implements Predicate<GeoPoint> { - GeoPoint result = null; + protected Date date; - if (!geoPoints.isEmpty()) { + private WithDatePredicate(Date date) { + this.date = date; + } - List<GeoPoint> source = - Ordering.from(orderByDate()).sortedCopy(geoPoints); - - List<Date> geoPointDates = Lists.transform(source, toDate()); - - int index = getBeforeDateIndex(0, geoPointDates, date); - if (index != -1) { - result = geoPoints.get(index); - } else { - result = newEmptyGeoPoint(date); - } + @Override + public boolean apply(GeoPoint input) { + return date != null && date.equals(input.getRecordTime()); } - return result; } - protected static int getBeforeDateIndex(int startIndex, List<Date> source, Date date) { - int size = source.size(); - Preconditions.checkElementIndex(startIndex, size); - DateTime dateTime = Dates.toDateTime(date); + private static class ToClosestPointFunction implements Function<Date, GeoPoint> { - // If the first date is after the argument date we return -1, no date - // is available before - if (Dates.toDateTime(source.get(0)).isAfter(dateTime)) { - return -1; - } + protected Date date; - for (int index = startIndex; index < size; index++) { + protected List<GeoPoint> list; - int nextIndex = index + 1; - if (nextIndex < size) { + protected List<Date> dates; - Date begin = source.get(index); - Date end = source.get(nextIndex); - Interval interval = Dates.toInterval(begin, end); - - if (interval.contains(dateTime)) { - return index; - } - -// // If the date is equal or before we take the current index -// if (date.equals(before) || date.before(before)) { -// return index; -// -// // If the date is before the next date, we check which one -// // of the before and after is the nearest value and we return -// // its index -// } else if (date.before(after)) { -// -// long diffBefore = date.getTime() - before.getTime(); -// long diffAfter = after.getTime() - date.getTime(); -// -// if (diffBefore <= diffAfter) { -// return index; -// -// } else { -// return nextIndex; -// } -// } - } + private ToClosestPointFunction(List<GeoPoint> list) { + this.list = list; + this.dates = FluentIterable + .from(list) + .transform(toDate()) + .toSortedImmutableList(Ordering.natural()); } - // We loop over the whole list, we return the last index - return size - 1; - } - private static Function<GeoPoint, Date> TO_DATE_FUNCTION = new Function<GeoPoint, Date>() { - @Override - public Date apply(GeoPoint input) { - return input.getRecordTime(); - } - }; + public GeoPoint apply(Date input) { - private static Comparator<GeoPoint> BY_DATE_COMPARATOR = new Comparator<GeoPoint>() { + // Get the date before + Date beforeDate = Dates.getBeforeDate(input, dates); - @Override - public int compare(GeoPoint o1, GeoPoint o2) { - return o1.getRecordTime().compareTo(o2.getRecordTime()); - } - }; + // Find the matching GeoPoint or create an empty one with the date + GeoPoint result = Iterables.find( + list, withDate(beforeDate), newEmptyGeoPoint(input)); - private static Predicate<GeoPoint> IS_COORDINATES_EMPTY_PREDICATE = new Predicate<GeoPoint>() { - - @Override - public boolean apply(GeoPoint input) { - return isCoordinatesEmpty(input); + return result; } - }; + } } Added: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DatesTest.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DatesTest.java (rev 0) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DatesTest.java 2012-09-10 13:33:34 UTC (rev 566) @@ -0,0 +1,54 @@ +package fr.ulr.sammoa.persistence; + +import com.google.common.collect.ImmutableList; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Date; +import java.util.List; + +/** + * Created: 10/09/12 + * + * @author fdesbois <florian.desbois(a)codelutin.com> + */ +public class DatesTest { + + @Test + public void testGetBeforeDate() throws Exception { + + List<Date> dates = ImmutableList.of( + new Date(2000), + new Date(4000), + new Date(3000) + ); + + // Begin case + { + Date date = new Date(1000); + Date result = Dates.getBeforeDate(date, dates); + Assert.assertNull(result); + } + + // Normal case + { + Date date = new Date(2100); + Date result = Dates.getBeforeDate(date, dates); + Assert.assertEquals(2000, result.getTime()); + } + + // Equal case + { + Date date = new Date(3000); + Date result = Dates.getBeforeDate(date, dates); + Assert.assertEquals(3000, result.getTime()); + } + + // End case + { + Date date = new Date(4100); + Date result = Dates.getBeforeDate(date, dates); + Assert.assertEquals(4000, result.getTime()); + } + } +} Property changes on: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DatesTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r565 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map
by fdesbois＠users.forge.codelutin.com 10 Sep '12

10 Sep '12

Author: fdesbois Date: 2012-09-10 13:10:56 +0200 (Mon, 10 Sep 2012) New Revision: 565 Url: http://forge.codelutin.com/repositories/revision/sammoa/565 Log: fixes #1480: use min and max seconds for begin and end date in export maps Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java 2012-09-10 11:10:41 UTC (rev 564) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java 2012-09-10 11:10:56 UTC (rev 565) @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import fr.ulr.sammoa.application.io.output.map.ExportMapModel; import fr.ulr.sammoa.persistence.Campaign; +import fr.ulr.sammoa.persistence.Dates; import fr.ulr.sammoa.persistence.RouteType; import fr.ulr.sammoa.persistence.Species; import fr.ulr.sammoa.persistence.Species2; @@ -323,13 +324,21 @@ if (beginDate == null || beginDate.before(campaignBeginDate)) { beginDate = campaignBeginDate; } - beginDate = new Date(beginDate.getTime()); + beginDate = Dates.toDateTime(beginDate) + .secondOfDay() + .withMinimumValue() + .toDate(); + Date endDate = getEndDate(); Date campaignEndDate = getSelectedCampaign().getEndDate(); if (endDate == null || endDate.after(campaignEndDate)) { endDate = campaignEndDate; } - endDate = new Date(endDate.getTime()); + endDate = Dates.toDateTime(endDate) + .secondOfDay() + .withMaximumValue() + .toDate(); + ExportMapModel result = ExportMapModel.newModel( getExportDirectory(), filename,

1 0

r564 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map
by fdesbois＠users.forge.codelutin.com 10 Sep '12

10 Sep '12

Author: fdesbois Date: 2012-09-10 13:10:41 +0200 (Mon, 10 Sep 2012) New Revision: 564 Url: http://forge.codelutin.com/repositories/revision/sammoa/564 Log: fixes #1481: missing update model selection for export map filters Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-09-10 10:05:28 UTC (rev 563) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-09-10 11:10:41 UTC (rev 564) @@ -215,6 +215,7 @@ ExportMapUIModel model = getModel(); model.setSelectedStrates(Collections.<Strate>emptyList()); + model.setSelectedRouteTypes(Collections.<RouteType>emptyList()); model.setSelectedSpecies(Collections.<Species>emptyList()); model.setSelectedSpeciesTypes(Collections.<StringRef>emptyList()); @@ -294,6 +295,11 @@ }; ExportMapUIModel model = getModel(); + model.setSelectedStrates( + getFilterValues(Strate.class, ui.getStrateFilter())); + model.setSelectedRouteTypes( + getFilterValues(RouteType.class, ui.getRouteTypeFilter())); + displayExportLauncher(_("sammoa.title.export.exportEfforts"), model.getExportEffortsFilename(), model, @@ -333,6 +339,16 @@ }; ExportMapUIModel model = getModel(); + model.setSelectedStrates( + getFilterValues(Strate.class, ui.getStrateFilter())); + model.setSelectedRouteTypes( + getFilterValues(RouteType.class, ui.getRouteTypeFilter())); + + model.setSelectedSpecies( + getFilterValues(Species.class, ui.getSpeciesFilter())); + model.setSelectedSpeciesTypes( + getFilterValues(StringRef.class, ui.getSpeciesTypeFilter())); + displayExportLauncher(_("sammoa.title.export.exportObservations"), model.getExportObservationsFilename(), model, @@ -381,6 +397,14 @@ return ui.getModel(); } + protected <E> List<E> getFilterValues(Class<E> clazz, JList list) { + List<E> result = Lists.newArrayList(); + for (Object object : list.getSelectedValues()) { + result.add(clazz.cast(object)); + } + return result; + } + protected void displayExportLauncher(String effortTitle, String defaultFilename, ExportMapUIModel model,

1 0

r563 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by fdesbois＠users.forge.codelutin.com 10 Sep '12

10 Sep '12

Author: fdesbois Date: 2012-09-10 12:05:28 +0200 (Mon, 10 Sep 2012) New Revision: 563 Url: http://forge.codelutin.com/repositories/revision/sammoa/563 Log: refs #1472 : improve configuration UI, can't keep dialog positions for the moment... Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-09-10 10:05:12 UTC (rev 562) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-09-10 10:05:28 UTC (rev 563) @@ -340,7 +340,7 @@ ), SITE_URL("sammoa.url", n_("sammoa.config.application.site.url"), - "", + "http://forge.codelutin.com/projects/sammoa", URL.class, false, true Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-09-10 10:05:12 UTC (rev 562) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-09-10 10:05:28 UTC (rev 563) @@ -47,6 +47,7 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.ErrorDialogUI; +import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; import org.nuiton.util.ApplicationConfig; import org.nuiton.widget.SwingSession; @@ -409,21 +410,42 @@ helper.setOptionCallBack("audio"); helper.addOption(AudioConfig.AudioConfigOption.RECORD_DELAY_IN_SECONDS); helper.setOptionCallBack("audio"); + helper.addOption(AudioConfig.AudioConfigOption.COMPRESSION); + helper.setOptionCallBack("audio"); } // OTHER { helper.addCategory(n_("sammoa.config.category.other"), n_("sammoa.config.category.other.description")); - helper.addOption(SammoaConfig.SammoaConfigOption.LOCALE); - helper.setOptionCallBack("ui"); helper.addOption(SammoaConfig.SammoaConfigOption.SITE_URL); helper.addOption(SammoaConfig.SammoaConfigOption.UI_CONFIG_FILE); helper.setOptionCallBack("ui"); } - helper.buildUI(ui, "sammoa.config.category.applications"); + ConfigUI configUI = helper.buildUI(ui, "sammoa.config.category.applications"); + // FIXME-fdesbois-2012-09-10: Some issue with configUI, the dialog is + // the ancestor, but the swingSession not always keep the same saved positions + +// configUI.addAncestorListener(new AncestorListener() { +// +// @Override +// public void ancestorAdded(AncestorEvent event) { +// context.getSwingSession().add(event.getAncestor()); +// } +// +// @Override +// public void ancestorRemoved(AncestorEvent event) { +// context.getSwingSession().save(); +// } +// +// @Override +// public void ancestorMoved(AncestorEvent event) { +// // nothing to do +// } +// }); + helper.displayUI(ui, false); }

1 0

r562 - in trunk/sammoa-ui-swing/src/main: java/fr/ulr/sammoa/ui/swing java/fr/ulr/sammoa/ui/swing/flight resources/i18n
by fdesbois＠users.forge.codelutin.com 10 Sep '12

10 Sep '12

Author: fdesbois Date: 2012-09-10 12:05:12 +0200 (Mon, 10 Sep 2012) New Revision: 562 Url: http://forge.codelutin.com/repositories/revision/sammoa/562 Log: fixes #1467 : add menu for flight actions Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.css 2012-09-10 10:03:43 UTC (rev 561) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.css 2012-09-10 10:05:12 UTC (rev 562) @@ -51,7 +51,7 @@ text:"sammoa.action.audioCheck"; toolTipText:"sammoa.action.audioCheck.tip"; actionIcon:"sound"; - mnemonic:A; + mnemonic:S; } #exit { @@ -70,6 +70,59 @@ toolTipText:"sammoa.menu.showValidation.tip"; } +#menuActions { + enabled:{getScreen() == SammoaScreen.FLIGHT || getScreen() == SammoaScreen.VALIDATION}; + text:"sammoa.menu.actions"; + toolTipText:"sammoa.menu.actions.tip"; + mnemonic:A; +} + +#menuActionStartFlight { + _actionName: {"start"}; + _actionKeepButtonDecoration: {true}; + icon: {null}; + text: "sammoa.action.start"; +} +#menuActionStopFlight { + _actionName: {"stop"}; + _actionKeepButtonDecoration: {true}; + icon: {null}; + text: "sammoa.action.stop"; +} +#menuActionBeginEffort { + _actionName: {"begin"}; +} +#menuActionEndEffort { + _actionName: {"end"}; +} +#menuActionNextEffort { + _actionName: {"next"}; +} +#menuActionAddEffort { + _actionName: {"add"}; + _actionKeepButtonDecoration: {true}; + icon: {null}; + text: "sammoa.action.add"; +} +#menuActionLeftObservation { + _actionName: {"leftObservation"}; +} +#menuActionCenterObservation { + _actionName: {"centerObservation"}; +} +#menuActionRightObservation { + _actionName: {"rightObservation"}; +} +#menuActionValidTransect { + _actionName: {"validTransect"}; +} +#menuActionValidRoute { + _actionName: {"validRoute"}; +} +#menuActionValidObservation { + _actionName: {"validObservation"}; +} + #menuHelp { text:"sammoa.menu.help"; toolTipText:"sammoa.menu.help.tip"; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx 2012-09-10 10:03:43 UTC (rev 561) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx 2012-09-10 10:05:12 UTC (rev 562) @@ -66,6 +66,20 @@ <JMenuItem id='exit' onActionPerformed='getHandler().closeSammoa()'/> </JMenu> + <JMenu id='menuActions'> + <JMenuItem id='menuActionStartFlight'/> + <JMenuItem id='menuActionStopFlight'/> + <JMenuItem id='menuActionBeginEffort'/> + <JMenuItem id='menuActionEndEffort'/> + <JMenuItem id='menuActionNextEffort'/> + <JMenuItem id='menuActionAddEffort'/> + <JMenuItem id='menuActionLeftObservation'/> + <JMenuItem id='menuActionCenterObservation'/> + <JMenuItem id='menuActionRightObservation'/> + <JMenuItem id='menuActionValidTransect'/> + <JMenuItem id='menuActionValidRoute'/> + <JMenuItem id='menuActionValidObservation'/> + </JMenu> <JMenu id='menuHelp'> <JMenuItem id='menuShowLogs' onActionPerformed='getHandler().showLogs()'/> 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-10 10:03:43 UTC (rev 561) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-09-10 10:05:12 UTC (rev 562) @@ -123,6 +123,7 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.apache.commons.lang3.BooleanUtils; import org.jdesktop.swingx.JXTable; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; @@ -133,6 +134,7 @@ import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.DefaultCellEditor; +import javax.swing.Icon; import javax.swing.InputMap; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -891,6 +893,10 @@ getModel().setActionMap(getActionMap()); + // Init actions from MainUI for menu + initActions(context.getMainUIHandler().getUI()); + + // Init actions from ui initActions(ui); } @@ -916,17 +922,41 @@ if (!Strings.isNullOrEmpty(actionName)) { if (logger.isDebugEnabled()) { - logger.debug("attach action '" + actionName + "' to button " + abstractButton); + logger.debug("attach action '{}' to button {}", actionName, abstractButton); } Action action = getActionMap().get(actionName); - Preconditions.checkNotNull(action, - "action '" + actionName + "' is not " + - "declared. Declared actions: " - + Arrays.toString(getActionMap().keys())); + if (action == null) { + abstractButton.setEnabled(false); - abstractButton.setAction(action); + if (logger.isDebugEnabled()) { + logger.debug("action '{}' is not declared, the " + + "button is disabled. Declared actions: {}", + actionName, + Arrays.toString(getActionMap().keys())); + } + + } else { + + Icon icon = abstractButton.getIcon(); + String text = abstractButton.getText(); + + abstractButton.setAction(action); + + // keep button decoration for text and icon + Boolean actionKeepButtonDecoration = + (Boolean) abstractButton.getClientProperty("actionKeepButtonDecoration"); + if (BooleanUtils.isTrue(actionKeepButtonDecoration)) { + + if (logger.isDebugEnabled()) { + logger.debug("Keep button definition. Icon={}, Text={}", icon, text); + } + + abstractButton.setIcon(icon); + abstractButton.setText(text); + } + } } } } Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-10 10:03:43 UTC (rev 561) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-10 10:05:12 UTC (rev 562) @@ -3,6 +3,7 @@ sammoa.about.message=About Sammoa sammoa.action.about=About sammoa.action.about.tip=About +sammoa.action.add=Add sammoa.action.add.tip=ADD \: create a new LEG route for the current Transect (the observation conditions have changed) sammoa.action.audioCheck=Audio test sammoa.action.audioCheck.tip=Audio test @@ -47,9 +48,11 @@ sammoa.action.save=Save sammoa.action.site=Site sammoa.action.site.tip=Display project site +sammoa.action.start=Start flight sammoa.action.start.tip=START \: start the flight and create a new TRANSIT route sammoa.action.startAudio.tip=Start audio sammoa.action.startExport=Start +sammoa.action.stop=Stop flight sammoa.action.stop.tip=STOP \: stop the flight. No other actions on routes and observations could be done after stop. sammoa.action.stopAudio.tip=Stop audio sammoa.action.validObservation=Observation @@ -154,6 +157,8 @@ sammoa.label.transect.name=Name\: sammoa.label.transect.strate=Strate\: sammoa.map.mapFollow=Follow plane +sammoa.menu.actions=Actions +sammoa.menu.actions.tip=Actions for flight sammoa.menu.exit=Exit sammoa.menu.file=File sammoa.menu.file.tip=File

1 0