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

r551 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home
by fdesbois＠users.forge.codelutin.com 07 Sep '12

07 Sep '12

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 06 Sep '12

06 Sep '12

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 06 Sep '12

06 Sep '12

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 06 Sep '12

06 Sep '12

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 06 Sep '12

06 Sep '12

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 06 Sep '12

06 Sep '12

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

r545 - tags
by maven-release＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: maven-release Date: 2012-09-06 12:06:49 +0200 (Thu, 06 Sep 2012) New Revision: 545 Url: http://forge.codelutin.com/repositories/revision/sammoa/545 Log: [maven-release-plugin] copy for tag sammoa-1.0-rc1 Added: tags/sammoa-1.0-rc1/

1 0

r544 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: maven-release Date: 2012-09-06 12:06:42 +0200 (Thu, 06 Sep 2012) New Revision: 544 Url: http://forge.codelutin.com/repositories/revision/sammoa/544 Log: [maven-release-plugin] prepare release sammoa-1.0-rc1 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:04:09 UTC (rev 543) +++ trunk/pom.xml 2012-09-06 10:06:42 UTC (rev 544) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.8-SNAPSHOT</version> + <version>1.0-rc1</version> <modules> <module>sammoa-persistence</module> @@ -81,12 +81,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1 </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-09-06 10:04:09 UTC (rev 543) +++ trunk/sammoa-application/pom.xml 2012-09-06 10:06:42 UTC (rev 544) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.8-SNAPSHOT</version> + <version>1.0-rc1</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-09-06 10:04:09 UTC (rev 543) +++ trunk/sammoa-persistence/pom.xml 2012-09-06 10:06:42 UTC (rev 544) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.8-SNAPSHOT</version> + <version>1.0-rc1</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-09-06 10:04:09 UTC (rev 543) +++ trunk/sammoa-ui-swing/pom.xml 2012-09-06 10:06:42 UTC (rev 544) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.8-SNAPSHOT</version> + <version>1.0-rc1</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r543 - 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
by maven-release＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: maven-release Date: 2012-09-06 12:04:09 +0200 (Thu, 06 Sep 2012) New Revision: 543 Url: http://forge.codelutin.com/repositories/revision/sammoa/543 Log: add missing headers Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.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/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-06 09:51:36 UTC (rev 542) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java 2012-09-06 10:04:09 UTC (rev 543) @@ -1,5 +1,29 @@ package fr.ulr.sammoa.application.device.audio; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Permet de se mettre listener sur l'avancement de la lecture du fichier * <p/> 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 09:51:36 UTC (rev 542) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-06 10:04:09 UTC (rev 543) @@ -1,5 +1,29 @@ package fr.ulr.sammoa.ui.swing; +/* + * #%L + * SAMMOA :: UI Swing + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Throwables; import fr.ulr.sammoa.application.device.audio.SammoaAudioReader; import fr.ulr.sammoa.application.device.audio.SammoaAudioRecorder; 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 09:51:36 UTC (rev 542) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 10:04:09 UTC (rev 543) @@ -1,5 +1,29 @@ package fr.ulr.sammoa.ui.swing.flight.bar; +/* + * #%L + * SAMMOA :: UI Swing + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; import fr.ulr.sammoa.application.device.DeviceStateListener;

1 0

r542 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps
by bpoussin＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: bpoussin Date: 2012-09-06 11:51:36 +0200 (Thu, 06 Sep 2012) New Revision: 542 Url: http://forge.codelutin.com/repositories/revision/sammoa/542 Log: interception du mauvais chargement de lib native Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-09-06 09:46:34 UTC (rev 541) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-09-06 09:51:36 UTC (rev 542) @@ -121,7 +121,7 @@ logAvailablePorts("openedSuccessful"); - } catch (Exception ex) { + } catch (Throwable ex) { // necessaire si on arrive pas a charger la lib native setState(DeviceState.UNAVAILABLE, null);

1 0