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

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

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:45:59 +0000 (Tue, 22 Jan 2008) New Revision: 374 Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java Log: suppression des beans (on utilise uniquement les model d'ui) Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java 2008-01-22 02:45:23 UTC (rev 373) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java 2008-01-22 02:45:59 UTC (rev 374) @@ -1,96 +0,0 @@ -/* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* \#\#% */ -package fr.cemagref.simexplorer.is.ui.swing.bean; - -/** - * Le modèle de pagination d'une liste - * - * @author tony - */ -public class PaginationBean { - - /** the index */ - long firstIndex; - - /** size of the total flow */ - long size; - - /** size of a page */ - int width; - - public long getFirstIndex() { - return firstIndex; - } - - public long getSize() { - return size; - } - - public int getWidth() { - return width; - } - - public boolean hasNext() { - return size - firstIndex > width; - } - - public boolean hasPrevious() { - return firstIndex >= width; - } - - public int getCurrentPage() { - int page = (int) (firstIndex / width); - if (page > 0 && firstIndex % width > 0) { - page++; - } - return page; - } - - public int getNbPages() { - return (int) (size / width); - } - - 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; - } - - public void setSize(long size) { - this.size = size; - } - - public void setWidth(int width) { - this.width = width; - } -}

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:45:23 +0000 (Tue, 22 Jan 2008) New Revision: 373 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/ApplicationBean.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/ListApplicationBean.java Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java Log: suppression des beans (on utilise uniquement les model d'ui) Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/ApplicationBean.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/ApplicationBean.java 2008-01-22 02:12:16 UTC (rev 372) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/ApplicationBean.java 2008-01-22 02:45:23 UTC (rev 373) @@ -1,112 +0,0 @@ -/* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* \#\#% */ -package fr.cemagref.simexplorer.is.ui.swing.bean; - -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.contenttype.ContentType; - -import java.util.Map; -import java.util.Date; - -/** - * Le bean qui contient le détail d'une application, ses métat données, ses - * versions. - * <p/> - * - * @author chemit - */ -public class ApplicationBean { - - protected MetaDataEntity data; - - protected Version[] versions; - - public MetaDataEntity getData() { - return data; - } - - public void setData(MetaDataEntity data) { - this.data = data; - } - - public Version[] getVersions() { - return versions; - } - - public void setVersions(Version[] versions) { - this.versions = versions; - } - - public Map<String, ContentType> getAttachments() { - return getData().getAttachments(); - } - - public Date getCreationDate() { - return getData().getCreationDate(); - } - - public String getDescription() { - return getData().getDescription(); - } - - public Map<String, String> getDescriptors() { - return getData().getDescriptors(); - } - - public String getType() { - return getData().getType(); - } - - public boolean isLatest() { - return getData().isLatest(); - } - - public String getHash() { - return getData().getHash(); - } - - public String getName() { - return getData().getName(); - } - - public String getParentDataUuid() { - return getData().getParentDataUuid(); - } - - public String getParentDataVersion() { - return getData().getParentDataVersion(); - } - - public String getParentVersionUuid() { - return getData().getParentVersionUuid(); - } - - public String getParentVersionVersion() { - return getData().getParentVersionVersion(); - } - - public String getUuid() { - return getData().getUuid(); - } - - public Version getVersion() { - return getData().getVersion(); - } -} \ No newline at end of file Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/ListApplicationBean.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/ListApplicationBean.java 2008-01-22 02:12:16 UTC (rev 372) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/ListApplicationBean.java 2008-01-22 02:45:23 UTC (rev 373) @@ -1,84 +0,0 @@ -/* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* \#\#% */ -package fr.cemagref.simexplorer.is.ui.swing.bean; - -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; - -/** - * Le bean qui contient la liste des meta données des applications, - * ainsi que la position du premier élément de la liste dans le flux d'origin, - * le model de pagination - * <p/> - * On conserve enfin ici aussi la requete de recherche'index du premier élément de la dans le flux - * - * @author chemit - */ -public class ListApplicationBean { - - protected String query; - - protected PaginationBean pagination; - - protected MetaDataEntity[] list; - - public MetaDataEntity[] getList() { - return list; - } - - public String getQuery() { - return query; - } - - public void setQuery(String query) { - this.query = query; - } - - public PaginationBean getPagination() { - return pagination; - } - - public void setPagination(PaginationBean pagination) { - this.pagination = pagination; - } - - public void setList(MetaDataEntity[] list) { - this.list = list; - } - - public MetaDataEntity get(int index) { - checkSize(index); - return getList()[index]; - } - - private void checkSize(int index) { - if (isEmpty() || size() < index) { - throw new IllegalStateException(getClass() + " has size " + size() + " and was required index " + index); - } - } - - public boolean isEmpty() { - return getList().length == 0; - } - - public int size() { - return isEmpty() ? 0 : list.length; - } - - -} Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-01-22 02:12:16 UTC (rev 372) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-01-22 02:45:23 UTC (rev 373) @@ -18,10 +18,15 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.bean.ApplicationBean; import jaxx.runtime.builder.TabModel; +import java.util.Date; +import java.util.Map; + /** * Le model pour un Tab contenant le détail d'une application * @@ -31,11 +36,12 @@ protected SimExplorerTab tab; - protected ApplicationBean bean; - private static final long serialVersionUID = 4851121531481734868L; + protected MetaDataEntity bean; + protected Version[] versions; + public String getName() { return tab.name(); } @@ -44,15 +50,80 @@ return tab; } - public ApplicationBean getBean() { + public MetaDataEntity getBean() { return bean; } + public Version[] getVersions() { + return versions; + } + + public void setVersions(Version[] versions) { + this.versions = versions; + } + + public Map<String, ContentType> getAttachments() { + return getBean().getAttachments(); + } + + public Date getCreationDate() { + return getBean().getCreationDate(); + } + + public String getDescription() { + return getBean().getDescription(); + } + + public Map<String, String> getDescriptors() { + return getBean().getDescriptors(); + } + + public String getType() { + return getBean().getType(); + } + + public boolean isLatest() { + return getBean().isLatest(); + } + + public String getHash() { + return getBean().getHash(); + } + + public String getApplicationName() { + return getBean().getName(); + } + + public String getParentDataUuid() { + return getBean().getParentDataUuid(); + } + + public String getParentDataVersion() { + return getBean().getParentDataVersion(); + } + + public String getParentVersionUuid() { + return getBean().getParentVersionUuid(); + } + + public String getParentVersionVersion() { + return getBean().getParentVersionVersion(); + } + + public String getUuid() { + return getBean().getUuid(); + } + + public Version getVersion() { + return getBean().getVersion(); + } + public void setName(String name) { this.tab = SimExplorerTab.valueOf(name); } - public void setBean(ApplicationBean bean) { + public void setBean(MetaDataEntity bean) { this.bean = bean; } + } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-01-22 02:12:16 UTC (rev 372) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-01-22 02:45:23 UTC (rev 373) @@ -18,8 +18,9 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; +import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; import jaxx.runtime.builder.TabModel; /** @@ -31,8 +32,13 @@ protected SimExplorerTab tab; - protected ListApplicationBean list; + protected String query; + protected PaginationModel pagination; + + protected MetaDataEntity[] list; + + private static final long serialVersionUID = -3623331875470531459L; public String getName() { @@ -43,15 +49,57 @@ return tab; } - public ListApplicationBean getList() { + public String getQuery() { + return query; + } + + public MetaDataEntity[] getList() { return list; } + public PaginationModel getPagination() { + return pagination; + } + + public MetaDataEntity get(int index) { + checkSize(index); + return getList()[index]; + } + + public boolean isEmpty() { + return list == null || getList().length == 0; + } + + public int size() { + return isEmpty() ? 0 : list.length; + } + + private void checkSize(int index) { + if (isEmpty() || size() < index) { + throw new IllegalStateException(getClass() + " has size " + size() + " and was required index " + index); + } + } + + @Override + public String toString() { + String s = super.toString(); + return s.substring(s.lastIndexOf(".") + 1) + "<size: " + size() + ">"; + } + + public void setQuery(String query) { + this.query = query; + } + + public void setPagination(PaginationModel pagination) { + this.pagination = pagination; + } + public void setName(String name) { this.tab = SimExplorerTab.valueOf(name); } - public void setList(ListApplicationBean list) { + + public void setList(MetaDataEntity[] list) { this.list = list; } } Copied: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java (from rev 354, trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/bean/PaginationBean.java) =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/PaginationModel.java 2008-01-22 02:45:23 UTC (rev 373) @@ -0,0 +1,96 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.model; + +/** + * Le modèle de pagination d'une liste + * + * @author tony + */ +public class PaginationModel { + + /** the index */ + long firstIndex; + + /** size of the total flow */ + long size; + + /** size of a page */ + int width; + + public long getFirstIndex() { + return firstIndex; + } + + public long getSize() { + return size; + } + + public int getWidth() { + return width; + } + + public boolean hasNext() { + return size - firstIndex > width; + } + + public boolean hasPrevious() { + return firstIndex >= width; + } + + public int getCurrentPage() { + int page = (int) (firstIndex / width); + if (page > 0 && firstIndex % width > 0) { + page++; + } + return page; + } + + public int getNbPages() { + return (int) (size / width); + } + + 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; + } + + public void setSize(long size) { + this.size = size; + } + + public void setWidth(int width) { + this.width = width; + } +} Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-01-22 02:12:16 UTC (rev 372) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-01-22 02:45:23 UTC (rev 373) @@ -18,8 +18,8 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.bean.ListApplicationBean; import jaxx.runtime.builder.TabModel; /** @@ -31,8 +31,8 @@ protected SimExplorerTab tab; - protected ListApplicationBean listLocal; - protected ListApplicationBean listRemote; + protected MetaDataEntity[] listLocal; + protected MetaDataEntity[] listRemote; private static final long serialVersionUID = -3623331875470531459L; @@ -44,11 +44,11 @@ return tab; } - public ListApplicationBean getListLocal() { + public MetaDataEntity[] getListLocal() { return listLocal; } - public ListApplicationBean getListRemote() { + public MetaDataEntity[] getListRemote() { return listRemote; } @@ -56,11 +56,11 @@ this.tab = SimExplorerTab.valueOf(name); } - public void setListLocal(ListApplicationBean listLocal) { + public void setListLocal(MetaDataEntity[] listLocal) { this.listLocal = listLocal; } - public void setListRemote(ListApplicationBean listRemote) { + public void setListRemote(MetaDataEntity[] listRemote) { this.listRemote = listRemote; } } \ No newline at end of file

1 0

r372 - 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 02:12:16 +0000 (Tue, 22 Jan 2008) New Revision: 372 Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPageAction.java Log: renommage en action ChangePageAction Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPageAction.java 2008-01-22 02:11:51 UTC (rev 371) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPageAction.java 2008-01-22 02:12:16 UTC (rev 372) @@ -1,52 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.ui.swing.action.pagination; - -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.util.SelectActionConfig; - -/** - * Action pour lancer une recherche d'application - * - * @author chemit - */ - at SelectActionConfig( - actionCommand = "goPage", - container = SimExplorerUI.class, - name = "simexplorer.action.pagination.goPage", - shortDescription = "simexplorer.action.pagination.goPage.tooltip", - longDescription = "simexplorer.action.pagination.goPage.help", - selectedIndex = 0 -) -public class GoPageAction extends SimExplorerAbstractAction { - - private static final long serialVersionUID = 448524625085364914L; - - public GoPageAction(String name) { - super(name); - } - - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } -} \ No newline at end of file

1 0

r371 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action: . admin application auth common help pagination tab
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 02:11:51 +0000 (Tue, 22 Jan 2008) New Revision: 371 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAbstractAction.java 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 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/admin/GroupsAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/AdvancedSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ListApplicationsAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ConfigAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/QuitAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/AboutAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/HelpAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/SiteAction.java 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/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 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/ShowDetailTabAction.java 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 trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java Log: supression du container Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAbstractAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ChangeI18nAbstractAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -44,8 +44,8 @@ public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)_(\\w\\w)"); protected LanguageEnum language; + protected CountryEnum country; - protected CountryEnum country; private static final long serialVersionUID = 4180668477670765253L; public ChangeI18nAbstractAction(String name) { @@ -62,8 +62,8 @@ } @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); + public void doAction(java.awt.event.ActionEvent e) { + //TODO Should ask confirm from user since it will close ui, and re instanciate ui getMainUI().getQuit().getAction().actionPerformed(new ActionEvent(this, ActionEvent.ACTION_FIRST, "cancel")); 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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -34,7 +34,7 @@ } @Override - protected void doAction(ActionEvent e) throws Exception { + protected void doAction(ActionEvent e) throws Exception { tab.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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -48,7 +48,7 @@ log.info("source : " + e.getSource()); try { boolean accepted = beforeAction(e); - log.info("doAction : ("+accepted+") : " + getActionName()); + log.info("doAction : (" + accepted + ") : " + getActionName()); if (accepted) { doAction(e); afterAction(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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -20,8 +20,8 @@ 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; -import jaxx.runtime.JAXXObject; import org.apache.commons.beanutils.Converter; import org.codelutin.i18n.I18n; import org.codelutin.util.ConverterUtil; 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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ToggleTabAbstractAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -48,7 +48,7 @@ super.beforeAction(e); // find real action to perform JTabbedPane container = getMainUI().getContent(); - if (tab.isTabVisible(container) ) { + if (tab.isTabVisible(container)) { action = getCloseAction(); } else { action = getShowAction(); @@ -57,7 +57,7 @@ } @Override - protected void doAction(ActionEvent e) throws Exception { + protected void doAction(ActionEvent e) throws Exception { action.actionPerformed(e); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.admin; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** @@ -28,7 +27,7 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "groups", - container = SimExplorerUI.class, + //container = SimExplorerUI.class, name = "simexplorer.action.groups", shortDescription = "simexplorer.action.groups.tooltip", longDescription = "simexplorer.action.groups.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.admin; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** @@ -28,7 +27,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "users", - container = SimExplorerUI.class, name = "simexplorer.action.users", shortDescription = "simexplorer.action.users.tooltip", longDescription = "simexplorer.action.users.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/AdvancedSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/AdvancedSearchApplicationAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/AdvancedSearchApplicationAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,8 +19,6 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import javax.swing.JComboBox; @@ -29,14 +27,13 @@ * * @author tony */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "advancedSearchApplication", - container = SimExplorerUI.class, name = "simexplorer.action.application.advancedSearch", shortDescription = "simexplorer.action.application.advancedSearch.tooltip", longDescription = "simexplorer.action.application.advancedSearch.help", smallIcon = "action/advanced-search.png", - mnemonic='v', + mnemonic = 'v', hideActionText = true ) public class AdvancedSearchApplicationAction extends SimExplorerAbstractAction { @@ -45,7 +42,7 @@ public AdvancedSearchApplicationAction(String name) { super(name); - JComboBox c=null; + JComboBox c = null; } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,22 +19,19 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Pour réduire tous les noeuds de l'arbe d'une application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "collapseAllApplication", - container = SimExplorerUI.class, name = "simexplorer.action.application.collapseAll", shortDescription = "simexplorer.action.application.collapseAll.tooltip", longDescription = "simexplorer.action.application.collapseAll.help", smallIcon = "action/collapseAll.png", - mnemonic='c', + mnemonic = 'c', hideActionText = true ) public class CollapseAllAction extends SimExplorerAbstractAction { @@ -45,9 +42,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,22 +19,19 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Pour dérouler tous les noeuds de l'arbre d'une application * * @author tony */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "expandAllApplication", - container = SimExplorerUI.class, name = "simexplorer.action.application.expandAll", shortDescription = "simexplorer.action.application.expandAll.tooltip", longDescription = "simexplorer.action.application.expandAll.help", smallIcon = "action/expandAll.png", - mnemonic='e', + mnemonic = 'e', hideActionText = true ) public class ExpandAllAction extends SimExplorerAbstractAction { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,22 +19,19 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour exporter une application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "exportApplication", - container = SimExplorerUI.class, name = "simexplorer.action.application.export", shortDescription = "simexplorer.action.application.export.tooltip", longDescription = "simexplorer.action.application.export.help", - smallIcon = "action/export-application.png", - mnemonic='x', + smallIcon = "action/export-application.png", + mnemonic = 'x', hideActionText = false ) public class ExportApplicationAction extends SimExplorerAbstractAction { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,22 +19,19 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action de base pour importer une application * * @author tony */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "importApplication", - container = SimExplorerUI.class, name = "simexplorer.action.application.import", shortDescription = "simexplorer.action.application.import.tooltip", longDescription = "simexplorer.action.application.import.help", - smallIcon = "action/import-application.png", - mnemonic='i', + smallIcon = "action/import-application.png", + mnemonic = 'i', hideActionText = false ) public class ImportApplicationAction extends SimExplorerAbstractAction { @@ -46,9 +43,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/LaunchSynchronizeAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,17 +19,14 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pouyr lancer la synchro * * @author tony */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "launchSynchronize", - container = SimExplorerUI.class, name = "simexplorer.action.synchronize", shortDescription = "simexplorer.action.synchronize.tooltip", longDescription = "simexplorer.action.synchronize.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ListApplicationsAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ListApplicationsAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ListApplicationsAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -26,7 +26,7 @@ * @author tony */ public class ListApplicationsAction extends SimExplorerAbstractAction { - + private static final long serialVersionUID = 6220034344778635703L; public ListApplicationsAction(String name) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,22 +19,19 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour réinitialiser une recherche d'application * * @author tony */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "resetSearchApplication", - container = SimExplorerUI.class, name = "simexplorer.action.application.resetSearch", shortDescription = "simexplorer.action.application.resetSearch.tooltip", longDescription = "simexplorer.action.application.resetSearch.help", smallIcon = "action/reset-search.png", - mnemonic='e', + mnemonic = 'e', hideActionText = true ) public class ResetSearchApplicationAction extends SimExplorerAbstractAction { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,22 +19,19 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour lancer une recherche d'application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "searchApplication", - container = SimExplorerUI.class, name = "simexplorer.action.application.search", shortDescription = "simexplorer.action.application.search.tooltip", longDescription = "simexplorer.action.application.search.help", smallIcon = "action/search.png", - mnemonic='e', + mnemonic = 'e', hideActionText = true ) public class SearchApplicationAction extends SimExplorerAbstractAction { @@ -45,9 +42,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.auth; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** @@ -28,7 +27,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "connect", - container = SimExplorerUI.class, name = "simexplorer.action.connect", shortDescription = "simexplorer.action.connect.tooltip", longDescription = "simexplorer.action.connect.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.auth; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** @@ -28,7 +27,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "unconnect", - container = SimExplorerUI.class, name = "simexplorer.action.unconnect", shortDescription = "simexplorer.action.unconnect.tooltip", longDescription = "simexplorer.action.unconnect.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,13 +18,11 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.common; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; /** @author chemit */ @jaxx.runtime.builder.ActionConfig( actionCommand = "i18n_fr_FR", - container = SimExplorerUI.class, name = "simexplorer.action.i18n.fr", shortDescription = "simexplorer.action.i18n.fr.tooltip", longDescription = "simexplorer.action.i18n.fr.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,13 +18,11 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.common; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; /** @author chemit */ @jaxx.runtime.builder.ActionConfig( actionCommand = "i18n_en_GB", - container = SimExplorerUI.class, name = "simexplorer.action.i18n.en", shortDescription = "simexplorer.action.i18n.en.tooltip", longDescription = "simexplorer.action.i18n.en.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ConfigAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ConfigAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ConfigAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,8 +19,6 @@ package fr.cemagref.simexplorer.is.ui.swing.action.common; import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; import org.codelutin.option.ui.ConfigTableModel; @@ -29,9 +27,8 @@ * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "config", - container = SimExplorerUI.class, name = "simexplorer.action.config", shortDescription = "simexplorer.action.config.tooltip", longDescription = "simexplorer.action.config.help", @@ -48,8 +45,7 @@ } @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); + public void doAction(java.awt.event.ActionEvent e) { JConfigUI.showUI(getContext().getConfig(), ConfigTableModel.TypeModel.all); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/QuitAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/QuitAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/QuitAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,17 +19,14 @@ package fr.cemagref.simexplorer.is.ui.swing.action.common; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour quitter l'application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "quit", - container = SimExplorerUI.class, name = "simexplorer.action.quit", shortDescription = "simexplorer.action.quit.tooltip", longDescription = "simexplorer.action.quit.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/AboutAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/AboutAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/AboutAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.help; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** @@ -28,7 +27,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "about", - container = SimExplorerUI.class, name = "simexplorer.action.about", shortDescription = "simexplorer.action.about.tooltip", longDescription = "simexplorer.action.about.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/HelpAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/HelpAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/HelpAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.help; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** @@ -28,7 +27,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "help", - container = SimExplorerUI.class, name = "simexplorer.action.help", shortDescription = "simexplorer.action.help.tooltip", longDescription = "simexplorer.action.help.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/SiteAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/SiteAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/SiteAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.help; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** @@ -28,7 +27,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "site", - container = SimExplorerUI.class, name = "simexplorer.action.site", shortDescription = "simexplorer.action.site.tooltip", longDescription = "simexplorer.action.site.help", Copied: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java (from rev 331, trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPageAction.java) =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -0,0 +1,81 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.swing.action.pagination; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import jaxx.runtime.JAXXObject; + +import javax.swing.Action; +import javax.swing.JComboBox; +import java.awt.event.ActionEvent; + +/** + * Action pour lancer une recherche d'application + * + * @author chemit + */ + at 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", + selectedIndex = -1 +) +public class ChangePageAction extends SimExplorerAbstractTabAction { + + private static final long serialVersionUID = 448524625085364914L; + + protected int selectedIndex; + protected int newIndex; + + public ChangePageAction(String name) { + super(name, null); + } + + @Override + public String toString() { + return super.toString() + " oldIndex:" + selectedIndex + ", newIndex:" + newIndex; + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + super.beforeAction(e); + newIndex = getComboBox().getSelectedIndex(); + return newIndex != selectedIndex; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + + super.doAction(e); + // deal with PaginationBean and ListApplicationBean + } + + @Override + protected void afterAction(ActionEvent e) throws Exception { + super.afterAction(e); + selectedIndex = newIndex; + } + + protected JComboBox getComboBox() { + return (JComboBox) ((JAXXObject) getTab()).getObjectById((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/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,33 +19,63 @@ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.util.SelectActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import jaxx.runtime.JAXXObject; +import javax.swing.Action; +import javax.swing.JComboBox; +import java.awt.event.ActionEvent; + /** * Action pour lancer une recherche d'application * * @author chemit */ - at SelectActionConfig( + at jaxx.runtime.builder.SelectActionConfig( actionCommand = "changeSizor", container = SimExplorerUI.class, name = "simexplorer.action.pagination.changeSizor", shortDescription = "simexplorer.action.pagination.changeSizor.tooltip", longDescription = "simexplorer.action.pagination.changeSizor.help", - selectedIndex = 3 + selectedIndex = -1 ) -public class ChangeSizorAction extends SimExplorerAbstractAction { +public class ChangeSizorAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 5137512273375524199L; + protected int selectedIndex; + protected int newIndex; + public ChangeSizorAction(String name) { - super(name); + super(name, null); } @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO + protected boolean beforeAction(ActionEvent e) throws Exception { + super.beforeAction(e); + newIndex = getComboBox().getSelectedIndex(); + return getComboBox().isEnabled() && newIndex != selectedIndex; } + + @Override + protected void doAction(ActionEvent e) throws Exception { + + super.doAction(e); + // deal with PaginationBean and ListApplicationBean + + } + + @Override + protected void afterAction(ActionEvent e) throws Exception { + super.afterAction(e); + selectedIndex = newIndex; + } + + protected JComboBox getComboBox() { + return (JComboBox) ((JAXXObject) getTab()).getObjectById((String) getValue(Action.ACTION_COMMAND_KEY)); + } + + @Override + public String toString() { + return super.toString() + " oldIndex:" + selectedIndex + ", newIndex:" + newIndex; + } } \ No newline at end of file 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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,31 +18,28 @@ * ##% */ 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.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; /** * Action pour lancer une recherche d'application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "goFirstPage", - container = SimExplorerUI.class, name = "simexplorer.action.pagination.goFirstPage", shortDescription = "simexplorer.action.pagination.goFirstPage.tooltip", longDescription = "simexplorer.action.pagination.goFirstPage.help", smallIcon = "action/go-first.png", - mnemonic='f', + mnemonic = 'f', hideActionText = true ) -public class GoFirstPageAction extends SimExplorerAbstractAction { +public class GoFirstPageAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -7292269279566418188L; public GoFirstPageAction(String name) { - super(name); + super(name, null); } @Override 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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,31 +18,28 @@ * ##% */ 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.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; /** * Action pour lancer une recherche d'application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "goLastPage", - container = SimExplorerUI.class, name = "simexplorer.action.pagination.goLastPage", shortDescription = "simexplorer.action.pagination.goLastPage.tooltip", longDescription = "simexplorer.action.pagination.goLastPage.help", smallIcon = "action/go-last.png", - mnemonic='f', + mnemonic = 'f', hideActionText = true ) -public class GoLastPageAction extends SimExplorerAbstractAction { +public class GoLastPageAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 3453164752580608948L; public GoLastPageAction(String name) { - super(name); + super(name, null); } @Override 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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -19,22 +19,19 @@ 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.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; /** * Action pour lancer une recherche d'application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "goNextPage", - container = SimExplorerUI.class, name = "simexplorer.action.pagination.goNextPage", shortDescription = "simexplorer.action.pagination.goNextPage.tooltip", longDescription = "simexplorer.action.pagination.goNextPage.help", smallIcon = "action/go-next.png", - mnemonic='f', + mnemonic = 'f', hideActionText = true ) public class GoNextPageAction extends SimExplorerAbstractAction { @@ -45,9 +42,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ 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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,36 +18,28 @@ * ##% */ 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.util.ActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; /** * Action pour lancer une recherche d'application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "goPreviousPage", - container = SimExplorerUI.class, name = "simexplorer.action.pagination.goPreviousPage", shortDescription = "simexplorer.action.pagination.goPreviousPage.tooltip", longDescription = "simexplorer.action.pagination.goPreviousPage.help", smallIcon = "action/go-previous.png", - mnemonic='f', + mnemonic = 'f', hideActionText = true ) -public class GoPreviousPageAction extends SimExplorerAbstractAction { +public class GoPreviousPageAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 3318383412609641337L; public GoPreviousPageAction(String name) { - super(name); + super(name, null); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file 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 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -29,7 +29,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "closeTab", - container = fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader.class, name = "simexplorer.action.closeTab", shortDescription = "simexplorer.action.closeTab.tooltip", longDescription = "simexplorer.action.closeTab.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; /** @@ -28,7 +27,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "showTab_detail", - container = SimExplorerUI.class, name = "simexplorer.action.show.detail", shortDescription = "simexplorer.action.show.detail.tooltip", longDescription = "simexplorer.action.show.detail.help", 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:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -21,7 +21,6 @@ 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.SimExplorerUI; 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; @@ -39,7 +38,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "showtag_local", - container = SimExplorerUI.class, name = "simexplorer.action.show.local", shortDescription = "simexplorer.action.show.local.tooltip", longDescription = "simexplorer.action.show.local.help", 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:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -20,7 +20,6 @@ import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; 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; @@ -35,7 +34,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "showtag_remote", - container = SimExplorerUI.class, name = "simexplorer.action.show.remote", shortDescription = "simexplorer.action.show.remote.tooltip", longDescription = "simexplorer.action.show.remote.help", Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java 2008-01-22 02:05:00 UTC (rev 370) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java 2008-01-22 02:11:51 UTC (rev 371) @@ -18,7 +18,6 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; /** @@ -28,7 +27,6 @@ */ @jaxx.runtime.builder.ActionConfig( actionCommand = "showtag_synchronize", - container = SimExplorerUI.class, name = "simexplorer.action.show.synchronize", shortDescription = "simexplorer.action.show.synchronize.tooltip", longDescription = "simexplorer.action.show.synchronize.help",

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:05:00 +0000 (Tue, 22 Jan 2008) New Revision: 370 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java Log: utilisation action abstraite Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java 2008-01-22 02:04:35 UTC (rev 369) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nFRAction.java 2008-01-22 02:05:00 UTC (rev 370) @@ -18,22 +18,21 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.common; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAction; +import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; /** @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "i18n_fr_FR", container = SimExplorerUI.class, name = "simexplorer.action.i18n.fr", shortDescription = "simexplorer.action.i18n.fr.tooltip", longDescription = "simexplorer.action.i18n.fr.help", - mnemonic='F', + mnemonic = 'F', //smallIcon = "action/i18n.fr.png", hideActionText = false ) -public class ChangeI18nFRAction extends ChangeI18nAction { +public class ChangeI18nFRAction extends ChangeI18nAbstractAction { private static final long serialVersionUID = 7616779035801280791L; public ChangeI18nFRAction(String name) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java 2008-01-22 02:04:35 UTC (rev 369) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/common/ChangeI18nGBAction.java 2008-01-22 02:05:00 UTC (rev 370) @@ -18,22 +18,21 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.common; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAction; +import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; /** @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "i18n_en_GB", container = SimExplorerUI.class, name = "simexplorer.action.i18n.en", shortDescription = "simexplorer.action.i18n.en.tooltip", longDescription = "simexplorer.action.i18n.en.help", - mnemonic='n', + mnemonic = 'n', //smallIcon = "action/i18n-en.png", hideActionText = false ) -public class ChangeI18nGBAction extends ChangeI18nAction { +public class ChangeI18nGBAction extends ChangeI18nAbstractAction { private static final long serialVersionUID = 7616779035801280791L; public ChangeI18nGBAction(String name) {

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:04:35 +0000 (Tue, 22 Jan 2008) New Revision: 369 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java Log: actions ?\195?\160 implanter Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java 2008-01-22 02:03:58 UTC (rev 368) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/GroupsAction.java 2008-01-22 02:04:35 UTC (rev 369) @@ -18,22 +18,22 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.admin; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** * Action pour afficher la page de gestion des groupes d'utilisateurs * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "groups", container = SimExplorerUI.class, name = "simexplorer.action.groups", shortDescription = "simexplorer.action.groups.tooltip", longDescription = "simexplorer.action.groups.help", //smallIcon = "action/groups.png", + smallIcon = "action/users.png", mnemonic = 'G', hideActionText = false ) @@ -45,9 +45,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java 2008-01-22 02:03:58 UTC (rev 368) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java 2008-01-22 02:04:35 UTC (rev 369) @@ -18,16 +18,15 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.admin; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** * Action pour voir la gestion des utilisateurs * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "users", container = SimExplorerUI.class, name = "simexplorer.action.users", @@ -45,9 +44,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:03:58 +0000 (Tue, 22 Jan 2008) New Revision: 368 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java Log: actions ?\195?\160 implanter Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-22 02:03:20 UTC (rev 367) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-22 02:03:58 UTC (rev 368) @@ -20,21 +20,20 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; /** * Action de connexion au serveur distant * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "connect", container = SimExplorerUI.class, name = "simexplorer.action.connect", shortDescription = "simexplorer.action.connect.tooltip", longDescription = "simexplorer.action.connect.help", //smallIcon = "action/connect.png", - mnemonic='C', + mnemonic = 'C', hideActionText = false ) public class ConnectAction extends SimExplorerAbstractAction { @@ -45,9 +44,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO appeler le service Auth - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-22 02:03:20 UTC (rev 367) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-22 02:03:58 UTC (rev 368) @@ -18,22 +18,21 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.auth; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** * Action pour se deconnecter du serveur distant * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "unconnect", container = SimExplorerUI.class, name = "simexplorer.action.unconnect", shortDescription = "simexplorer.action.unconnect.tooltip", longDescription = "simexplorer.action.unconnect.help", - mnemonic='n', + mnemonic = 'n', //smallIcon = "action/unconnect.png", hideActionText = false ) @@ -44,10 +43,4 @@ public UnconnectAction(String name) { super(name); } - - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO appel au service auth ? - } } \ No newline at end of file

1 0

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

22 Jan '08

Author: tchemit Date: 2008-01-22 02:03:20 +0000 (Tue, 22 Jan 2008) New Revision: 367 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/AboutAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/HelpAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/SiteAction.java Log: actions ?\195?\160 implanter Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/AboutAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/AboutAction.java 2008-01-22 02:02:06 UTC (rev 366) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/AboutAction.java 2008-01-22 02:03:20 UTC (rev 367) @@ -18,16 +18,15 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.help; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** * Action pour afficher la boit de dialogue About de l'application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "about", container = SimExplorerUI.class, name = "simexplorer.action.about", @@ -45,9 +44,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/HelpAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/HelpAction.java 2008-01-22 02:02:06 UTC (rev 366) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/HelpAction.java 2008-01-22 02:03:20 UTC (rev 367) @@ -18,16 +18,15 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.help; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** * Action pour afficher l'aide principale * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "help", container = SimExplorerUI.class, name = "simexplorer.action.help", @@ -45,9 +44,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/SiteAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/SiteAction.java 2008-01-22 02:02:06 UTC (rev 366) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/help/SiteAction.java 2008-01-22 02:03:20 UTC (rev 367) @@ -18,16 +18,15 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.help; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; /** * Action pour accéder au site de l'application * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "site", container = SimExplorerUI.class, name = "simexplorer.action.site", @@ -45,9 +44,4 @@ super(name); } - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } } \ No newline at end of file

1 0

r366 - 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:02:06 +0000 (Tue, 22 Jan 2008) New Revision: 366 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 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 trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java Log: utilisation action abstraite Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-22 02:01:46 UTC (rev 365) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-22 02:02:06 UTC (rev 366) @@ -19,15 +19,14 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; /** * Action pour afficher le tab local * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "showTab_detail", container = SimExplorerUI.class, name = "simexplorer.action.show.detail", @@ -37,11 +36,11 @@ mnemonic = 'd', hideActionText = false ) -public class ShowDetailTabAction extends SimExplorerAbstractTabAction { +public class ShowDetailTabAction extends ShowTabAbstractAction { private static final long serialVersionUID = 6643631041114311643L; public ShowDetailTabAction(String name) { - super(name, "showTab"); + super(name); } } 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:01:46 UTC (rev 365) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-22 02:02:06 UTC (rev 366) @@ -18,19 +18,26 @@ * \#\#% */ 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.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +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.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.bean.PaginationBean; +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.swing.JAXXComboBox; +import java.awt.event.ActionEvent; + /** * Action pour afficher le tab local * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "showtag_local", container = SimExplorerUI.class, name = "simexplorer.action.show.local", @@ -40,32 +47,79 @@ mnemonic = 'A', hideActionText = false ) -public class ShowLocalTabAction extends SimExplorerAbstractTabAction { +public class ShowLocalTabAction extends ShowTabAbstractAction { private static final long serialVersionUID = -5349479338237813002L; public ShowLocalTabAction(String name) { - super(name, "showTab"); + super(name); + } - protected void initAction() { + static ListApplicationBean list; + ListApplicationBean newList; - StorageService service; + protected boolean beforeAction(ActionEvent e) { - ListApplicationBean list; - if (getContext().getLocalApplications() == null) { + ListTabModel model = (ListTabModel) getModel(); - service = SimExplorer.getStorageService(); + if (model.getList() == null) { - // first local query, - list = new ListApplicationBean(); + // first local query, build listBean + newList = new ListApplicationBean(); + try { - long size = service.findApplicationsCount(true); + 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(); + } + log.info("use local list " + newList); + return true; + } + protected void afterAction(ActionEvent e) { + if (list == null || newList.getTimestamp() > list.getTimestamp()) { + // nothing to ? + JApplicationListTab container = (JApplicationListTab) getTab(); + JApplicationTableModel model = (JApplicationTableModel) container.getTable().getModel(); + model.setData(newList.getList()); + // init pagination + initPagination(newList.getPagination(), container); + } - } catch (Exception e) { - e.printStackTrace(); - } + list = newList; + } + + private void initPagination(PaginationBean bean, JApplicationListTab container) { + JAXXComboBox combo; + + combo = container.getChangeSizor(); + combo.setEnabled(false); + combo.setSelectedItem("" + bean.getWidth()); + combo.setEnabled(true); + + combo = container.getGoPage(); + long size = bean.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 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:01:46 UTC (rev 365) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-22 02:02:06 UTC (rev 366) @@ -21,16 +21,19 @@ import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +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.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.bean.PaginationBean; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import java.awt.event.ActionEvent; + /** * Action pour afficher le tab local * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "showtag_remote", container = SimExplorerUI.class, name = "simexplorer.action.show.remote", @@ -40,26 +43,38 @@ mnemonic = 'p', hideActionText = false ) -public class ShowRemoteTabAction extends SimExplorerAbstractTabAction { +public class ShowRemoteTabAction extends ShowTabAbstractAction { private static final long serialVersionUID = -5349479338237813002L; public ShowRemoteTabAction(String name) { - super(name, "showTab"); + super(name); } + protected void initAction() throws Exception { - protected void initAction() { - StorageService service; ListApplicationBean list; - if (getContext().getRemoteApplications() == null) { + ListTabModel model = (ListTabModel) getModel(); + + if (model.getList() == null) { // first remote query, service = SimExplorer.getRemoteStorageService(); list = new ListApplicationBean(); - + 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); } } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java 2008-01-22 02:01:46 UTC (rev 365) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java 2008-01-22 02:02:06 UTC (rev 366) @@ -19,15 +19,14 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; /** * Action pour afficher le tab de synchronisation * * @author chemit */ - at ActionConfig( + at jaxx.runtime.builder.ActionConfig( actionCommand = "showtag_synchronize", container = SimExplorerUI.class, name = "simexplorer.action.show.synchronize", @@ -37,12 +36,12 @@ mnemonic = 'S', hideActionText = false ) -public class ShowSynchronizeTabAction extends SimExplorerAbstractTabAction { +public class ShowSynchronizeTabAction extends ShowTabAbstractAction { private static final long serialVersionUID = -5349479338237813002L; public ShowSynchronizeTabAction(String name) { - super(name, "showTab"); + super(name); } }

1 0