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

r404 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 10:24:03 +0000 (Tue, 22 Jan 2008) New Revision: 404 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx Log: utilisation binding jaxx pour les tests sur l'accessibilit?\195?\169 des bouttons (mais par partout car ?\195?\167a ne marchepas avec les combo par exemple...) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 09:52:37 UTC (rev 403) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 10:24:03 UTC (rev 404) @@ -89,11 +89,7 @@ protected void refreshPagination(JApplicationListTab ui, PaginationModel pagination) { int page = pagination.getCurrentPage(); - - boolean notFirst = page > 0; - ui.getGoFirstPage().setEnabled(notFirst); - ui.getGoPreviousPage().setEnabled(notFirst); - boolean notLast = page + 1 < pagination.getNbPages(); + boolean notLast = page + 1 < pagination.getNbPages(); ui.getGoNextPage().setEnabled(notLast); ui.getGoLastPage().setEnabled(notLast); } Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-22 09:52:37 UTC (rev 403) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-22 10:24:03 UTC (rev 404) @@ -47,8 +47,8 @@ <cell anchor='center' insets='0,0,0,0'> <JToolBar floatable='false' opaque='false' borderPainted='false' margin='0,0,0,0'> - <JButton id='goFirstPage' enabled='false'/> - <JButton id='goPreviousPage' enabled='false'/> + <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/> + <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/> <JPanel layout='{new GridLayout(0, 2, 0, 0)}'> <JLabel id='currentPage' text='{_("simexplorer.action.pagination.currentPage")}' labelFor="{goPage}" font-size='9'/>

1 0

r403 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 09:52:37 +0000 (Tue, 22 Jan 2008) New Revision: 403 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: on grise aussi le texte dans la pagination si il n'y a qu'une page visible Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 09:51:47 UTC (rev 402) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 09:52:37 UTC (rev 403) @@ -125,6 +125,8 @@ //System.out.println("new page size : " + combo.getItemCount()); combo.setSelectedIndex(model.getPagination().getCurrentPage()); - combo.setEnabled(combo.getItemCount() > 1); + boolean b = combo.getItemCount() > 1; + combo.setEnabled(b); + ui.getCurrentPage().setEnabled(b); } }

1 0

r402 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 09:51:47 +0000 (Tue, 22 Jan 2008) New Revision: 402 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx Log: binding jaxx pour les actions de la recherche 'les bouttons sont accessibles uniquement lorsque du texte est saisie dans la zone de saisie) Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-22 09:36:47 UTC (rev 401) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-22 09:51:47 UTC (rev 402) @@ -16,8 +16,10 @@ <JTextField id='searchText' toolTipText='{_("simexplorer.action.application.searchText.tooltip")}'/> - <JButton id='searchApplication' enabled='false'/> - <JButton id='resetSearchApplication' enabled='false'/> + <JButton id='searchApplication' + enabled='{!searchText.getText().isEmpty()}' /> + <JButton id='resetSearchApplication' + enabled='{!searchText.getText().isEmpty()}'/> <JButton id='advancedSearchApplication' enabled='false'/> <JComboBox id='changeSizor' enabled='false' font-size='9' @@ -48,7 +50,7 @@ <JButton id='goFirstPage' enabled='false'/> <JButton id='goPreviousPage' enabled='false'/> <JPanel layout='{new GridLayout(0, 2, 0, 0)}'> - <JLabel text='{_("simexplorer.action.pagination.currentPage")}' + <JLabel id='currentPage' text='{_("simexplorer.action.pagination.currentPage")}' labelFor="{goPage}" font-size='9'/> <JComboBox id='goPage' enabled='false' font-size='9' opaque='false'

1 0

r401 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 09:36:47 +0000 (Tue, 22 Jan 2008) New Revision: 401 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java Log: surcharge de l'action ChangePageAction Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java 2008-01-22 09:36:23 UTC (rev 400) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java 2008-01-22 09:36:47 UTC (rev 401) @@ -18,8 +18,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import javax.swing.Action; +import javax.swing.JButton; +import java.awt.event.ActionEvent; + /** * Action pour lancer une recherche d'application * @@ -34,17 +38,31 @@ mnemonic = 'f', hideActionText = true ) -public class GoFirstPageAction extends SimExplorerAbstractTabAction { +public class GoFirstPageAction extends ChangePageAction { private static final long serialVersionUID = -7292269279566418188L; public GoFirstPageAction(String name) { - super(name, null); + super(name); } @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!getButton().isEnabled()) { + return false; + } + ListTabModel model = (ListTabModel) getModel(); + Integer oldPage = model.getPagination().getCurrentPage(); + boolean b = oldPage > 0; + if (b) { + newPage = 0; + } + return b; } + + protected JButton getButton() { + return (JButton) getUIObject((String) super.getValue(Action.ACTION_COMMAND_KEY)); + } + + } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java 2008-01-22 09:36:23 UTC (rev 400) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java 2008-01-22 09:36:47 UTC (rev 401) @@ -18,8 +18,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import javax.swing.Action; +import javax.swing.JButton; +import java.awt.event.ActionEvent; + /** * Action pour lancer une recherche d'application * @@ -34,17 +38,30 @@ mnemonic = 'f', hideActionText = true ) -public class GoLastPageAction extends SimExplorerAbstractTabAction { +public class GoLastPageAction extends ChangePageAction { private static final long serialVersionUID = 3453164752580608948L; public GoLastPageAction(String name) { - super(name, null); + super(name); } @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!getButton().isEnabled()) { + return false; + } + ListTabModel model = (ListTabModel) getModel(); + Integer oldPage = model.getPagination().getCurrentPage(); + boolean b = oldPage < model.getPagination().getNbPages(); + if (b) { + newPage = getChangePageComboBox().getItemCount() - 1; + } + return b; } + + protected JButton getButton() { + return (JButton) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); + } + } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java 2008-01-22 09:36:23 UTC (rev 400) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java 2008-01-22 09:36:47 UTC (rev 401) @@ -18,8 +18,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import javax.swing.Action; +import javax.swing.JButton; +import java.awt.event.ActionEvent; + /** * Action pour lancer une recherche d'application * @@ -34,7 +38,7 @@ mnemonic = 'f', hideActionText = true ) -public class GoNextPageAction extends SimExplorerAbstractAction { +public class GoNextPageAction extends ChangePageAction { private static final long serialVersionUID = 836465304625059733L; @@ -42,4 +46,21 @@ super(name); } + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!getButton().isEnabled()) { + return false; + } + ListTabModel model = (ListTabModel) getModel(); + Integer oldPage = model.getPagination().getCurrentPage(); + boolean b = oldPage < model.getPagination().getNbPages(); + if (b) { + newPage = getChangePageComboBox().getSelectedIndex() + 1; + } + return b; + } + + protected JButton getButton() { + return (JButton) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); + } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-22 09:36:23 UTC (rev 400) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-22 09:36:47 UTC (rev 401) @@ -18,15 +18,10 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; import javax.swing.Action; import javax.swing.JButton; -import javax.swing.JComboBox; import java.awt.event.ActionEvent; /** @@ -43,12 +38,12 @@ mnemonic = 'f', hideActionText = true ) -public class GoPreviousPageAction extends SimExplorerAbstractTabAction { +public class GoPreviousPageAction extends ChangePageAction { private static final long serialVersionUID = 3318383412609641337L; public GoPreviousPageAction(String name) { - super(name, null); + super(name); } @Override @@ -58,28 +53,16 @@ } ListTabModel model = (ListTabModel) getModel(); Integer oldPage = model.getPagination().getCurrentPage(); - return oldPage > 0; + boolean b = oldPage > 0; + if (b) { + newPage = oldPage - 1; + } + return b; } - @Override - protected void doAction(ActionEvent e) throws Exception { - // change value in combo-box, will trigger ChangePageAction - getComboBox().setSelectedIndex(getComboBox().getSelectedIndex() - 1); - } - - @Override - protected void clear() { - super.clear(); - setTab(null); - } - protected JButton getButton() { return (JButton) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); } - protected JComboBox getComboBox() { - AbstractAction action = SimExplorerActionManager.newAction("goPage", (AbstractButton) null); - return (JComboBox) getUIObject((String) action.getValue(Action.ACTION_COMMAND_KEY)); - } } \ No newline at end of file

1 0

r400 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 09:36:23 +0000 (Tue, 22 Jan 2008) New Revision: 400 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java Log: m?\195?\169thode jetComboBox devient getChangeComboBox et est maintenant ind?\195?\169pendante de l'action r?\195?\169elle ==> on peut r?\195?\169utiliser l'action Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 09:07:39 UTC (rev 399) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 09:36:23 UTC (rev 400) @@ -19,6 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -26,8 +27,11 @@ import fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationTable; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; import javax.swing.Action; import javax.swing.JComboBox; +import javax.swing.JComponent; import java.awt.event.ActionEvent; /** @@ -54,7 +58,7 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - JComboBox jComboBox = getComboBox(); + JComboBox jComboBox = getChangePageComboBox(); if (!jComboBox.isEnabled()) { return false; } @@ -64,7 +68,7 @@ if (o != null) { newPage = Integer.valueOf(o + ""); } - return o!=null && !oldPage.equals(newPage); + return o != null && !oldPage.equals(newPage); } @Override @@ -82,7 +86,7 @@ //long oldLastIndex = oldFirstindex + model.size(); //TODO optimiser l'algo - data = getData(false,width, newFirstIndex,-1); + data = getData(false, width, newFirstIndex, -1); // save in model model.setList(data); @@ -105,7 +109,17 @@ newPage = null; } - protected JComboBox getComboBox() { - return (JComboBox) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); + protected JComboBox getChangePageComboBox() { + JComponent uiObject = getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); + if (uiObject instanceof JComboBox) { + return (JComboBox) uiObject; + } + // find with hard name + AbstractAction action = SimExplorerActionManager.newAction("goPage", (AbstractButton) null); + uiObject = getUIObject((String) action.getValue(Action.ACTION_COMMAND_KEY)); + if (uiObject instanceof JComboBox) { + return (JComboBox) uiObject; + } + throw new IllegalStateException("could not find ChangePageComboBox for action " + this); } } \ No newline at end of file

1 0

r399 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 09:07:39 +0000 (Tue, 22 Jan 2008) New Revision: 399 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: simplification algo lors d'un changement de sizor afin d'?\195?\169viter les effets de bord (gestion d'un segment de table) ==> code plus simple Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 09:06:50 UTC (rev 398) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 09:07:39 UTC (rev 399) @@ -65,7 +65,7 @@ if (o != null) { newWidth = Integer.valueOf(o + ""); } - return o!=null && !oldIndex.equals(newWidth); + return o != null && !oldIndex.equals(newWidth); } @Override @@ -74,35 +74,29 @@ final ListTabModel model = (ListTabModel) getModel(); final PaginationModel pagination = model.getPagination(); - int oldWidth = pagination.getWidth(); - MetaDataEntity[] data; + // pour le moment, chaque retaille de fenetre repositionne + // la liste à zero pour simplifier - if (oldWidth > newWidth || model.size() > newWidth) { - // just cut the data in the table model, don't touch the list - data = new MetaDataEntity[newWidth]; - System.arraycopy(model.getList(), 0, data, 0, newWidth); - - } else { - // need ask service more data - long firstIndex = pagination.getFirstIndex() + oldWidth; - int size = newWidth - oldWidth; - MetaDataEntity[] newData = getData(false,size, (int) firstIndex,-1); - data = new MetaDataEntity[oldWidth + newData.length]; - System.arraycopy(model.getList(), 0, data, 0, oldWidth); - System.arraycopy(newData, 0, data, oldWidth, newData.length); - - // save in model - model.setList(data); + long firstIndex = 0; + long lastIndex = newWidth; + if (lastIndex >= pagination.getSize()) { + lastIndex = pagination.getSize() - 1; } + int size = (int) (lastIndex - firstIndex); + MetaDataEntity[] data = getData(false, size, (int) firstIndex, -1); + // save list + model.setList(data); + // save in TableModel JApplicationListTab container = (JApplicationListTab) getUI(); JApplicationTable jApplicationTable = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); modelTab.setData(data); - // save new width in model + // save pagination pagination.setWidth(newWidth); + pagination.setFirstIndex(0); // refresh ui getMainUI().refreshListTabUI(model, container);

1 0

r398 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 09:06:50 +0000 (Tue, 22 Jan 2008) New Revision: 398 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java Log: suppression m?\195?\169thodes inutiles Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java 2008-01-22 08:09:11 UTC (rev 397) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java 2008-01-22 09:06:50 UTC (rev 398) @@ -70,22 +70,6 @@ return nbPages; } - public void increment() { - if (firstIndex + width > size) { - firstIndex = size - width; - return; - } - firstIndex += width; - } - - public void decrement() { - if (firstIndex < width) { - firstIndex = 0; - } else { - firstIndex -= width; - } - } - public void setFirstIndex(long firstIndex) { this.firstIndex = firstIndex; }

1 0

r397 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 08:09:11 +0000 (Tue, 22 Jan 2008) New Revision: 397 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java Log: premi?\195?\168re action d?\195?\169rivant de ChangePageAction Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-22 08:08:01 UTC (rev 396) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-22 08:09:11 UTC (rev 397) @@ -18,8 +18,17 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.Action; +import javax.swing.JButton; +import javax.swing.JComboBox; +import java.awt.event.ActionEvent; + /** * Action pour lancer une recherche d'application * @@ -42,4 +51,35 @@ super(name, null); } + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!getButton().isEnabled()) { + return false; + } + ListTabModel model = (ListTabModel) getModel(); + Integer oldPage = model.getPagination().getCurrentPage(); + return oldPage > 0; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + // change value in combo-box, will trigger ChangePageAction + getComboBox().setSelectedIndex(getComboBox().getSelectedIndex() - 1); + } + + @Override + protected void clear() { + super.clear(); + setTab(null); + } + + protected JButton getButton() { + return (JButton) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); + } + + protected JComboBox getComboBox() { + AbstractAction action = SimExplorerActionManager.newAction("goPage", (AbstractButton) null); + return (JComboBox) getUIObject((String) action.getValue(Action.ACTION_COMMAND_KEY)); + } + } \ No newline at end of file

1 0

r396 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 08:08:01 +0000 (Tue, 22 Jan 2008) New Revision: 396 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: renforce test : probl?\195?\168me lors du rechargement de l'appli (changement de langue), le rafraichissement des donn?\195?\169e est effectu?\195?\169 en non synchronise, en rechargeant les tabs, on peut donc avoir des incoh?\195?\169rences... a corriger Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 07:34:12 UTC (rev 395) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 08:08:01 UTC (rev 396) @@ -64,8 +64,7 @@ if (o != null) { newPage = Integer.valueOf(o + ""); } - - return !oldPage.equals(newPage); + return o!=null && !oldPage.equals(newPage); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 07:34:12 UTC (rev 395) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 08:08:01 UTC (rev 396) @@ -65,7 +65,7 @@ if (o != null) { newWidth = Integer.valueOf(o + ""); } - return !oldIndex.equals(newWidth); + return o!=null && !oldIndex.equals(newWidth); } @Override

1 0

r395 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 07:34:12 +0000 (Tue, 22 Jan 2008) New Revision: 395 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java Log: action change page ok Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 07:33:24 UTC (rev 394) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 07:34:12 UTC (rev 395) @@ -18,9 +18,13 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import jaxx.runtime.JAXXObject; +import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; +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.panel.JApplicationTable; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import javax.swing.Action; import javax.swing.JComboBox; @@ -33,7 +37,6 @@ */ @jaxx.runtime.builder.SelectActionConfig( actionCommand = "goPage", - container = SimExplorerUI.class, name = "simexplorer.action.pagination.goPage", shortDescription = "simexplorer.action.pagination.goPage.tooltip", longDescription = "simexplorer.action.pagination.goPage.help", @@ -43,39 +46,67 @@ private static final long serialVersionUID = 448524625085364914L; - protected int selectedIndex; - protected int newIndex; + protected Integer newPage; public ChangePageAction(String name) { super(name, null); } @Override - public String toString() { - return super.toString() + " oldIndex:" + selectedIndex + ", newIndex:" + newIndex; - } + protected boolean beforeAction(ActionEvent e) throws Exception { + JComboBox jComboBox = getComboBox(); + if (!jComboBox.isEnabled()) { + return false; + } + ListTabModel model = (ListTabModel) getModel(); + Integer oldPage = model.getPagination().getCurrentPage(); + Object o = jComboBox.getSelectedItem(); + if (o != null) { + newPage = Integer.valueOf(o + ""); + } - @Override - protected boolean beforeAction(ActionEvent e) throws Exception { - super.beforeAction(e); - newIndex = getComboBox().getSelectedIndex(); - return newIndex != selectedIndex; + return !oldPage.equals(newPage); } @Override protected void doAction(ActionEvent e) throws Exception { + // user ask to change page + final ListTabModel model = (ListTabModel) getModel(); + final PaginationModel pagination = model.getPagination(); - super.doAction(e); - // deal with PaginationBean and ListApplicationBean + MetaDataEntity[] data; + int width = pagination.getWidth(); + long newFirstIndex = newPage * width; + + //long newLastIndex = newFirstIndex + width; + //long oldFirstindex = pagination.getFirstIndex(); + //long oldLastIndex = oldFirstindex + model.size(); + + //TODO optimiser l'algo + data = getData(false,width, newFirstIndex,-1); + + // save in model + model.setList(data); + + JApplicationListTab container = (JApplicationListTab) getUI(); + JApplicationTable jApplicationTable = container.getTable(); + JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); + modelTab.setData(data); + + // save new firstIndex in model + pagination.setFirstIndex(newFirstIndex); + + // refresh ui + getMainUI().refreshListTabUI(model, container); } @Override - protected void afterAction(ActionEvent e) throws Exception { - super.afterAction(e); - selectedIndex = newIndex; + protected void clear() { + setTab(null); + newPage = null; } protected JComboBox getComboBox() { - return (JComboBox) ((JAXXObject) getTab()).getObjectById((String) getValue(Action.ACTION_COMMAND_KEY)); + return (JComboBox) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); } } \ No newline at end of file

1 0