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

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

22 Jan '08

Author: tchemit Date: 2008-01-22 06:07:33 +0000 (Tue, 22 Jan 2008) New Revision: 384 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: action de chnagement de nombre de r?\195?\169sultats ok 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 06:04:17 UTC (rev 383) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 06:07:33 UTC (rev 384) @@ -18,9 +18,17 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; 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; @@ -42,8 +50,7 @@ public class ChangeSizorAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 5137512273375524199L; - protected int selectedIndex; - protected int newIndex; + protected Integer newWidth; public ChangeSizorAction(String name) { super(name, null); @@ -51,31 +58,69 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - super.beforeAction(e); - newIndex = getComboBox().getSelectedIndex(); - return getComboBox().isEnabled() && newIndex != selectedIndex; + + ListTabModel model = (ListTabModel) getModel(); + JComboBox jComboBox = getComboBox(); + + if (!jComboBox.isEnabled()) { + return false; + } + + Integer oldIndex = model.getPagination().getWidth(); + newWidth = Integer.valueOf(jComboBox.getSelectedItem() + ""); + return !oldIndex.equals(newWidth); } @Override protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); - // deal with PaginationBean and ListApplicationBean + final ListTabModel model = (ListTabModel) getModel(); + final PaginationModel pagination = model.getPagination(); + int oldWidth = pagination.getWidth(); + MetaDataEntity[] data; + + 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; + StorageService service; + service = getTab() == SimExplorerTab.local ? SimExplorer.getStorageService() : SimExplorer.getRemoteStorageService(); + MetaDataEntity[] newData; + newData = service.findApplications(false, (int) firstIndex, size, -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); + } + + // save in TableModel + JApplicationListTab container = (JApplicationListTab) getUI(); + JApplicationTable jApplicationTable = container.getTable(); + JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); + modelTab.setData(data); + + // save new width in model + pagination.setWidth(newWidth); + + // refresh ui + getMainUI().refreshListTabUI(model, container); } @Override - protected void afterAction(ActionEvent e) throws Exception { - super.afterAction(e); - selectedIndex = newIndex; + protected void clear() { + setTab(null); + newWidth = null; } protected JComboBox getComboBox() { - return (JComboBox) ((JAXXObject) getTab()).getObjectById((String) getValue(Action.ACTION_COMMAND_KEY)); + return (JComboBox) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); } - - @Override - public String toString() { - return super.toString() + " oldIndex:" + selectedIndex + ", newIndex:" + newIndex; - } } \ No newline at end of file

1 0

r383 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 06:04:17 +0000 (Tue, 22 Jan 2008) New Revision: 383 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java Log: utilisation accesseur getTab() plutot que la r?\195?\169f?\195?\169rence tab utilisation m?\195?\169thode g?\195?\169n?\195?\169rique de rafraichissement d'ui Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-22 06:02:55 UTC (rev 382) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-22 06:04:17 UTC (rev 383) @@ -18,21 +18,20 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; +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.model.ListTabModel; -import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import jaxx.runtime.JAXXObject; import javax.swing.JTabbedPane; +import java.awt.Component; import java.awt.event.ActionEvent; -import java.awt.Component; -import jaxx.runtime.JAXXObject; - /** * Action pour afficher le tab local * @@ -57,12 +56,12 @@ super(name); } - protected boolean beforeAction(ActionEvent e) throws Exception { + protected boolean beforeAction(ActionEvent e) throws Exception { JTabbedPane tabbedPane = getTabContainer(); - JAXXObject ui = tab.getUI(); + JAXXObject ui = getUI(); - if (tab.isTabVisible(tabbedPane)) { + if (getTab().isTabVisible(tabbedPane)) { // tab is already visible, just select it tabbedPane.setSelectedComponent((Component) ui); return false; @@ -94,7 +93,7 @@ model.setList(data); } return true; - } + } @Override protected void afterAction(ActionEvent e) { @@ -103,12 +102,18 @@ if (firstTime) { // push model into TableModel - JApplicationListTab container = (JApplicationListTab) getTab(); + JApplicationListTab container = (JApplicationListTab) getUI(); JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel(); modelTab.setData(model.getList()); - // init pagination - ShowLocalTabAction.initPagination(model.getPagination(), container); + // refresh ui + getMainUI().refreshListTabUI(model, container); } } + + @Override + protected void clear() { + super.clear(); + firstTime = null; + } } \ No newline at end of file

1 0

r382 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 06:02:55 +0000 (Tue, 22 Jan 2008) New Revision: 382 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java Log: utilisation accesseur getTab() plutot que la r?\195?\169f?\195?\169rence tab utilisation m?\195?\169thode g?\195?\169n?\195?\169rique de rafraichissement d'ui Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-22 06:01:30 UTC (rev 381) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-22 06:02:55 UTC (rev 382) @@ -45,6 +45,6 @@ @Override protected void doAction(ActionEvent e) throws Exception { - tab.closeTab(getMainUI().getContent()); + getTab().closeTab(getMainUI().getContent()); } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-22 06:01:30 UTC (rev 381) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-22 06:02:55 UTC (rev 382) @@ -22,9 +22,9 @@ import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; 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.tab.JApplicationListTab; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.JAXXComboBox; @@ -55,15 +55,15 @@ public ShowLocalTabAction(String name) { super(name); - } + @Override protected boolean beforeAction(ActionEvent e) throws Exception { JTabbedPane tabbedPane = getTabContainer(); - JAXXObject ui = tab.getUI(); + JAXXObject ui = getUI(); - if (tab.isTabVisible(tabbedPane)) { + if (getTab().isTabVisible(tabbedPane)) { // tab is already visible, just select it tabbedPane.setSelectedComponent((Component) ui); return false; @@ -104,12 +104,12 @@ if (firstTime) { // push model into tableModel - JApplicationListTab container = (JApplicationListTab) getTab(); + JApplicationListTab container = (JApplicationListTab) getUI(); JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel(); modelTab.setData(model.getList()); - // init pagination - initPagination(model.getPagination(), container); + // refresh ui + getMainUI().refreshListTabUI(model, container); } } @@ -118,24 +118,4 @@ super.clear(); firstTime = null; } - - public static void initPagination(PaginationModel model, JApplicationListTab container) { - JAXXComboBox combo; - - combo = container.getChangeSizor(); - combo.setEnabled(false); - combo.setSelectedItem("" + model.getWidth()); - combo.setEnabled(true); - - combo = container.getGoPage(); - long size = model.getNbPages(); - combo.setEnabled(false); - combo.removeAllItems(); - for (int i = 0; i < size; i++) { - combo.addItem(i); - } - combo.setEnabled(true); - } - - } \ No newline at end of file

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 06:01:30 +0000 (Tue, 22 Jan 2008) New Revision: 381 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: utilisation accesseur getTab() plutot que la r?\195?\169f?\195?\169rence tab + ajout m?\195?\169thode pour r?\195?\169cup?\195?\169rer le tab quand l'action n'est pas sp?\195?\169cifique ?\195?\160 un tab ainsi on peut maintenant utiliser une m?\195?\170me action sur plusieurs tab, le tab utilis?\195?\169 sera celui dans lequel se trouve la source de l'?\195?\169v?\195?\168nement :) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java 2008-01-22 05:59:18 UTC (rev 380) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java 2008-01-22 06:01:30 UTC (rev 381) @@ -35,6 +35,6 @@ @Override protected void doAction(ActionEvent e) throws Exception { - tab.showTab(getTabContainer()); + getTab().showTab(getTabContainer()); } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-01-22 05:59:18 UTC (rev 380) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-01-22 06:01:30 UTC (rev 381) @@ -42,12 +42,12 @@ public void actionPerformed(java.awt.event.ActionEvent e) { - log.info("------------------------------------------------------------"); - log.info("action : " + this); + log.info("------------------------------------------------------------"); log.info("event : " + e); log.info("source : " + e.getSource()); try { boolean accepted = beforeAction(e); + log.info("action : " + this); log.info("doAction : (" + accepted + ") : " + getActionName()); if (accepted) { doAction(e); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-22 05:59:18 UTC (rev 380) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-22 06:01:30 UTC (rev 381) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabModel; @@ -28,6 +27,7 @@ import javax.swing.JComponent; import javax.swing.JTabbedPane; +import java.awt.Component; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -38,7 +38,7 @@ */ public abstract class SimExplorerAbstractTabAction extends SimExplorerAbstractAction implements ActionParameter { - protected SimExplorerTab tab; + private SimExplorerTab tab; protected String param; private static final long serialVersionUID = 5285229914266682509L; @@ -58,7 +58,6 @@ tab = (SimExplorerTab) convertorLanguage.convert(SimExplorerTab.class, matcher.group(1)); } else { param = name; - tab = SimExplorerActionManager.getLoadingTab(); } log.info(">>> " + this); } @@ -71,16 +70,28 @@ return getMainUI().getContent(); } - public JAXXObject getTab() { - return tab.getUI(); + public SimExplorerTab getTab() { + if (tab == null) { + Component comp = getTabContainer().getSelectedComponent(); + for (SimExplorerTab explorerTab : SimExplorerTab.values()) { + if (comp.equals(explorerTab.getUI())) { + tab = explorerTab; + break; + } + } + if (tab==null) { + throw new IllegalStateException("could not found tab to match for action " + this); + } + } + return tab; } - public TabModel getModel() { - return tab.getModel(); + public JAXXObject getUI() { + return getTab().getUI(); } - protected JComponent getUIObject(String name) { - return getUIObject(name, getTab()); + public TabModel getModel() { + return getTab().getModel(); } @Override @@ -88,4 +99,12 @@ String s = super.toString(); return s.substring(s.lastIndexOf(".") + 1) + "<tab: " + tab + ", param: " + param + ">"; } + + protected JComponent getUIObject(String name) { + return getUIObject(name, getUI()); + } + + protected void setTab(SimExplorerTab tab) { + this.tab = tab; + } }

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 05:59:18 +0000 (Tue, 22 Jan 2008) New Revision: 380 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java Log: utilisation accesseur getTab() plutot que la r?\195?\169f?\195?\169rence tab Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java 2008-01-22 05:58:43 UTC (rev 379) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java 2008-01-22 05:59:18 UTC (rev 380) @@ -48,7 +48,7 @@ super.beforeAction(e); // find real action to perform JTabbedPane container = getMainUI().getContent(); - if (tab.isTabVisible(container)) { + if (getTab().isTabVisible(container)) { action = getCloseAction(); } else { action = getShowAction(); @@ -63,14 +63,14 @@ public AbstractAction getCloseAction() { if (closeAction == null) { - closeAction = SimExplorerActionManager.newAction("closeTab_" + tab.name(), (AbstractButton) null); + closeAction = SimExplorerActionManager.newAction("closeTab_" + getTab().name(), (AbstractButton) null); } return closeAction; } public AbstractAction getShowAction() { if (showAction == null) { - showAction = SimExplorerActionManager.newAction("showTab_" + tab.name(), (AbstractButton) null); + showAction = SimExplorerActionManager.newAction("showTab_" + getTab().name(), (AbstractButton) null); } return showAction; }

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 05:58:43 +0000 (Tue, 22 Jan 2008) New Revision: 379 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java Log: correction erreur du calcul du nombre de pages 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 05:57:42 UTC (rev 378) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java 2008-01-22 05:58:43 UTC (rev 379) @@ -63,7 +63,11 @@ } public int getNbPages() { - return (int) (size / width); + int nbPages = (int) (size / width); + if (nbPages==0 && size>0) { + nbPages++; + } + return nbPages; } public void increment() {

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 05:57:42 +0000 (Tue, 22 Jan 2008) New Revision: 378 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: ajout m?\195?\169thodes pour rafraichir ui ?\195?\160 partir du mod?\195?\168le ListTabModel 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 05:57:07 UTC (rev 377) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 05:57:42 UTC (rev 378) @@ -20,10 +20,15 @@ import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; +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.tab.JApplicationListTab; import org.codelutin.i18n.CountryEnum; import org.codelutin.i18n.LanguageEnum; import javax.swing.AbstractButton; +import javax.swing.JComboBox; +import javax.swing.SwingUtilities; import java.util.regex.Matcher; /** @@ -58,4 +63,68 @@ button.setEnabled(enable); } } + + public void refreshListTabUI(final ListTabModel model, final JApplicationListTab ui) { + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + + // refresh changePage combobox + refreshChangePageCombo(ui, model); + + // refresh changeSizor combo + refreshChangeSizorCombo(ui, model); + + // refresh pagination buttons + refreshPagination(ui, model.getPagination()); + + // table data model may have changed, must revalidate + ui.getTable().invalidate(); + + // parent must be repaint (will revalidate layout for table) + ui.repaint(); + } + }); + } + + 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(); + ui.getGoNextPage().setEnabled(notLast); + ui.getGoLastPage().setEnabled(notLast); + } + + protected void refreshChangeSizorCombo(JApplicationListTab ui, ListTabModel model) { + JComboBox combo = ui.getChangeSizor(); + String s = model.getPagination().getWidth() + ""; + if (!s.equals(String.valueOf(combo.getSelectedItem()))) { + combo.setEnabled(false); + combo.setSelectedItem(s); + combo.setEnabled(true); + } + } + + protected void refreshChangePageCombo(JApplicationListTab ui, ListTabModel model) { + JComboBox combo = ui.getGoPage(); + long size = model.getPagination().getNbPages(); + combo.setEnabled(false); + //System.out.println("page old size : " + combo.getItemCount() + " new size : " + size); + if (size < combo.getItemCount()) { + while (size < combo.getItemCount()) { + combo.removeItemAt(combo.getItemCount() - 1); + } + } else { + while (size > combo.getItemCount()) { + combo.addItem(combo.getItemCount()); + } + } + //System.out.println("new page size : " + combo.getItemCount()); + + combo.setSelectedIndex(model.getPagination().getCurrentPage()); + combo.setEnabled(combo.getItemCount() > 1); + } }

1 0

r377 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 05:57:07 +0000 (Tue, 22 Jan 2008) New Revision: 377 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: correction erreur dans algo Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-22 05:56:50 UTC (rev 376) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-22 05:57:07 UTC (rev 377) @@ -1,5 +1,5 @@ /* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, * Tony Chemit * * This program is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * 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.service; import com.healthmarketscience.rmiio.RemoteInputStream; @@ -24,7 +24,8 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; -import java.util.Iterator; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; @@ -32,16 +33,20 @@ /** @author tony */ public class MockStorageServiceImpl implements StorageService { - static final int SIZE = 200; + static final int SIZE = 400; SortedMap<String, MetaDataEntity> mockData; + List<String> mockDataIndex; public SortedMap<String, MetaDataEntity> mockData() { if (mockData == null) { mockData = new TreeMap<String, MetaDataEntity>(); + mockDataIndex = new ArrayList<String>(); MetaDataGenerator generator = new MetaDataGenerator(); for (int i = 0; i < SIZE; i++) { MetaDataEntity metaDataEntity = generator.generateMetaDataEntity(); + metaDataEntity.setName(i + " -- " + metaDataEntity.getName()); mockData.put(metaDataEntity.getUuid(), metaDataEntity); + mockDataIndex.add(metaDataEntity.getUuid()); } } return mockData; @@ -89,22 +94,16 @@ public MetaDataEntity[] findApplications(boolean onlyLatest, int start, int count, int dateOrder) throws Exception { int last = start + count; + System.out.println("ask data from " + start + " width:" + count); SortedMap<String, MetaDataEntity> map = mockData(); if (last > map.size()) { - last = map.size() - last; + last = map.size(); } MetaDataEntity[] result = new MetaDataEntity[last - start]; - int i = 0; - Iterator<MetaDataEntity> it = map.values().iterator(); - for (; it.hasNext();) { - if (i == start) { - break; - } - it.next(); + + for (int i = start; i < last; i++) { + result[i - start] = map.get(mockDataIndex.get(i)); } - for (; i < last; i++) { - result[i - start] = it.next(); - } return result; }

1 0

r376 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 05:56:50 +0000 (Tue, 22 Jan 2008) New Revision: 376 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx Log: plus de valeurs dans sizor 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 02:49:56 UTC (rev 375) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-01-22 05:56:50 UTC (rev 376) @@ -27,6 +27,8 @@ <item value='20'/> <item value='50'/> <item value='100'/> + <item value='200'/> + <item value='500'/> </JComboBox> </JToolBar> </cell>

1 0

r375 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 02:49:56 +0000 (Tue, 22 Jan 2008) New Revision: 375 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java Log: implantation init list ok Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-22 02:45:59 UTC (rev 374) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-22 02:49:56 UTC (rev 375) @@ -22,13 +22,15 @@ import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; -import fr.cemagref.simexplorer.is.ui.swing.bean.PaginationBean; +import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; 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.tab.JApplicationListTab; +import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.JAXXComboBox; +import javax.swing.JTabbedPane; +import java.awt.Component; import java.awt.event.ActionEvent; /** @@ -49,68 +51,84 @@ private static final long serialVersionUID = -5349479338237813002L; + protected Boolean firstTime; + public ShowLocalTabAction(String name) { super(name); } - static ListApplicationBean list; - ListApplicationBean newList; + protected boolean beforeAction(ActionEvent e) throws Exception { - protected boolean beforeAction(ActionEvent e) { + JTabbedPane tabbedPane = getTabContainer(); + JAXXObject ui = tab.getUI(); + if (tab.isTabVisible(tabbedPane)) { + // tab is already visible, just select it + tabbedPane.setSelectedComponent((Component) ui); + return false; + } + + // mark it, after action will push table model + firstTime = ui == null; + ListTabModel model = (ListTabModel) getModel(); - if (model.getList() == null) { + MetaDataEntity[] data = model.getList(); - // first local query, build listBean - newList = new ListApplicationBean(); + if (data == null) { + // first local query, build model + StorageService service = SimExplorer.getStorageService(); + long size = service.findApplicationsCount(false); - try { - StorageService service = SimExplorer.getStorageService(); - long size = service.findApplicationsCount(false); - PaginationBean paginationBean = new PaginationBean(); - paginationBean.setFirstIndex(0); - paginationBean.setSize(size); - paginationBean.setWidth(getContext().getConfig().getSizor()); - newList.setPagination(paginationBean); - MetaDataEntity[] data = service.findApplications(false, (int) paginationBean.getFirstIndex(), paginationBean.getWidth(), -1); - newList.setList(data); - // save in model - model.setList(newList); - } catch (Exception ee) { - ee.printStackTrace(); - } - } else { - newList = model.getList(); + // init pagination + PaginationModel paginationModel = new PaginationModel(); + paginationModel.setFirstIndex(0); + paginationModel.setSize(size); + paginationModel.setWidth(getContext().getConfig().getSizor()); + model.setPagination(paginationModel); + + // obtain datas from service + data = service.findApplications(false, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); + + // save in model + model.setList(data); } - log.info("use local list " + newList); return true; } + @Override protected void afterAction(ActionEvent e) { - if (list == null || newList.getTimestamp() > list.getTimestamp()) { - // nothing to ? + ListTabModel model = (ListTabModel) getModel(); + + if (firstTime) { + + // push model into tableModel JApplicationListTab container = (JApplicationListTab) getTab(); - JApplicationTableModel model = (JApplicationTableModel) container.getTable().getModel(); - model.setData(newList.getList()); + JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel(); + modelTab.setData(model.getList()); + // init pagination - initPagination(newList.getPagination(), container); + initPagination(model.getPagination(), container); } + } - list = newList; + @Override + protected void clear() { + super.clear(); + firstTime = null; } - private void initPagination(PaginationBean bean, JApplicationListTab container) { + public static void initPagination(PaginationModel model, JApplicationListTab container) { JAXXComboBox combo; combo = container.getChangeSizor(); combo.setEnabled(false); - combo.setSelectedItem("" + bean.getWidth()); + combo.setSelectedItem("" + model.getWidth()); combo.setEnabled(true); combo = container.getGoPage(); - long size = bean.getNbPages(); + long size = model.getNbPages(); combo.setEnabled(false); combo.removeAllItems(); for (int i = 0; i < size; i++) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-22 02:45:59 UTC (rev 374) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-22 02:49:56 UTC (rev 375) @@ -21,12 +21,18 @@ import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; -import fr.cemagref.simexplorer.is.ui.swing.bean.PaginationBean; +import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import javax.swing.JTabbedPane; import java.awt.event.ActionEvent; +import java.awt.Component; +import jaxx.runtime.JAXXObject; + /** * Action pour afficher le tab local * @@ -45,34 +51,64 @@ private static final long serialVersionUID = -5349479338237813002L; + protected Boolean firstTime; + public ShowRemoteTabAction(String name) { super(name); } - protected void initAction() throws Exception { + protected boolean beforeAction(ActionEvent e) throws Exception { - StorageService service; + JTabbedPane tabbedPane = getTabContainer(); + JAXXObject ui = tab.getUI(); - ListApplicationBean list; + if (tab.isTabVisible(tabbedPane)) { + // tab is already visible, just select it + tabbedPane.setSelectedComponent((Component) ui); + return false; + } + + // mark it, after action will push table model + firstTime = ui == null; + ListTabModel model = (ListTabModel) getModel(); - if (model.getList() == null) { - // first remote query, - service = SimExplorer.getRemoteStorageService(); + MetaDataEntity[] data = model.getList(); - list = new ListApplicationBean(); + if (data == null) { + // first local query, build model + StorageService service = SimExplorer.getRemoteStorageService(); long size = service.findApplicationsCount(false); - PaginationBean paginationBean = new PaginationBean(); - paginationBean.setFirstIndex(0); - paginationBean.setSize(size); - paginationBean.setWidth(getContext().getConfig().getSizor()); - list.setPagination(paginationBean); - model.setList(list); + + // init pagination + PaginationModel paginationModel = new PaginationModel(); + paginationModel.setFirstIndex(0); + paginationModel.setSize(size); + paginationModel.setWidth(getContext().getConfig().getSizor()); + model.setPagination(paginationModel); + + // obtain datas from service + data = service.findApplications(false, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); + + // save in model + model.setList(data); } - } + return true; + } @Override - protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); + protected void afterAction(ActionEvent e) { + ListTabModel model = (ListTabModel) getModel(); + + if (firstTime) { + + // push model into TableModel + JApplicationListTab container = (JApplicationListTab) getTab(); + JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel(); + modelTab.setData(model.getList()); + + // init pagination + ShowLocalTabAction.initPagination(model.getPagination(), container); + } } } \ No newline at end of file

1 0