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 ab3f0e9bba742d3f4e7c37e58a23bb88b6618919 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 12:39:21 2015 +0100 suppression code mort + fixmes --- .../fr/ird/observe/ObserveSwingBinderService.java | 22 ---------------------- .../ObserveSwingApplicationConfigOption.java | 1 - .../ird/observe/ui/tree/ActivityLonglineNode.java | 6 ------ .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 1 - .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 6 ------ .../loadors/ActivityLonglineNodeChildLoador.java | 1 - .../loadors/ProgramLonglineNodeChildLoador.java | 4 ++-- .../ui/tree/loadors/RoutesNodeChildLoador.java | 6 ------ 8 files changed, 2 insertions(+), 45 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java index 2ff97fa..ceb6b58 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java @@ -38,28 +38,6 @@ public class ObserveSwingBinderService { return builder; } - //FIXME -// public <E extends TopiaEntity> TopiaEntityBinder<E> getTopiaBinder(Class<E> entityClass, -// String contextName) { -// if (ObserveBinderHelper.getCachedBinderModel(entityClass, entityClass, contextName) == null) { -// -// // we do not want to have auto created binder model by the factory -// return null; -// } -// return (TopiaEntityBinder<E>) ObserveBinderHelper.newBinder(entityClass, entityClass, contextName, TopiaEntityBinder.class); -// } - - //FIXME -// public <E extends TopiaEntity> TopiaEntityBinder<E> registerTopiaBinder(Class<E> entityClass, -// BinderModelBuilder<E, E> builder, -// String contextName) { -// return ObserveBinderHelper.registerTopiaBinder(entityClass, builder, contextName); -// } -// -// public <E extends TopiaEntity> TopiaEntityBinder<E> getSimpleTopiaBinder(Class<E> entityClass) { -// return getTopiaBinder(entityClass, "Observe"); -// } - public <E extends AbstractObserveDto> void simpleCopy(E source, E target, boolean tech) { //FIXME // Class<E> entityClass = (Class<E>) TopiaEntityHelper.getContractClass(ObserveDAOHelper.getContracts(), target.getClass()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java index c8def54..26e5ed0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java @@ -608,7 +608,6 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { false ), - //FIXME /** le type de liste d'espèces pour les captures cibles (seine) */ SPECIES_LIST_SEINE_TARGET_CATCH_ID( "speciesList.seine.targetCatch", diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index fb566c5..2b1bfd3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -49,10 +49,4 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { return referenceDto; } - //FIXME -// @Override -// protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) { -// return dataService.getActivityLonglineStub(source, id); -// } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index e5de607..b122b50 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -143,7 +143,6 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { log.info("will load entity " + internalClass.getSimpleName() + " : " + id); } - //FIXME entity = fetchEntity(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index 414e18d..6bef031 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -49,10 +49,4 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { return referenceDto; } - //FIXME -// @Override -// protected SetSeine getEntity(DataService dataService, DataSource source) { -// return (SetSeine) dataService.loadEntity(source, id, true); -// } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 039af11..be4ff46 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -45,7 +45,6 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -//FIXME public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; 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 8b732dd..d29e594 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 @@ -123,8 +123,8 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa { // Add activities - //FIXME - ObserveNode child = ObserveTreeHelper.createStringNode(TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, 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/RoutesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java index ef1f626..414459c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java @@ -60,16 +60,10 @@ public class RoutesNodeChildLoador extends AbstractReferenceDtoChildLoador<Route String parentId, NavDataProvider dataProvider) throws Exception { -// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); - //FIXME -// List<RouteDto> data = getDataService().getRouteStubByTrip(dataSource, parentId); -// return data; - RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); ReferenceSetDto<RouteDto> routeByTripSeine = routeService.getRouteByTripSeine(parentId); return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(routeByTripSeine.getReference())); - } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.