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

r1325 - in trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities: composite data metadata
by glandais＠users.labs.libre-entreprise.org 13 Mar '08

13 Mar '08

Author: glandais Date: 2008-03-13 09:18:45 +0000 (Thu, 13 Mar 2008) New Revision: 1325 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java Log: UI presentation Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -21,6 +21,7 @@ import java.util.List; +import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; /** @@ -31,11 +32,10 @@ /** The Constant serialVersionUID. */ private static final long serialVersionUID = 6100507219070076248L; - // @Override - // protected boolean visitEnter(EntityVisitor visitor) { - // // do not visit attachments - // return false; - // } + @Override + protected boolean visitEnter(EntityVisitor visitor) { + return visitEnterIfNotEmpty(visitor); + } @Override public List<String> getRow() { Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -21,6 +21,7 @@ import java.util.List; +import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.data.Descriptor; /** @@ -28,15 +29,14 @@ */ public final class Descriptors extends SimpleComposite<Descriptor> { - // @Override - // protected boolean visitEnter(EntityVisitor visitor) { - // // do not visit descriptors - // return false; - // } - /** The Constant serialVersionUID. */ private static final long serialVersionUID = -5742926033876669501L; + @Override + protected boolean visitEnter(EntityVisitor visitor) { + return visitEnterIfNotEmpty(visitor); + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.entities.composite.SimpleComposite#getRow() */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -28,6 +28,7 @@ import fr.cemagref.simexplorer.is.entities.Composite; import fr.cemagref.simexplorer.is.entities.Entity; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; +import fr.cemagref.simexplorer.is.entities.EntityVisitor; /** * The Class SimpleComposite. @@ -60,6 +61,13 @@ this.elements = elements; } + protected boolean visitEnterIfNotEmpty(EntityVisitor visitor) { + if (size() == 0) { + return false; + } + return visitEnter(visitor); + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.entities.Entity#getChildren() */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -82,6 +82,15 @@ } @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(getLanguage()); + row.add(getCode()); + return row; + } + + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -112,12 +121,5 @@ return true; } - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(""); - row.add(getLanguage()); - row.add(getCode()); - return row; - } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -80,6 +80,15 @@ } @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(getName()); + row.add(getType().getSimpleName()); + return row; + } + + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -110,13 +119,4 @@ return true; } - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(""); - row.add(getName()); - row.add(getType().getSimpleName()); - return row; - } - } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -86,6 +86,15 @@ } @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(constant.toString()); + row.add(value); + return row; + } + + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -116,12 +125,4 @@ return true; } - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(""); - row.add(constant.toString()); - row.add(value); - return row; - } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -92,6 +92,15 @@ } @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(name); + row.add(value); + return row; + } + + @Override public int compareTo(Descriptor o) { if (this.getName() == null || o == null || o.getName() == null) { return 0; @@ -130,12 +139,4 @@ return true; } - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(""); - row.add(name); - row.add(value); - return row; - } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -78,6 +78,18 @@ return sb.toString(); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.Entity#getRow() + */ + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(_("simexplorer.common.metadata")); + row.add(getName()); + row.add(getVersion().toString()); + return row; + } + /** * Gets the uuid. * @@ -302,15 +314,4 @@ return getEntityType().getLibelle(); } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.entities.Entity#getRow() - */ - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(_("simexplorer.common.metadata")); - row.add(getName()); - row.add(getVersion().toString()); - return row; - } }

1 0

r1324 - in trunk/simexplorer-is: simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 12 Mar '08

12 Mar '08

Author: glandais Date: 2008-03-12 17:07:27 +0000 (Wed, 12 Mar 2008) New Revision: 1324 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermission.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java Log: Debug methods Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java 2008-03-12 17:07:14 UTC (rev 1323) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java 2008-03-12 17:07:27 UTC (rev 1324) @@ -186,6 +186,15 @@ */ public List<User> getUsersOfGroup(Group group); + /** + * Gets the groups of actor. + * + * @param actor the actor + * + * @return the groups of actor + */ public List<Group> getGroupsOfActor(Actor actor); + + //public Object debugQuery(String query, int type); } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermission.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermission.java 2008-03-12 17:07:14 UTC (rev 1323) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermission.java 2008-03-12 17:07:27 UTC (rev 1324) @@ -22,7 +22,6 @@ import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Permission; -import fr.cemagref.simexplorer.is.security.entities.User; /** * The Interface DaoPermission. Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-03-12 17:07:14 UTC (rev 1323) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-03-12 17:07:27 UTC (rev 1324) @@ -353,4 +353,6 @@ */ public void setPermissions(String token, String uuid, Permission[] permissions) throws SimExplorerException; +// public Object debugQuery(String query, int type); + }

1 0

r1323 - in trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security: credentials dao
by glandais＠users.labs.libre-entreprise.org 12 Mar '08

12 Mar '08

Author: glandais Date: 2008-03-12 17:07:14 +0000 (Wed, 12 Mar 2008) New Revision: 1323 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java Log: Comment for log variable Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-03-12 17:06:45 UTC (rev 1322) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-03-12 17:07:14 UTC (rev 1323) @@ -47,6 +47,7 @@ @TransactionAttribute(TransactionAttributeType.REQUIRED) public class CredentialManagerImpl implements CredentialManager { + /** The Constant log. */ private static final Log log = LogFactory.getLog(CredentialManagerImpl.class); /** The dao. */ Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2008-03-12 17:06:45 UTC (rev 1322) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2008-03-12 17:07:14 UTC (rev 1323) @@ -37,6 +37,7 @@ @Stateless(name = "DaoPermission") public class DaoPermissionImpl implements DaoPermission { + /** The Constant log. */ private static final Log log = LogFactory.getLog(DaoPermissionImpl.class); /** The em. */

1 0

r1322 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 12 Mar '08

12 Mar '08

Author: glandais Date: 2008-03-12 17:06:45 +0000 (Wed, 12 Mar 2008) New Revision: 1322 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java Log: Avoid group recursion Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-12 17:06:24 UTC (rev 1321) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-12 17:06:45 UTC (rev 1322) @@ -736,6 +736,27 @@ throw new SimExplorerSecurityException(); } + /** + * Checks if container contains contained. + * + * @param container the group container + * @param contained the group contained + * + * @return true, if is containing + */ + private boolean isContaining(Group container, Group contained) { + if (container.getId().equals(contained.getId())) { + return true; + } + List<Group> groups = container.getGroups(); + for (Group group : groups) { + if (isContaining(group, contained)) { + return true; + } + } + return false; + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.AuthenticationService#setGroupsOfGroup(java.lang.String, fr.cemagref.simexplorer.is.security.entities.Group, java.lang.Integer[]) */ @@ -745,7 +766,9 @@ realGroup.getGroups().clear(); for (Integer groupsId : groupsIds) { Group groupOwned = daoActor.getGroup(groupsId); - realGroup.getGroups().add(groupOwned); + if (!isContaining(groupOwned, realGroup)) { + realGroup.getGroups().add(groupOwned); + } } daoActor.updateGroup(realGroup); } else { @@ -805,7 +828,13 @@ return credentialManager.getPermissionsOwnedByCount(user); } +/* + public Object debugQuery(String query, int type) { + return daoActor.debugQuery(query, type); + } +*/ + { I18n.initISO88591("fr", "FR"); }

1 0

r1321 - trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao
by glandais＠users.labs.libre-entreprise.org 12 Mar '08

12 Mar '08

Author: glandais Date: 2008-03-12 17:06:24 +0000 (Wed, 12 Mar 2008) New Revision: 1321 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java Log: Query bug (getGroupsOfActor) Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-12 17:04:45 UTC (rev 1320) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-12 17:06:24 UTC (rev 1321) @@ -134,6 +134,11 @@ return a; } + /** + * Sets the actor visible. + * + * @param actor the new actor visible + */ private void setActorVisible(Actor actor) { actor.setVisible(true); } @@ -259,12 +264,33 @@ } public List<Group> getGroupsOfActor(Actor actor) { + + //String query = "select distinct group from Actor actor join actor.groups as group where actor = :actor and group.visible = true"; + String query = "select distinct g from Group g, Actor actor where g member of actor.groups and g.visible = true and actor=:actor"; List<Group> groups = CollectionUtil.toGenericList(em.createQuery( - "select distinct group from Actor actor join actor.groups as group where actor = :actor and group.visible = true") + query) .setParameter("actor", actor).getResultList(), Group.class); return groups; } + + /* + public Object debugQuery(String query, int type) { + Query jpaQuery = em.createQuery(query); + if (type == 0) { + return jpaQuery.getSingleResult(); + } + if (type == 1) { + return jpaQuery.getResultList(); + } + if (type == 2) { + int lines = jpaQuery.executeUpdate(); + return lines; + } + return null; + } +*/ + }

1 0

r1320 - trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities
by glandais＠users.labs.libre-entreprise.org 12 Mar '08

12 Mar '08

Author: glandais Date: 2008-03-12 17:04:45 +0000 (Wed, 12 Mar 2008) New Revision: 1320 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java Log: Download files (attachments) Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-12 17:04:29 UTC (rev 1319) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-12 17:04:45 UTC (rev 1320) @@ -23,6 +23,7 @@ import javax.swing.tree.DefaultMutableTreeNode; +import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; import fr.cemagref.simexplorer.is.entities.data.Library; @@ -60,6 +61,9 @@ /** DOWNLOAD. */ DOWNLOAD("", ActionAvailabilty.SWING, ExplorationApplication.class, Result.class, Library.class), + /** The DOWNLOADATTACHMENT. */ + DOWNLOADATTACHMENT("download", ActionAvailabilty.WEB, Attachment.class), + /** EXPORT. */ EXPORT("export", ActionAvailabilty.BOTH, ExplorationApplication.class, Result.class, Library.class), @@ -111,7 +115,7 @@ * * @return true, if successful */ - public boolean accept(LoggableElement sNode) { + public boolean accept(Entity sNode) { return sNode != null && accept(sNode.getClass()); } @@ -171,7 +175,7 @@ private boolean accept(Class<?> klass) { return classes.contains(klass); } - + } /**

1 0

r1319 - trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF
by glandais＠users.labs.libre-entreprise.org 12 Mar '08

12 Mar '08

Author: glandais Date: 2008-03-12 17:04:29 +0000 (Wed, 12 Mar 2008) New Revision: 1319 Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties Log: i18N Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-03-12 17:04:16 UTC (rev 1318) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-03-12 17:04:29 UTC (rev 1319) @@ -45,6 +45,7 @@ simexplorer.ui.web.value=Value simexplorer.ui.web.values=Values simexplorer.ui.web.version=Version +simexplorer.ui.web.groupHierarchy=Group hierarchy simexplorer.ui.web.layout.pagetitle=Simexplorer SI Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-03-12 17:04:16 UTC (rev 1318) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-03-12 17:04:29 UTC (rev 1319) @@ -45,6 +45,7 @@ simexplorer.ui.web.value=Valeur simexplorer.ui.web.values=Valeurs simexplorer.ui.web.version=Versions +simexplorer.ui.web.groupHierarchy=Hiérarchie des groupes simexplorer.ui.web.layout.pagetitle=Simexplorer SI

1 0

r1318 - in trunk/simexplorer-is/simexplorer-is-web/src: java/fr/cemagref/simexplorer/is/ui/web/pages main/webapp
by glandais＠users.labs.libre-entreprise.org 12 Mar '08

12 Mar '08

Author: glandais Date: 2008-03-12 17:04:16 +0000 (Wed, 12 Mar 2008) New Revision: 1318 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupList.tml Log: Display group hierarchy Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-12 17:03:51 UTC (rev 1317) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-12 17:04:16 UTC (rev 1318) @@ -17,12 +17,19 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.Link; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Retain; import org.apache.tapestry.beaneditor.BeanModel; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import org.codelutin.tapestry.beans.TreeNode; import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; @@ -76,7 +83,7 @@ * Gets the groups. * * @return the groups - * @throws SimExplorerException + * @throws SimExplorerException */ public Group[] getGroups() throws SimExplorerException { Group[] groups; @@ -96,7 +103,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onActionFromDelete(Integer context) throws SimExplorerException { RemoteSecurityService.getAuthentificationService().deleteGroup(getToken(), context); @@ -117,10 +124,23 @@ } /** + * On edit. + * + * @param context the context + * + * @return the object + * + * @throws SimExplorerException the sim explorer exception + */ + public Object onEdit(Integer context) throws SimExplorerException { + return onActionFromEdit(context); + } + + /** * On action from add. * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onActionFromAdd() throws SimExplorerException { groupEdit.setup(-1); @@ -154,4 +174,84 @@ this.groupEdit = groupEdit; } + /** + * Builds the node. + * + * @param group the group + * + * @return the tree node + */ + private TreeNode buildNode(Group group) { + TreeNode node = new TreeNode(); + + List<Group> children = group.getGroups(); + if (children.size() == 0) { + node.setType(TreeNode.TYPE_DOCUMENT); + } else { + node.setType(TreeNode.TYPE_FOLDER); + List<TreeNode> childrenNodes = new ArrayList<TreeNode>(); + for (Group child : children) { + childrenNodes.add(buildNode(child)); + } + node.setChildren(childrenNodes); + } + + Link link = getResources().createActionLink("edit", false, group.getId()); + StringBuffer sb = new StringBuffer(""); + sb.append("<a href=\""); + sb.append(link.toString()); + sb.append("\">"); + sb.append(getMessages().get("simexplorer.ui.web.modify")); + sb.append("</a>"); + + node.setColumns(new String[] { group.getName(), sb.toString() }); + + node.setObject(group); + + return node; + } + + /** + * Gets the group nodes. + * + * @return the group nodes + * + * @throws SimExplorerException the sim explorer exception + */ + public List<TreeNode> getGroupNodes() throws SimExplorerException { + List<TreeNode> nodes = new ArrayList<TreeNode>(); + + Map<Group, Integer> usage = new HashMap<Group, Integer>(); + Group[] groups = getGroups(); + for (Group group : groups) { + usage.put(group, 0); + } + for (Group group : groups) { + List<Group> children = group.getGroups(); + for (Group child : children) { + usage.put(child, usage.get(child) + 1); + } + } + + for (Group group : groups) { + if (usage.get(group).equals(0)) { + nodes.add(buildNode(group)); + } + } + + return nodes; + } + + /** + * Gets the group headers. + * + * @return the group headers + */ + public List<String> getGroupHeaders() { + List<String> result = new ArrayList<String>(); + result.add(getMessages().get("simexplorer.ui.web.name")); + result.add(getMessages().get("simexplorer.ui.web.title.groupedit")); + return result; + } + } Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupList.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-03-12 17:03:51 UTC (rev 1317) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-03-12 17:04:16 UTC (rev 1318) @@ -13,4 +13,10 @@ </p> <p><t:actionlink t:id="add">${message:simexplorer.ui.web.addgroup}</t:actionlink></p> + <p>${message:simexplorer.ui.web.groupHierarchy} :</p> + <table t:type="cl/TreeGrid" source="groupNodes" + columnHeaders="groupHeaders"> + </table> + + </t:layout>

1 0

r1317 - in trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web: pages tools
by glandais＠users.labs.libre-entreprise.org 12 Mar '08

12 Mar '08

Author: glandais Date: 2008-03-12 17:03:51 +0000 (Wed, 12 Mar 2008) New Revision: 1317 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java Log: Download files (attachments) Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-03-11 00:25:18 UTC (rev 1316) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-03-12 17:03:51 UTC (rev 1317) @@ -87,38 +87,8 @@ return response; } - /** - * On download file. - * - * @param context the context - * - * @return the object - * @throws SimExplorerException - */ - public Object onDownloadFile(String context) throws SimExplorerException { - StreamResponse response = null; + - StringTokenizer st = new StringTokenizer(context, ","); - String uuid = st.nextToken(); - String version = st.nextToken(); - String attachmentUniqueId = st.nextToken(); - - LoggableElement loggableElement = RemoteStorageService.getStorageService().getLoggableElement(getToken(), uuid, - version); - List<Attachment> attachments = loggableElement.getAttachments(); - for (Attachment attachment : attachments) { - if (attachment.getUniqueId().equals(attachmentUniqueId)) { - InputStream stream = RemoteStorageService.getStorageService().retrieveElementData(getToken(), uuid, - version, attachment); - - response = new AttachmentStreamResponse(stream, attachment.getFileName()); - return response; - } - } - - return response; - } - /** * Headers of tree grid. * Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-03-11 00:25:18 UTC (rev 1316) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-03-12 17:03:51 UTC (rev 1317) @@ -17,19 +17,26 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; +import static org.codelutin.i18n.I18n._; + +import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; import org.apache.tapestry.Link; +import org.apache.tapestry.StreamResponse; import org.apache.tapestry.annotations.InjectPage; import org.codelutin.tapestry.beans.TreeNode; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Descriptor; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; +import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; +import fr.cemagref.simexplorer.is.ui.web.tools.AttachmentStreamResponse; /** * The Class ElementPageDetail. @@ -153,6 +160,38 @@ } /** + * On download file. + * + * @param context the context + * + * @return the object + * @throws SimExplorerException + */ + public Object onDownloadFile(String context) throws SimExplorerException { + StreamResponse response = null; + + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + String attachmentUniqueId = st.nextToken(); + + LoggableElement loggableElement = RemoteStorageService.getStorageService().getLoggableElement(getToken(), uuid, + version); + List<Attachment> attachments = loggableElement.getAttachments(); + for (Attachment attachment : attachments) { + if (attachment.getUniqueId().equals(attachmentUniqueId)) { + InputStream stream = RemoteStorageService.getStorageService().retrieveElementData(getToken(), uuid, + version, attachment); + + response = new AttachmentStreamResponse(stream, attachment.getFileName()); + return response; + } + } + + return response; + } + + /** * Generate string. * * @param actionCaption the action caption @@ -311,7 +350,7 @@ for (Attachment attachment : attachments) { StringBuffer description = new StringBuffer(); if (attachment.getContentType() != null) { - description.append(attachment.getContentType().getDescription()).append(" - "); + description.append(_(attachment.getContentType().getDescription())).append(" - "); } if (attachment.getContentType() != null) { description.append("MD5 : ").append(attachment.getDataHash()); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java 2008-03-11 00:25:18 UTC (rev 1316) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java 2008-03-12 17:03:51 UTC (rev 1317) @@ -32,6 +32,7 @@ import fr.cemagref.simexplorer.is.entities.EntityVisitorTreeNode; import fr.cemagref.simexplorer.is.entities.EntityHelper.Action; import fr.cemagref.simexplorer.is.entities.EntityHelper.ActionAvailabilty; +import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -41,6 +42,8 @@ private Messages messages; + private LoggableElement lastLE; + public WebEntityVisitor(ComponentResources resources, Messages messages) { super(); this.resources = resources; @@ -103,25 +106,38 @@ } } + StringBuffer sb = new StringBuffer(); + if (v instanceof LoggableElement) { - LoggableElement le = (LoggableElement) v; - StringBuffer sb = new StringBuffer(); + LoggableElement le; + le = (LoggableElement) v; + lastLE = le; Action[] actions = EntityHelper.Action.values(); for (Action action : actions) { if ((action.getAvailabilty() == ActionAvailabilty.WEB || action.getAvailabilty() == ActionAvailabilty.BOTH) - && action.accept(le)) { + && action.accept(v)) { sb.append("<br>"); sb.append(generateString(messages.get("simexplorer.ui.web." + action.getActionName() + ".action"), action.getActionName(), le.getMetaData())); } } - if (sb.length() > 0) { - asArray[3] = sb.substring(4).toString(); - } } + if (v instanceof Attachment) { + LoggableElement le; + le = lastLE; + String context = le.getMetaData().getUuid() + "," + le.getMetaData().getVersion() + "," + + ((Attachment) v).getUniqueId(); + sb.append("<br>"); + sb.append(generateString(messages.get("simexplorer.ui.web.export.action"), "downloadFile", context)); + } + + if (sb.length() > 0) { + asArray[3] = sb.substring(4).toString(); + } + treeNode.setColumns(asArray); if (getCurrentParent() != null) { @@ -130,5 +146,4 @@ return treeNode; } - }

1 0

r1316 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 11 Mar '08

11 Mar '08

Author: tchemit Date: 2008-03-11 00:25:18 +0000 (Tue, 11 Mar 2008) New Revision: 1316 Modified: trunk/simexplorer-is/ Log: svn ignore Property changes on: trunk/simexplorer-is ___________________________________________________________________ Name: svn:ignore - target .project + target .project *.iml *.ipr *.iws

1 0