Author: tchemit Date: 2008-01-21 04:43:29 +0000 (Mon, 21 Jan 2008) New Revision: 327 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ChangeSizorAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoFirstPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoLastPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoNextPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPreviousPageAction.java Removed: trunk/simexplorer-is-swing/src/resources/icons/collapseall.png trunk/simexplorer-is-swing/src/resources/icons/expandall.png trunk/simexplorer-is-swing/src/resources/icons/go-last.png trunk/simexplorer-is-swing/src/resources/icons/go-next.png 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/application/AdvancedSearchApplicationAction.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/ResetSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java Log: suppression des derni?\195?\168res toolbar, int?\195?\169gration toolbar de pagination 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-21 04:42:53 UTC (rev 326) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/admin/UsersAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -33,7 +33,7 @@ name = "simexplorer.action.users", shortDescription = "simexplorer.action.users.tooltip", longDescription = "simexplorer.action.users.help", - //smallIcon = "action/users.png", + smallIcon = "action/users.png", mnemonic = 'U', hideActionText = false ) 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-21 04:42:53 UTC (rev 326) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/AdvancedSearchApplicationAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -22,6 +22,8 @@ import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import javax.swing.JComboBox; + /** * Action pour réinitialiser une recherche d'application * @@ -33,9 +35,9 @@ name = "simexplorer.action.application.advancedSearch", shortDescription = "simexplorer.action.application.advancedSearch.tooltip", longDescription = "simexplorer.action.application.advancedSearch.help", - //smallIcon = "action/advancedSearch.png", + smallIcon = "action/advanced-search.png", mnemonic='v', - hideActionText = false + hideActionText = true ) public class AdvancedSearchApplicationAction extends SimExplorerAbstractAction { @@ -43,6 +45,8 @@ public AdvancedSearchApplicationAction(String name) { super(name); + JComboBox c=null; + } @Override Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ChangeSizorAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ChangeSizorAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -0,0 +1,51 @@ +/* +* ##% 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.application; + +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 = "changeSizor", + container = SimExplorerUI.class, + name = "simexplorer.action.pagination.changeSizor", + shortDescription = "simexplorer.action.pagination.changeSizor.tooltip", + longDescription = "simexplorer.action.pagination.changeSizor.help", + selectedIndex = 3 +) +public class ChangeSizorAction extends SimExplorerAbstractAction { + private static final long serialVersionUID = 5137512273375524199L; + + public ChangeSizorAction(String name) { + 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/ExportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-01-21 04:42:53 UTC (rev 326) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -33,8 +33,7 @@ name = "simexplorer.action.application.export", shortDescription = "simexplorer.action.application.export.tooltip", longDescription = "simexplorer.action.application.export.help", - //smallIcon = "action/export-application.png", - smallIcon = "action/fileexport.png", + smallIcon = "action/export-application.png", mnemonic='x', hideActionText = false ) Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoFirstPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoFirstPageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoFirstPageAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -0,0 +1,53 @@ +/* +* ##% 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.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( + 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', + hideActionText = true +) +public class GoFirstPageAction extends SimExplorerAbstractAction { + + private static final long serialVersionUID = -7292269279566418188L; + + public GoFirstPageAction(String name) { + super(name); + } + + @Override + public void actionPerformed(java.awt.event.ActionEvent e) { + super.actionPerformed(e); + //TODO + } +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoLastPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoLastPageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoLastPageAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -0,0 +1,53 @@ +/* +* ##% 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.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( + 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', + hideActionText = true +) +public class GoLastPageAction extends SimExplorerAbstractAction { + + private static final long serialVersionUID = 3453164752580608948L; + + public GoLastPageAction(String name) { + super(name); + } + + @Override + public void actionPerformed(java.awt.event.ActionEvent e) { + super.actionPerformed(e); + //TODO + } +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoNextPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoNextPageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoNextPageAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -0,0 +1,53 @@ +/* +* ##% 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.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( + 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', + hideActionText = true +) +public class GoNextPageAction extends SimExplorerAbstractAction { + + private static final long serialVersionUID = 836465304625059733L; + + public GoNextPageAction(String name) { + super(name); + } + + @Override + public void actionPerformed(java.awt.event.ActionEvent e) { + super.actionPerformed(e); + //TODO + } +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPageAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -0,0 +1,52 @@ +/* +* ##% 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.application; + +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 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPreviousPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPreviousPageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPreviousPageAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -0,0 +1,53 @@ +/* +* ##% 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.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( + 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', + hideActionText = true +) +public class GoPreviousPageAction extends SimExplorerAbstractAction { + + private static final long serialVersionUID = 3318383412609641337L; + + public GoPreviousPageAction(String name) { + 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/ImportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java 2008-01-21 04:42:53 UTC (rev 326) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ImportApplicationAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -33,9 +33,8 @@ name = "simexplorer.action.application.import", shortDescription = "simexplorer.action.application.import.tooltip", longDescription = "simexplorer.action.application.import.help", - //smallIcon = "action/import-application.png", - smallIcon = "action/fileimport.png", - mnemonic='x', + smallIcon = "action/import-application.png", + mnemonic='i', hideActionText = false ) public class ImportApplicationAction extends SimExplorerAbstractAction { 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-21 04:42:53 UTC (rev 326) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -33,9 +33,9 @@ name = "simexplorer.action.application.resetSearch", shortDescription = "simexplorer.action.application.resetSearch.tooltip", longDescription = "simexplorer.action.application.resetSearch.help", - smallIcon = "action/resetSearch.png", + smallIcon = "action/reset-search.png", mnemonic='e', - hideActionText = false + 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-21 04:42:53 UTC (rev 326) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-21 04:43:29 UTC (rev 327) @@ -35,7 +35,7 @@ longDescription = "simexplorer.action.application.search.help", smallIcon = "action/search.png", mnemonic='e', - hideActionText = false + hideActionText = true ) public class SearchApplicationAction extends SimExplorerAbstractAction { Deleted: trunk/simexplorer-is-swing/src/resources/icons/collapseall.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/expandall.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/go-last.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/go-next.png =================================================================== (Binary files differ)