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 9076109ed64da2e89d50d25fd3b4739558e26c38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 24 19:06:15 2015 +0200 Fix merge --- .../java/fr/ird/observe/ObserveServiceHelper.java | 1 + .../observe/ObserveSwingApplicationContext.java | 8 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 2 - .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 8 +- .../observe/ui/admin/export/ExportUIHandler.java | 2 +- .../ObsoleteEntityListCellRenderer.java | 2 +- .../ird/observe/ui/content/ContentUIHandler.java | 24 +++--- .../observe/ui/content/ContentUIInitializer.java | 87 +++++++++++++--------- .../content/impl/longline/BranchlineUIHandler.java | 15 +--- .../LonglineDetailCompositionUIHandler.java | 8 +- .../LonglineGlobalCompositionUIHandler.java | 10 --- .../impl/longline/SetLonglineUIHandler.java | 11 --- .../ActivitySeineObservedSystemUIHandler.java | 11 --- ...ngObjectTransmittingBuoyOperationUIHandler.java | 16 +--- .../impl/seine/FloatingObjectUIHandler.java | 11 --- .../ui/content/impl/seine/SetSeineUIHandler.java | 11 --- .../ui/content/list/ContentListUIHandler.java | 23 ++---- .../ui/content/open/ContentOpenableUIHandler.java | 10 --- .../ui/content/ref/ContentReferenceUIHandler.java | 31 +++++--- .../ui/content/ref/ReferenceHomeUIHandler.java | 11 --- .../ref/ReferentialContentUIInitializer.java | 17 ----- .../ui/content/ref/UniqueKeyTableModel.java | 2 +- .../ui/content/table/ContentTableUIHandler.java | 23 ++---- .../impl/longline/CatchLonglineUIHandler.java | 14 ++-- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 15 +--- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 1 - .../configuration/ObserveDataSourceConnection.java | 1 + .../services/dto/referential/ReferentialDtos.java | 10 ++- 29 files changed, 142 insertions(+), 245 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java index fbb4a49..e174736 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java @@ -27,6 +27,7 @@ import fr.ird.observe.business.validation.ValidationService; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.ui.DecoratorService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index ba4b340..756316c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -23,7 +23,6 @@ package fr.ird.observe; import com.google.common.base.Preconditions; import fr.ird.observe.business.BinderService; -import fr.ird.observe.business.DecoratorService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.gps.GPSService; import fr.ird.observe.business.validation.ObserveValidator; @@ -49,6 +48,7 @@ import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.ObserveUIMode; @@ -141,7 +141,6 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { JAXXUtil.newContextEntryDef(ObserveSwingDataSource.class); - public static final JAXXContextEntryDef<ValidationContext> VALIDATION_CONTEXT_ENTRY_DEF = JAXXUtil.newContextEntryDef(ValidationContext.class); @@ -574,7 +573,6 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { public void prepareMainStorage(ObserveSwingDataSource dataSource) { - dataSource.addDataSourceListener(new ObserveSwingDataSourceListenerAdapter() { @Override @@ -709,12 +707,12 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { log.info("- " + programName); if (ProgramDtos.isProgramSeine(programDtoRef)) { List<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); - for (TripSeineStubDto tripSeine :tripSeines) { + for (TripSeineStubDto tripSeine : tripSeines) { log.info(" - " + tripSeine.getVesselLabel() + " " + tripSeine.getStartDate() + " - " + tripSeine.getEndDate()); } } else if (ProgramDtos.isProgramLongline(programDtoRef)) { List<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); - for (TripLonglineStubDto tripLongline :tripLonglines) { + for (TripLonglineStubDto tripLongline : tripLonglines) { log.info(" - " + tripLongline.getVesselLabel() + " " + tripLongline.getStartDate() + " - " + tripLongline.getEndDate()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java index ba37f9a..c9b4d70 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java @@ -22,8 +22,6 @@ package fr.ird.observe.ui; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.ObserveContext; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.ui.util.table.ObserveBooleanTableCellRenderer; import jaxx.runtime.FileChooserUtil; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 60e18bb..eec3d9f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -21,29 +21,27 @@ */ package fr.ird.observe.ui.admin; +import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.BinderService; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveRunner; import fr.ird.observe.business.SendMessageAble; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.gps.GPSService; +import fr.ird.observe.business.validation.ValidationService; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.admin.config.SelectDataUI; import fr.ird.observe.ui.admin.resume.ShowResumeUI; import fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel; import fr.ird.observe.ui.tree.ObserveTreeHelper; -import fr.ird.observe.business.validation.ValidationService; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JTree; -import javax.swing.tree.TreeModel; import java.io.PrintWriter; import java.io.StringWriter; import java.util.concurrent.Callable; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java index 5afccf2..c4f72f2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.admin.export; -import fr.ird.observe.business.DecoratorService; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java index 2ddca0a..462d322 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.admin.synchronize; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.DecoratorService; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.services.dto.AbstractObserveDto; import org.nuiton.decorator.Decorator; 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 425d75a..ed5acc4 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 @@ -21,13 +21,9 @@ */ package fr.ird.observe.ui.content; +import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.BinderService; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.IdDtos; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; @@ -35,6 +31,7 @@ import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; @@ -56,8 +53,14 @@ import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.*; -import java.awt.*; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JToolBar; +import javax.swing.UIManager; +import java.awt.Component; import java.util.ArrayList; import java.util.List; @@ -69,7 +72,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentUIHandler<E extends AbstractObserveDto> { +public abstract class ContentUIHandler<E extends IdDto> { /** Logger */ static private final Log log = LogFactory.getLog(ContentUIHandler.class); @@ -143,7 +146,7 @@ public abstract class ContentUIHandler<E extends AbstractObserveDto> { errorIcon = UIManager.getIcon("action.error"); } - public static <E extends AbstractObserveDto> ContentUIHandler<E> newHandler(ObserveContentUI<E> ui) { + public static <E extends IdDto> ContentUIHandler<E> newHandler(ObserveContentUI<E> ui) { String uiName = ui.getClass().getName(); String modelName = uiName + "Handler"; @@ -357,7 +360,8 @@ public abstract class ContentUIHandler<E extends AbstractObserveDto> { public void initUI() throws Exception { ContentUIInitializer<E, ObserveContentUI<E>> uiInitializer = new ContentUIInitializer<E, ObserveContentUI<E>>(ui); - uiInitializer.initUI(getDataSource()); + //FIXME + uiInitializer.initUI(); } 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 6516573..1ae7eee 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 @@ -25,17 +25,13 @@ package fr.ird.observe.ui.content; import com.google.common.base.Predicate; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.validation.ObserveValidator; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.FormDto; 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.constants.ReferenceStatus; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialDtos; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; @@ -69,10 +65,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; @@ -100,7 +111,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ContentUIInitializer<E extends AbstractObserveDto, UI extends ObserveContentUI<E>> { +public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E>> { public static final String OBSERVE_ACTION = "observeAction"; @@ -198,7 +209,8 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser // initialisation des éditeurs - init(dataSource); + //FIXME +// init(); Set<String> doNotBlockComponentIds = new HashSet<String>(); @@ -212,7 +224,8 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser } if (o instanceof AbstractObserveDto) { - init(dataSource, (AbstractObserveDto) o); + //FIXME +// init((AbstractObserveDto) o); continue; } @@ -322,6 +335,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_RESET_PROPERTY_NAME); if (propertyName != null) { editor.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { JavaBeanObjectUtil.setProperty(getBean(), propertyName, null); @@ -366,7 +380,9 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser } beanComboBox.setI18nPrefix("observe.common."); beanComboBox.setMinimumSize(new Dimension(0, 24)); - prepareBeanComboBox(beanComboBox); + //FIXME + Class entityClass = null; + prepareBeanComboBox(entityClass, beanComboBox); } @SuppressWarnings("unchecked") @@ -390,6 +406,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser log.debug("addDecorator to list " + jlist.getName()); } + DecoratorService decoratorService = ObserveSwingApplicationContext.get().getDecoratorService(); Decorator<AbstractObserveDto> decorator = decoratorService.getDecoratorByType(klass); jlist.putClientProperty("decorator", decorator); } @@ -413,7 +430,9 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser log.info("init list for " + beanList.getBeanType()); } - prepareEntityList(beanList); + //FIXME + Class<? extends IdDto> entityClass = null; + prepareEntityList(entityClass, beanList); } @@ -461,6 +480,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { editor.addKeyListener(new KeyAdapter() { + @Override public void keyReleased(KeyEvent e) { JTextField source = (JTextField) e.getSource(); @@ -476,6 +496,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { editor.addKeyListener(new KeyAdapter() { + @Override public void keyReleased(KeyEvent e) { JTextArea source = (JTextArea) e.getSource(); @@ -493,6 +514,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { editor.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent event) { if (event.getStateChange() == ItemEvent.SELECTED) { @@ -529,6 +551,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { editor.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent event) { Boolean newValue = ((JCheckBox) event.getSource()).isSelected(); @@ -553,6 +576,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser final String propertyName = (String) picker.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { picker.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { JXDatePicker source = (JXDatePicker) e.getSource(); @@ -571,9 +595,11 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser protected void addAutoSelectOnFocus(JTextField jTextField) { jTextField.addFocusListener(new FocusAdapter() { + @Override public void focusGained(final FocusEvent e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JTextField source = (JTextField) e.getSource(); @@ -605,17 +631,14 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser * Remplit le modèle d'une liste graphique avec la liste des entités d'un * type donné sur un service de persistance donné. * - * @param storageService le service de persistance à utiliser pour - * récupérer les entités - * @param entityClass le type de l'entité - * @param list le component graphique à initialiser + * @param entityClass le type de l'entité + * @param list le component graphique à initialiser * @throws DataSourceException si un problème lors de la récupération * des entités * @since 1.5 */ - protected <E extends AbstractObserveDto> void prepareEntityList(DataSource storageService, - Class<E> entityClass, - FilterableDoubleList<E> list) throws DataSourceException { + protected <E extends AbstractObserveDto> void prepareEntityList(Class<E> entityClass, + FilterableDoubleList<E> list) { ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); @@ -665,17 +688,14 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser * Remplit le modèle d'une liste graphique avec la liste des entités d'un * type donné sur un service de persistance donné. * - * @param storageService le service de persistance à utiliser pour - * récupérer les entités - * @param entityClass le type de l'entité - * @param list le component graphique à initialiser + * @param entityClass le type de l'entité + * @param list le component graphique à initialiser * @throws DataSourceException si un problème lors de la récupération * des entités * @since 1.5 */ - protected <E extends AbstractObserveDto> void prepareEntityList(DataSource storageService, - Class<E> entityClass, - BeanListHeader<E> list) throws DataSourceException { + protected <E extends AbstractObserveDto> void prepareEntityList(Class<E> entityClass, + BeanListHeader<E> list) { ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); @@ -724,18 +744,13 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser * Prépare un component de choix d'entités pour un type d'entité donné et * pour un service de persistance donné. * - * @param <E> le type de l'entité - * @param storageService le service de persistance à utiliser pour récupérer - * les entités - * @param entityClass le type de l'entité - * @param comboBox le component graphique à initialiser + * @param <E> le type de l'entité + * @param entityClass le type de l'entité + * @param comboBox le component graphique à initialiser * @throws DataSourceException si un pb pendant la récupération des * entités */ - protected <E extends AbstractObserveDto> void prepareBeanComboBox( - DataSource storageService, - Class<E> entityClass, - BeanComboBox<E> comboBox) throws DataSourceException { + protected <E extends AbstractObserveDto> void prepareBeanComboBox(Class<E> entityClass, BeanComboBox<E> comboBox) { ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); @@ -786,6 +801,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser final ListCellRenderer renderer = comboBox.getCombobox().getRenderer(); ListCellRenderer toolTipRenderer = new ListCellRenderer() { + @Override public Component getListCellRendererComponent(JList list, Object value, @@ -817,6 +833,7 @@ public class ContentUIInitializer<E extends AbstractObserveDto, UI extends Obser // listen on cache modification BeanComboBoxPropertyChangeListener listener = new BeanComboBoxPropertyChangeListener(entityClass, comboBox) { + @Override public void propertyChange(PropertyChangeEvent evt) { if (log.isDebugEnabled()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java index 04ab5e2..568475e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java @@ -25,7 +25,6 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.ui.UIHelper; @@ -41,7 +40,7 @@ import org.nuiton.decorator.Decorator; import org.nuiton.i18n.I18n; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.*; +import javax.swing.JOptionPane; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import java.util.HashSet; @@ -84,7 +83,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { getModel().setBranchline(branchline); //FIXME // getLoadBinder().copy(branchline, getBean()); - loadBean(branchline); +// loadBean(branchline); if (branchline == null) { @@ -260,16 +259,6 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { } - @Override - protected FormDto<BranchlineDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<BranchlineDto> loadToReadDto(String id) { - return null; - } - public boolean tryToQuit() { boolean canContinue; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 2074eb1..56da8e2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -25,7 +25,6 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.entities.longline.SectionTemplate; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -45,7 +44,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.*; +import javax.swing.JOptionPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.TableModelEvent; @@ -53,10 +52,8 @@ import javax.swing.event.TableModelListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -312,7 +309,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong this.branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); LonglineDetailCompositionUIInitializer uiInitializer = new LonglineDetailCompositionUIInitializer(getUi()); - uiInitializer.initUI(getDataSource()); + //FIXME +// uiInitializer.initUI(getDataSource()); LonglineDetailCompositionUI ui1 = getUi(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index cb6f8db..c9d1708 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -25,7 +25,6 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentMode; @@ -221,13 +220,4 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong getUi().getBaitsCompositionUI().getHandler().afterSave(refresh); } - @Override - protected FormDto<SetLonglineDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<SetLonglineDto> loadToReadDto(String id) { - return null; - } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index d5ded97..0ed76f6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -25,7 +25,6 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentMode; @@ -288,16 +287,6 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } - @Override - protected FormDto<SetLonglineDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<SetLonglineDto> loadToReadDto(String id) { - return null; - } - //FIXME // @Override // protected SetLongline onPreCreate(TopiaContext tx, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index 07434b3..fa39ae2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -99,16 +98,6 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ super.startEditUI(binding); } - @Override - protected FormDto<ActivitySeineObservedSystemDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<ActivitySeineObservedSystemDto> loadToReadDto(String id) { - return null; - } - //FIXME // @Override // protected boolean doSave(ActivitySeine bean, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 5e24206..1d7d3f0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; @@ -39,8 +38,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import java.awt.GridLayout; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -303,16 +303,6 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH resetEditUI(); } - @Override - protected FormDto<FloatingObjectDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<FloatingObjectDto> loadToReadDto(String id) { - return null; - } - protected void changeTypeOperation(TypeTransmittingBuoyOperation typeOperation, boolean reset) { FloatingObjectTransmittingBuoyOperationUI ui = getUi(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index dd172d4..165703c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.content.ContentMode; @@ -221,16 +220,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } } - @Override - protected FormDto<FloatingObjectDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<FloatingObjectDto> loadToReadDto(String id) { - return null; - } - //FIXME // @Override // protected boolean doDelete(FloatingObject bean, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index b1ce26d..7c0201b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.constants.seine.SchoolType; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -355,16 +354,6 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } } - @Override - protected FormDto<SetSeineDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<SetSeineDto> loadToReadDto(String id) { - return null; - } - //FIXME // @Override // protected boolean doDelete(SetSeine bean, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java index 89b3221..b9aa0c0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java @@ -22,9 +22,7 @@ package fr.ird.observe.ui.content.list; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.actions.shared.SelectNodeUIAction; @@ -37,8 +35,14 @@ import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; -import java.awt.*; +import javax.swing.DefaultListCellRenderer; +import javax.swing.Icon; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; +import java.awt.Color; +import java.awt.Component; import java.awt.event.MouseEvent; import java.util.List; @@ -65,7 +69,6 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> ext * * @param bean the container of entities to display * @return the list of entities to display - * @throws DataSourceException if a pb while grabbing data */ protected abstract List<ReferenceDto> getChilds(E bean); @@ -192,16 +195,6 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends IdDto> ext // rien par default } - @Override - protected FormDto<E> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<E> loadToReadDto(String id) { - return null; - } - /** * Un renderer de liste d'entité qui reprendre la cosmétique de l'arbre * de navigation. 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 b2561da..3ccdb75 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 @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.open; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -332,13 +331,4 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - @Override - protected FormDto<E> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<E> loadToReadDto(String id) { - return null; - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index ec56dec..f71bc47 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -21,9 +21,8 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.DecoratorService; import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.validation.ValidationContext; @@ -32,10 +31,10 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; -import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.usage.UsagesUI; import fr.ird.observe.ui.util.SpringUtilities; import jaxx.runtime.JAXXContext; @@ -46,16 +45,28 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.*; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JToolBar; +import javax.swing.ListModel; +import javax.swing.SpringLayout; +import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import java.awt.*; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Font; import java.beans.Introspector; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; @@ -388,7 +399,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content public void initUI() throws Exception { ReferentialContentUIInitializer<E, ContentReferenceUI<E>> uiInitializer = new ReferentialContentUIInitializer<E, ContentReferenceUI<E>>(getUi()); - uiInitializer.initUI(getDataSource()); + //FIXME + uiInitializer.initUI(); ContentReferenceUI<E> ui = getUi(); @@ -528,7 +540,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content @Override protected void prepareValidationContext() { super.prepareValidationContext(); - BeanListHeader<E> jList = getUi().getListHeader(); + //FIXME + BeanListHeader<E> jList = (BeanListHeader)getUi().getListHeader(); List<E> data = jList.getData(); ValidationContext validationContext = ObserveServiceHelper.get().getValidationContext(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java index 6efb0e4..381f935 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.ref; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -51,14 +50,4 @@ public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto> { return source.canWriteReferentiel(); } - @Override - protected FormDto<ProgramDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<ProgramDto> loadToReadDto(String id) { - return null; - } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java index 74624ed..e56f645 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java @@ -22,27 +22,10 @@ package fr.ird.observe.ui.content.ref; * #L% */ -import com.google.common.base.Predicate; -import fr.ird.observe.business.DecoratorService; -import fr.ird.observe.ObserveContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.services.dto.AbstractObserveDto; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.content.ContentUIInitializer; -import fr.ird.observe.ui.content.ObserveContentUI; -import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; -import org.nuiton.decorator.DecoratorUtil; -import org.nuiton.decorator.JXPathDecorator; - -import javax.swing.JList; -import javax.swing.ListCellRenderer; -import java.util.ArrayList; -import java.util.List; /** * Created on 11/28/14. diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java index 6fa1640..37101e9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.business.DecoratorService; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ObserveSwingApplicationContext; import javax.swing.table.AbstractTableModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index e40cd5f..b3249d7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -22,11 +22,10 @@ package fr.ird.observe.ui.content.table; import com.google.common.collect.Collections2; -import fr.ird.observe.ObserveContext; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; @@ -40,10 +39,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.ListSelectionModel; +import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.*; +import java.awt.Rectangle; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -198,7 +199,8 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex // preparation du bean d'édition // dataService.loadEditEntity(dataSource, id, getLoadExecutor()); - loadBean(id); + //FIXME +// loadBean(id); getModel().setMode(mode); @@ -466,15 +468,4 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex getTableModel().resetEditBean(); } - //FIXME - @Override - protected FormDto<E> loadToEdit(String id) { - return null; - } - - //FIXME - @Override - protected FormDto<E> loadToReadDto(String id) { - return null; - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index f70b61e..d4a00bb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -22,10 +22,9 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -39,12 +38,11 @@ import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; import fr.ird.observe.services.dto.referential.longline.HealthnessDto; import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.UIHelper; -import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; -import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -61,8 +59,6 @@ import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -444,6 +440,12 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineDto } //FIXME + @Override + protected String getEditBeanIdToLoad() { + return null; + } + + //FIXME // @Override // protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { // return dataContext.getSelectedSetId(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 4c4e31c..0215342 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -21,9 +21,8 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -33,7 +32,7 @@ import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -101,14 +100,4 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati } - @Override - protected FormDto<FloatingObjectDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<FloatingObjectDto> loadToReadDto(String id) { - return null; - } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index fc0c6a0..cf9df56 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -27,7 +27,7 @@ import com.google.common.collect.Iterables; import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.DecoratorService; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.util.SecurityModel; 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 a583ac0..ed629d5 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 @@ -24,7 +24,6 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.ObserveContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.OpenableDto; diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java index e16c9bc..c151292 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java @@ -58,6 +58,7 @@ public interface ObserveDataSourceConnection { */ boolean canWriteData(); + //FIXME Version of what ? Version getVersion(); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java index 731191d..44747cf 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java @@ -1,6 +1,8 @@ package fr.ird.observe.services.dto.referential; +import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -42,6 +44,11 @@ import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Iterator; +import java.util.List; public class ReferentialDtos extends AbstractReferentialDtos { @@ -116,7 +123,7 @@ public class ReferentialDtos extends AbstractReferentialDtos { .addAll(REFERENCE_LONGLINE_DTOS) .build(); - /** + /** * Logger. */ private static final Log log = LogFactory.getLog(ReferentialDtos.class); @@ -161,6 +168,7 @@ public class ReferentialDtos extends AbstractReferentialDtos { } public static final Predicate<ReferentialDto> IS_ACTIF_PREDICATE = new Predicate<ReferentialDto>() { + @Override public boolean apply(ReferentialDto input) { return ReferenceStatus.disabled != input.getStatus(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.