This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3636751335b51bcac643b79530dd02e2686ef3b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 16:53:17 2015 +0200 Correction du code suite au merge sur les Openable --- .../observe/ui/content/open/ContentOpenableUI.jaxx | 4 +-- .../ui/content/open/ContentOpenableUIHandler.java | 12 ++++----- .../ui/content/open/ContentOpenableUIModel.java | 4 +-- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 30 +++++++++++++--------- .../entities/longline/TripLonglineTopiaDao.java | 5 ++-- .../observe/entities/seine/TripSeineTopiaDao.java | 6 ++--- .../service/longline/TripLonglineServiceTopia.java | 2 +- .../service/seine/TripSeineServiceTopia.java | 2 +- 8 files changed, 35 insertions(+), 30 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx index 12cbfa9..b7cf93e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx @@ -23,12 +23,12 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends OpenableDto' + genericType='E extends IdDto'
<import> fr.ird.observe.services.dto.AbstractObserveDto - fr.ird.observe.services.dto.OpenableDto + fr.ird.observe.services.dto.IdDto fr.ird.observe.ui.actions.shared.CancelCreateUIAction fr.ird.observe.ui.actions.shared.CloseAndCreateUIAction diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java index 6cfbec7..2208490 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java @@ -24,7 +24,8 @@ package fr.ird.observe.ui.content.open; import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.OpenableDto; +import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.tree.ObserveNode; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends ContentUIHandler<E> { +public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentUIHandler<E> { protected static final String POSITION_OPENABLE = "positionOpenable"; @@ -81,6 +82,8 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co protected abstract boolean doOpenData(); + public abstract boolean doCloseData(); + public final void openDataUI() { boolean ok = false; try { @@ -132,11 +135,6 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - public boolean doCloseData() { - getBean().setOpen(false); - return true; - } - public final void afterCloseData() { ContentOpenableUI<E> ui = getUi(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java index 1d8f522..c7bad89 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.open; -import fr.ird.observe.services.dto.OpenableDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIModel; /** @@ -30,7 +30,7 @@ import fr.ird.observe.ui.content.ContentUIModel; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public abstract class ContentOpenableUIModel<E extends OpenableDto> extends ContentUIModel<E> { +public abstract class ContentOpenableUIModel<E extends IdDto> extends ContentUIModel<E> { public static final String PROPERTY_CAN_REOPEN = "canReopen"; 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 955bb95..660ec55 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 @@ -26,6 +26,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -57,7 +58,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeModel; @@ -402,17 +403,22 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return result; } - public ObserveNode addOpenable(ObserveNode parentNode, ReferenceDto bean) { - if (TripSeineDto.class.equals(bean.getType())) { - return addTripSeine(parentNode, (ReferenceDto<TripSeineDto>) bean); - } else if (TripLonglineDto.class.equals(bean.getType())) { - return addTripLongline(parentNode, (ReferenceDto<TripLonglineDto>) bean); - } else if (RouteDto.class.equals(bean.getType())) { - return addRoute(parentNode, (ReferenceDto<RouteDto>) bean); - } else if (ActivitySeineDto.class.equals(bean.getType())) { - return addActivitySeine(parentNode, (ReferenceDto<ActivitySeineDto>) bean); - } else if (ActivityLonglineDto.class.equals(bean.getType())) { - return addActivityLongline(parentNode, (ReferenceDto<ActivityLonglineDto>) bean); + public <E extends IdDto> ObserveNode addOpenable(ObserveNode parentNode, E bean) { + if (bean instanceof TripSeineDto) { + ReferenceDto<TripSeineDto> ref = null; //TODO + return addTripSeine(parentNode, ref); + } else if (bean instanceof TripLonglineDto) { + ReferenceDto<TripLonglineDto> ref = null; //TODO + return addTripLongline(parentNode, ref); + } else if (bean instanceof RouteDto) { + ReferenceDto<RouteDto> ref = null; //TODO + return addRoute(parentNode, ref); + } else if (bean instanceof ActivitySeineDto) { + ReferenceDto<ActivitySeineDto> ref = null;//TODO + return addActivitySeine(parentNode, ref); + } else if (bean instanceof ActivityLonglineDto) { + ReferenceDto<ActivityLonglineDto> ref = null;//TODO + return addActivityLongline(parentNode, ref); } throw new IllegalStateException("Can not come here!"); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 842f7c7..430b555 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -41,6 +41,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongline> { @@ -77,11 +78,11 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } - public List<TripMapPointDto> extractTripMapActivityPoints(String tripId) { + public LinkedHashSet<TripMapPointDto> extractTripMapActivityPoints(String tripId) { TripLongline tripLongline = forTopiaIdEquals(tripId).findUnique(); - List<TripMapPointDto> tripMapPoints = Lists.newLinkedList(); + LinkedHashSet<TripMapPointDto> tripMapPoints = new LinkedHashSet<>(); // add departure harbours Harbour departureHarbour = tripLongline.getDepartureHarbour(); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 4bf20af..a68cacd 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.entities.seine; -import com.google.common.collect.Lists; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.Harbour; @@ -40,6 +39,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -80,11 +80,11 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } - public List<TripMapPointDto> extractTripMapActivityPoints(String tripId) { + public LinkedHashSet<TripMapPointDto> extractTripMapActivityPoints(String tripId) { TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique(); - List<TripMapPointDto> tripMapPoints = Lists.newLinkedList(); + LinkedHashSet<TripMapPointDto> tripMapPoints = new LinkedHashSet<>(); // add departure harbours Harbour departureHarbour = tripSeine.getDepartureHarbour(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 8ea8e6d..486424d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -94,7 +94,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri @Override public TripMapDto getTripLonglineMap(String tripLonglineId) { - List<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripLonglineId); + LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripLonglineId); TripMapDto tripMapDto = new TripMapDto(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 3f39477..6b24fbe 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -91,7 +91,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe @Override public TripMapDto getTripSeineMap(String tripSeineId) { - List<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); + LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); TripMapDto tripMapDto = new TripMapDto(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.