branch feature/7589 created (now cf7f553)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7589 in repository observe. See http://git.codelutin.com/observe.git at cf7f553 association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) This branch includes the following new commits: new cf7f553 association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) 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 cf7f5538271fbc4645703a642db67abcc9bd2b52 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 12 10:39:01 2015 +0200 association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) -- 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/7589 in repository observe. See http://git.codelutin.com/observe.git commit cf7f5538271fbc4645703a642db67abcc9bd2b52 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 12 10:39:01 2015 +0200 association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) --- .../src/main/java/fr/ird/observe/ui/content/ContentUIManager.java | 8 ++++++-- .../ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java | 4 ++-- 2 files changed, 8 insertions(+), 4 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..92f44bf 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 @@ -61,6 +61,7 @@ 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.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; @@ -76,7 +77,8 @@ import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JPanel; import java.lang.reflect.Constructor; import java.util.Map; import java.util.TreeMap; @@ -95,6 +97,8 @@ public class ContentUIManager { public static final String DATA = "data"; + public static final String CONTEXT_GEAR_USE_FEATURES_SEINE = "gearUseFeaturesSeine"; + /** Logger */ static private final Log log = LogFactory.getLog(ContentUIManager.class); @@ -113,8 +117,8 @@ public class ContentUIManager { addMapping(DATA, TripSeineDto.class, TripSeineUI.class); addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeineDto.unsaved"), TripSeineUI.class); + addMapping(DATA, TripSeineDto.class, CONTEXT_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.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, RouteDto.class, RouteUI.class); 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..f99ab76 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 @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.ui.content.ContentUIManager; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripSeineNode; @@ -121,8 +122,7 @@ public class ProgramSeineNodeChildLoador extends AbstractReferenceDtoChildLoador { // Add gears - //FIXME - ObserveNode child = ObserveTreeHelper.createStringNode("gearUseFeaturesSeine"); + ObserveNode child = ObserveTreeHelper.createStringNode(ContentUIManager.CONTEXT_GEAR_USE_FEATURES_SEINE); 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