Author: tchemit Date: 2013-02-18 08:40:56 +0100 (Mon, 18 Feb 2013) New Revision: 438 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/438 Log: - improve loading dialog position - improve protocol cloned ui - improve open-close db action - continue user doc - hide synchronisation menu (should delete it!) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUI.jaxx 2013-02-18 07:40:56 UTC (rev 438) @@ -79,7 +79,7 @@ <JMenuItem id='menuImportTemporaryReferential'/> </JMenu> - <JMenu id='menuSynchronisations'> + <!--JMenu id='menuSynchronisations'> <JMenuItem id='menuSynchronisationImport' onActionPerformed="getHandler().showImportScreen()"/> @@ -87,7 +87,7 @@ onActionPerformed="getHandler().showExportScreen()"/> <JMenuItem id='menuSynchronisationAllegro' onActionPerformed="getHandler().showAllegroScreen()"/> - </JMenu> + </JMenu--> <JMenu id='menuHelp'> <JMenuItem id='menuHelpSite' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-18 07:40:56 UTC (rev 438) @@ -136,7 +136,6 @@ // open tutti db OpenDbAction openDbAction = createAction(OpenDbAction.class); - openDbAction.setCheckDbContext(true); openDbAction.actionPerformed(null); } } @@ -200,18 +199,6 @@ context.setScreen(TuttiScreen.EDIT_FISHING_OPERATION); } - public void showImportScreen() { - - } - - public void showExportScreen() { - - } - - public void showAllegroScreen() { - - } - public void showAbout() { ApplicationConfig applicationConfig = @@ -289,6 +276,25 @@ return body.getHandler(); } + /** + * Reload the persistence service and set the new ne into the handler. + * + * @since 1.0 + */ + public void reloadPersistenceService() { + this.persistenceService = context.reloadPersistenceService(); + } + + /** + * Get the persistence service instance used by the handler. + * + * @return the persistence service instance used by the handler + * @since 1.0 + */ + public PersistenceService getPersistenceService() { + return persistenceService; + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// @@ -498,16 +504,4 @@ return title; } - - public void reloadPersistenceService() { - - this.persistenceService = context.reloadPersistenceService(); - - context.setProgramId(null); - context.setProgramId(null); - } - - public PersistenceService getPersistenceService() { - return persistenceService; - } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 2013-02-18 07:40:56 UTC (rev 438) @@ -87,13 +87,17 @@ progressionModel.setMessage("Rechargement de la base de données"); getContext().setDbLoaded(true); - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); } else { sendMessage("Aucune mise à jour de base détectée."); } + } + @Override + protected void releaseAction(ActionEvent event) { getContext().getActionUI().getModel().setProgressionModel(null); + super.releaseAction(event); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java 2013-02-18 07:40:56 UTC (rev 438) @@ -70,6 +70,8 @@ getHandler().reloadPersistenceService(); + getContext().clearDbContext(); + sendMessage(String.format("La base de données '%s' est fermée.", jdbcUrl)); // goto the only screen possible in this state Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-02-18 07:40:56 UTC (rev 438) @@ -88,7 +88,7 @@ new Runnable() { @Override public void run() { - getContext().getMainUI().getBody().revalidate(); + getContext().getMainUI().getBody().repaint(); } } ); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java 2013-02-18 07:40:56 UTC (rev 438) @@ -48,13 +48,6 @@ /** Logger. */ private static final Log log = LogFactory.getLog(OpenDbAction.class); - /** - * Flag to sanity or not the db context (and save it in config). - * - * @since 1.0 - */ - protected boolean checkDbContext; - public OpenDbAction(MainUIHandler handler) { super(handler, "openDb", @@ -77,23 +70,10 @@ sendMessage(String.format("La base de données '%s' est ouverte.", jdbcUrl)); - if (checkDbContext) { - - if (log.isDebugEnabled()) { - log.debug("Check db context"); - } - getContext().checkDbContext(); + if (log.isDebugEnabled()) { + log.debug("Check db context"); } + getContext().checkDbContext(); getContext().setScreen(TuttiScreen.SELECT_CRUISE); } - - @Override - protected void releaseAction(ActionEvent event) { - checkDbContext = false; - super.releaseAction(event); - } - - public void setCheckDbContext(boolean checkDbContext) { - this.checkDbContext = checkDbContext; - } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-02-18 07:40:56 UTC (rev 438) @@ -51,13 +51,12 @@ text: {getStringValue(model.getComment())}; } -#warningContainer { +#saveWarningContainer { background: {new java.awt.Color(245, 218, 88)}; - visible: {model.isImported()}; + visible: {model.isImported() || model.isCloned()}; } -#importWarning { - text: "tutti.label.import.warning"; +#saveWarning { actionIcon: warning; border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-02-18 07:40:56 UTC (rev 438) @@ -175,9 +175,9 @@ </tab> </JTabbedPane> - <JPanel id='warningContainer' layout='{new BorderLayout(10, 10)}' + <JPanel id='saveWarningContainer' layout='{new BorderLayout(10, 10)}' constraints='BorderLayout.NORTH'> - <JLabel id='importWarning' constraints='BorderLayout.CENTER'/> + <JLabel id='saveWarning' constraints='BorderLayout.CENTER'/> </JPanel> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-18 07:40:56 UTC (rev 438) @@ -194,6 +194,7 @@ model.fromBean(protocol); model.setImported(true); + ui.getSaveWarning().setText(_("tutti.label.protocol.import.warning")); } else { @@ -209,7 +210,10 @@ if (mustClone != null && mustClone) { ui.setContextValue(false, MainUIHandler.CLONE_PROTOCOL); model.setId(null); + model.setCloned(true); + ui.getSaveWarning().setText(_("tutti.label.protocol.clone.warning")); + } else { log.debug(model.getExistingProtocols()); model.getExistingProtocols().remove(protocol); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-02-18 07:40:56 UTC (rev 438) @@ -61,6 +61,8 @@ public static final String PROPERTY_IMPORTED = "imported"; + public static final String PROPERTY_CLONED = "cloned"; + protected String name; protected String comment; @@ -73,9 +75,21 @@ protected List<String> hydrologyPmfmId; + /** + * Flag when a incoming protocol is imported. + * + * @since 1.0 + */ protected boolean imported; /** + * Flag when a incoming protocol is cloned. + * + * @since 1.0 + */ + protected boolean cloned; + + /** * Can user remove a selected species? * * @since 0.3 @@ -205,6 +219,16 @@ firePropertyChange(PROPERTY_IMPORTED, oldValue, imported); } + public boolean isCloned() { + return cloned; + } + + public void setCloned(boolean cloned) { + Object oldValue = isCloned(); + this.cloned = cloned; + firePropertyChange(PROPERTY_CLONED, oldValue, cloned); + } + public List<TuttiProtocol> getExistingProtocols() { return existingProtocols; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-02-18 07:40:56 UTC (rev 438) @@ -29,12 +29,12 @@ import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.MainUI; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.SwingUtilities; +import java.awt.Container; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -119,16 +119,19 @@ } else { // starting action - if (ui.getOwner() != null) { - MainUI mainUI = getContext().getMainUI(); - if (mainUI != null) { - SwingUtil.center(mainUI, ui); - } - } // new action - ui.getGlobalActionLabel().setText(_("tutti.message.action.running", action.getActionDescription())); + ui.getGlobalActionLabel().setText( + _("tutti.message.action.running", action.getActionDescription())); ui.pack(); + + MainUI mainUI = getContext().getMainUI(); + if (mainUI != null) { + Container component = mainUI.getBody(); + int x = mainUI.getX() + (mainUI.getWidth() - component.getWidth()); + int y = mainUI.getY() + (mainUI.getHeight() - component.getHeight()); + ui.setLocation(x, y); + } ui.setVisible(true); } } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-17 20:23:04 UTC (rev 437) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-18 07:40:56 UTC (rev 438) @@ -277,7 +277,6 @@ tutti.label.frequencyConfiguration.no.configuration=< Pas de configuration > tutti.label.frequencyConfiguration.rafaleStep=Classe de taille à incrémenter tutti.label.frequencyConfiguration.step=Pas de la classe de taille -tutti.label.import.warning=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.label.list.gear=Engin(s) tutti.label.list.headOfMission=Chef(s) de mission tutti.label.list.headOfSortRoom=Reponsable(s) de salle de tri @@ -288,6 +287,8 @@ tutti.label.program.name=Nom tutti.label.program.zone=Zone tutti.label.protocol=Protocol de saisie +tutti.label.protocol.clone.warning=Le protocole que vous venez de cloner ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". +tutti.label.protocol.import.warning=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.label.referential.gear=Référentiel Engin tutti.label.referential.person=Référentiel Personne tutti.label.referential.species=Référentiel Espèce