This is an automated email from the git hooks/post-receive script. New commit to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git commit d30781b8df6c5c6801079373b8ea6b3768f12eae Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 5 18:21:33 2015 +0200 début de migration de l'ecran (refs #7587) --- .../ird/observe/ui/content/ContentUIHandler.java | 6 +- .../observe/ui/content/ContentUIInitializer.java | 19 +++++- .../ird/observe/ui/content/ObserveContentUI.java | 3 +- .../ui/content/open/ContentOpenableUIHandler.java | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 73 +++------------------- .../content/open/impl/seine/TripSeineUIModel.java | 7 --- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 2 +- 7 files changed, 32 insertions(+), 82 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index f771ad5..8a6b083 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -244,11 +244,11 @@ public abstract class ContentUIHandler<E extends IdDto> { /** * Pour calculer la propriete {@code canWrite} du modèle. * - * @param source la base source de l'ui + * @param dataSsource la base source de l'ui * @return {@code true} si on peut écrire (donc éditer), {@code false} autrement. */ - protected abstract boolean computeCanWrite(ObserveSwingDataSource source); - + protected abstract boolean computeCanWrite(ObserveSwingDataSource dataSsource); + protected final String getSelectedParentId() { String s = null; if (parentType != null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 97ddd8a..5160d83 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -66,10 +66,25 @@ import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; import org.nuiton.util.DateUtil; -import javax.swing.*; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JScrollBar; +import javax.swing.JSpinner; +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.ListCellRenderer; +import javax.swing.SwingUtilities; import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java index 5a40d9e..9f5586e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java @@ -30,7 +30,8 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.BlockingLayerUI; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; -import javax.swing.*; +import javax.swing.Icon; +import javax.swing.JToolBar; /** * Created on 10/5/14. 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 2208490..20ba59c 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 @@ -82,8 +82,6 @@ public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentU protected abstract boolean doOpenData(); - public abstract boolean doCloseData(); - public final void openDataUI() { boolean ok = false; try { @@ -135,6 +133,8 @@ public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentU } } + public abstract boolean doCloseData(); + public final void afterCloseData() { ContentOpenableUI<E> ui = getUi(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index a0d0536..c567581 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -26,10 +26,6 @@ import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; -import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDtos; import fr.ird.observe.services.service.seine.TripSeineService; @@ -41,7 +37,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; -import javax.swing.*; +import javax.swing.JTabbedPane; +import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.util.Date; @@ -95,15 +92,15 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { @Override protected ContentMode getContentMode(DataContext dataContext) { - String mareeId = getSelectedId(); + String tripSeineId = getSelectedId(); - if (mareeId == null) { + if (tripSeineId == null) { // maree en cours de creation return ContentMode.CREATE; } - if (dataContext.isSelectedOpen(TripSeineDto.class)) { + if (getOpenDataManager().isOpenTripSeine(tripSeineId)) { // maree ouverte return ContentMode.UPDATE; @@ -141,8 +138,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { TripSeineUI ui = getUi(); TripMapUI tripMap = ui.getTripMap(); - //FIXME -// tripMap.getHandler().doOpenMap(ui.getDataSource(), ui.getDataService(), getSelectedId()); + tripMap.getHandler().doOpenMap(getSelectedId()); } }); buildTripMap = false; @@ -192,12 +188,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { } formDto = getTripSeineService().loadToEdit(tripId); - //FIXME -// if (!bean.isRouteEmpty()) { -// -// // on force le trie des routes -// Routes.sort(bean.getRoute()); -// } } getModel().setFormDto(formDto); @@ -210,22 +200,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { finalizeOpenUI(mode, create); } - //FIXME -// @Override -// protected TripSeine onPreCreate(TopiaContext tx, Object parent, TripSeine bean) throws TopiaException { -// -// Program parentBean = (Program) parent; -// Date date = DateUtil.getDay(new Date()); -// bean.setStartDate(date); -// bean.setEndDate(date); -// if (log.isDebugEnabled()) { -// log.debug("start date : " + date); -// log.debug("program : " + parentBean); -// } -// bean.setProgram(parentBean); -// return bean; -// } - @Override public void startEditUI(String... binding) { @@ -276,12 +250,9 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { model.setModified(create); } - //FIXME @Override protected boolean doSave(TripSeineDto bean) throws Exception { - String programId = getDataContext().getSelectedProgramId(); - // on force toujours la date a etre sans heure, minute,... Date startDate = DateUtil.getDay(bean.getStartDate()); if (log.isDebugEnabled()) { @@ -294,8 +265,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { log.debug("endDate = " + endDate); } - bean.setOpen(true); - String beanId = getTripSeineService().save(bean); bean.setId(beanId); @@ -306,23 +275,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { return true; } - //FIXME -// @Override -// protected TripSeine onCreate(TopiaContext tx, Object parent, TripSeine editBean) throws TopiaException { -// TripSeine beanToSave = ObserveDAOHelper.getTripSeineDAO(tx).create(); -// editBean.setTopiaId(beanToSave.getTopiaId()); -// return beanToSave; -// } - - //FIXME -// @Override -// protected TripSeine onUpdate(TopiaContext tx, Object parentBean, TripSeine beanToSave) throws TopiaException { -// -// getLoadBinder().copyExcluding(getBean(), beanToSave, TripSeine.PROPERTY_ROUTE, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); -// -// return beanToSave; -// } - @Override protected boolean doDelete(TripSeineDto bean) throws Exception { @@ -341,20 +293,9 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { return true; } - //FIXME -// @Override -// protected void onDelete(TopiaContext tx, Object parentBean, TripSeine beanToDelete) throws TopiaException { -// -// TopiaDAO<TripSeine> dao = getDataSource().getDAO(tx, TripSeine.class); -// dao.delete(beanToDelete); -// } - @Override protected boolean obtainCanReopen(boolean create) { - - DataContext dataContext = getDataContext(); - return !create && !dataContext.isOpenTrip(); - + return !create && getOpenDataManager().canOpenTripSeine(); } protected TripSeineService getTripSeineService() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java index aa9fa89..3da50c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java @@ -58,16 +58,9 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeineDto> { TripSeineDto.PROPERTY_OCEAN, TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, TripSeineDto.PROPERTY_LANDING_HARBOUR, - //FIXME -// TripSeineDto.PROPERTY_PROGRAM, -// TripSeineDto.PROPERTY_ROUTE, TripSeineDto.PROPERTY_ERS_ID, TripSeineDto.PROPERTY_OPEN); - // on ajoute la recopie de l'association route - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeineDto.PROPERTY_ROUTE); - return builder; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index 787ad27..abe4361 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -48,7 +48,7 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { @Override protected ReferenceDto<TripSeineDto> fetchEntity() { TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); - FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(entity.getId()); + FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(getId()); ReferenceDto<TripSeineDto> referenceDto = ReferenceDtos.newReferenceDto(TripSeineDto.class, Lists.newArrayList(TripSeineDto.PROPERTY_ID, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.