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