This is an automated email from the git hooks/post-receive script. New commit to branch feature/7621 in repository observe. See http://git.codelutin.com/observe.git commit 385f4c57d56e04787bb16f208067ae3ea9e4f3ea Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 10 16:46:32 2015 +0100 tri des programmes dans la popup + ajout d'une icône au bouton (fixes #7621) --- .../src/main/filters/observe-ui.properties | 1 + .../src/main/java/fr/ird/observe/ui/ObserveMainUI.css | 1 + .../ird/observe/ui/actions/shared/MoveTripsUIAction.java | 13 +++++++++---- .../java/fr/ird/observe/ui/tree/ObserveTreeHelper.java | 3 ++- .../i18n/observe-application-swing_en_GB.properties | 4 ++++ .../i18n/observe-application-swing_es_ES.properties | 4 ++++ .../i18n/observe-application-swing_fr_FR.properties | 2 ++ .../src/main/resources/icons/action-move-trips.png | Bin 0 -> 1036 bytes 8 files changed, 23 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index aaa1d4d..897856f 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -148,6 +148,7 @@ icon.action.warning=warning.png icon.action.mode-create=action-mode-create.png icon.action.mode-update=action-mode-update.png icon.action.mode-read=action-mode-read.png +icon.action.move-trips=action-move-trips.png icon.action.translate=action-translate.png icon.action.application-reload=action-application-reload.png icon.action.report=action-report.png diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css index 5ba212f..2a385e0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css @@ -44,6 +44,7 @@ JSplitPane { #navigationMoveTripAction { text: "observe.navigationMenu.moveTrip"; toolTipText: "observe.navigationMenu.moveTrip"; + actionIcon: "move-trips"; } #navigationNoAction { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java index 5a97048..fed3acb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java @@ -42,10 +42,12 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; +import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Action pour changer le programme d'une ou plusieurs marée dans la liste. @@ -69,7 +71,7 @@ public abstract class MoveTripsUIAction extends AbstractUIAction { actionName, n("observe.action.move.trips"), n("observe.action.move.trips.tip"), - "close" + "move-trips" ); } @@ -121,7 +123,9 @@ public abstract class MoveTripsUIAction extends AbstractUIAction { GearType gearType = getGearType(ui); - List<ReferenceDto> programs = Lists.newArrayList(ProgramDtos.filterReferencesByGearType(allPrograms, gearType)); + List<ReferenceDto> filteredPrograms = Lists.newArrayList(ProgramDtos.filterReferencesByGearType(allPrograms, gearType)); + List<ReferenceDto<ProgramDto>> programs = new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(filteredPrograms)); + ObserveTreeHelper.sortPrograms(programs); Decorator<ReferenceDto> decorator = applicationContext.getDecorator(ReferenceDto.class, ProgramDto.class.getSimpleName()); @@ -136,7 +140,9 @@ public abstract class MoveTripsUIAction extends AbstractUIAction { } } - Object decoratedProgram = JOptionPane.showInputDialog(ui, "message", "title", + Object decoratedProgram = JOptionPane.showInputDialog(ui, + t("observe.action.choose.program.message"), + t("observe.action.choose.program.title"), JOptionPane.QUESTION_MESSAGE, null, decoratedPrograms, @@ -158,7 +164,6 @@ public abstract class MoveTripsUIAction extends AbstractUIAction { ObserveNode rootNode = treeHelper.getRootNode(); ObserveNode newProgramNode = treeHelper.getChild(rootNode, programId); - for (int i = 0, s = positions.size(); i < s; i++) { String tripId = tripIds.get(i); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index c4b162f..a8ed1e9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -542,7 +542,8 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { public static void sortPrograms(List<ReferenceDto<ProgramDto>> data) { Collections.sort(data, new Comparator<ReferenceDto<ProgramDto>>() { - Decorator<ReferentialReferenceDto<ProgramDto>> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getReferenceDecorator(ProgramDto.class); + Decorator<ReferentialReferenceDto<ProgramDto>> decorator = + ObserveSwingApplicationContext.get().getDecoratorService().getReferenceDecorator(ProgramDto.class); @Override public int compare(ReferenceDto<ProgramDto> o1, ReferenceDto<ProgramDto> o2) { diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index bf26992..c9145ec 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -43,11 +43,15 @@ observe.action.catchFateLongline.modify.tip= observe.action.catchFateLongline.save.tip= observe.action.change.storage=Change storage observe.action.change.storage.tip=To change current storage +observe.action.choose-program.message= +observe.action.choose-program.title= observe.action.choose.db.dump=Choose the backup observe.action.choose.db.dump.description=Database backup (*.sql.gz) observe.action.choose.db.dump.directory=Choose the backup directory observe.action.choose.importGPS=Use this file observe.action.choose.importGPS.description=GPS File (*.gpx) +observe.action.choose.program.message= +observe.action.choose.program.title= observe.action.choose.report.directory=Choose reports directory observe.action.choose.reportFile=Choose the reports directory observe.action.choose.reportFile.description=Report's file (*.properties) diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 9faa438..a5de89f 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -43,11 +43,15 @@ observe.action.catchFateLongline.modify.tip= observe.action.catchFateLongline.save.tip= observe.action.change.storage=Cambiar el origen de datos observe.action.change.storage.tip=Para cambiar el origen de datos de la aplicación +observe.action.choose-program.message= +observe.action.choose-program.title= observe.action.choose.db.dump=Elegir la copia de seguridad observe.action.choose.db.dump.description=Copia de seguridad de la base (*.sql.gz) observe.action.choose.db.dump.directory=Elegir el directorio de la copia de seguridad observe.action.choose.importGPS=Usar este archivo observe.action.choose.importGPS.description=Archivo GPS (*.gpx) +observe.action.choose.program.message= +observe.action.choose.program.title= observe.action.choose.report.directory=Elegir el directorio de los informes observe.action.choose.reportFile=Elegir el archivo de definición de informe observe.action.choose.reportFile.description=Archivo de definición (*.properties) diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 843e2f3..c68b428 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -48,6 +48,8 @@ observe.action.choose.db.dump.description=Sauvegarde de base (*.sql.gz) observe.action.choose.db.dump.directory=Choisir le répertoire de sauvegarde observe.action.choose.importGPS=Utiliser ce fichier observe.action.choose.importGPS.description=Fichier GPS (*.gpx) +observe.action.choose.program.message=A quel programme voulez-vous associer les marées sélectionnées ? +observe.action.choose.program.title=Changer le programme des marées observe.action.choose.report.directory=Choisir le répertoire des rapports observe.action.choose.reportFile=Choisir le fichier de définition de report observe.action.choose.reportFile.description=Fichier de définition (*.properties) diff --git a/observe-application-swing/src/main/resources/icons/action-move-trips.png b/observe-application-swing/src/main/resources/icons/action-move-trips.png new file mode 100644 index 0000000..c80244b Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-move-trips.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.