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

r1215 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org 24 Feb '08

24 Feb '08

Author: tchemit Date: 2008-02-24 19:46:36 +0000 (Sun, 24 Feb 2008) New Revision: 1215 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java Log: reset de l'historique au changement de langue 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-02-24 19:45:18 UTC (rev 1214) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-02-24 19:46:36 UTC (rev 1215) @@ -19,6 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing.actions.util; import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import static org.codelutin.i18n.I18n._; import org.codelutin.i18n.LocaleEnum; @@ -73,8 +74,20 @@ } @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + return true; + //TODO Faut-il proposer une confirmation ? + //String s = _(locale.getLibelle()); + //int result = JOptionPane.showConfirmDialog(null, _("simexplorer.confirm.changeLanguage", s), "changeLanguage", JOptionPane.YES_NO_OPTION); + //return result == JOptionPane.OK_OPTION; + } + + @Override public void doAction(ActionEvent e) { + // suppression de l'historique + SimExplorerActionManager.fireAction("historyReset", e.getSource()); + getContext().getConfig().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

1 0

r1214 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org 24 Feb '08

24 Feb '08

Author: tchemit Date: 2008-02-24 19:45:18 +0000 (Sun, 24 Feb 2008) New Revision: 1214 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SelectedAction.java Log: introduction Interface de marquage d'action qui poss?\195?\168de une propri?\195?\169t?\195?\169 selected Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SelectedAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SelectedAction.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SelectedAction.java 2008-02-24 19:45:18 UTC (rev 1214) @@ -0,0 +1,30 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* 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.ui.swing.actions.util; + +import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; + +/** + * TODO javadoc + * + * @author chemit + */ +public interface SelectedAction { + void setSelected(DataEntityModel selected); +}

1 0

r1213 - trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui
by tchemit＠users.labs.libre-entreprise.org 24 Feb '08

24 Feb '08

Author: tchemit Date: 2008-02-24 19:44:06 +0000 (Sun, 24 Feb 2008) New Revision: 1213 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx Log: ajout action de detail sur l'onglet de synchro Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx 2008-02-24 19:43:41 UTC (rev 1212) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx 2008-02-24 19:44:06 UTC (rev 1213) @@ -13,6 +13,9 @@ public AbstractButton getExportButton(boolean remote) { return remote ? exportElementToLocal : exportElementToRemote; } +public AbstractButton getShowDetailButton(boolean remote) { + return remote ? showTabRemote_detail: showTabLocal_detail ; +} </script> <row> <cell> @@ -23,6 +26,7 @@ </cell> <cell anchor="east"> <JToolBar> + <JButton id='showTabLocal_detail'/> <JButton id='collapseAllLocal'/> <JButton id='expandAllLocal'/> </JToolBar> @@ -40,6 +44,7 @@ </cell> <cell anchor="east"> <JToolBar> + <JButton id='showTabRemote_detail'/> <JButton id='collapseAllRemote'/> <JButton id='expandAllRemote'/> </JToolBar>

1 0

r1212 - trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui
by tchemit＠users.labs.libre-entreprise.org 24 Feb '08

24 Feb '08

Author: tchemit Date: 2008-02-24 19:43:41 +0000 (Sun, 24 Feb 2008) New Revision: 1212 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx Log: utilisation EnumEditor + ajout code d'init a invoquer apres le chargement des actions Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2008-02-24 19:42:12 UTC (rev 1211) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2008-02-24 19:43:41 UTC (rev 1212) @@ -1,10 +1,21 @@ <JAXXTab> - <style source="common.css"/> + <style source="common.css"/> + <script> +public void initPopup(){ + showTab_detail.setHideActionText(false); + showTab_synchronize.setHideActionText(false); + exportElement.setHideActionText(false); + downloadElement.setHideActionText(false); + deleteElement.setHideActionText(false); + importElement.setEnabled(true); + importElement.getAction().setEnabled(true); +} + </script>  <row> <cell fill='horizontal' insets='0,0,0,0'> <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> - <JMenuItem id='showTab_detail'/> + <JMenuItem id='showTab_detail' hideActionText='false'/> <JMenuItem id='showTab_synchronize'/> <JMenuItem id='exportElement'/> <JMenuItem id='downloadElement'/> @@ -16,22 +27,15 @@ <JTextField id='searchText' toolTipText='simexplorer.action.searchText.tooltip'/> <JButton id='search'/> <JButton id='advancedSearch'/> - <JComboBox id='changeSizor' enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'> - <item value='5'/> - <item value='10'/> - <item value='20'/> - <item value='50'/> - <item value='100'/> - <item value='200'/> - <item value='500'/> - </JComboBox> + <org.codelutin.util.EnumEditor id='changeSizor' font-size='9' constructorParams="jaxx.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> </JToolBar> </cell> </row> <row fill='both' weightx='1' weighty='1'> <cell insets='0,0,0,0'> <JScrollPane> - <JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel()}'/> + <JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel()}' + selectionMode='{ListSelectionModel.SINGLE_SELECTION}'/> </JScrollPane> </cell> </row>

1 0

r1211 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Feb '08

24 Feb '08

Author: tchemit Date: 2008-02-24 19:42:12 +0000 (Sun, 24 Feb 2008) New Revision: 1211 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java Log: add a fixme : l'export engendre parfois des nullpointerException essayer le cas : export un element qui n'est pas la dernire version Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-24 19:41:17 UTC (rev 1210) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-24 19:42:12 UTC (rev 1211) @@ -73,6 +73,7 @@ protected Version incrementVersion(Version version) { Version result = new Version(""); result.setVersion(0, version.getVersion(0)); + // FIXME! can throw a NullPointerException result.setVersion(1, version.getVersion(1) + 1); return result; }

1 0

r1210 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Feb '08

24 Feb '08

Author: tchemit Date: 2008-02-24 19:41:17 +0000 (Sun, 24 Feb 2008) New Revision: 1210 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: fix bug sur la sauvegarde d'un le avec attachments 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-02-23 00:51:13 UTC (rev 1209) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-24 19:41:17 UTC (rev 1210) @@ -384,6 +384,10 @@ files.put(FILE_XML, getStorageEngine().retrieveData(token, loggableElement.getMetaData(), getXMLAttachment())); List<LoggableElement> children = loggableElement.getChildren(); + // TODO a valider : (fixbug: ajouter les attachments du le aussi) + for (Attachment attachment : loggableElement.getAttachments()) { + files.put(FILE_DATA_PREFIX + FOLDER_SEPARATOR + attachment.getUniqueId(), getStorageEngine().retrieveData(token, loggableElement.getMetaData(), attachment)); + } for (LoggableElement child : children) { List<Attachment> attachments = child.getAttachments(); for (Attachment attachment : attachments) {

1 0

r1209 - trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities
by tchemit＠users.labs.libre-entreprise.org 23 Feb '08

23 Feb '08

Author: tchemit Date: 2008-02-23 00:51:13 +0000 (Sat, 23 Feb 2008) New Revision: 1209 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java Log: add list sortor fix to see LE type TODO modify detail model to match directly a LE and no more a MetaData Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-02-23 00:50:58 UTC (rev 1208) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-02-23 00:51:13 UTC (rev 1209) @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.StringTokenizer; import javax.swing.tree.DefaultMutableTreeNode; @@ -71,9 +70,16 @@ if (entity == null) { return ""; } - return getLibelle(entity.getClass().getSimpleName()); + return getLibelle(entity instanceof Class?(Class)entity:entity.getClass()); } + public static String getLibelle(Class entity) { + if (entity == null) { + return ""; + } + return getLibelle(entity.getSimpleName()); + } + public String getLibelle() { return _(i18nKey); }

1 0

r1208 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/actions java/fr/cemagref/simexplorer/is/ui/swing/actions/util java/fr/cemagref/simexplorer/is/ui/swing/model java/fr/cemagref/simexplorer/is/ui/swing/ui resources/i18n
by tchemit＠users.labs.libre-entreprise.org 23 Feb '08

23 Feb '08

Author: tchemit Date: 2008-02-23 00:50:58 +0000 (Sat, 23 Feb 2008) New Revision: 1208 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.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/model/QueryModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: add list sortor fix to see LE type TODO modify detail model to match directly a LE and no more a MetaData Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-22 21:35:14 UTC (rev 1207) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-23 00:50:58 UTC (rev 1208) @@ -68,6 +68,9 @@ model.synch(model.isRemote(), (MetaData) null); model.setSelectedIndex(-1); + //model.getQuery().setSortAscending(false); + //model.getQuery().setSortColumn(SortColumn.None); + // update model model.updateTabModel(getContext(), (ListTableModel) ((JListTab) getUI()).getTable().getModel(), true); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-22 21:35:14 UTC (rev 1207) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-23 00:50:58 UTC (rev 1208) @@ -20,27 +20,35 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.ui.JListTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.actions.ImportElementAction; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; +import fr.cemagref.simexplorer.is.ui.swing.ui.JListTab; import fr.cemagref.simexplorer.is.ui.swing.ui.ListTabRefreshHelper; import jaxx.runtime.swing.JAXXTab; import static org.codelutin.i18n.I18n._; import javax.swing.AbstractButton; import javax.swing.JTabbedPane; +import javax.swing.JTable; import javax.swing.ListSelectionModel; +import javax.swing.RowSorter; +import javax.swing.SortOrder; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import javax.swing.event.RowSorterEvent; +import javax.swing.event.RowSorterListener; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.List; /** @author chemit */ public class ShowListTabAbstractAction extends ShowTabAbstractAction<JListTab, ListTabModel> { @@ -89,9 +97,10 @@ ui.getImportElement().setToolTipText(_(action.getI18nToolTipText(model.isRemote()))); listMetaSelectionListener = new ListMetaSelectionListener(ui, model); - ui.getTable().getSelectionModel().addListSelectionListener(listMetaSelectionListener); + final JTable table = ui.getTable(); + table.getSelectionModel().addListSelectionListener(listMetaSelectionListener); - ui.getTable().addMouseListener(new ListMetaMouseListener(ui, model)); + table.addMouseListener(new ListMetaMouseListener(ui, model)); // add search actions listeners ui.getSearchText().addKeyListener(new KeyAdapter() { @@ -104,11 +113,38 @@ //TODO Est-ce vraiment le bon endroit pour faire ça ? // push model into tableModel - ListTableModel modelTab = (ListTableModel) ui.getTable().getModel(); + final ListTableModel modelTab = (ListTableModel) table.getModel(); modelTab.setData(model.getList()); // on force les valeurs nulles model.setSelectedIndex(-1); model.setSelectedItem(null); + //table.setAutoCreateRowSorter(true); + table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + table.getTableHeader().setReorderingAllowed(true); + + final MyTableRowSorter rowSorter = new MyTableRowSorter(modelTab); + ui.getTable().setRowSorter(rowSorter); + rowSorter.addRowSorterListener(new RowSorterListener() { + public void sorterChanged(RowSorterEvent e) { + RowSorterEvent.Type type = e.getType(); + if (type == RowSorterEvent.Type.SORT_ORDER_CHANGED) { + List keys = e.getSource().getSortKeys(); + if (keys.isEmpty()) { + return; + } + RowSorter.SortKey key = (RowSorter.SortKey) keys.get(0); + int column = key.getColumn(); + SortOrder sortOrder = key.getSortOrder(); + model.getQuery().setSortColumn(modelTab.getSortColumn(column)); + model.getQuery().setSortAscending(sortOrder== SortOrder.ASCENDING); + log.info("sortedChanged " + model.getQuery()); + //TODOFinish this + model.updateTabModel(getContext(), modelTab, true); + } + + + } + }); } protected void synchSelected(final JListTab ui, int rowAtPoint, ListSelectionModel selectionModel, ListTabModel model) { @@ -137,7 +173,7 @@ entityModel = model.getSelectedItem(); log.info(entityModel); - ListTabRefreshHelper.refreshListTablePopupMenu(getMainUI(),getContext(), ui, model); + ListTabRefreshHelper.refreshListTablePopupMenu(getMainUI(), getContext(), ui, model); } } @@ -190,8 +226,7 @@ try { // synchronization du meta selectionne synchSelected(ui, getRowAtPoint(ui, e.getPoint()), ui.getTable().getSelectionModel(), model); - // lancement de l'action d'affichage de l'onglet de detail - //ActionEvent e1 = new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_detail"); + // lancement de l'action d'affichage de l'onglet de detail SimExplorerActionManager.fireAction("showTab_detail", e.getSource(), (AbstractButton) null); } catch (Exception e1) { throw new SimExplorerRuntimeException(e1); @@ -208,4 +243,17 @@ } } } + + private static class MyTableRowSorter extends TableRowSorter<TableModel> { + + private MyTableRowSorter(TableModel model) { + super(model); + setMaxSortKeys(1); + } + + @Override + public void sort() { + // do not sort + } + } } 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-02-22 21:35:14 UTC (rev 1207) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2008-02-23 00:50:58 UTC (rev 1208) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.storage.SortColumn; import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; @@ -58,9 +59,17 @@ this.data = data; } + private final SortColumn[] sorts = { + SortColumn.uuid, + SortColumn.elementClass, + SortColumn.description, + SortColumn.version, + SortColumn.creationDate + }; + private final String[] columnNames = { n_("simexplorer.common.name"), - n_("simexplorer.common.type"), + n_("simexplorer.common.elementClass"), n_("simexplorer.common.description"), n_("simexplorer.common.version"), n_("simexplorer.common.creationDate") @@ -79,13 +88,12 @@ MetaData current = data[rowIndex]; if (current != null) { try { + PropertyDescriptor propertyDescriptor = getDescriptors()[columnIndex]; + Method readMethod = propertyDescriptor.getReadMethod(); + result = readMethod.invoke(current); if (columnIndex == 1) { // use I18n - result = EntityHelper.Type.getLibelle(current); - } else { - PropertyDescriptor propertyDescriptor = getDescriptors()[columnIndex]; - Method readMethod = propertyDescriptor.getReadMethod(); - result = readMethod.invoke(current); + result = EntityHelper.Type.getLibelle(result); } } catch (IllegalAccessException e) { throw new RuntimeException(e); @@ -130,4 +138,9 @@ } return descriptors; } + + + public SortColumn getSortColumn(int column) { + return sorts[column]; + } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java 2008-02-22 21:35:14 UTC (rev 1207) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java 2008-02-23 00:50:58 UTC (rev 1208) @@ -18,7 +18,6 @@ package fr.cemagref.simexplorer.is.ui.swing.model; import fr.cemagref.simexplorer.is.storage.SortColumn; -import fr.cemagref.simexplorer.is.storage.database.DatabaseConstants; import java.io.Serializable; @@ -36,7 +35,7 @@ protected boolean onlyLatest = true; protected SortColumn sortColumn = SortColumn.None; - + protected boolean sortAscending = true; private static final long serialVersionUID = -5018101346037499469L; @@ -92,4 +91,9 @@ sortColumn = SortColumn.None; sortAscending = true; } + + @Override + public String toString() { + return super.toString() + "<sortColumn:" + sortColumn + ",sortAscending:" + sortAscending + ", query:" + query + ">"; + } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java 2008-02-22 21:35:14 UTC (rev 1207) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java 2008-02-23 00:50:58 UTC (rev 1208) @@ -203,7 +203,7 @@ // FIXME !!! // ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", detail.getDescriptors().size())); ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", 0)); - ui.getDetailType().setText(EntityHelper.Type.getLibelle(detail)); + ui.getDetailType().setText(EntityHelper.Type.getLibelle(detail.getElementClass())); String s = detail.getDescription(); String tooltip = s; if (s.length() > 32) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-22 21:35:14 UTC (rev 1207) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-23 00:50:58 UTC (rev 1208) @@ -134,6 +134,7 @@ simexplorer.common.close=Close simexplorer.common.creationDate=create date simexplorer.common.description=description +simexplorer.common.elementClass=type simexplorer.common.key=key simexplorer.common.login=Login simexplorer.common.name=name Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-22 21:35:14 UTC (rev 1207) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-23 00:50:58 UTC (rev 1208) @@ -134,6 +134,7 @@ simexplorer.common.close=Fermer simexplorer.common.creationDate=date de cr\u00E9ation simexplorer.common.description=description +simexplorer.common.elementClass=type simexplorer.common.key=nom descriptor simexplorer.common.login=Login utilisateur simexplorer.common.name=nom

1 0

r1207 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: tchemit Date: 2008-02-22 21:35:14 +0000 (Fri, 22 Feb 2008) New Revision: 1207 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java Log: multi-config refactor Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-22 21:27:59 UTC (rev 1206) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-22 21:35:14 UTC (rev 1207) @@ -200,7 +200,7 @@ return storageService = new MockStorageServiceImpl(false); } try { - storageService = new StorageServiceClient(context.getConfig().getSource().toString(),"local"); + storageService = new StorageServiceClient(context.getConfig().getSource().toString(),"local."); } catch (Exception e) { throw new SimExplorerRuntimeException(e); } @@ -218,7 +218,7 @@ return remoteStorageService = new MockStorageServiceImpl(true); } try { - Properties props = initProperties(context.getConfig().getRemoteURI()); + Properties props = initProperties(context.getRemoteConfig().getURI()); Context context2; try { context2 = new InitialContext(props);

1 0

r1206 - in trunk/simexplorer-is/simexplorer-is-swing: . src/java/fr/cemagref/simexplorer/is/ui/swing/actions src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: tchemit Date: 2008-02-22 21:27:59 +0000 (Fri, 22 Feb 2008) New Revision: 1206 Modified: trunk/simexplorer-is/simexplorer-is-swing/go.sh trunk/simexplorer-is/simexplorer-is-swing/pom.xml 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/ExportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementToLocalAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementToRemoteAction.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: multi-config refactor Modified: trunk/simexplorer-is/simexplorer-is-swing/go.sh =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/go.sh 2008-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/go.sh 2008-02-22 21:27:59 UTC (rev 1206) @@ -2,6 +2,9 @@ DEBUG_PORT=5005 VERSION=0.0.1-SNAPSHOT +JAVA=java +RELEASE="simexplorer-is-swing-$VERSION" +MX=128M ############################################################################### ####### parse arguments ####################################################### @@ -23,17 +26,12 @@ done ############################################################################### -####### init variables ######################################################## +####### init dir ############################################################## ############################################################################### -JAVA=java - dir=$(dirname $0) cd $dir -RELEASE="simexplorer-is-swing-$VERSION" -MX=128M - rep=`dirname $0` rep=`cd $rep && pwd` Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-02-22 21:27:59 UTC (rev 1206) @@ -93,6 +93,8 @@ <source>${maven.vcs.src.dir}/resources/commandline.properties</source> <parserPackageName>fr.cemagref.simexplorer.is.ui.swing.commandline</parserPackageName> <actionSuperClass>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionAction</actionSuperClass> + <configSuperClass>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfig</configSuperClass> + <concreteConfig>true</concreteConfig> </configuration> <executions> <execution> 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-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-02-22 21:27:59 UTC (rev 1206) @@ -19,7 +19,6 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; -import org.codelutin.option.ui.ConfigTableModel; import org.codelutin.option.ui.ConfigUI; /** @@ -38,6 +37,8 @@ ) public class ConfigAction extends SimExplorerAbstractAction { + ConfigUI ui; + private static final long serialVersionUID = 1449553547444065616L; public ConfigAction(String name) { @@ -46,6 +47,22 @@ @Override public void doAction(java.awt.event.ActionEvent e) { - ConfigUI.showUI(getContext().getConfig(), ConfigTableModel.TypeModel.all); + getUi().setVisible(true); } + + @Override + public void disposeUI() { + super.disposeUI(); + if (ui!=null) { + ui.dispose(); + ui=null; + } + } + + public ConfigUI getUi() { + if (ui == null) { + ui = new ConfigUI().init(getContext().getConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig()); + } + return ui; + } } \ No newline at end of file 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-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-22 21:27:59 UTC (rev 1206) @@ -81,8 +81,8 @@ @Override protected void doAction(ActionEvent e) throws Exception { super.doAction(e); - String login = getContext().getConfig().getRemoteLogin(); - String hashPassword = getContext().getConfig().getRemotePassword(); + String login = getContext().getRemoteConfig().getLogin(); + String hashPassword = getContext().getRemoteConfig().getPassword(); if (hashPassword == null || hashPassword.length() == 0 || !loginUIHandler.connect(login, hashPassword)) { ui.launch(login); } @@ -178,13 +178,13 @@ boolean isConnected = getContext().isConnected(); if (isConnected) { // keep password - getContext().getConfig().setRemotePassword(password); + getContext().getRemoteConfig().setPassword(password); } else { // delete password - getContext().getConfig().setRemotePassword(null); + getContext().getRemoteConfig().setPassword(null); } //always keep login - getContext().getConfig().setRemoteLogin(login); + getContext().getRemoteConfig().setLogin(login); //Save configuration, I don't like it, but required by client... getContext().getConfig().saveSafely(); return isConnected; 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-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-02-22 21:27:59 UTC (rev 1206) @@ -18,6 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; @@ -32,9 +33,11 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.JListTab; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.ui.SynchronizeTabRefreshHelper; +import jaxx.runtime.UIHelper; import jaxx.runtime.builder.TabModel; import static org.codelutin.i18n.I18n.n_; +import javax.swing.Action; import java.awt.event.ActionEvent; /** @@ -46,7 +49,6 @@ actionCommand = "exportElement", name = "simexplorer.action.exportElement", longDescription = "simexplorer.action.exportElement.help", - smallIcon = "action/export-element.png", mnemonic = 'x', hideActionText = true ) @@ -69,6 +71,7 @@ public ExportElementAction(String name) { super(name); + putValue(Action.SMALL_ICON, UIHelper.createImageIcon(getIcon(name))); } @Override @@ -86,6 +89,18 @@ return result; } + public String getIcon(String action) { + String result = "action/export-element"; + if (!action.equals("exportElement")) { + if (action.endsWith("ToLocal")) { + result += "-to-local"; + } else { + result += "-to-remote"; + } + } + return result + ".png"; + } + @Override protected boolean beforeAction(ActionEvent e) throws Exception { if (!super.beforeAction(e)) { @@ -95,6 +110,7 @@ // on retrouve l'onglet concerné à partir de son model TabModel tabModel = getModel(); + boolean result = true; if (tabModel instanceof DetailTabModel) { DetailTabModel model = (DetailTabModel) tabModel; selected = model.getSelectedItem(); @@ -102,13 +118,28 @@ ListTabModel model = (ListTabModel) getModel(); selected = model.getSelectedItem(); } else if (tabModel instanceof SimExplorerTabModel) { + SynchronizeTabModel model = (SynchronizeTabModel) getModel(); // on doit traiter ça dans les classes étendues // car cela ne depend pas uniquement du model mais aussi de l'action // choisie - return true; + // on utilise le nom de l'action pour savoir quoi faire + String actionName = getActionName(); + if (actionName.equals("exportElementToLocal")) { + LoggableElement element = model.getSelectedNode(true); + if (result = EntityHelper.Action.EXPORT.accept(element)) { + selected = new DataEntityModel(); + selected.synch(true, element); + } + } else if (actionName.equals("exportElementToRemote")) { + LoggableElement element = model.getSelectedNode(false); + + if (result = EntityHelper.Action.EXPORT.accept(element)) { + selected = new DataEntityModel(); + selected.synch(false, element); + } + } } - boolean result; - result = selected != null && selected.getUuid() != null; + result = result && (selected != null && selected.getUuid() != null); if (result) { // on garde toujours une copie, pas l'original selected = selected.clone(); @@ -155,7 +186,7 @@ // update detail model (delegue a l'action d'historique) if (synchronizeModified != null && synchronizeModified) { - SynchronizeTabRefreshHelper.updateTree(getMainUI(),getContext(), getTabContainer(), oldLocalRoot, oldRemoteRoot); + SynchronizeTabRefreshHelper.updateTree(getMainUI(), getContext(), getTabContainer(), oldLocalRoot, oldRemoteRoot); } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementToLocalAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementToLocalAction.java 2008-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementToLocalAction.java 2008-02-22 21:27:59 UTC (rev 1206) @@ -34,7 +34,7 @@ actionCommand = "exportElementToLocal", name = "simexplorer.action.exportElementToLocal", longDescription = "simexplorer.action.exportElementToLocal.help", - smallIcon = "action/export-to-local.png", + smallIcon = "action/export-element-to-local.png", mnemonic = 'x', hideActionText = true ) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementToRemoteAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementToRemoteAction.java 2008-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementToRemoteAction.java 2008-02-22 21:27:59 UTC (rev 1206) @@ -34,7 +34,7 @@ actionCommand = "exportElementToRemote", name = "simexplorer.action.exportElementToRemote", longDescription = "simexplorer.action.exportElementToRemote.help", - smallIcon = "action/export-to-remote.png", + smallIcon = "action/export-element-to-remote.png", mnemonic = 'x', hideActionText = true ) 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-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-02-22 21:27:59 UTC (rev 1206) @@ -48,14 +48,12 @@ @Override public void doAction(java.awt.event.ActionEvent e) { - getContext().getConfig().setRemotePassword(null); + getContext().getRemoteConfig().setPassword(null); getContext().getConfig().saveSafely(); if (getContext().isConnected()) { // unconnect SimExplorerActionManager.fireAction("unconnect", e.getSource(), (AbstractButton) null); } - // reconnect ? - //SimExplorerActionManager.fireAction("connect", e.getSource(), (AbstractButton) null); } } \ No newline at end of file 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-02-22 21:25:25 UTC (rev 1205) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-02-22 21:27:59 UTC (rev 1206) @@ -19,9 +19,8 @@ package fr.cemagref.simexplorer.is.ui.swing.actions.util; import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; -import org.codelutin.i18n.I18n; +import static org.codelutin.i18n.I18n._; import org.codelutin.i18n.LocaleEnum; -import static org.codelutin.i18n.I18n.*; import javax.swing.Action; import java.awt.event.ActionEvent; @@ -35,16 +34,12 @@ * et YY le pays de la locale à charger. * * @author chemit - * @see org.codelutin.i18n.LanguageEnum - * @see org.codelutin.i18n.CountryEnum + * @see org.codelutin.i18n.LocaleEnum */ @jaxx.runtime.builder.ActionConfig( actionCommand = "changeLocale", - //name = "simexplorer.action.changeLocale", shortDescription = "simexplorer.action.changeLocale.tooltip", longDescription = "simexplorer.action.changeLocale.help", - //mnemonic = 'F', - //smallIcon = "action/i18n-fr.png", hideActionText = false ) public class ChangeLocaleAction extends SimExplorerAbstractAction { @@ -59,14 +54,13 @@ super(name); Matcher matcher = PATTERN_NAME.matcher(name); if (!matcher.matches()) { - throw new IllegalArgumentException(_(getClass().getName() + " should have a nmae like this 'i18n_XX', but was {0}", name)); + throw new IllegalArgumentException(_(getClass().getName() + " should have a name like this 'i18n_XX', but was {0}", name)); } locale = LocaleEnum.valueOf(matcher.group(1)); putValue(Action.NAME, _(locale.getLibelle())); putValue(Action.SMALL_ICON, jaxx.runtime.UIHelper.createImageIcon(getIcon())); - putValue(Action.SHORT_DESCRIPTION, jaxx.runtime.UIHelper.createImageIcon(getIcon())); } @Override @@ -81,23 +75,17 @@ @Override public void doAction(ActionEvent e) { - //TODO Should ask confirm from user since it will close ui, and re instanciate ui - //getMainUI().getQuit().getAction().actionPerformed(new ActionEvent(this, ActionEvent.ACTION_FIRST, "cancel")); - getContext().getConfig().setI18n(locale); + getContext().getConfig().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 ... - getContext().getConfig().initI18n(); + getContext().initI18n(); // save config - getContext().saveSafely(); + getContext().getConfig().saveSafely(); // dispose then reload main ui SimExplorer.dispose(true); } - //public boolean equalsLocale(LanguageEnum lang, CountryEnum countr) { - // return language == lang && country == countr; - //} - @Override public String toString() { return super.toString() + " Locale " + locale;

1 0