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

r334 - in trunk: simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages simexplorer-is-web/src/main/webapp
by glandais＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

Author: glandais Date: 2008-01-21 09:35:17 +0000 (Mon, 21 Jan 2008) New Revision: 334 Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationService.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityTestCase.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml Log: User/group edit Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurity.java 2008-01-21 09:35:17 UTC (rev 334) @@ -40,4 +40,6 @@ public List<User> getUsersOfGroup(Group group); + public List<Group> getGroupsOfUser(User user); + } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-21 09:35:17 UTC (rev 334) @@ -105,4 +105,10 @@ .setParameter("group", group).getResultList(); } + public List<Group> getGroupsOfUser(User user) { + return em.createQuery( + "select distinct u.groups from User u where u = :user") + .setParameter("user", user).getResultList(); + } + } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationService.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationService.java 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationService.java 2008-01-21 09:35:17 UTC (rev 334) @@ -30,6 +30,10 @@ public void setUsersOfGroup(Group group, Integer[] usersInGroup); + public Group[] getGroupsOfUser(User user); + + public void setGroupsOfUser(User user, Integer[] groupsIds); + public Group saveGroup(String name, User owner); public Group getGroup(Integer id); Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-21 09:35:17 UTC (rev 334) @@ -222,13 +222,28 @@ for (Integer idUser : usersToAdd) { User user = dao.getUser(idUser); user.getGroups().add(group); - dao.saveUser(user); + dao.updateUser(user); } for (Integer idUser : usersToRemove) { User user = dao.getUser(idUser); removeUserFromGroup(user, group); - dao.saveUser(user); + dao.updateUser(user); } } + public void setGroupsOfUser(User user, Integer[] groupsIds) { + User realUser = dao.getUser(user.getId()); + realUser.getGroups().clear(); + for (int i = 0; i < groupsIds.length; i++) { + Group group = dao.getGroup(groupsIds[i]); + realUser.getGroups().add(group); + } + dao.updateUser(user); + + } + + public Group[] getGroupsOfUser(User user) { + return dao.getGroupsOfUser(user).toArray(new Group[0]); + } + } Modified: trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityTestCase.java =================================================================== --- trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityTestCase.java 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityTestCase.java 2008-01-21 09:35:17 UTC (rev 334) @@ -29,6 +29,14 @@ } public void testSecurityEntities() { + /* + User user = authenticationService.getUser("user3"); + Group[] groups = authenticationService.getGroupsOfUser(user); + for (Group group : groups) { + System.out.println(group.getName()); + } + */ + User[] simpleUsers = new User[20]; for (int i = 0; i < 20; i++) { simpleUsers[i] = authenticationService.saveUser("user" + i, @@ -60,6 +68,7 @@ superAdminUser.setAdmin(true); superAdminUser.setSuperAdmin(true); authenticationService.updateUser(superAdminUser); + /* User[] users = new User[10]; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-21 09:35:17 UTC (rev 334) @@ -1,5 +1,7 @@ package fr.cemagref.simexplorer.is.ui.web.pages; +import java.util.ArrayList; +import java.util.List; import java.util.StringTokenizer; import javax.naming.NamingException; @@ -24,20 +26,21 @@ private StringValueEncoder stringEncoder = new StringValueEncoder(); @Persist - private String[] usersInGroup; + private List<String> usersInGroup; + @Persist + private List<String> groupsInGroup; + void setup(int groupId) throws NamingException { + this.usersInGroup = new ArrayList<String>(); if (groupId == -1) { this.group = new Group(); - this.usersInGroup = new String[0]; } else { this.group = ServiceFactory.getSecurityService().getGroup(groupId); User[] users = ServiceFactory.getSecurityService().getUsersOfGroup( group); - this.usersInGroup = new String[users.length]; - for (int i = 0; i < users.length; i++) { - this.usersInGroup[i] = users[i].getId() + "/" - + users[i].getLogin(); + for (User user : users) { + this.usersInGroup.add(user.getId() + "/" + user.getLogin()); } } } @@ -49,12 +52,27 @@ } else { ServiceFactory.getSecurityService().updateGroup(group); } - Integer[] usersIds = new Integer[usersInGroup.length]; - for (int i = 0; i < usersIds.length; i++) { - StringTokenizer st = new StringTokenizer(usersInGroup[i], "/"); + + Integer[] usersIds = new Integer[usersInGroup.size()]; + int i = 0; + for (String user : usersInGroup) { + StringTokenizer st = new StringTokenizer(user, "/"); usersIds[i] = new Integer(st.nextToken()); + i++; } ServiceFactory.getSecurityService().setUsersOfGroup(group, usersIds); + + /* + Integer[] groupsIds = new Integer[groupsInGroup.size()]; + i = 0; + for (String group : groupsInGroup) { + StringTokenizer st = new StringTokenizer(group, "/"); + groupsIds[i] = new Integer(st.nextToken()); + i++; + } + ServiceFactory.getSecurityService().setGroupsOfGroup(group, groupsIds); + */ + return groupList; } @@ -62,20 +80,21 @@ return groupList; } - public String[] getUsers() throws NamingException { + public List<String> getUsers() throws NamingException { User[] users = ServiceFactory.getSecurityService().getUsers(); - String[] result = new String[users.length]; + List<String> result = new ArrayList<String>(); for (int i = 0; i < users.length; i++) { - result[i] = users[i].getId() + "/" + users[i].getLogin(); + result.add(users[i].getId() + "/" + users[i].getLogin()); } return result; } - public String[] getUsersInGroup() throws NamingException { + public List<String> getUsersInGroup() throws NamingException { return usersInGroup; } - public void setUsersInGroup(String[] usersInGroup) throws NamingException { + public void setUsersInGroup(List<String> usersInGroup) + throws NamingException { this.usersInGroup = usersInGroup; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-01-21 09:35:17 UTC (rev 334) @@ -1,10 +1,16 @@ package fr.cemagref.simexplorer.is.ui.web.pages; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + import javax.naming.NamingException; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.internal.services.StringValueEncoder; +import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.ui.web.pages.security.AdminPage; import fr.cemagref.simexplorer.is.ui.web.services.ServiceFactory; @@ -17,24 +23,55 @@ @InjectPage private UserList userList; + private StringValueEncoder stringEncoder = new StringValueEncoder(); + + @Persist + private List<String> groupsOfUser; + void setup(int groupId) throws NamingException { + this.groupsOfUser = new ArrayList<String>(); if (groupId == -1) { this.user = new User(); } else { this.user = ServiceFactory.getSecurityService().getUser(groupId); + Group[] groups = ServiceFactory.getSecurityService() + .getGroupsOfUser(this.user); + for (Group group : groups) { + groupsOfUser.add(group.getId() + "/" + group.getName()); + } } } public Object onSuccess() throws NamingException { + if (user.getId() == null) { ServiceFactory.getSecurityService().saveUser(user.getLogin(), user.getMail()); } else { ServiceFactory.getSecurityService().updateUser(user); } + + Integer[] groupsIds = new Integer[groupsOfUser.size()]; + int i = 0; + for (String group : groupsOfUser) { + StringTokenizer st = new StringTokenizer(group, "/"); + groupsIds[i] = new Integer(st.nextToken()); + i++; + } + ServiceFactory.getSecurityService().setGroupsOfUser(user, groupsIds); + return userList; } + public List<String> getGroups() throws NamingException { + Group[] groups = ServiceFactory.getSecurityService().getGroups(); + List<String> result = new ArrayList<String>(); + for (int i = 0; i < groups.length; i++) { + result.add(groups[i].getId() + "/" + groups[i].getName()); + } + return result; + } + public Object onActionFromCancel() { return userList; } @@ -51,4 +88,16 @@ return user; } + public List<String> getGroupsOfUser() { + return groupsOfUser; + } + + public void setGroupsOfUser(List<String> groupsOfUser) { + this.groupsOfUser = groupsOfUser; + } + + public StringValueEncoder getStringEncoder() { + return stringEncoder; + } + } Modified: trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml 2008-01-21 09:35:17 UTC (rev 334) @@ -14,11 +14,10 @@ <input t:type="Palette" model="users" selected="usersInGroup" encoder="stringEncoder"/> </p> - + <input t:type="Submit" t:value="message:submit" /> <a t:type="actionlink" t:id="cancel">${message:cancel}</a> Modified: trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-01-21 04:50:07 UTC (rev 333) +++ trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-01-21 09:35:17 UTC (rev 334) @@ -19,6 +19,10 @@ t:id="resetPassword" t:context="user.id">${message:resetPassword}</a> </p> + <p>${message:memberOf} : + <input t:type="Palette" model="groups" selected="groupsOfUser" encoder="stringEncoder"/> + </p> + <input t:type="Submit" t:value="message:submit" /> <a t:type="actionlink" t:id="cancel">${message:cancel}</a> </t:form>

1 0

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

21 Jan '08

Author: tchemit Date: 2008-01-21 04:50:07 +0000 (Mon, 21 Jan 2008) New Revision: 333 Removed: 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 Log: creation paquetage pagination Deleted: 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 2008-01-21 04:49:55 UTC (rev 332) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ChangeSizorAction.java 2008-01-21 04:50:07 UTC (rev 333) @@ -1,51 +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.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 Deleted: 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 2008-01-21 04:49:55 UTC (rev 332) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoFirstPageAction.java 2008-01-21 04:50:07 UTC (rev 333) @@ -1,53 +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.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 Deleted: 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 2008-01-21 04:49:55 UTC (rev 332) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoLastPageAction.java 2008-01-21 04:50:07 UTC (rev 333) @@ -1,53 +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.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 Deleted: 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 2008-01-21 04:49:55 UTC (rev 332) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoNextPageAction.java 2008-01-21 04:50:07 UTC (rev 333) @@ -1,53 +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.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 Deleted: 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 2008-01-21 04:49:55 UTC (rev 332) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPageAction.java 2008-01-21 04:50:07 UTC (rev 333) @@ -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.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 Deleted: 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 2008-01-21 04:49:55 UTC (rev 332) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/GoPreviousPageAction.java 2008-01-21 04:50:07 UTC (rev 333) @@ -1,53 +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.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

1 0

r332 - trunk/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

Author: tchemit Date: 2008-01-21 04:49:55 +0000 (Mon, 21 Jan 2008) New Revision: 332 Modified: trunk/simexplorer-is-swing/src/resources/actions.properties Log: creation paquetage pagination Modified: trunk/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-21 04:48:18 UTC (rev 331) +++ trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-21 04:49:55 UTC (rev 332) @@ -26,12 +26,12 @@ action.resetSearchApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ResetSearchApplicationAction action.advancedSearchApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.AdvancedSearchApplicationAction -action.goFirstPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoFirstPageAction -action.goPreviousPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoPreviousPageAction -action.goPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoPageAction -action.goNextPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoNextPageAction -action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoLastPageAction -action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.action.application.ChangeSizorAction +action.goFirstPage=fr.cemagref.simexplorer.is.ui.swing.action.pagination.GoFirstPageAction +action.goPreviousPage=fr.cemagref.simexplorer.is.ui.swing.action.pagination.GoPreviousPageAction +action.goPage=fr.cemagref.simexplorer.is.ui.swing.action.pagination.GoPageAction +action.goNextPage=fr.cemagref.simexplorer.is.ui.swing.action.pagination.GoNextPageAction +action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.action.pagination.GoLastPageAction +action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.action.pagination.ChangeSizorAction action.collapseAll=fr.cemagref.simexplorer.is.ui.swing.action.application.CollapseAllAction action.expandAll=fr.cemagref.simexplorer.is.ui.swing.action.application.ExpandAllAction

1 0

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

21 Jan '08

Author: tchemit Date: 2008-01-21 04:48:18 +0000 (Mon, 21 Jan 2008) New Revision: 331 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ 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/GoPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java Log: creation paquetage pagination Added: 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 (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-21 04:48:18 UTC (rev 331) @@ -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.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 = "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 Added: 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 (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java 2008-01-21 04:48:18 UTC (rev 331) @@ -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.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( + 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/pagination/GoLastPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java 2008-01-21 04:48:18 UTC (rev 331) @@ -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.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( + 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/pagination/GoNextPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java 2008-01-21 04:48:18 UTC (rev 331) @@ -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.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( + 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/pagination/GoPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPageAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPageAction.java 2008-01-21 04:48:18 UTC (rev 331) @@ -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.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 Added: 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 (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-21 04:48:18 UTC (rev 331) @@ -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.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( + 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

1 0

r330 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

Author: tchemit Date: 2008-01-21 04:44:29 +0000 (Mon, 21 Jan 2008) New Revision: 330 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: suppression des derni?\195?\168res toolbar, int?\195?\169gration toolbar de pagination Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-21 04:44:12 UTC (rev 329) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-21 04:44:29 UTC (rev 330) @@ -1,4 +1,4 @@ -#Mon Jan 21 01:10:09 GMT 2008 +#Mon Jan 21 04:38:09 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = @@ -58,6 +58,24 @@ simexplorer.action.i18n.fr=French simexplorer.action.i18n.fr.help= simexplorer.action.i18n.fr.tooltip=Change to french language +simexplorer.action.pagination.changeSizor=Change Page size +simexplorer.action.pagination.changeSizor.help= +simexplorer.action.pagination.changeSizor.tooltip=Select the number of results to display in a page +simexplorer.action.pagination.goFirstPage=First page +simexplorer.action.pagination.goFirstPage.help= +simexplorer.action.pagination.goFirstPage.tooltip=Access to first page in the list of results +simexplorer.action.pagination.goLastPage=Last page +simexplorer.action.pagination.goLastPage.help= +simexplorer.action.pagination.goLastPage.tooltip=Access to last page in the list of results +simexplorer.action.pagination.goNextPage=Next page +simexplorer.action.pagination.goNextPage.help= +simexplorer.action.pagination.goNextPage.tooltip=Access to next page in the list of results +simexplorer.action.pagination.goPage=Page +simexplorer.action.pagination.goPage.help= +simexplorer.action.pagination.goPage.tooltip=Select page to display in the list of results +simexplorer.action.pagination.goPreviousPage=Previous page +simexplorer.action.pagination.goPreviousPage.help= +simexplorer.action.pagination.goPreviousPage.tooltip=Access to previous page in the list of results simexplorer.action.quit=Quit simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Quit SimExplorer SI Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-21 04:44:12 UTC (rev 329) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-21 04:44:29 UTC (rev 330) @@ -1,4 +1,4 @@ -#Mon Jan 21 01:10:09 GMT 2008 +#Mon Jan 21 04:38:09 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = @@ -58,6 +58,24 @@ simexplorer.action.i18n.fr=Fran\u00E7ais simexplorer.action.i18n.fr.help= simexplorer.action.i18n.fr.tooltip=Traduire l'application en fran\u00E7ais +simexplorer.action.pagination.changeSizor=Change fen\u00EAtre +simexplorer.action.pagination.changeSizor.help= +simexplorer.action.pagination.changeSizor.tooltip=Choisir le nombre de r\u00E9sultats par page +simexplorer.action.pagination.goFirstPage=Premi\u00E8re page +simexplorer.action.pagination.goFirstPage.help= +simexplorer.action.pagination.goFirstPage.tooltip=Acc\u00E9der \u00E0 la premi\u00E8re page de la liste des r\u00E9sultats +simexplorer.action.pagination.goLastPage=Derni\u00E8re Page +simexplorer.action.pagination.goLastPage.help= +simexplorer.action.pagination.goLastPage.tooltip=Acc\u00E9der \u00E0 la derni\u00E8re page de la liste des r\u00E9sultats +simexplorer.action.pagination.goNextPage=Prochaine page +simexplorer.action.pagination.goNextPage.help= +simexplorer.action.pagination.goNextPage.tooltip=Acc\u00E9der \u00E0 la prochaine page de la liste des r\u00E9sultats +simexplorer.action.pagination.goPage=Page +simexplorer.action.pagination.goPage.help= +simexplorer.action.pagination.goPage.tooltip=Choisir la page \u00E0 acc\u00E9der dans la liste des r\u00E9sultats +simexplorer.action.pagination.goPreviousPage=Pr\u00E9c\u00E9dente page +simexplorer.action.pagination.goPreviousPage.help= +simexplorer.action.pagination.goPreviousPage.tooltip=Acc\u00E9der \u00E0 la page pr\u00E9c\u00E9dente de la liste des r\u00E9sultats simexplorer.action.quit=Quitter simexplorer.action.quit.help= simexplorer.action.quit.tooltip=Pour quitter l'application

1 0

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

21 Jan '08

Author: tchemit Date: 2008-01-21 04:44:12 +0000 (Mon, 21 Jan 2008) New Revision: 329 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java Log: ajout annotation de configuration pour ComboBox Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-21 04:43:52 UTC (rev 328) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-21 04:44:12 UTC (rev 329) @@ -23,6 +23,7 @@ import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; import fr.cemagref.simexplorer.is.ui.swing.util.GlueActionConfig; import fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton; +import fr.cemagref.simexplorer.is.ui.swing.util.SelectActionConfig; import jaxx.runtime.JAXXObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -31,6 +32,7 @@ import javax.swing.AbstractButton; import javax.swing.Action; import javax.swing.Icon; +import javax.swing.JComboBox; import java.io.IOException; import java.util.Map; import java.util.Properties; @@ -99,37 +101,52 @@ for (Map.Entry<String, Class<? extends SimExplorerAbstractAction>> entry : impls.entrySet()) { String actionKey = entry.getKey(); Object comp = ui.getObjectById(actionKey); - if (comp == null || !(comp instanceof AbstractButton)) { + if (comp == null || !(comp instanceof AbstractButton || comp instanceof JComboBox)) { continue; } - AbstractButton component = (AbstractButton) comp; + if (comp instanceof AbstractButton) { + AbstractButton component = (AbstractButton) comp; - SimExplorerAbstractAction action = newAction(actionKey, component); + SimExplorerAbstractAction action = newAction(actionKey, component); - component.setAction(action); + component.setAction(action); - if (component instanceof MyToggleButton) { - MyToggleButton glueComponent = (MyToggleButton) component; - glueComponent.setIcon((Icon) action.getValue(Action.SMALL_ICON )); - Integer integer = (Integer) action.getValue(Action.MNEMONIC_KEY); - if (integer!=null) { - glueComponent.setNormalMnemonic(integer); + if (component instanceof MyToggleButton) { + MyToggleButton glueComponent = (MyToggleButton) component; + glueComponent.setIcon((Icon) action.getValue(Action.SMALL_ICON)); + Integer integer = (Integer) action.getValue(Action.MNEMONIC_KEY); + if (integer != null) { + glueComponent.setNormalMnemonic(integer); + } + glueComponent.setSelectedIcon((Icon) action.getValue(Action.SMALL_ICON + 2)); + integer = (Integer) action.getValue(Action.MNEMONIC_KEY + 2); + if (integer != null) { + glueComponent.setGlueMnemonic(integer); + } + glueComponent.setGlueText((String) action.getValue(Action.NAME + 2)); + glueComponent.setGlueTooltipText((String) action.getValue(Action.SHORT_DESCRIPTION + 2)); + + glueComponent.setNormalText((String) action.getValue(Action.NAME)); + glueComponent.setNormalTooltipText((String) action.getValue(Action.SHORT_DESCRIPTION)); } - glueComponent.setSelectedIcon((Icon) action.getValue(Action.SMALL_ICON + 2)); - integer = (Integer) action.getValue(Action.MNEMONIC_KEY + 2); - if (integer!=null) { - glueComponent.setGlueMnemonic(integer); + + Boolean value = (Boolean) action.getValue("hideActionText"); + + component.setHideActionText(value != null && value); + continue; + } + if (comp instanceof JComboBox) { + JComboBox component = (JComboBox) comp; + + SimExplorerAbstractAction action = newAction(actionKey, component); + + component.setAction(action); + Integer val = (Integer) action.getValue("selectedIndex"); + if (val != null && val<component.getItemCount()) { + component.setSelectedIndex(val); } - glueComponent.setGlueText((String)action.getValue(Action.NAME+ 2)); - glueComponent.setGlueTooltipText((String)action.getValue(Action.SHORT_DESCRIPTION+ 2)); - - glueComponent.setNormalText((String)action.getValue(Action.NAME)); - glueComponent.setNormalTooltipText((String)action.getValue(Action.SHORT_DESCRIPTION)); } - Boolean value = (Boolean) action.getValue("hideActionText"); - - component.setHideActionText(value != null && value); } } @@ -167,10 +184,10 @@ result.putValue("hideActionText", component.getHideActionText()); if (component instanceof MyToggleButton) { MyToggleButton glueComponent = (MyToggleButton) component; - result.putValue(Action.SHORT_DESCRIPTION , glueComponent.getNormalTooltipText()); - result.putValue(Action.NAME , glueComponent.getNormalText()); - result.putValue(Action.SMALL_ICON , glueComponent.getIcon()); - result.putValue(Action.MNEMONIC_KEY , glueComponent.getNormalMnemonic()); + result.putValue(Action.SHORT_DESCRIPTION, glueComponent.getNormalTooltipText()); + result.putValue(Action.NAME, glueComponent.getNormalText()); + result.putValue(Action.SMALL_ICON, glueComponent.getIcon()); + result.putValue(Action.MNEMONIC_KEY, glueComponent.getNormalMnemonic()); result.putValue(Action.SHORT_DESCRIPTION + 2, glueComponent.getGlueTooltipText()); result.putValue(Action.NAME + 2, glueComponent.getGlueText()); result.putValue(Action.SMALL_ICON + 2, glueComponent.getSelectedIcon()); @@ -194,6 +211,39 @@ } } + /** + * @param actionKey le nom de l'action tel que définie dans le fichier + * de mapping (sans le prefix action.) + * @param component le button où rattacher l'action + * @return une nouvelle instance de l'action associée à sa clef. + */ + public static SimExplorerAbstractAction newAction(String actionKey, JComboBox component) { + + // on vérifie que l'action existe bien + checkRegistredAction(actionKey); + + // on récupère la classe d'implantation de l'action + Class<? extends SimExplorerAbstractAction> klazz = impls.get(actionKey); + + try { + SimExplorerAbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + //result.putValue(Action.ACTION_COMMAND_KEY, actionKey); + + log.debug(actionKey + " : " + result); + // recherche de l'annotation de configuration + SelectActionConfig anno = initSelectActionConfig(component, klazz, result); + if (anno == null) { + result.putValue(Action.ACTION_COMMAND_KEY, component.getName()); + result.putValue(Action.SHORT_DESCRIPTION, component.getToolTipText()); + result.putValue("selectedIndex", component.getSelectedIndex()); + + } + return result; + } catch (Exception e) { + throw new SimExplorerRuntimeException(e); + } + } + private static GlueActionConfig initGlueActionConfig(AbstractButton component, Class<? extends SimExplorerAbstractAction> klazz, SimExplorerAbstractAction result) { GlueActionConfig anno = klazz.getAnnotation(GlueActionConfig.class); if (anno != null) { @@ -268,6 +318,25 @@ return anno; } + private static SelectActionConfig initSelectActionConfig(JComboBox component, Class<? extends SimExplorerAbstractAction> klazz, SimExplorerAbstractAction result) { + SelectActionConfig anno = klazz.getAnnotation(SelectActionConfig.class); + if (anno != null) { + // inject les données + if (!anno.name().isEmpty()) { + result.putValue(Action.NAME, _(anno.name())); + } + if (!anno.shortDescription().isEmpty()) { + result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); + } else { + result.putValue(Action.SHORT_DESCRIPTION, _(component.getToolTipText())); + } + result.putValue("selectedIndex", anno.selectedIndex()); + //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); + result.setEnabled(anno.enabled()); + } + return anno; + } + protected static void checkInit() { if (impls == null) { throw new SimExplorerRuntimeException("you must init first the " + SimExplorerActionManager.class.getName() + " class via init method");

1 0

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

21 Jan '08

Author: tchemit Date: 2008-01-21 04:43:52 +0000 (Mon, 21 Jan 2008) New Revision: 328 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util/SelectActionConfig.java Log: ajout annotation de configuration pour ComboBox Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util/SelectActionConfig.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util/SelectActionConfig.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util/SelectActionConfig.java 2008-01-21 04:43:52 UTC (rev 328) @@ -0,0 +1,91 @@ +/* +* ##% 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.util; + +import jaxx.runtime.JAXXObject; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour enregister une action. + * <p/> + * Placer cette annotation sur la classe implantant l'action, + * <p/> + * les informations décrites seront utilisées pour instancier l'action + * + * @author chemit + */ + at Retention(RetentionPolicy.RUNTIME) + + at Target(ElementType.TYPE) + +public @interface SelectActionConfig { + + /** + * @return la clef de la commande (doit être unique) + * @see javax.swing.Action#ACTION_COMMAND_KEY + */ + public abstract String actionCommand(); + + /** + * @return la clef i18n du texte de l'action, si vide ignoré + * @see javax.swing.Action#NAME + */ + public abstract String name() default ""; + + /** + * @return la clef i18n du tooltip de l'action, si vide ignoré + * @see javax.swing.Action#SHORT_DESCRIPTION + */ + public abstract String shortDescription() default ""; + + /** + * @return la clef i18n du texte de l'action, si vide ignoré + * @see javax.swing.Action#LONG_DESCRIPTION + */ + public abstract String longDescription() default ""; + + /** + * @return + * @see javax.swing.Action#ACCELERATOR_KEY + */ + public abstract String accelerator() default ""; + + /** + * @return la valeur par défaut pour les component selectable + * @see javax.swing.Action#SELECTED_KEY + */ + public abstract int selectedIndex() default 0; + + /** + * @return + * @see javax.swing.Action#isEnabled() + */ + public abstract boolean enabled() default true; + + /** + * @return la class du container jaxx associé + * @see javax.swing.Action#NAME + */ + public abstract Class<? extends JAXXObject> container(); + +} \ No newline at end of file

1 0

r327 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/action/admin java/fr/cemagref/simexplorer/is/ui/swing/action/application resources/icons
by tchemit＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

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)

1 0

r326 - in trunk/simexplorer-is-swing/src/resources: . icons icons/action
by tchemit＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

Author: tchemit Date: 2008-01-21 04:42:53 +0000 (Mon, 21 Jan 2008) New Revision: 326 Added: trunk/simexplorer-is-swing/src/resources/icons/action/advanced-search.png trunk/simexplorer-is-swing/src/resources/icons/action/collapseall.png trunk/simexplorer-is-swing/src/resources/icons/action/connect_creating.png trunk/simexplorer-is-swing/src/resources/icons/action/connect_established.png trunk/simexplorer-is-swing/src/resources/icons/action/connect_no.png trunk/simexplorer-is-swing/src/resources/icons/action/expandall.png trunk/simexplorer-is-swing/src/resources/icons/action/export-application.png trunk/simexplorer-is-swing/src/resources/icons/action/go-first.png trunk/simexplorer-is-swing/src/resources/icons/action/go-last.png trunk/simexplorer-is-swing/src/resources/icons/action/go-next.png trunk/simexplorer-is-swing/src/resources/icons/action/go-previous.png trunk/simexplorer-is-swing/src/resources/icons/action/import-application.png trunk/simexplorer-is-swing/src/resources/icons/action/reset-search.png trunk/simexplorer-is-swing/src/resources/icons/action/users.png Removed: trunk/simexplorer-is-swing/src/resources/icons/action/fileexport.png trunk/simexplorer-is-swing/src/resources/icons/action/fileimport.png trunk/simexplorer-is-swing/src/resources/icons/action/resetSearch.png trunk/simexplorer-is-swing/src/resources/icons/folder_inbox.png trunk/simexplorer-is-swing/src/resources/icons/folder_outbox.png trunk/simexplorer-is-swing/src/resources/icons/go-first.png trunk/simexplorer-is-swing/src/resources/icons/go-previous.png Modified: trunk/simexplorer-is-swing/src/resources/actions.properties trunk/simexplorer-is-swing/src/resources/icons/action/search.png Log: suppression des derni?\195?\168res toolbar, int?\195?\169gration toolbar de pagination Modified: trunk/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-21 04:42:35 UTC (rev 325) +++ trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-21 04:42:53 UTC (rev 326) @@ -26,6 +26,13 @@ action.resetSearchApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ResetSearchApplicationAction action.advancedSearchApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.AdvancedSearchApplicationAction +action.goFirstPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoFirstPageAction +action.goPreviousPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoPreviousPageAction +action.goPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoPageAction +action.goNextPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoNextPageAction +action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.action.application.GoLastPageAction +action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.action.application.ChangeSizorAction + action.collapseAll=fr.cemagref.simexplorer.is.ui.swing.action.application.CollapseAllAction action.expandAll=fr.cemagref.simexplorer.is.ui.swing.action.application.ExpandAllAction Added: trunk/simexplorer-is-swing/src/resources/icons/action/advanced-search.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/advanced-search.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/collapseall.png (from rev 317, trunk/simexplorer-is-swing/src/resources/icons/collapseall.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/collapseall.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/connect_creating.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/connect_creating.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/connect_established.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/connect_established.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/connect_no.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/connect_no.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/expandall.png (from rev 317, trunk/simexplorer-is-swing/src/resources/icons/expandall.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/expandall.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/export-application.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/export-application.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/simexplorer-is-swing/src/resources/icons/action/fileexport.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/action/fileimport.png =================================================================== (Binary files differ) Copied: trunk/simexplorer-is-swing/src/resources/icons/action/go-first.png (from rev 317, trunk/simexplorer-is-swing/src/resources/icons/go-first.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/go-first.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/go-last.png (from rev 317, trunk/simexplorer-is-swing/src/resources/icons/go-last.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/go-last.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/go-next.png (from rev 317, trunk/simexplorer-is-swing/src/resources/icons/go-next.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/go-next.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/simexplorer-is-swing/src/resources/icons/action/go-previous.png (from rev 317, trunk/simexplorer-is-swing/src/resources/icons/go-previous.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/go-previous.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/import-application.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/import-application.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/reset-search.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/reset-search.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/simexplorer-is-swing/src/resources/icons/action/resetSearch.png =================================================================== (Binary files differ) Modified: trunk/simexplorer-is-swing/src/resources/icons/action/search.png =================================================================== (Binary files differ) Added: trunk/simexplorer-is-swing/src/resources/icons/action/users.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/users.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/simexplorer-is-swing/src/resources/icons/folder_inbox.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/folder_outbox.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/go-first.png =================================================================== (Binary files differ) Deleted: trunk/simexplorer-is-swing/src/resources/icons/go-previous.png =================================================================== (Binary files differ)

1 0

r325 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar
by tchemit＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

Author: tchemit Date: 2008-01-21 04:42:35 +0000 (Mon, 21 Jan 2008) New Revision: 325 Removed: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationTreeToolbar.jaxx trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationsListToolbar.jaxx Log: suppression des derni?\195?\168res toolbar, int?\195?\169gration toolbar de pagination Deleted: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationTreeToolbar.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationTreeToolbar.jaxx 2008-01-21 04:41:46 UTC (rev 324) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationTreeToolbar.jaxx 2008-01-21 04:42:35 UTC (rev 325) @@ -1,5 +0,0 @@ -<JToolBar id='toolbar' floatable='false'> - <JButton id='collapseAllApplication' enabled='false'/> - <JButton id='expandAllApplication' enabled='false'/> - <JButton id='exportApplication' enabled='false'/> -</JToolBar> Deleted: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationsListToolbar.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationsListToolbar.jaxx 2008-01-21 04:41:46 UTC (rev 324) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationsListToolbar.jaxx 2008-01-21 04:42:35 UTC (rev 325) @@ -1,3 +0,0 @@ -<JToolBar id='toolbar' floatable='false'> - <JButton id='launchSynchronize' enabled='false' /> -</JToolBar>

1 0