- Simexplorer-si-commits - mailman.cloud.codelutin.com

r1375 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: actions actions/util model ui
by tchemit＠users.labs.libre-entreprise.org March 17, 2008

March 17, 2008

Author: tchemit Date: 2008-03-17 23:07:39 +0000 (Mon, 17 Mar 2008) New Revision: 1375 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTab.java Log: add i18nable annotation (via mvn process-classes -Di18n.detectea=true) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -48,10 +48,11 @@ hideActionText = false, enabled = true ) + at org.codelutin.i18n.I18nable public class ConnectAction extends SimExplorerAbstractAction { LoginUI ui; - MyLoginUIHandler loginUIHandler; + transient MyLoginUIHandler loginUIHandler; private static final long serialVersionUID = -6172528731543675359L; @@ -83,10 +84,10 @@ } /** - * Rafraichit les uis après un changement de status de connexion de l'utilisateur. + * Rafraichit les uis aprÃšs un changement de status de connexion de l'utilisateur. * - * Si l'utilisateur est déconnecté, alors toutes les ui et actions liées au - * mode remote sont fermées et les actions correspondantes sont rendues + * Si l'utilisateur est dÃ©connectÃ©, alors toutes les ui et actions liÃ©es au + * mode remote sont fermÃ©es et les actions correspondantes sont rendues * inaccessibles. */ @Override @@ -152,14 +153,14 @@ /** * Tente de se connecter au service. * - * Le mot de passe hashé est sauvegardé. + * Le mot de passe hashÃ© est sauvegardÃ©. * - * Si l'utilisateur abandonne l'opération, alors on reset le mot de - * passe hashé dans la config et on sauvegarde la config. + * Si l'utilisateur abandonne l'opÃ©ration, alors on reset le mot de + * passe hashÃ© dans la config et on sauvegarde la config. * * @param login le login de l'utilisateur - * @param password le password hashé de l'utilisateur - * @return <code>true</code> si l'utilisateur est connecté + * @param password le password hashÃ© de l'utilisateur + * @return <code>true</code> si l'utilisateur est connectÃ© */ protected boolean connect(String login, String password) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -43,9 +43,10 @@ mnemonic = 'x', hideActionText = true ) + at org.codelutin.i18n.I18nable public class DeleteElementAction extends SimExplorerAbstractTabAction { - /** le modèle de sélection */ + /** le modÃšle de sÃ©lection */ protected DataEntityModel selected; /** flag pour indiquer si le model de l'onglet de synchro a ete modifie */ protected Boolean synchronizeModified; @@ -70,7 +71,7 @@ return false; } if (selected == null) { - // on doit retrouver l'élément à traiter à partir de la source + // on doit retrouver l'Ã©lÃ©ment Ã traiter Ã partir de la source selected = findSelectedItem(e); } boolean selectedUuid = selected != null && selected.getUuid() != null; @@ -107,7 +108,7 @@ model.reloadSources(uuid, !remote, remote, !remote, remote); } - // suppression de l'élément de l'historique (si present) + // suppression de l'Ã©lÃ©ment de l'historique (si present) SimExplorerActionManager.fireSelectedAction("historyDelete", e.getSource(), selected); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -30,7 +30,7 @@ import java.io.InputStream; /** - * Action pour downloader un fichier attachéà un LoggableElement + * Action pour downloader un fichier attachÃ©Ã un LoggableElement * * @author chemit */ @@ -44,6 +44,7 @@ hideActionText = true, enabled = false ) + at org.codelutin.i18n.I18nable public class DownloadAttachmentAction extends DownloadAbstractAction { protected Attachment attachment; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -42,6 +42,7 @@ mnemonic = 'x', hideActionText = true ) + at org.codelutin.i18n.I18nable public class DownloadElementAction extends DownloadAbstractAction { protected static final MessageFormat FILENAME_PATTERN = new MessageFormat("{0}.zip"); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -39,7 +39,7 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; /** - * Action pour exporter un élément + * Action pour exporter un Ã©lÃ©ment * * @author chemit */ @@ -50,13 +50,14 @@ mnemonic = 'x', hideActionText = true ) + at org.codelutin.i18n.I18nable public class ExportElementAction extends SimExplorerAbstractTabAction { /** le service d'origine */ protected StorageService fromService; - /** le service où exporter */ + /** le service oÃ¹ exporter */ protected StorageService toService; - /** le modèle de sélection */ + /** le modÃšle de sÃ©lection */ protected DataEntityModel selected; private static final long serialVersionUID = 7535647131305304738L; @@ -99,7 +100,7 @@ return false; } - // on retrouve l'onglet concerné à partir de son model + // on retrouve l'onglet concernÃ© Ã partir de son model TabModel tabModel = getModel(); boolean result = true; @@ -111,7 +112,7 @@ selected = model.getSelectedItem(); } else if (tabModel instanceof SimExplorerAbstractTabModel) { SynchronizeTabModel model = (SynchronizeTabModel) getModel(); - // on doit traiter ça dans les classes étendues + // on doit traiter Ã§a dans les classes Ã©tendues // car cela ne depend pas uniquement du model mais aussi de l'action // choisie // on utilise le nom de l'action pour savoir quoi faire @@ -161,7 +162,7 @@ model.reloadSources(uuid, false,false,remote,!remote); } - // suppression de l'élément de l'historique (si present) + // suppression de l'Ã©lÃ©ment de l'historique (si present) SimExplorerActionManager.fireSelectedAction("historyDeleteExport", e.getSource(), selected); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -51,6 +51,7 @@ mnemonic = 'I', hideActionText = false ) + at org.codelutin.i18n.I18nable public class ImportElementAction extends SimExplorerAbstractTabAction { protected ImportDialog ui; @@ -103,7 +104,7 @@ model.reloadSources(selected.getUuid(), false,false,!remote,remote); } - // suppression de l'élément de l'historique (si present) + // suppression de l'Ã©lÃ©ment de l'historique (si present) SimExplorerActionManager.fireSelectedAction("historyDelete", e.getSource(), selected); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -31,8 +31,8 @@ /** * Une action pour recharger la locale. * - * Le nom de l'action doit etre de la forme i18n_XX_YY où XX est la langue - * et YY le pays de la locale à charger. + * Le nom de l'action doit etre de la forme i18n_XX_YY oÃ¹ XX est la langue + * et YY le pays de la locale Ã charger. * * @author chemit * @see org.codelutin.i18n.LocaleEnum @@ -43,6 +43,7 @@ longDescription = "simexplorer.action.changeLocale.help", hideActionText = false ) + at org.codelutin.i18n.I18nable public class ChangeLocaleAction extends SimExplorerAbstractAction { public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)"); @@ -90,7 +91,7 @@ getContext().getMainConfig().setUserLocale(locale); // on doit initialiser la nouvelle locale avant de decharger les ui - // au cas ou un appel à une ui surviendrait et dans quel cas la locale + // au cas ou un appel Ã une ui surviendrait et dans quel cas la locale // serait toujours sur l'ancienne valeur ... getContext().initI18n(); // save config Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -38,10 +38,11 @@ import java.awt.event.ActionEvent; /** - * La classe de base à utiliser pour toutes les actions de l'application + * La classe de base Ã utiliser pour toutes les actions de l'application * * @author chemit */ + at org.codelutin.i18n.I18nable public abstract class SimExplorerAbstractAction extends javax.swing.AbstractAction { protected static Log log = LogFactory.getLog(SimExplorerAbstractAction.class); @@ -175,4 +176,4 @@ tab.closeTab(getContext(),getMainUI(),getMainUI().getContent()); } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -43,6 +43,7 @@ * * @author chemit */ + at org.codelutin.i18n.I18nable public abstract class SimExplorerAbstractTabAction extends SimExplorerAbstractAction { private SimExplorerTab tab; @@ -141,8 +142,8 @@ } /** - * @param e l'évènement d'action - * @return le tab d'où l'action a été lancée + * @param e l'Ã©vÃšnement d'action + * @return le tab d'oÃ¹ l'action a Ã©tÃ© lancÃ©e */ protected SimExplorerTab findTab(ActionEvent e) { SimExplorerTab sourceTab; @@ -151,8 +152,8 @@ } /** - * @param e l'évènement d'action - * @return le dataentity sélectionné dans le tab d'où a été lancée l'action + * @param e l'Ã©vÃšnement d'action + * @return le dataentity sÃ©lectionnÃ© dans le tab d'oÃ¹ a Ã©tÃ© lancÃ©e l'action */ protected DataEntityModel findSelectedItem(ActionEvent e) { SimExplorerTab sourceTab = SimExplorerTab.findTab((Component) e.getSource()); @@ -171,7 +172,7 @@ protected JTree getTreeForAction(JAXXTab _ui, String actionPrefix, String actionName) { JTree tree = null; - // on retrouve l'arbre concerné à partir du nom de l'action + // on retrouve l'arbre concernÃ© Ã partir du nom de l'action if ((actionPrefix + "Detail").equals(actionName)) { JDetailTab ui = (JDetailTab) _ui; tree = ui.getNavigationTree(); @@ -187,4 +188,4 @@ } return tree; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -34,6 +34,7 @@ * * @author chemit */ + at org.codelutin.i18n.I18nable public class DetailTableModel extends AbstractTableModel { protected LoggableElement data; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -36,6 +36,7 @@ import java.util.List; /** @author tony */ + at org.codelutin.i18n.I18nable public class ListTableModel extends AbstractTableModel { MetaData[] data; @@ -144,4 +145,4 @@ public SortColumn getSortColumn(int column) { return sorts[column]; } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -47,6 +47,7 @@ * * @author chemit */ + at org.codelutin.i18n.I18nable public class DetailTabUpdater extends SimExplorerAbstractTabUpdater<JDetailTab, DetailTabModel> { public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss.SSS"); @@ -233,7 +234,7 @@ MetaData data = rootElement.getMetaData(); Version version = model.getSelectedVersion(); if (version == null && detail != null) { - // la version peut être null, ce qui veut dire que l'on vient d'un changement + // la version peut Ãªtre null, ce qui veut dire que l'on vient d'un changement // de node dans l'arbre de navigation et donc la version est celle du detai version = detail.getVersion(); } @@ -383,4 +384,4 @@ } throw new IllegalStateException("can not come her :)"); } -} +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTab.java 2008-03-17 18:26:31 UTC (rev 1374) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTab.java 2008-03-17 23:07:39 UTC (rev 1375) @@ -31,11 +31,12 @@ import java.awt.Component; /** - * La défintion des onglets utilisés dans l'application + * La dÃ©fintion des onglets utilisÃ©s dans l'application * * @author tony */ + at org.codelutin.i18n.I18nable public enum SimExplorerTab { @TabContentConfig( @@ -87,7 +88,7 @@ * recherche d'un onglet contenant un component. * * @param c le component dont on cherche l'onglet - * @return l'onglet parent du component, ou null si pas de tab trouvé + * @return l'onglet parent du component, ou null si pas de tab trouvÃ© */ public static SimExplorerTab findTab(Component c) { Component parent = c.getParent(); @@ -118,19 +119,10 @@ return (JListTab) getListTab(remote).getUI(); } - /*public static ListTabModel getListModel(boolean remote) { - return (ListTabModel) getListTab(remote).getModel(); - }*/ - - public JAXXTab getUI() { return getFactory().getUI(name()); } - private SimExplorerAbstractTabModel getModel() { - return getFactory().getModel(name()); - } - public SimExplorerAbstractTabModel getModel(SimExplorerContext context) { return getFactory().getModel(name(),context); } @@ -164,4 +156,4 @@ } getFactory().resetCache(); } -} +} \ No newline at end of file

1 0

r1374 - in trunk/simexplorer-is: simexplorer-is-ear simexplorer-is-web
by glandais＠users.labs.libre-entreprise.org March 17, 2008

March 17, 2008

Author: glandais Date: 2008-03-17 18:26:31 +0000 (Mon, 17 Mar 2008) New Revision: 1374 Modified: trunk/simexplorer-is/simexplorer-is-ear/pom.xml trunk/simexplorer-is/simexplorer-is-web/pom.xml Log: pom update (t5 components) Modified: trunk/simexplorer-is/simexplorer-is-ear/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-ear/pom.xml 2008-03-17 18:12:28 UTC (rev 1373) +++ trunk/simexplorer-is/simexplorer-is-ear/pom.xml 2008-03-17 18:26:31 UTC (rev 1374) @@ -36,9 +36,7 @@ <webModule> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-web</artifactId> - <contextRoot> - / - </contextRoot> + <contextRoot>/</contextRoot> </webModule> </modules> </configuration> @@ -51,7 +49,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>${tapestry.version}</version> + <version>${tapestry.version}.1</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> @@ -69,9 +67,9 @@ <version>${tapestry.version}</version> </dependency> <dependency> - <groupId>de.hsofttec.t5components</groupId> - <artifactId>t5components</artifactId> - <version>0.5.6</version> + <groupId>org.apache.tapestry</groupId> + <artifactId>t5c-commons</artifactId> + <version>0.5.11</version> </dependency> <dependency> Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-17 18:12:28 UTC (rev 1373) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-03-17 18:26:31 UTC (rev 1374) @@ -96,7 +96,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>${tapestry.version}</version> + <version>${tapestry.version}.1</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> @@ -114,10 +114,11 @@ <version>${tapestry.version}</version> </dependency> <dependency> - <groupId>de.hsofttec.t5components</groupId> - <artifactId>t5components</artifactId> - <version>0.5.6</version> + <groupId>org.apache.tapestry</groupId> + <artifactId>t5c-commons</artifactId> + <version>0.5.11</version> </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jbossall-client</artifactId>

1 0

r1373 - trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui
by tchemit＠users.labs.libre-entreprise.org March 17, 2008

March 17, 2008

Author: tchemit Date: 2008-03-17 18:12:28 +0000 (Mon, 17 Mar 2008) New Revision: 1373 Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx Log: hide menu debug when no debugMode :) Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2008-03-17 18:12:04 UTC (rev 1372) +++ trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2008-03-17 18:12:28 UTC (rev 1373) @@ -37,7 +37,7 @@ <JMenuItem id="site"/> <JMenuItem id="about"/> </JMenu> - <JMenu text='simexplorer.debug.menu'> + <JMenu id="debug" text='simexplorer.debug.menu'> <JMenuItem id="generateData"/> </JMenu> </JMenuBar>

1 0

r1372 - in trunk/simexplorer-is/simexplorer-is-swing: . src/java/fr/cemagref/simexplorer/is/ui/swing src/java/fr/cemagref/simexplorer/is/ui/swing/actions src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab src/java/fr/cemagref/simexplorer/is/ui/swing/ui
by tchemit＠users.labs.libre-entreprise.org March 17, 2008

March 17, 2008

Author: tchemit Date: 2008-03-17 18:12:04 +0000 (Mon, 17 Mar 2008) New Revision: 1372 Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SiteAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java Log: change getConfig to getMainConfig Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-17 18:12:04 UTC (rev 1372) @@ -56,25 +56,27 @@ <treateDefaultEntry>false</treateDefaultEntry> <entries> <entry> - <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/actions</basedir> + <basedir>${maven.src.dir}/java</basedir> +  <includes> - <param>**\/*Action.java</param> + <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*Action.java</param> </includes> <excludes> - <param>**\/*AbstractAction.java</param> + <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java</param> </excludes> </entry> <entry> - <basedir>${maven.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/ui</basedir> + <basedir>${maven.src.dir}/java</basedir> <includes> - <param>SimExplorerTab.java</param> + <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/SimExplorerTab.java</param> </includes> </entry> </entries> </configuration> </execution> <execution> - <phase>compile</phase> +  + <phase>process-classes</phase> <id>java</id> <goals> <goal>parserJava</goal> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-17 18:12:04 UTC (rev 1372) @@ -60,9 +60,10 @@ public static void init(String... args) { try { - // init context, parser and configs + // instanciate context, parser and configs context = new SimExplorerContext(); + // init context context.init(args); } catch (IOException e) { @@ -88,7 +89,7 @@ // init ui SimExplorerMainUI mainUI = SimExplorerMainUI.getUI(); - SimExplorerConfigMain conf = getContext().getConfig(); + SimExplorerConfigMain conf = getContext().getMainConfig(); if (conf.isShowLocalTab()) { // show local tab @@ -158,7 +159,7 @@ } public void initI18n() { - I18n.initISO88591(getContext().getConfig().getUserLocale()); + I18n.initISO88591(getContext().getMainConfig().getUserLocale()); } protected SimExplorer() { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-03-17 18:12:04 UTC (rev 1372) @@ -26,6 +26,7 @@ import jaxx.runtime.builder.SimpleActionFactoryImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.i18n.I18nable; import javax.swing.AbstractAction; import javax.swing.AbstractButton; @@ -42,6 +43,7 @@ * @author tony * @see fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction */ + at I18nable public class SimExplorerActionManager { private static final Log log = LogFactory.getLog(SimExplorerActionManager.class); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-17 18:12:04 UTC (rev 1372) @@ -85,7 +85,7 @@ } public void initI18n() { - I18n.initISO88591(getConfig().getUserLocale()); + I18n.initISO88591(getMainConfig().getUserLocale()); } @@ -93,7 +93,7 @@ // init local service getLocalStorageService(); - if (getConfig().isAutoConnect()) { + if (getMainConfig().isAutoConnect()) { getRemoteStorageService(); } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-03-17 18:12:04 UTC (rev 1372) @@ -61,7 +61,7 @@ public ConfigUI getUi() { if (ui == null) { - ui = new ConfigUI().init(getContext(),getContext().getConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig()); + ui = new ConfigUI().init(getContext(),getContext().getMainConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig()); } return ui; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SiteAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SiteAction.java 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SiteAction.java 2008-03-17 18:12:04 UTC (rev 1372) @@ -54,7 +54,7 @@ if (!super.beforeAction(e)) { return false; } - siteUrl = getContext().getConfig().getSiteURL(); + siteUrl = getContext().getMainConfig().getSiteURL(); return siteUrl != null; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-03-17 18:12:04 UTC (rev 1372) @@ -88,7 +88,7 @@ // suppression de l'historique SimExplorerActionManager.fireAction("historyReset", e.getSource()); - getContext().getConfig().setUserLocale(locale); + getContext().getMainConfig().setUserLocale(locale); // on doit initialiser la nouvelle locale avant de decharger les ui // au cas ou un appel à une ui surviendrait et dans quel cas la locale // serait toujours sur l'ancienne valeur ... Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2008-03-17 18:12:04 UTC (rev 1372) @@ -74,7 +74,7 @@ // no selection at first load synch(remote, null, null); // set default sizor from config - setWidth(remote ? context.getConfig().getRemoteSizor() : context.getConfig().getLocalSizor()); + setWidth(remote ? context.getMainConfig().getRemoteSizor() : context.getMainConfig().getLocalSizor()); } public void setSelectedIndex(int selectedIndex) { @@ -267,7 +267,7 @@ * * @author tony */ - public static class PaginationModel { + public static class PaginationModel implements Serializable{ /** default size of a page */ protected SimplePaginationEnum defaultWidth; @@ -280,6 +280,7 @@ /** size of a page */ protected SimplePaginationEnum width; + private static final long serialVersionUID = -1997321819766676403L; public PaginationModel(SimplePaginationEnum defaultWidth) { this.defaultWidth = defaultWidth; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-03-17 17:45:56 UTC (rev 1371) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-03-17 18:12:04 UTC (rev 1372) @@ -120,6 +120,10 @@ // repaint i18n actions refreshI18nActions(context); + if (!context.getMainConfig().isDebugMode()) { + getDebug().setVisible(false); + } + UpdateButton(getHistoryReset(), false); } @@ -131,7 +135,7 @@ */ public void refreshI18nActions(SimExplorerContext context) { - LocaleEnum locale = context.getConfig().getUserLocale(); + LocaleEnum locale = context.getMainConfig().getUserLocale(); //CountryEnum country = context.getConfig().getUserCountry(); String[] actions = SimExplorerActionManager.getFactory().getActionNames(); for (String actionName : actions) {

1 0

r1371 - in trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web: pages pages/security services tools
by glandais＠users.labs.libre-entreprise.org March 17, 2008

March 17, 2008

Author: glandais Date: 2008-03-17 17:45:56 +0000 (Mon, 17 Mar 2008) New Revision: 1371 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/SimExplorerState.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java Log: Redirect after login Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-03-17 17:45:04 UTC (rev 1370) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-03-17 17:45:56 UTC (rev 1371) @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Arrays; +import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.InjectPage; @@ -27,7 +28,6 @@ import org.apache.tapestry.corelib.components.Form; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; -import org.apache.tapestry.services.RequestGlobals; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.security.entities.User; @@ -61,10 +61,6 @@ @ApplicationState private SimExplorerState applicationState; - /** The request globals. */ - @Inject - private RequestGlobals requestGlobals; - /** The messages. */ @Inject private Messages messages; @@ -73,13 +69,17 @@ @Component private Form formLogin; + /** The resources. */ + @Inject + private ComponentResources resources; + /** * On success. * * @return the object * * @throws SimExplorerException the sim explorer exception - * @throws IOException + * @throws IOException */ public Object onSuccessFromFormLogin() throws SimExplorerException, IOException { // on hache directement le password pour ne pas le transmettre en clair @@ -91,18 +91,17 @@ String token = RemoteSecurityService.getAuthentificationService().loginUser(user, pass); if (token != null && !token.equals("")) { - + User loggedUser = RemoteSecurityService.getAuthentificationService().getLoggedUser(token); applicationState.setToken(token); applicationState.setUser(loggedUser); - - String fromURL = applicationState.getRequestedURL(); - if (fromURL == null) { + + String fromPage = applicationState.getPageName(); + if (fromPage == null) { return elementList; } - //return fromURL.substring(1); - requestGlobals.getResponse().sendRedirect(fromURL); + return resources.createPageLink(applicationState.getPageName(), true, applicationState.getPageContext()); } formLogin.recordError(messages.get("simexplorer.ui.web.login.invalid")); return this; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-03-17 17:45:04 UTC (rev 1370) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-03-17 17:45:56 UTC (rev 1371) @@ -22,7 +22,6 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; -import org.apache.tapestry.services.RequestGlobals; import org.codelutin.i18n.I18n; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; @@ -40,10 +39,6 @@ @ApplicationState private SimExplorerState applicationState; - /** The request globals. */ - @Inject - private RequestGlobals requestGlobals; - /** The user. */ @Persist private User user; @@ -75,11 +70,11 @@ * * @throws SimExplorerException the sim explorer exception */ - Object onActivate() throws SimExplorerException { + Object onActivate(Object... pageContext) throws SimExplorerException { getUserRights(); if (!userLogged) { - String fromURL = requestGlobals.getRequest().getPath(); - applicationState.setRequestedURL(fromURL); + applicationState.setPageName(resources.getPageName()); + applicationState.setPageContext(pageContext); return "Login"; } if (!hasAccessToPage()) Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/SimExplorerState.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/SimExplorerState.java 2008-03-17 17:45:04 UTC (rev 1370) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/SimExplorerState.java 2008-03-17 17:45:56 UTC (rev 1371) @@ -30,8 +30,11 @@ /** The user. */ private User user; - /** The requested url. */ - private String requestedURL; + /** The page name. */ + private String pageName; + + /** The page context. */ + private Object[] pageContext; /** * Instantiates a new sim explorer state. @@ -40,7 +43,8 @@ super(); token = null; user = null; - requestedURL = null; + pageName = null; + pageContext = null; } /** @@ -80,21 +84,40 @@ } /** - * Gets the requested url. + * Gets the page name. * - * @return the requested url + * @return the page name */ - public String getRequestedURL() { - return requestedURL; + public String getPageName() { + return pageName; } /** - * Sets the requested url. + * Sets the page name. * - * @param requestedURL the new requested url + * @param pageName the new page name */ - public void setRequestedURL(String requestedURL) { - this.requestedURL = requestedURL; + public void setPageName(String pageName) { + this.pageName = pageName; } + /** + * Gets the page context. + * + * @return the page context + */ + public Object[] getPageContext() { + return pageContext; + } + + /** + * Sets the page context. + * + * @param pageContext the new page context + */ + public void setPageContext(Object[] pageContext) { + this.pageContext = pageContext; + } + + } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java 2008-03-17 17:45:04 UTC (rev 1370) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java 2008-03-17 17:45:56 UTC (rev 1371) @@ -28,7 +28,6 @@ import fr.cemagref.simexplorer.is.entities.Composite; import fr.cemagref.simexplorer.is.entities.Entity; import fr.cemagref.simexplorer.is.entities.EntityHelper; -import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.EntityVisitorTreeNode; import fr.cemagref.simexplorer.is.entities.SimExplorerPage; import fr.cemagref.simexplorer.is.entities.EntityHelper.Action;

1 0

r1370 - in trunk/simexplorer-is: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/test/properties simexplorer-is-storage/src/java/fr/cemagref/simex
by glandais＠users.labs.libre-entreprise.org March 17, 2008

March 17, 2008

Author: glandais Date: 2008-03-17 17:45:04 +0000 (Mon, 17 Mar 2008) New Revision: 1370 Added: trunk/simexplorer-is/simexplorer-is-service/src/test/properties/configlocal.properties trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StreamInfo.java Removed: trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsLocalTestCase.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java Log: Data size added Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -36,6 +36,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.entities.EntityVisitable#accept(fr.cemagref.simexplorer.is.entities.EntityVisitor) */ + @Override public void accept(EntityVisitor visitor) { visitor.visitLeaf(this); } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -23,6 +23,7 @@ import java.util.List; import org.apache.commons.lang.StringUtils; +import org.codelutin.util.StringUtil; import fr.cemagref.simexplorer.is.entities.Leaf; @@ -33,8 +34,8 @@ */ public class Attachment extends Leaf { - /** Serial version ID. */ - private static final long serialVersionUID = 5467615366054227592L; + /** The Constant serialVersionUID. */ + private static final long serialVersionUID = -7574882159899851556L; /** Filename. */ private String fileName; @@ -45,6 +46,9 @@ /** Data hash. */ private String dataHash; + /** The data size. */ + private long dataSize; + /** * Gets the file name. * @@ -100,6 +104,24 @@ } /** + * Gets the data size. + * + * @return the data size + */ + public long getDataSize() { + return dataSize; + } + + /** + * Sets the data size. + * + * @param dataSize the new data size + */ + public void setDataSize(long dataSize) { + this.dataSize = dataSize; + } + + /** * Gets the unique id. * * @return the unique id @@ -178,17 +200,23 @@ if (getContentType() != null) { sb.append(" - ").append(_(getContentType().getDescription())); } + sb.append(" (").append(StringUtil.convertMemory(getDataSize())).append(")"); return sb.toString(); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.Entity#getRow() + */ @Override public List<String> getRow() { List<String> row = new ArrayList<String>(); - row.add(""); row.add(getFileName()); if (getContentType() != null) { row.add(_(getContentType().getDescription())); + } else { + row.add(""); } + row.add(StringUtil.convertMemory(getDataSize())); return row; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -21,6 +21,8 @@ import java.util.List; +import org.codelutin.util.StringUtil; + import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; @@ -40,9 +42,24 @@ @Override public List<String> getRow() { List<String> row = super.getRow(); - row.add(_("simexplorer.common.attachment.filename")); + row.set(0, row.get(0) + " - " + _("simexplorer.common.attachment.filename")); row.add(_("simexplorer.common.attachment.datatype")); + row.add(StringUtil.convertMemory(getTotalSize())); return row; } -} + /** + * Gets the total size. + * + * @return the total size + */ + public long getTotalSize() { + List<Attachment> children = getInnerList(); + long total = 0; + for (Attachment attachment : children) { + total += attachment.getDataSize(); + } + return total; + } + +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -151,6 +151,15 @@ row.add(toString()); return row; } + + /** + * Gets the inner list. + * + * @return the inner list + */ + public List<E> getInnerList() { + return elements; + } /** * Delegate List methods. Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -37,8 +37,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.MD5; -import org.codelutin.util.MD5InputStream; import org.codelutin.util.ZipStreamEncoder; import com.healthmarketscience.rmiio.SerializableInputStream; @@ -57,6 +55,7 @@ import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.storage.SortOrder; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; +import fr.cemagref.simexplorer.is.storage.engine.StreamInfo; /** * The Class StorageServiceCommon. @@ -75,9 +74,6 @@ /** The Constant log. */ private static final Log log = LogFactory.getLog(StorageServiceCommon.class); - /** The xml attachment. */ - protected Attachment xmlAttachment = null; - /** * Gets the storage engine. * @@ -262,27 +258,21 @@ while (entry != null) { if (!entry.isDirectory()) { String entryName = entry.getName(); + StreamInfo streamInfo = getStorageEngine().storeTempData(zis); if (entryName.equals(FILE_XML)) { - xmlFile = getStorageEngine().storeTempData(zis); + xmlFile = streamInfo.getUuid(); } else { if (entryName.startsWith(FILE_DATA_PREFIX)) { String fileName = entryName.replace(FILE_DATA_PREFIX + FOLDER_SEPARATOR, ""); - - String zipMD5 = Attachment.getHashFromUniqueId(fileName); fileName = Attachment.getFileNameFromUniqueId(fileName); - - MD5InputStream md5Stream = new MD5InputStream(zis); - String idFile = getStorageEngine().storeTempData(md5Stream); - - String localMD5 = MD5.asHex(md5Stream.hash()); - - if (!localMD5.equals(zipMD5)) { + String idFile = streamInfo.getUuid(); + String zipMD5 = Attachment.getHashFromUniqueId(fileName); + if (!streamInfo.getHash().equals(zipMD5)) { throw new SimExplorerBusinessException(_("simexplorer.service.invalidhash")); - } Attachment attachment = new Attachment(); attachment.setFileName(fileName); - attachment.setDataHash(localMD5); + attachment.setDataHash(zipMD5); attachments.put(attachment, idFile); } } @@ -319,10 +309,14 @@ public LoggableElement saveElement(String token, SerializableInputStream xmlFile, Map<Attachment, SerializableInputStream> attachments) throws SimExplorerException { // Store temporary data - String idxml = getStorageEngine().storeTempData(xmlFile); + String idxml = getStorageEngine().storeTempData(xmlFile).getUuid(); Map<Attachment, String> idsattachment = new HashMap<Attachment, String>(); for (Map.Entry<Attachment, SerializableInputStream> entry : attachments.entrySet()) { - String idattachment = getStorageEngine().storeTempData(entry.getValue()); + StreamInfo streamInfo = getStorageEngine().storeTempData(entry.getValue()); + String idattachment = streamInfo.getUuid(); + if (!streamInfo.getHash().equals(entry.getKey().getDataHash())) { + throw new SimExplorerBusinessException(_("simexplorer.service.invalidhash")); + } idsattachment.put(entry.getKey(), idattachment); } InputStream xmlData = getStorageEngine().retrieveTempData(idxml); @@ -524,7 +518,8 @@ * * @throws SimExplorerException the sim explorer exception */ - private void getDeletableChildren(String token, String uuid, String version, Set<MetaData> set) throws SimExplorerException { + private void getDeletableChildren(String token, String uuid, String version, Set<MetaData> set) + throws SimExplorerException { // this item is an orphan only if it has one parent maximum MetaData[] metadatasUsedBy = getMetadatasUsedBy(token, uuid, version); if (metadatasUsedBy.length <= 1) { @@ -674,11 +669,9 @@ * @return the xML attachment */ private Attachment getXMLAttachment() { - if (xmlAttachment == null) { - xmlAttachment = new Attachment(); - xmlAttachment.setDataHash(""); - xmlAttachment.setFileName("entity.xml"); - } + Attachment xmlAttachment = new Attachment(); + xmlAttachment.setFileName("entity.xml"); + xmlAttachment.setDataHash(""); return xmlAttachment; } @@ -760,10 +753,9 @@ // Compute element hash metaData.setHash(Long.toString(loggableElement.hashCode())); } - + /** - * Save all LE under element - * Only first level LE are saved + * Save all LE under element Only first level LE are saved * * @param token the token * @param element the element @@ -775,7 +767,7 @@ throws SimExplorerException { List<Entity> children = element.getChildren(); for (Entity child : children) { - if (child instanceof LoggableElement) { + if (child instanceof LoggableElement) { LoggableElement leChild = (LoggableElement) child; LoggableElement childElement = saveElement(token, leChild, idsattachment); // TODO check Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsLocalTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsLocalTestCase.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsLocalTestCase.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -29,7 +29,7 @@ */ @Override protected void buildStorageService() { - storageService = new StorageServiceClient(); + storageService = new StorageServiceClient("/properties/configlocal.properties", null); } /* (non-Javadoc) Deleted: trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties 2008-03-17 17:45:04 UTC (rev 1370) @@ -1,4 +0,0 @@ -simexplorer.db=/var/local/simexplorer/local-db -simexplorer.data=/var/local/simexplorer/local-data -simexplorer.optimizeperiod=3600 -simexplorer.adminmail=landais at codelutin.com Copied: trunk/simexplorer-is/simexplorer-is-service/src/test/properties/configlocal.properties (from rev 1369, trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties) =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/properties/configlocal.properties (rev 0) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/properties/configlocal.properties 2008-03-17 17:45:04 UTC (rev 1370) @@ -0,0 +1,4 @@ +simexplorer.db=/var/local/simexplorer/local-db +simexplorer.data=/var/local/simexplorer/local-data +simexplorer.optimizeperiod=3600 +simexplorer.adminmail=landais at codelutin.com Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -53,20 +53,8 @@ * @throws SimExplorerException the sim explorer storage exception */ public abstract InputStream retrieveData(MetaData entity, Attachment attachment) throws SimExplorerException; - + /** - * Retrieve MD5. - * - * @param entity the entity - * @param attachment the attachment - * - * @return the string - * - * @throws SimExplorerException the sim explorer storage exception - */ - public abstract String retrieveMD5Data(MetaData entity, Attachment attachment) throws SimExplorerException; - - /** * Delete content. * * @param entity DataEntity related to content Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -28,6 +28,7 @@ import java.io.OutputStream; import org.codelutin.util.MD5; +import org.codelutin.util.MD5InputStream; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -104,23 +105,9 @@ throw new SimExplorerTechnicalException(e); } return fis; - } + } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler#retrieveMD5Data(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String) - */ - @Override - public String retrieveMD5Data(MetaData entity, Attachment attachment) throws SimExplorerException { - String md5; - try { - md5 = MD5.asHex(MD5.getHash(getFile(entity, attachment, false))); - } catch (Exception e) { - throw new SimExplorerTechnicalException(e); - } - return md5; - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler#storeData(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String, java.io.InputStream) */ @Override @@ -135,16 +122,20 @@ // Buffer copy stream to stream BufferedInputStream bin = new BufferedInputStream(is); + MD5InputStream md5is = new MD5InputStream(bin); bout = new BufferedOutputStream(fos); while (true) { - int datum = bin.read(); + int datum = md5is.read(); if (datum == -1) break; bout.write(datum); } bout.flush(); + + attachment.setDataHash(MD5.asHex(md5is.hash())); + attachment.setDataSize(md5is.getStreamLength()); } catch (FileNotFoundException e) { throw new SimExplorerTechnicalException(e); Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -246,7 +246,8 @@ * * @throws SimExplorerException the sim explorer storage exception */ - public abstract int findFullTextCount(String token, String query, SearchColumn searchColumn, boolean onlyLatest) throws SimExplorerException; + public abstract int findFullTextCount(String token, String query, SearchColumn searchColumn, boolean onlyLatest) + throws SimExplorerException; /** * Retrieve list of items corresponding to query. @@ -264,8 +265,8 @@ * * @throws SimExplorerException the sim explorer storage exception */ - public abstract MetaData[] findFullText(String token, String query, SearchColumn searchColumn, boolean onlyLatest, int indexStart, int count, - SortColumn sortColumn, SortOrder sortOrder) throws SimExplorerException; + public abstract MetaData[] findFullText(String token, String query, SearchColumn searchColumn, boolean onlyLatest, + int indexStart, int count, SortColumn sortColumn, SortOrder sortOrder) throws SimExplorerException; /** * Retrieve list of items of type wanted. @@ -319,19 +320,9 @@ * * @throws SimExplorerException the sim explorer storage exception */ - public abstract String storeTempData(InputStream stream) throws SimExplorerException; + public abstract StreamInfo storeTempData(InputStream stream) throws SimExplorerException; /** - * Store temporary data, for stream duplication. - * - * @param stream Stream to store - * @param id the id - * - * @throws SimExplorerException the sim explorer storage exception - */ - public abstract void storeTempData(String id, InputStream stream) throws SimExplorerException; - - /** * Retrieve temporary data. * * @param id Id associated @@ -343,17 +334,6 @@ public abstract InputStream retrieveTempData(String id) throws SimExplorerException; /** - * Retrieve MD5 temp data. - * - * @param id the id - * - * @return the string - * - * @throws SimExplorerException the sim explorer storage exception - */ - public abstract String retrieveMD5TempData(String id) throws SimExplorerException; - - /** * Delete temporary data. * * @param id the id Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-03-16 21:10:15 UTC (rev 1369) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -55,11 +55,10 @@ /** Storage. */ protected AttachmentHandler attachmentHandler; - /** Metadata handling temporary data. */ - private MetaData mdTmp; - /** The opened. */ private boolean opened = false; + + private static final String uuidTmpData = UUID.randomUUID().toString(); /** * Convert list. @@ -94,10 +93,15 @@ database = new LuceneDatabase(); // Storage attachmentHandler = new FileSystemAttachmentHandler(); + + } + + private MetaData getTmpMetaData() { // Storing tmp data - mdTmp = new MetaData(); - mdTmp.setUuid(UUID.randomUUID().toString()); + MetaData mdTmp = new MetaData(); + mdTmp.setUuid(uuidTmpData); mdTmp.setVersion("0"); + return mdTmp; } /* (non-Javadoc) @@ -341,44 +345,32 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#storeTempData(java.io.InputStream) */ - public String storeTempData(InputStream stream) throws SimExplorerException { - String id = UUID.randomUUID().toString(); - storeTempData(id, stream); - return id; + public StreamInfo storeTempData(InputStream stream) throws SimExplorerException { + String id = UUID.randomUUID().toString(); + StreamInfo streamInfo = new StreamInfo(); + MetaData tmpMetaData = getTmpMetaData(); + Attachment tmpAttachment = getTmpAttachment(id); + attachmentHandler.storeData(tmpMetaData, tmpAttachment, stream); + streamInfo.setUuid(id); + streamInfo.setHash(tmpAttachment.getDataHash()); + streamInfo.setLength(tmpAttachment.getDataSize()); + return streamInfo; } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#storeTempData(java.lang.String, java.io.InputStream) - */ - @Override - public void storeTempData(String id, InputStream stream) throws SimExplorerException { - attachmentHandler.storeData(mdTmp, getTmpAttachment(id), stream); - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#retrieveTempData(java.lang.String) */ public InputStream retrieveTempData(String id) throws SimExplorerException { InputStream is; - is = attachmentHandler.retrieveData(mdTmp, getTmpAttachment(id)); + is = attachmentHandler.retrieveData(getTmpMetaData(), getTmpAttachment(id)); return is; } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#retrieveMD5TempData(java.lang.String) - */ - @Override - public String retrieveMD5TempData(String id) throws SimExplorerException { - String md5; - md5 = attachmentHandler.retrieveMD5Data(mdTmp, getTmpAttachment(id)); - return md5; - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#deleteTempData(java.lang.String) */ public void deleteTempData(String id) throws SimExplorerException { - attachmentHandler.deleteData(mdTmp, getTmpAttachment(id)); + attachmentHandler.deleteData(getTmpMetaData(), getTmpAttachment(id)); } /* (non-Javadoc) Added: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StreamInfo.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StreamInfo.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StreamInfo.java 2008-03-17 17:45:04 UTC (rev 1370) @@ -0,0 +1,88 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.storage.engine; + +/** + * The Class StreamInfo. + */ +public class StreamInfo { + + /** The uuid. */ + private String uuid; + + /** The hash. */ + private String hash; + + /** The length. */ + private long length; + + /** + * Gets the uuid. + * + * @return the uuid + */ + public String getUuid() { + return uuid; + } + + /** + * Sets the uuid. + * + * @param uuid the new uuid + */ + public void setUuid(String uuid) { + this.uuid = uuid; + } + + /** + * Gets the hash. + * + * @return the hash + */ + public String getHash() { + return hash; + } + + /** + * Sets the hash. + * + * @param hash the new hash + */ + public void setHash(String hash) { + this.hash = hash; + } + + /** + * Gets the length. + * + * @return the length + */ + public long getLength() { + return length; + } + + /** + * Sets the length. + * + * @param length the new length + */ + public void setLength(long length) { + this.length = length; + } + +}

1 0

r1369 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions actions/util
by tchemit＠users.labs.libre-entreprise.org March 16, 2008

March 16, 2008

Author: tchemit Date: 2008-03-16 21:10:15 +0000 (Sun, 16 Mar 2008) New Revision: 1369 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java Log: context is now responsible of init + save configs TODO put all config stuff in context ? instead of parser Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -61,7 +61,10 @@ try { // init context, parser and configs - context = new SimExplorerContext(args); + context = new SimExplorerContext(); + + context.init(args); + } catch (IOException e) { log.error("io error : " + e.getMessage()); e.printStackTrace(); @@ -132,7 +135,7 @@ init(args); // launch actions required - context.getParser().doAllActions(context); + context.getParser().getLastResult().doAllActions(context); // show edit config if first launch if (context.isFirstLaunch()) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -35,8 +35,6 @@ import org.codelutin.i18n.I18n; import org.codelutin.option.ParserFailedException; -import java.io.IOException; - /** * Le context de l'application, implanté en singleton. * @@ -180,14 +178,19 @@ /** * restricted access constructor * - * @param args argumentsfor parser * @throws java.io.IOException if pb while saing configuration * @throws ParserFailedException if pb while parsing arguments */ - SimExplorerContext(String... args) throws IOException, ParserFailedException { + SimExplorerContext() throws Exception { + super(); + } - super(args); + @Override + public void init(String[] args) throws Exception { + + super.init(args); + initServices(); } @@ -199,7 +202,7 @@ localService = new MockStorageServiceImpl(false); } else { try { - localService = new StorageServiceClient(getConfig().getSource().toString(), "local."); + localService = new StorageServiceClient(this.getSource().toString(), "local."); } catch (Exception e) { throw new SimExplorerRuntimeException(e); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -61,7 +61,7 @@ public ConfigUI getUi() { if (ui == null) { - ui = new ConfigUI().init(getContext().getConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig()); + ui = new ConfigUI().init(getContext(),getContext().getConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig()); } return ui; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -176,7 +176,7 @@ //always keep login getContext().getRemoteConfig().setLogin(login); //Save configuration, I don't like it, but required by client... - getContext().getConfig().saveSafely(); + getContext().saveSafely(); return isConnected; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -49,7 +49,7 @@ public void doAction(java.awt.event.ActionEvent e) { getContext().getRemoteConfig().setPassword(null); - getContext().getConfig().saveSafely(); + getContext().saveSafely(); if (getContext().isConnected()) { // unconnect Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-03-16 14:27:12 UTC (rev 1368) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-03-16 21:10:15 UTC (rev 1369) @@ -94,7 +94,7 @@ // serait toujours sur l'ancienne valeur ... getContext().initI18n(); // save config - getContext().getConfig().saveSafely(); + getContext().saveSafely(); // dispose then reload main ui SimExplorer.dispose(true); }

1 0

r1368 - in trunk/simexplorer-is/simexplorer-is-swing-commandline: . src/resources
by tchemit＠users.labs.libre-entreprise.org March 16, 2008

March 16, 2008

Author: tchemit Date: 2008-03-16 14:27:12 +0000 (Sun, 16 Mar 2008) New Revision: 1368 Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties Log: simplify commandline configuration (first pass) Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-16 12:30:52 UTC (rev 1367) +++ trunk/simexplorer-is/simexplorer-is-swing-commandline/pom.xml 2008-03-16 14:27:12 UTC (rev 1368) @@ -71,19 +71,7 @@ <source>${maven.src.dir}/resources/commandline.properties</source> <out>${maven.src.dir}/java</out> <parserPackageName>fr.cemagref.simexplorer.is.ui.swing.commandline</parserPackageName> - <abstractConfigOptionKey>CHANGE_CONFIG_OPTION_KEY</abstractConfigOptionKey> - <abstractConfigFileOptionKey>CHANGE_FILE_CONFIG_OPTION_KEY</abstractConfigFileOptionKey> - <abstractConfigFilenameConfigKey> - fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY - </abstractConfigFilenameConfigKey> <concreteConfig>true</concreteConfig> - <actionImplementations> - </actionImplementations> - <configImplementations> - <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain</value> - <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigLocal</value> - <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigRemote</value> - </configImplementations> </configuration> <executions> <execution> Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-16 12:30:52 UTC (rev 1367) +++ trunk/simexplorer-is/simexplorer-is-swing-commandline/src/resources/commandline.properties 2008-03-16 14:27:12 UTC (rev 1368) @@ -2,21 +2,8 @@ ### Option definitions ######################################################## ############################################################################### -### -### common options (TODO should be in commandline project) -### -showConfig.option.definition=--show-config {0,1} <main|local|remote> [all|tec] -editConfig.option.definition=--edit-config -changeFileConfig.option.definition=--config-file <configFile:File> -changeConfig.option.definition=--config * [main|local|remote] <key:String> <value:String> -resetConfig.option.definition=--resetConfig -help.option.definition=--help|-h -ui.option.definition=--ui <value:Boolean> +# TODO definie them -### -### others options TODO -### - ############################################################################### ### Local configuration definition ############################################ ###############################################################################

1 0

r1367 - trunk/simexplorer-is/simexplorer-is-swing-jaxx
by tchemit＠users.labs.libre-entreprise.org March 16, 2008

March 16, 2008

Author: tchemit Date: 2008-03-16 12:30:52 +0000 (Sun, 16 Mar 2008) New Revision: 1367 Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/ Log: ... Property changes on: trunk/simexplorer-is/simexplorer-is-swing-jaxx ___________________________________________________________________ Name: svn:ignore - target + target target/* .project .classpath *.iml *.ipr *.iws

1 0

r1366 - trunk/simexplorer-is/simexplorer-is-swing-commandline
by tchemit＠users.labs.libre-entreprise.org March 16, 2008

March 16, 2008

Author: tchemit Date: 2008-03-16 12:24:24 +0000 (Sun, 16 Mar 2008) New Revision: 1366 Modified: trunk/simexplorer-is/simexplorer-is-swing-commandline/ Log: ... Property changes on: trunk/simexplorer-is/simexplorer-is-swing-commandline ___________________________________________________________________ Name: svn:ignore - *.iml .project .classpath target/* + *.iml .project .classpath target target/*

1 0