This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 9459b7c8173001b2935d002166067e629db9204b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 23 14:31:45 2015 +0200 compute trip only if trip has change --- .../open/impl/longline/TripLonglineUIHandler.java | 22 ++++++++++++-------- .../open/impl/seine/TripSeineUIHandler.java | 24 ++++++++++++++-------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index 1f75db7..8b9e83e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -65,6 +65,8 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline /** Logger */ static private final Log log = LogFactory.getLog(TripLonglineUIHandler.class); + protected boolean buildTripMap = true; + public TripLonglineUIHandler(TripLonglineUI ui) { super(ui, DataContextType.Program, @@ -117,16 +119,19 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline if (tripLonglineTabPane.getSelectedComponent().equals(tripMap)) { ui.getActions().setVisible(false); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { + if (buildTripMap) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { - TripLonglineUI ui = getUi(); - TripMapUI tripMap = ui.getTripMap(); + TripLonglineUI ui = getUi(); + TripMapUI tripMap = ui.getTripMap(); - tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); - } - }); + tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); + } + }); + buildTripMap = false; + } } else { ui.getActions().setVisible(true); @@ -182,6 +187,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline } getUi().getTripLonglineTabPane().setSelectedIndex(0); + buildTripMap = true; finalizeOpenUI(mode, create); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index d487cf2..0a59641 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -62,6 +62,8 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { /** Logger */ static private final Log log = LogFactory.getLog(TripSeineUIHandler.class); + protected boolean buildTripMap = true; + public TripSeineUIHandler(TripSeineUI ui) { super(ui, DataContextType.Program, @@ -69,6 +71,8 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { n("observe.tripSeine.message.not.open")); } + + @Override public TripSeineUI getUi() { return (TripSeineUI) super.getUi(); @@ -115,16 +119,19 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { if (tripSeineTabPane.getSelectedComponent().equals(tripMap)) { ui.getActions().setVisible(false); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { + if (buildTripMap) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { - TripSeineUI ui = getUi(); - TripMapUI tripMap = ui.getTripMap(); + TripSeineUI ui = getUi(); + TripMapUI tripMap = ui.getTripMap(); - tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); - } - }); + tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); + } + }); + buildTripMap = false; + } } else { ui.getActions().setVisible(true); @@ -180,6 +187,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { } getUi().getTripSeineTabPane().setSelectedIndex(0); + buildTripMap = true; finalizeOpenUI(mode, create); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.