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

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

18 Feb '08

Author: tchemit Date: 2008-02-18 17:03:55 +0000 (Mon, 18 Feb 2008) New Revision: 1075 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java Log: ajout d'une m?\195?\169thode pour retrouver l'onglet d'un composant Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-18 17:03:10 UTC (rev 1074) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-18 17:03:55 UTC (rev 1075) @@ -26,6 +26,9 @@ import jaxx.runtime.swing.JAXXTab; import javax.swing.JTabbedPane; +import javax.swing.JPopupMenu; +import java.awt.Component; +import java.awt.Container; /** * La défintion des onglets utilisés dans l'application @@ -93,6 +96,33 @@ return factory; } + /** + * 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é + */ + public static SimExplorerTab findTab(Component c) { + Component parent = c.getParent(); + while (parent != null) { + if (parent instanceof JPopupMenu) { + parent = ((JPopupMenu)parent).getInvoker(); + } + if (parent instanceof JAXXTab) { + // find a JAXXTab + for (SimExplorerTab tab : values()) { + if (parent.equals(tab.getUI())) { + // find the correct tab + return tab; + } + } + break; + } + parent = parent.getParent(); + } + return null; + } + public abstract <U extends JAXXTab, M extends SimExplorerTabModel> void updateUI(U ui, M model); public JAXXTab getUI() {

1 0

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

18 Feb '08

Author: tchemit Date: 2008-02-18 17:03:10 +0000 (Mon, 18 Feb 2008) New Revision: 1074 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java Log: ajout m?\195?\169thode delete Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-18 17:01:47 UTC (rev 1073) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-18 17:03:10 UTC (rev 1074) @@ -127,6 +127,14 @@ } } + public static void deleteElement(SimExplorerContext context, boolean remote, String uuid, String version) { + try { + getService(context, remote).deleteElement(context.getToken(), uuid, version); + } catch (SimExplorerException e1) { + throw new SimExplorerRuntimeException(e1); + } + } + public static MetaData getMetaData(SimExplorerContext context, boolean remote, String uuid, String version) { try { MetaData metas;

1 0

r1073 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by glandais＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: glandais Date: 2008-02-18 17:01:47 +0000 (Mon, 18 Feb 2008) New Revision: 1073 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java Log: Or instead of and Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java 2008-02-18 16:53:01 UTC (rev 1072) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java 2008-02-18 17:01:47 UTC (rev 1073) @@ -88,7 +88,7 @@ DataEntityModel item = model.getSelectedItem(); ui.getTablePopupMenu().setEnabled(item != null); int index = model.getSelectedIndex(); - if (item == null && index==-1) { + if (item == null || index==-1) { return; } MetaData data = model.get(index);

1 0

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

18 Feb '08

Author: tchemit Date: 2008-02-18 16:53:01 +0000 (Mon, 18 Feb 2008) New Revision: 1072 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: on trie les versions par ordre decroissant 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-18 15:35:42 UTC (rev 1071) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-18 16:53:01 UTC (rev 1072) @@ -29,6 +29,9 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.Collections; +import java.util.ArrayList; +import java.util.Arrays; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -374,7 +377,7 @@ InputStream currentXml = getStorageEngine().retrieveData(token, currentMetaData, getXMLAttachment()); - InputStream newXml = null; + InputStream newXml; MetaDataFactory<MetaData> mdeFactory = MetaDataFactory.getFactory(MetaData.class); newXml = mdeFactory.modifyMedataElementStream(currentXml, elementToUpdate); @@ -398,14 +401,13 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) */ public Version[] getVersions(String token, String uuid) throws SimExplorerException { - Set<MetaData> versions = getStorageEngine().getElementVersions(token, uuid); - Version[] result = new Version[versions.size()]; - int i = 0; - for (MetaData metaData : versions) { - result[i] = metaData.getVersion(); - i++; + Set<MetaData> metas = getStorageEngine().getElementVersions(token, uuid); + List<Version> versions = new ArrayList<Version>(metas.size()); + for (MetaData metaData : metas) { + versions.add(metaData.getVersion()); } - return result; + Collections.sort(versions,Collections.reverseOrder()); + return versions.toArray(new Version[versions.size()]); } /* (non-Javadoc) @@ -428,13 +430,9 @@ public void deleteElement(String token, String uuid) throws SimExplorerException { Set<MetaData> allUsedByList = new HashSet<MetaData>(); Version[] versions = getVersions(token, uuid); - for (int i = 0; i < versions.length; i++) { - Version aVersion = versions[i]; + for (Version aVersion : versions) { MetaData[] versionUsedBy = getMetadatasUsedBy(token, uuid, aVersion.toString()); - for (int j = 0; j < versionUsedBy.length; j++) { - MetaData metaData = versionUsedBy[j]; - allUsedByList.add(metaData); - } + allUsedByList.addAll(Arrays.asList(versionUsedBy)); } if (allUsedByList.size() > 0) { throw new SimExplorerBusinessException(_("simexplorer.service.business.notdeletable.allversions"));

1 0

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

18 Feb '08

Author: tchemit Date: 2008-02-18 15:35:42 +0000 (Mon, 18 Feb 2008) New Revision: 1071 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 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/SimExplorerAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java Log: chaque liste a son sizor, refactor updateUi (a finir) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-18 15:34:45 UTC (rev 1070) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-18 15:35:42 UTC (rev 1071) @@ -19,19 +19,17 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.ui.swing.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; 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.model.PaginationModel; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.Action; import javax.swing.JComboBox; import javax.swing.JComponent; -import javax.swing.JTable; import java.awt.event.ActionEvent; /** @@ -83,24 +81,15 @@ // save new firstIndex in model pagination.setFirstIndex(newFirstIndex); - model.updateTabModel(getContext(), isRemote()); - - // update table model - JListTab container = (JListTab) getUI(); - JTable table = container.getTable(); - ListTableModel modelTab = (ListTableModel) table.getModel(); - modelTab.setData(model.getList()); - - // refresh ui - //ListTabRefreshHelper.refreshListTabUI(container, model); + // update model + model.updateTabModel(getContext(), (ListTableModel) ((JListTab) getUI()).getTable().getModel()); } @Override public void updateUI() { super.updateUI(); // refresh ui - getTab().updateUI(); - //ListTabRefreshHelper.refreshListTabUI((JListTab) getUI(), (ListTabModel) getModel()); + getTab().updateUI(); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-18 15:34:45 UTC (rev 1070) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-18 15:35:42 UTC (rev 1071) @@ -18,16 +18,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; import javax.swing.Action; import javax.swing.JComboBox; -import javax.swing.JTable; import java.awt.event.ActionEvent; /** @@ -78,18 +76,16 @@ // la liste à zero pour simplifier pagination.setWidth(newWidth); pagination.setFirstIndex(0); - - model.updateTabModel(getContext(), isRemote()); - - - // save in TableModel - JListTab container = (JListTab) getUI(); - JTable jApplicationTable = container.getTable(); - ListTableModel modelTab = (ListTableModel) jApplicationTable.getModel(); - modelTab.setData(model.getList()); - - // refresh ui - //ListTabRefreshHelper.refreshListTabUI(container, model); + model.synch(null); + // on sauvegarde dans la config la nouvelle valeur + // la valeur sera utilisée apres chaque action de recherche + if (model.isRemote()) { + getContext().getConfig().setRemoteSizor(newWidth); + } else { + getContext().getConfig().setLocalSizor(newWidth); + } + // update model + model.updateTabModel(getContext(), (ListTableModel) ((JListTab) getUI()).getTable().getModel()); } @Override @@ -101,6 +97,7 @@ @Override protected void clear() { + // multi-tab action setTab(null); newWidth = null; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-18 15:34:45 UTC (rev 1070) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-18 15:35:42 UTC (rev 1071) @@ -18,13 +18,11 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; -import fr.cemagref.simexplorer.is.ui.swing.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel; -import javax.swing.JTable; import java.awt.event.ActionEvent; /** @@ -75,20 +73,11 @@ // reset query in model model.setQuery(null); - // a new search begins always on first page - model.getPagination().setFirstIndex(0); + // pagination a vide + model.setPagination(null); - // get data from service - model.updateTabModel(getContext(), isRemote()); - - // update table model in ui - JListTab container = (JListTab) getUI(); - JTable table = container.getTable(); - ListTableModel modelTab = (ListTableModel) table.getModel(); - modelTab.setData(model.getList()); - - // refresh ui - //ListTabRefreshHelper.refreshListTabUI(container, model); + // update model + model.updateTabModel(getContext(), (ListTableModel) ((JListTab) getUI()).getTable().getModel()); } @Override 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-18 15:34:45 UTC (rev 1070) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-18 15:35:42 UTC (rev 1071) @@ -18,14 +18,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; 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.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper; import javax.swing.JTextField; -import javax.swing.JTable; import java.awt.event.ActionEvent; /** @@ -53,7 +51,7 @@ } @Override - protected boolean beforeAction(ActionEvent e) throws Exception { + protected boolean beforeAction(ActionEvent e) throws Exception { JTextField uiObject = (JTextField) getUIObject("searchText"); query = uiObject.getText(); ListTabModel model = (ListTabModel) getModel(); @@ -66,26 +64,20 @@ ListTabModel model = (ListTabModel) getModel(); model.getQuery().setQuery(query); - // a new search begins always on first page - model.getPagination().setFirstIndex(0); + // on supprime la selection courante avant tout + model.synch(null); + model.setSelectedIndex(-1); - // get data from service - model.updateTabModel(getContext(), isRemote()); + // pagination a vide + model.setPagination(null); - // update table model in ui - JListTab container = (JListTab) getUI(); - JTable table = container.getTable(); - ListTableModel modelTab = (ListTableModel) table.getModel(); - modelTab.setData(model.getList()); - - // refresh ui - //ListTabRefreshHelper.refreshListTabUI(container, model); + // update model + model.updateTabModel(getContext(), (ListTableModel) ((JListTab) getUI()).getTable().getModel()); } @Override public void updateUI() { - super.updateUI(); - // refresh ui + // refresh tab ui getTab().updateUI(); } 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-02-18 15:34:45 UTC (rev 1070) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-02-18 15:35:42 UTC (rev 1071) @@ -41,12 +41,12 @@ public void actionPerformed(java.awt.event.ActionEvent e) { - log.debug("------------------------------------------------------------"); - log.debug("event : " + e); - log.debug("source : " + e.getSource()); + log.info("------------------------------------------------------------"); + log.info("event : " + e); + log.info("source : " + e.getSource()); try { boolean accepted = beforeAction(e); - log.debug("action : " + this); + log.info("action : " + this); if (accepted) { log.info(getActionName()+" (treate:" + accepted + ") : " + this); } else { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-18 15:34:45 UTC (rev 1070) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-18 15:35:42 UTC (rev 1071) @@ -68,8 +68,11 @@ } public MetaData get(int index) { + if (index == -1) { + return null; + } checkSize(index); - return index==-1?null:getList()[index]; + return getList()[index]; } public boolean isEmpty() { @@ -87,7 +90,7 @@ @Override public String toString() { String s = super.toString(); - return s.substring(s.lastIndexOf(".") + 1) + "<size: " + size() + ">"; + return s.substring(s.lastIndexOf(".") + 1) + "<size: " + size() + ",selectedItem:"+selectedItem+">"; } public void setSelectedIndex(int selectedIndex) { @@ -107,19 +110,20 @@ this.list = list; } - public void initTabModel(SimExplorerContext context, boolean remote) throws Exception { - // first local query, build model + public void initTabModel(SimExplorerContext context, boolean remote, ListTableModel tableModel) { - synch(remote,null,null); + // no selection at first load + synch(remote, null, null); - updateTabModel(context, remote); + // first query, build model + updateTabModel(context, tableModel); } - public void updateTabModel(SimExplorerContext context, boolean remote) throws Exception { + public void updateTabModel(SimExplorerContext context, ListTableModel tableModel) { // init pagination PaginationModel paginationModel; - paginationModel = pagination == null ? initPagination(context, remote) : pagination; + paginationModel = pagination == null ? initPagination(context) : pagination; // init query model QueryModel queryModel; @@ -130,9 +134,10 @@ // save in model setList(data); + tableModel.setData(data); } - protected PaginationModel initPagination(SimExplorerContext context, boolean remote) { + protected PaginationModel initPagination(SimExplorerContext context) { QueryModel queryModel; queryModel = getQuery(); @@ -145,7 +150,7 @@ paginationModel.setFirstIndex(0); paginationModel.setSize(size); // utilisation sizor par défaut - paginationModel.setWidth(context.getConfig().getSizor()); + paginationModel.setWidth(remote ? context.getConfig().getRemoteSizor() : context.getConfig().getLocalSizor()); // save pagination in model setPagination(paginationModel); @@ -153,7 +158,7 @@ } private void checkSize(int index) { - if (index>-1 && (isEmpty() || size() < index)) { + if (index > -1 && (isEmpty() || size() < index)) { throw new IllegalStateException(getClass() + " has size " + size() + " and was required index " + index); } }

1 0

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

18 Feb '08

Author: tchemit Date: 2008-02-18 15:34:45 +0000 (Mon, 18 Feb 2008) New Revision: 1070 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: mod?\195?\168le r?\195?\169cup?\195?\169r?\195?\169 uniquement apres construction de l'ui 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-18 15:33:04 UTC (rev 1069) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-18 15:34:45 UTC (rev 1070) @@ -74,22 +74,19 @@ tabbedPane.setSelectedComponent(ui); return false; } - - ListTabModel model = (ListTabModel) getModel(); - - MetaData[] data = model.getList(); - - if (data == null) { - // first coming here, init model - model.initTabModel(getContext(), remote); - } + return true; } protected void initFirstUsage(final JListTab ui, final ListTabModel model) { detailAction = (ShowDetailTabAction) SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null); synchronizeAction = (ShowSynchronizeTabAction) SimExplorerActionManager.newAction("showTab_synchronize", (AbstractButton) null); + MetaData[] data = model.getList(); + if (data == null) { + // first coming here, init model + model.initTabModel(getContext(), remote, (ListTableModel) ((JListTab) getUI()).getTable().getModel()); + } ui.getShowTab_synchronize().setHideActionText(false); ui.getExportElement().setHideActionText(false); ui.getDownloadElement().setHideActionText(false); @@ -121,7 +118,7 @@ if (e.getClickCount() == 2) { try { // synchronization du meta selectionne - synchSelected(ui, getRowAtPoint(ui, e.getPoint()), ui.getTable().getSelectionModel(), model); + synchSelected(ui, getRowAtPoint(ui, e.getPoint()), ui.getTable().getSelectionModel(), model); // lancement de l'action d'affichage du tab detailAction.actionPerformed(new ActionEvent(e.getSource(), ActionEvent.ACTION_FIRST, "showTab_detail")); } catch (Exception e1) { @@ -159,17 +156,23 @@ } protected void synchSelected(final JListTab ui, int rowAtPoint, ListSelectionModel selectionModel, ListTabModel model) { + // if empty list, this is quick + if (model.isEmpty()) { + model.setSelectedIndex(-1); + model.synch(null); + return; + } DataEntityModel entityModel; if (rowAtPoint == -1 || model.getSelectedIndex() != rowAtPoint || selectionModel.isSelectionEmpty() || selectionModel.getMinSelectionIndex() != rowAtPoint) { if (rowAtPoint == -1) { rowAtPoint = 0; } - if (ui.getTable().getSelectedRow() != rowAtPoint) { + if (ui.getTable().getSelectedRow() != rowAtPoint) { // select the row - boolean wasEnabled =listMetaSelectionListener.enabled; - listMetaSelectionListener.enabled=false; + boolean wasEnabled = listMetaSelectionListener.enabled; + listMetaSelectionListener.enabled = false; selectionModel.setSelectionInterval(rowAtPoint, rowAtPoint); - listMetaSelectionListener.enabled=wasEnabled; + listMetaSelectionListener.enabled = wasEnabled; } // the model is not yet ready model.setSelectedIndex(rowAtPoint);

1 0

r1069 - in trunk/simexplorer-is/simexplorer-is-swing/src/resources: . i18n
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 15:33:04 +0000 (Mon, 18 Feb 2008) New Revision: 1069 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 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: chaque liste a son sizor Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-18 13:46:13 UTC (rev 1068) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-18 15:33:04 UTC (rev 1069) @@ -45,9 +45,12 @@ ### ### Application preferences ### -main.config.definition.sizor=java.lang.Integer:10 -main.config.modifiers.sizor= +main.config.definition.localSizor=java.lang.Integer:10 +main.config.modifiers.localSizor= +main.config.definition.remoteSizor=java.lang.Integer:10 +main.config.modifiers.remoteSizor= + main.config.definition.showLocalTab=java.lang.Boolean:True main.config.modifiers.showLocalTab= 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-18 13:46:13 UTC (rev 1068) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-18 15:33:04 UTC (rev 1069) @@ -137,13 +137,14 @@ simexplorer.config.main.baseDirectory.description=Directory of the local databse of SimExplorer simexplorer.config.main.configFileName.description=The path of the configuration file simexplorer.config.main.description=Configuration de l'application SimExplorer SI +simexplorer.config.main.localSizor.description=number of result to display by page in local list simexplorer.config.main.remoteLogin.description=User login to remote server simexplorer.config.main.remotePassword.description=User password to connect remote server +simexplorer.config.main.remoteSizor.description=number of result to display by page in remote list simexplorer.config.main.remoteURI.description=URI of the remote storage service simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab simexplorer.config.main.siteURL.description=Simexplorer-is site URL -simexplorer.config.main.sizor.description=number of result to display by page in ui simexplorer.config.main.userCountry.description=Country of the user's locale simexplorer.config.main.userFirstName.description=User first name simexplorer.config.main.userLanguage.description=Language of user's locale 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-18 13:46:13 UTC (rev 1068) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-18 15:33:04 UTC (rev 1069) @@ -137,13 +137,14 @@ simexplorer.config.main.baseDirectory.description=le r\u00E9pertoire de la base locale simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration simexplorer.config.main.description=La configuration de l'application +simexplorer.config.main.localSizor.description=Nombre de r\u00E9sultats par page dans la liste locale simexplorer.config.main.remoteLogin.description=Le login de l'utilisateur au service distant simexplorer.config.main.remotePassword.description=Le mot de passe utilisateur (non visible) au serveur distant +simexplorer.config.main.remoteSizor.description=Nombre de r\u00E9sultats par page dans la liste distante simexplorer.config.main.remoteURI.description=l'url du service distant simexplorer.config.main.showLocalTab.description=Voir au d\u00E9marrage l'onglet Local simexplorer.config.main.showRemoteTab.description=Voir au d\u00E9mrrage l'onglet Distant simexplorer.config.main.siteURL.description=L'URL du site de Simexplorer-is -simexplorer.config.main.sizor.description=Nombre de r\u00E9sultats par page dans l'ui simexplorer.config.main.userCountry.description=Le pays de la locale utilisateur simexplorer.config.main.userFirstName.description=Le pr\u00E9nom de l'utilisateur simexplorer.config.main.userLanguage.description=La langue de la locale utilisateur

1 0

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

18 Feb '08

Author: tchemit Date: 2008-02-18 13:46:13 +0000 (Mon, 18 Feb 2008) New Revision: 1068 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: log 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-18 13:45:32 UTC (rev 1067) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-18 13:46:13 UTC (rev 1068) @@ -177,7 +177,7 @@ model.synch(model.isRemote(), model.get(rowAtPoint)); entityModel = model.getSelectedItem(); - log.info("synch: " + entityModel); + log.info(entityModel); ListTabRefreshHelper.refreshListTablePopupMenu(ui, model); } entityModel = model.getSelectedItem();

1 0

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

18 Feb '08

Author: tchemit Date: 2008-02-18 13:45:32 +0000 (Mon, 18 Feb 2008) New Revision: 1067 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java Log: test pour les actions goFirst, goPrevious qui fonctionne. Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java 2008-02-18 13:33:41 UTC (rev 1066) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java 2008-02-18 13:45:32 UTC (rev 1067) @@ -138,7 +138,7 @@ boolean notLast = page + 1 < pagination.getNbPages(); ui.getGoNextPage().setEnabled(notLast); ui.getGoLastPage().setEnabled(notLast); - boolean notFirstPage = pagination.getSize() < 2 || page<2; + boolean notFirstPage = !(pagination.getSize() < 2 || page<1); ui.getGoFirstPage().setEnabled(notFirstPage); ui.getGoPreviousPage().setEnabled(notFirstPage); }

1 0

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

18 Feb '08

Author: tchemit Date: 2008-02-18 13:33:41 +0000 (Mon, 18 Feb 2008) New Revision: 1066 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx Log: renforce le test sur l'update de la popup... ajout de regle d'accessibilite pour les actions goFirst et goPrevious (suite ?\195?\160 modification mod?\195?\168le, le test jaxx ne suffit plus...) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-18 13:33:24 UTC (rev 1065) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-18 13:33:41 UTC (rev 1066) @@ -39,8 +39,8 @@ <row> <cell anchor='center' insets='0,0,0,0'> <JToolBar> - <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/> - <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/> + <JButton id='goFirstPage' enabled='{false}'/> + <JButton id='goPreviousPage' enabled='{false}'/> <JPanel layout='{new GridLayout(0, 2, 0, 0)}'> <JLabel id='currentPage' text='simexplorer.action.currentPage' labelFor="{goPage}" font-size='9'/> <JComboBox id='goPage' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'/>

1 0