branch feature/7553_2 created (now aa47105)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7553_2 in repository observe. See http://git.codelutin.com/observe.git at aa47105 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) This branch includes the following new commits: new aa47105 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit aa471057121fb1f5f8139b0a1430a27bc401a47e Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 16:19:51 2015 +0200 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_2 in repository observe. See http://git.codelutin.com/observe.git commit aa471057121fb1f5f8139b0a1430a27bc401a47e Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 16:19:51 2015 +0200 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) --- .../fr/ird/observe/ui/content/ContentUIManager.java | 19 ++++++++++--------- .../tree/loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../ui/tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 39ad3ae..3a46f12 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -49,7 +49,10 @@ import fr.ird.observe.ui.content.impl.seine.ActivitySeineObservedSystemUI; import fr.ird.observe.ui.content.impl.seine.FloatingObjectTransmittingBuoyOperationUI; import fr.ird.observe.ui.content.impl.seine.FloatingObjectUI; import fr.ird.observe.ui.content.impl.seine.SetSeineUI; +import fr.ird.observe.ui.content.list.impl.longline.ActivityLonglinesUI; import fr.ird.observe.ui.content.list.impl.longline.TripLonglinesUI; +import fr.ird.observe.ui.content.list.impl.seine.ActivitySeinesUI; +import fr.ird.observe.ui.content.list.impl.seine.RoutesUI; import fr.ird.observe.ui.content.list.impl.seine.TripSeinesUI; import fr.ird.observe.ui.content.open.impl.longline.ActivityLonglineUI; import fr.ird.observe.ui.content.open.impl.longline.TripLonglineUI; @@ -59,8 +62,10 @@ import fr.ird.observe.ui.content.open.impl.seine.TripSeineUI; import fr.ird.observe.ui.content.ref.ReferenceHomeUI; import fr.ird.observe.ui.content.table.impl.longline.CatchLonglineUI; import fr.ird.observe.ui.content.table.impl.longline.EncounterUI; +import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesLonglineUI; import fr.ird.observe.ui.content.table.impl.longline.SensorUsedUI; import fr.ird.observe.ui.content.table.impl.longline.TdrUI; +import fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI; import fr.ird.observe.ui.content.table.impl.seine.NonTargetCatchUI; import fr.ird.observe.ui.content.table.impl.seine.ObjectObservedSpeciesUI; import fr.ird.observe.ui.content.table.impl.seine.ObjectSchoolEstimateUI; @@ -113,18 +118,15 @@ public class ContentUIManager { addMapping(DATA, TripSeineDto.class, TripSeineUI.class); addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeineDto.unsaved"), TripSeineUI.class); - //FIXME -// addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); -// addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class); + addMapping(DATA, TripSeineDto.class, "gearUseFeaturesSeine", GearUseFeaturesSeineUI.class); + addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class); addMapping(DATA, RouteDto.class, RouteUI.class); addMapping(DATA, RouteDto.class, n("observe.tree.routeDto.unsaved"), RouteUI.class); -//FIXME -// addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); + addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); addMapping(DATA, ActivitySeineDto.class, ActivitySeineUI.class); addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeineDto.unsaved"), ActivitySeineUI.class); -//FIXME addMapping(DATA, ActivitySeineDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); addMapping(DATA, SetSeineDto.class, SetSeineUI.class); @@ -150,9 +152,8 @@ public class ContentUIManager { addMapping(DATA, TripLonglineDto.class, TripLonglineUI.class); addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLonglineDto.unsaved"), TripLonglineUI.class); -//FIXME -// addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_GEAR_USE_FEATURES_LONGLINE, GearUseFeaturesLonglineUI.class); -// addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); + addMapping(DATA, TripLonglineDto.class, "gearUseFeaturesLongline", GearUseFeaturesLonglineUI.class); + addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineUI.class); addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLonglineDto.unsaved"), ActivityLonglineUI.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 4dfb61f..a50907d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -133,7 +133,7 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa { // Add activities //FIXME - ObserveNode child = ObserveTreeHelper.createStringNode("activityLongline", ActivityLonglinesNodeChildLoador.class); + ObserveNode child = ObserveTreeHelper.createStringNode(TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesNodeChildLoador.class); result.add(child); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java index 6c38c60..a3f5b2a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -128,7 +128,7 @@ public class ProgramSeineNodeChildLoador extends AbstractReferenceDtoChildLoador { // Add routes - ObserveNode child = ObserveTreeHelper.createStringNode("route", RoutesNodeChildLoador.class); + ObserveNode child = ObserveTreeHelper.createStringNode(TripSeineDto.PROPERTY_ROUTE, RoutesNodeChildLoador.class); result.add(child); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm