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

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 @@ <t:actionlink t:id="add">${message:simexplorer.ui.web.addgroup}</t:actionlink> + ${message:simexplorer.ui.web.groupHierarchy} : + <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(" "); 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(" "); + 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

r1315 - in trunk/simexplorer-is: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories simexplorer-is-
by glandais＠users.labs.libre-entreprise.org 10 Mar '08

10 Mar '08

Author: glandais Date: 2008-03-10 14:12:41 +0000 (Mon, 10 Mar 2008) New Revision: 1315 Removed: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/EntityFactory.java 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/EntityVisitable.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitorTreeNode.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 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/Codes.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.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/ExplorationDatas.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.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/composite/Structures.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerRuntimeException.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerTechnicalException.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/UnreachableServiceException.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/ContentTypeFactory.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java trunk/simexplorer-is/src/site/fr/rst/devel/implementation.rst trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: Javadoc & rst 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-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -37,8 +37,17 @@ */ public class EntityHelper { + /** + * ActionAvailabilty : précise si le périmètre de l'action + */ public static enum ActionAvailabilty { - SWING, WEB, BOTH; + + /** The SWING. */ + SWING, + /** The WEB. */ + WEB, + /** The BOTH. */ + BOTH; } /** @@ -48,40 +57,100 @@ */ public static enum Action { + /** DOWNLOAD. */ DOWNLOAD("", ActionAvailabilty.SWING, ExplorationApplication.class, Result.class, Library.class), + + /** EXPORT. */ EXPORT("export", ActionAvailabilty.BOTH, ExplorationApplication.class, Result.class, Library.class), + + /** IMPORT. */ IMPORT("", ActionAvailabilty.SWING, ExplorationApplication.class, Library.class), + + /** DELETE. */ DELETE("delete", ActionAvailabilty.BOTH, ExplorationApplication.class, ExplorationData.class), + + /** HISTORY. */ HISTORY("history", ActionAvailabilty.WEB, LoggableElement.class), + + /** RIGHTS. */ RIGHTS("rights", ActionAvailabilty.WEB, ExplorationApplication.class, ExplorationData.class), + + /** DETAILS. */ DETAILS("details", ActionAvailabilty.WEB), + + /** METADATA. */ METADATA("metadata", ActionAvailabilty.WEB, ExplorationApplication.class, ExplorationData.class); + /** The classes. */ private List<Class<?>> classes; + + /** The types. */ private List<String> types; + + /** The action name. */ private String actionName; - private ActionAvailabilty availabilty; + /** The availabilty. */ + private ActionAvailabilty availabilty; + + /** + * Accept. + * + * @param node the node + * + * @return true, if successful + */ public boolean accept(DefaultMutableTreeNode node) { return node != null && node.getUserObject() != null && accept(node.getUserObject().getClass()); } + /** + * Accept. + * + * @param sNode the s node + * + * @return true, if successful + */ public boolean accept(LoggableElement sNode) { return sNode != null && accept(sNode.getClass()); } + /** + * Accept. + * + * @param metaData the meta data + * + * @return true, if successful + */ public boolean accept(MetaData metaData) { return metaData != null && accept(metaData.getElementClass()); } + /** + * Gets the action name. + * + * @return the action name + */ public String getActionName() { return actionName; } + /** + * Gets the availabilty. + * + * @return the availabilty + */ public ActionAvailabilty getAvailabilty() { return availabilty; } + /** + * Instantiates a new action. + * + * @param actionName the action name + * @param actionAvailabilty the action availabilty + * @param classes the classes + */ private Action(String actionName, ActionAvailabilty actionAvailabilty, Class<?>... classes) { this.actionName = actionName; this.availabilty = actionAvailabilty; @@ -92,15 +161,22 @@ } } + /** + * Accept. + * + * @param klass the klass + * + * @return true, if successful + */ private boolean accept(Class<?> klass) { return classes.contains(klass); } - - private boolean accept(String type) { - return types.contains(type); - } + } + /** + * Instantiates a new entity helper. + */ protected EntityHelper() { // no instance } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -30,7 +30,6 @@ * * @param visitor le visiteur * - * @return true, if accept */ void accept(EntityVisitor visitor); Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -22,7 +22,6 @@ * * @author chemit * @see EntityVisitable - * @see SimpleEntityVisitor */ public interface EntityVisitor { Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitorTreeNode.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitorTreeNode.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitorTreeNode.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -22,40 +22,77 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +/** + * The Class EntityVisitorTreeNode. + * @param <TN> TreeNode class + */ public abstract class EntityVisitorTreeNode<TN extends Object> implements EntityVisitor { + /** + * Creates the node. + * + * @param v the entity + * @param allowedChildren true if node can have children + * + * @return the treenode + */ protected abstract TN createNode(Entity v, boolean allowedChildren); + /** The root node. */ private TN rootNode; /** The node stack. */ private Deque<TN> nodeStack; + /** + * Visit a loggable element + * + * @param v the loggable element + * + * @return the root tree node + */ public TN treeNodeVisit(LoggableElement v) { nodeStack = new ArrayDeque<TN>(); visit(v); return rootNode; } + /** + * Gets the current parent tree node. + * + * @return the current parent + */ protected TN getCurrentParent() { return nodeStack.peekFirst(); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.EntityVisitor#enterComposite(fr.cemagref.simexplorer.is.entities.Composite) + */ @Override public void enterComposite(Composite v) { + // creates the parent node TN newNode; newNode = createNode(v, true); + // set the root node if not specified yet if (rootNode == null) { rootNode = newNode; } nodeStack.addFirst(newNode); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.EntityVisitor#exitComposite(fr.cemagref.simexplorer.is.entities.Composite) + */ @Override public void exitComposite(Composite v) { + // remove item from queue nodeStack.removeFirst(); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.EntityVisitor#visit(fr.cemagref.simexplorer.is.entities.EntityVisitable) + */ @Override public void visit(EntityVisitable v) { if (v != null) { @@ -64,13 +101,21 @@ } } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.EntityVisitor#visitComposite(fr.cemagref.simexplorer.is.entities.Composite) + */ @Override public void visitComposite(Composite v) { + // add node createNode(v, true); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.EntityVisitor#visitLeaf(fr.cemagref.simexplorer.is.entities.Leaf) + */ @Override public void visitLeaf(Leaf v) { + // add node createNode(v, false); } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -33,6 +33,9 @@ return new ArrayList<Entity>(); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.EntityVisitable#accept(fr.cemagref.simexplorer.is.entities.EntityVisitor) + */ public void accept(EntityVisitor visitor) { visitor.visitLeaf(this); } 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-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -23,8 +23,12 @@ import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +/** + * The Class Attachments. + */ public final class Attachments extends SimpleComposite<Attachment> { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 6100507219070076248L; // @Override Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -23,10 +23,17 @@ import fr.cemagref.simexplorer.is.entities.data.Code; +/** + * The Class Codes. + */ public final class Codes extends SimpleComposite<Code> { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = -8845424774771585654L; + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.composite.SimpleComposite#getRow() + */ @Override public List<String> getRow() { List<String> row = super.getRow(); Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -19,8 +19,12 @@ import fr.cemagref.simexplorer.is.entities.data.Component; +/** + * The Class Components. + */ public final class Components extends SimpleComposite<Component> { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 5467707236188600666L; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -23,10 +23,17 @@ import fr.cemagref.simexplorer.is.entities.data.ConstantValue; +/** + * The Class ConstantValues. + */ public final class ConstantValues extends SimpleComposite<ConstantValue> { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = -1567351689671452380L; + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.composite.SimpleComposite#getRow() + */ @Override public List<String> getRow() { List<String> row = super.getRow(); Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -23,10 +23,17 @@ import fr.cemagref.simexplorer.is.entities.data.Constant; +/** + * The Class Constants. + */ public final class Constants extends SimpleComposite<Constant> { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 2754488720122128335L; + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.composite.SimpleComposite#getRow() + */ @Override public List<String> getRow() { List<String> row = super.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-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -23,6 +23,9 @@ import fr.cemagref.simexplorer.is.entities.data.Descriptor; +/** + * The Class Descriptors. + */ public final class Descriptors extends SimpleComposite<Descriptor> { // @Override @@ -31,8 +34,12 @@ // return false; // } + /** The Constant serialVersionUID. */ private static final long serialVersionUID = -5742926033876669501L; + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.composite.SimpleComposite#getRow() + */ @Override public List<String> getRow() { List<String> row = super.getRow(); Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -19,8 +19,12 @@ import fr.cemagref.simexplorer.is.entities.data.ExplorationData; +/** + * The Class ExplorationDatas. + */ public final class ExplorationDatas extends SimpleComposite<ExplorationData> { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 616723755643872808L; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -19,8 +19,12 @@ import fr.cemagref.simexplorer.is.entities.data.Library; +/** + * The Class Libraries. + */ public final class Libraries extends SimpleComposite<Library> { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 3325488033333012292L; } 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-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -31,6 +31,8 @@ /** * The Class SimpleComposite. + * + * @param <E> Entitiy class of list element */ public abstract class SimpleComposite<E extends Entity> extends Composite implements List<E> { @@ -68,6 +70,9 @@ return entities; } + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ @Override public int hashCode() { final int prime = 31; @@ -76,6 +81,9 @@ return result; } + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ @Override public boolean equals(Object obj) { if (this == obj) @@ -84,7 +92,7 @@ return false; if (getClass() != obj.getClass()) return false; - final SimpleComposite other = (SimpleComposite) obj; + final SimpleComposite<?> other = (SimpleComposite<?>) obj; if (elements == null) { if (other.elements != null) return false; @@ -93,6 +101,12 @@ return true; } + /** + * Gets the children class. + * + * @return the children class + */ + @SuppressWarnings("unchecked") public Class<E> getChildrenClass() { Class<E> eClass = null; @@ -106,6 +120,9 @@ return null; } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ @Override public String toString() { Class<E> eClass = getChildrenClass(); @@ -119,6 +136,9 @@ return super.toString(); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.Entity#getRow() + */ @Override public List<String> getRow() { List<String> row = new ArrayList<String>(); @@ -127,7 +147,11 @@ } /** - * Delegate List methods + * Delegate List methods. + * + * @param e the e + * + * @return true, if adds the */ @Override @@ -135,111 +159,177 @@ return elements.add(e); } + /* (non-Javadoc) + * @see java.util.List#add(int, java.lang.Object) + */ @Override public void add(int index, E element) { elements.add(index, element); } + /* (non-Javadoc) + * @see java.util.List#addAll(java.util.Collection) + */ @Override public boolean addAll(Collection<? extends E> c) { return elements.addAll(c); } + /* (non-Javadoc) + * @see java.util.List#addAll(int, java.util.Collection) + */ @Override public boolean addAll(int index, Collection<? extends E> c) { return elements.addAll(index, c); } + /* (non-Javadoc) + * @see java.util.List#clear() + */ @Override public void clear() { elements.clear(); } + /* (non-Javadoc) + * @see java.util.List#contains(java.lang.Object) + */ @Override public boolean contains(Object o) { return elements.contains(o); } + /* (non-Javadoc) + * @see java.util.List#containsAll(java.util.Collection) + */ @Override public boolean containsAll(Collection<?> c) { return elements.containsAll(c); } + /* (non-Javadoc) + * @see java.util.List#get(int) + */ @Override public E get(int index) { return elements.get(index); } + /* (non-Javadoc) + * @see java.util.List#indexOf(java.lang.Object) + */ @Override public int indexOf(Object o) { return elements.indexOf(o); } + /* (non-Javadoc) + * @see java.util.List#isEmpty() + */ @Override public boolean isEmpty() { return elements.isEmpty(); } + /* (non-Javadoc) + * @see java.util.List#iterator() + */ @Override public Iterator<E> iterator() { return elements.iterator(); } + /* (non-Javadoc) + * @see java.util.List#lastIndexOf(java.lang.Object) + */ @Override public int lastIndexOf(Object o) { return elements.lastIndexOf(o); } + /* (non-Javadoc) + * @see java.util.List#listIterator() + */ @Override public ListIterator<E> listIterator() { return elements.listIterator(); } + /* (non-Javadoc) + * @see java.util.List#listIterator(int) + */ @Override public ListIterator<E> listIterator(int index) { return elements.listIterator(index); } + /* (non-Javadoc) + * @see java.util.List#remove(java.lang.Object) + */ @Override public boolean remove(Object o) { return elements.remove(o); } + /* (non-Javadoc) + * @see java.util.List#remove(int) + */ @Override public E remove(int index) { return elements.remove(index); } + /* (non-Javadoc) + * @see java.util.List#removeAll(java.util.Collection) + */ @Override public boolean removeAll(Collection<?> c) { return elements.removeAll(c); } + /* (non-Javadoc) + * @see java.util.List#retainAll(java.util.Collection) + */ @Override public boolean retainAll(Collection<?> c) { return elements.retainAll(c); } + /* (non-Javadoc) + * @see java.util.List#set(int, java.lang.Object) + */ @Override public E set(int index, E element) { return elements.set(index, element); } + /* (non-Javadoc) + * @see java.util.List#size() + */ @Override public int size() { return elements.size(); } + /* (non-Javadoc) + * @see java.util.List#subList(int, int) + */ @Override public List<E> subList(int fromIndex, int toIndex) { return elements.subList(fromIndex, toIndex); } + /* (non-Javadoc) + * @see java.util.List#toArray() + */ @Override public Object[] toArray() { return elements.toArray(); } + /* (non-Javadoc) + * @see java.util.List#toArray(T[]) + */ @Override public <T> T[] toArray(T[] a) { return elements.toArray(a); Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -19,8 +19,12 @@ import fr.cemagref.simexplorer.is.entities.data.Structure; +/** + * The Class Structures. + */ public final class Structures extends SimpleComposite<Structure> { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 6543027162443829281L; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -134,10 +134,10 @@ @Override public int hashCode() { final int prime = 31; - int result = super.hashCode(); - result = prime * result + ((constantValues == null) ? 0 : constantValues.hashCode()); - result = prime * result + ((this.result == null) ? 0 : this.result.hashCode()); - return result; + int resultHash = super.hashCode(); + resultHash = prime * resultHash + ((constantValues == null) ? 0 : constantValues.hashCode()); + resultHash = prime * resultHash + ((this.result == null) ? 0 : this.result.hashCode()); + return resultHash; } @Override 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-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -293,10 +293,18 @@ return EntityTypeEnum.getEntityType(getElementClass()); } + /** + * Gets the entity type libelle. + * + * @return the entity type libelle + */ public String getEntityTypeLibelle() { return getEntityType().getLibelle(); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.Entity#getRow() + */ @Override public List<String> getRow() { List<String> row = new ArrayList<String>(); Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerRuntimeException.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerRuntimeException.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerRuntimeException.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -20,23 +20,45 @@ /** * RuntimeException de base. - * + * * @author chemit */ public class SimExplorerRuntimeException extends RuntimeException { + + /** The Constant serialVersionUID. */ private static final long serialVersionUID = -4412747043461741154L; + /** + * Instantiates a new sim explorer runtime exception. + */ public SimExplorerRuntimeException() { + super(); } + /** + * Instantiates a new sim explorer runtime exception. + * + * @param cause the cause + */ public SimExplorerRuntimeException(Throwable cause) { super(cause); } + /** + * Instantiates a new sim explorer runtime exception. + * + * @param message the message + */ public SimExplorerRuntimeException(String message) { super(message); } + /** + * Instantiates a new sim explorer runtime exception. + * + * @param message the message + * @param cause the cause + */ public SimExplorerRuntimeException(String message, Throwable cause) { super(message, cause); } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerTechnicalException.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerTechnicalException.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerTechnicalException.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -22,6 +22,7 @@ */ public class SimExplorerTechnicalException extends SimExplorerException { + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 7182289381405452276L; /** Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/UnreachableServiceException.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/UnreachableServiceException.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/UnreachableServiceException.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -18,24 +18,46 @@ package fr.cemagref.simexplorer.is.exceptions; /** - * TODO javadoc - * + * TODO javadoc. + * * @author chemit */ public class UnreachableServiceException extends SimExplorerRuntimeException { + + /** The Constant serialVersionUID. */ private static final long serialVersionUID = -6740529102758721136L; + /** + * Instantiates a new unreachable service exception. + */ public UnreachableServiceException() { - } + super(); + } + /** + * Instantiates a new unreachable service exception. + * + * @param cause the cause + */ public UnreachableServiceException(Throwable cause) { super(cause); } + /** + * Instantiates a new unreachable service exception. + * + * @param message the message + */ public UnreachableServiceException(String message) { super(message); } + /** + * Instantiates a new unreachable service exception. + * + * @param message the message + * @param cause the cause + */ public UnreachableServiceException(String message, Throwable cause) { super(message, cause); } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/ContentTypeFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/ContentTypeFactory.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/ContentTypeFactory.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -24,7 +24,7 @@ /** * Cache content types. - * + * * @author landais */ public class ContentTypeFactory { @@ -32,23 +32,25 @@ /** Content type cache. */ private static Map<String, ContentType> contentTypes = null; - /** Constant defining where are implementations */ + /** Constant defining where are implementations. */ private static final String PACKAGE_IMPLS = ContentType.class.getPackage().getName(); /** - * Retrieve a content type instance from the cache. - * - * If no such instance is found, then create it and store it in cache. - * + * Retrieve a content type instance from the cache. If no such instance is found, then create it and store it + * in cache. + * * @param contentTypeClassSimpleName Class required + * * @return the Instance - * @throws IllegalArgumentException if could not found the class or has - * problem while instanciation + * + * @throws IllegalArgumentException if could not found the class or has problem while instanciation */ public static ContentType getContentTypeInstance(String contentTypeClassSimpleName) throws IllegalArgumentException { - Map<String, ContentType> contentTypes = getContentTypes(); + if (contentTypes == null) { + contentTypes = new HashMap<String, ContentType>(); + } // Check cache - ContentType result = getContentTypes().get(contentTypeClassSimpleName); + ContentType result = contentTypes.get(contentTypeClassSimpleName); // Create instance if doesn't exist, and put it in cache if (result == null) { try { @@ -67,13 +69,9 @@ return result; } - protected static Map<String, ContentType> getContentTypes() { - if (contentTypes == null) { - contentTypes = new HashMap<String, ContentType>(); - } - return contentTypes; - } - + /** + * Instantiates a new content type factory. + */ protected ContentTypeFactory() { // no instance } Deleted: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/EntityFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/EntityFactory.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/EntityFactory.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -1,37 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, 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.factories; - -import com.thoughtworks.xstream.XStream; - -import fr.cemagref.simexplorer.is.entities.Entity; - -/** - * A factory for creating BaseEntity objects. - * - * @param <E> Entity type - */ -public abstract class EntityFactory<E extends Entity> { - - private static XStream xstream = new XStream(); - - public static XStream getXstream() { - return xstream; - } - -} Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -22,19 +22,30 @@ import java.io.PipedInputStream; import java.io.PipedOutputStream; +import com.thoughtworks.xstream.XStream; + import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; /** * A factory for creating LoggableElement objects. * - * @param <E> - * LoggableElement subtype */ -public abstract class LoggableElementFactory<E extends LoggableElement> extends - EntityFactory<E> { +public abstract class LoggableElementFactory { + /** The xstream. */ + private static XStream xstream = new XStream(); + /** + * Gets the xstream. + * + * @return the xstream + */ + public static XStream getXstream() { + return xstream; + } + + /** * Parses the stream. * * @param xmlData the xml data Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -19,9 +19,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import java.util.Random; import java.util.UUID; @@ -49,7 +47,6 @@ import fr.cemagref.simexplorer.is.entities.data.Library; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.data.Result; -import fr.cemagref.simexplorer.is.entities.data.Structure; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.factories.ContentTypeFactory; @@ -67,6 +64,7 @@ /** The md5. */ private String md5; + /** The data. */ private byte[] data; /** @@ -98,6 +96,11 @@ this.md5 = md5; } + /** + * Sets the data. + * + * @param bytes the new data + */ public void setData(byte[] bytes) { data = bytes; } @@ -110,6 +113,7 @@ /** The cs. */ private static int cs; + /** The counter. */ private static int counter = 0; /** The randomstrings. */ @@ -133,23 +137,10 @@ } /** - * Long string. + * Hash. * * @return the string */ - private String longString() { - /* - StringBuilder sb = new StringBuilder(); - int c = 3 + r.nextInt(5); - for (int i = 0; i < c; i++) { - sb.append(shortString()); - sb.append(" "); - } - return sb.toString(); - */ - return RandomStringUtils.randomAlphabetic(r.nextInt(10) + 10); - } - private String hash() { return RandomStringUtils.randomAlphanumeric(32); } @@ -210,6 +201,18 @@ element.setMetaData(metaData); } + /** + * Generate composite. + * @param <SC> Simple composite wanted + * @param <T> Class of simple composite children + * + * @param compositeClass the composite class + * @param elementClass the element class + * + * @return the sC + * + * @throws Exception the exception + */ public <SC extends SimpleComposite<T>, T extends Entity> SC generateComposite(Class<SC> compositeClass, Class<T> elementClass) throws Exception { SC elements = compositeClass.newInstance(); Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -155,6 +155,13 @@ } } + /** + * Close stream. + * + * @param fos the fos + * + * @throws SimExplorerException the sim explorer exception + */ protected void closeStream(OutputStream fos) throws SimExplorerException { if (fos != null) { // Close file Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -292,9 +292,8 @@ * * @return the filter * - * @throws SimExplorerTechnicalException the sim explorer technical exception */ - private Filter createFilter(Collection<String> visibleItems) throws SimExplorerTechnicalException { + private Filter createFilter(Collection<String> visibleItems) { Filter filter = new CachingWrapperFilter(new QueryWrapperFilter(createQuery(visibleItems))); return filter; } @@ -676,7 +675,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - hits = filterSearch(searcher, query, userFilter, getSortDate(sortColumn, sortOrder)); + hits = filterSearch(searcher, query, userFilter, getSort(sortColumn, sortOrder)); // Convert hits to elements result = convertHitsToElements(hits, start, count); } finally { @@ -700,7 +699,7 @@ * * @return null if no sort */ - private Sort getSortDate(SortColumn column, SortOrder sortOrder) { + private Sort getSort(SortColumn column, SortOrder sortOrder) { Sort sort; if (column != SortColumn.None) { SortField[] fields = new SortField[3]; @@ -819,7 +818,7 @@ } Hits hits; - hits = filterSearch(searcher, query, userFilter, getSortDate(column, sortOrder)); + hits = filterSearch(searcher, query, userFilter, getSort(column, sortOrder)); return hits; } @@ -1101,7 +1100,7 @@ * @see fr.cemagref.simexplorer.is.storage.database.Database#updateFilter(java.lang.String, java.util.Collection) */ @Override - public void updateFilter(String userFilter, Collection<String> visibleItems) throws SimExplorerTechnicalException { + public void updateFilter(String userFilter, Collection<String> visibleItems) { if (visibleItems != null) { Filter filter = createFilter(visibleItems); synchronized (filterSynchronizer) { Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -19,7 +19,6 @@ import java.io.InputStream; import java.io.Reader; -import java.io.StringReader; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java 2008-03-10 14:12:41 UTC (rev 1315) @@ -31,12 +31,21 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -/** The Class Config. */ +/** + * The Class Config. + */ public class Config { + /** The Constant DB_FOLDER_PROPERTY. */ public static final String DB_FOLDER_PROPERTY = "simexplorer.db"; + + /** The Constant DATA_PROPERTY. */ public static final String DATA_PROPERTY = "simexplorer.data"; + + /** The Constant OPTIMIZE_PERIOD_PROPERTY. */ public static final String OPTIMIZE_PERIOD_PROPERTY = "simexplorer.optimizeperiod"; + + /** The Constant ADMIN_MAIL_PROPERTY. */ public static final String ADMIN_MAIL_PROPERTY = "simexplorer.adminmail"; /** The Constant log. */ @@ -48,12 +57,14 @@ /** The properties location. */ private static String propertiesLocation = "/properties/config.properties"; + /** The prefix key. */ private static String prefixKey = null; /** * Inits the properties. - * + * * @param location config file to load + * * @throws IOException Signals that an I/O exception has occurred. */ private static void initProperties(String location) throws IOException { @@ -99,6 +110,12 @@ } + /** + * Translate properties. + * + * @param prefixKey the prefix key + * @param keys the keys + */ private static void translateProperties(String prefixKey, String... keys) { Properties myProps = new Properties(); @@ -131,7 +148,7 @@ /** * Gets the properties. - * + * * @return the properties */ public static Properties getProperties() { @@ -140,9 +157,9 @@ /** * Sets the properties location. - * + * * @param propertiesLocation the new properties location - * @param prefixKey prefixKey to suppress in properties + * @param prefixKey prefixKey to suppress in properties */ public static void init(String propertiesLocation, String prefixKey) { Config.propertiesLocation = propertiesLocation; @@ -152,7 +169,7 @@ /** * Sets the properties location. - * + * * @param propertiesLocation the new properties location */ public static void setPropertiesLocation(String propertiesLocation) { @@ -161,8 +178,9 @@ /** * Gets the properties. - * + * * @param location config file to load + * * @return the properties */ protected static Properties getProperties(String location) { @@ -180,7 +198,7 @@ /** * Sets the properties. - * + * * @param properties the new properties */ protected static void setProperties(Properties properties) { Modified: trunk/simexplorer-is/src/site/fr/rst/devel/implementation.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/devel/implementation.rst 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/src/site/fr/rst/devel/implementation.rst 2008-03-10 14:12:41 UTC (rev 1315) @@ -8,18 +8,30 @@ Module entities --------------- -Ce premier module a trois objectifs : +Ce premier module a pour objectifs : #. les classes de données #. les types de contenus attachés aux données - #. les "usines" à instances, capables d'instancier les données, et de sérialiser/désérialiser en XML + #. le parcours des données pour l'interface graphique Classes de données __________________ Ce sont des classes sérializables. Elles représentent le modèle de données fournies. -Le type "LoggableElement" se voit rattaché une association vers un "MetaDataEntity". Cette classe contient +Le type "LoggableElement" se voit rattaché une association vers un "MetaData". Cette classe contient toutes les propriétés nécessaires au fonctionnement de Simexplorer SI. +Toutes les classes héritent de Entity, en étant soit un "Leaf" (feuille), soit un "Composite". +Une classe abstraite SimpleComposite implémentant List doit être utilisée pour créer des listes de données, +comme Codes, Libraries, etc. + +Pour l'affichage simple, la méthode toString() est utilisée. Pour l'affichage en grille, getRow permet +de spécifier les différentes propriétés affichées. + +Les données sont parcourues par un visiteur, héritant d'EntityVisitor. EntityVisitorTreeNode implémente +cette interface est est dérivée pour le module web et le module Swing. + +EntityTypeEnum recense les différents types d'éléments de l'application, afin de retrouver les libellés, etc. + Types de contenus _________________ @@ -27,11 +39,6 @@ fournissant le MIME type et une méthode virtuelle de conversion d'un flux en texte, afin de l'afficher ou de l'indexer pour la recherche. -Factories -_________ - -Ces classes servent à charger/sauver les objets sous la forme de fichiers XML. - Module storage -------------- Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-03-10 13:12:04 UTC (rev 1314) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-03-10 14:12:41 UTC (rev 1315) @@ -2,11 +2,6 @@ SimExplorer SI - TODO ===================== -Serveur central -=============== - - - retour synchronisation récursif - Client léger ============ @@ -38,7 +33,6 @@ Serveur ------- - - (NOK) Gestion du tri sur toutes les colonnes pour les recherches (tests) - (NOK) Créer les interfaces accessibles via d'autres protocoles que RMI (WebService, CORBA). - (NOK) Remplacer l'invoker jrmp par http afin de permettre l'utilisation de

1 0

r1314 - in trunk/simexplorer-is: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-entities/src/resources/i18n simexplorer-is-web/src/java/fr/
by glandais＠users.labs.libre-entreprise.org 10 Mar '08

10 Mar '08

Author: glandais Date: 2008-03-10 13:12:04 +0000 (Mon, 10 Mar 2008) New Revision: 1314 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Composite.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Entity.java 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/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 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/Codes.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.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/ExplorationDatas.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.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/composite/Structures.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/Component.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/data/ExplorationApplication.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Repository.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Result.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 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/Version.java trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 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/pages/security/ProtectedPage.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java Log: UI web visitor Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Composite.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Composite.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Composite.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -44,7 +44,7 @@ */ protected void visitLeave(EntityVisitor visitor) { visitor.exitComposite(this); - // do nothing + // do nothing } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Entity.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Entity.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Entity.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,12 +21,8 @@ import java.util.List; /** - * The minimal Entity contract. - * - * This is a <code>marker</code> interface, nothing special to describe for this - * contract. - * - * An Entity is serializable and visitable. + * The minimal Entity contract. This is a <code>marker</code> interface, nothing special to describe for this + * contract. An Entity is serializable and visitable. */ public interface Entity extends Serializable, EntityVisitable { @@ -36,5 +32,12 @@ * @return the children */ public List<Entity> getChildren(); - + + /** + * Gets the row for UI. + * + * @return the row + */ + public abstract List<String> getRow(); + } 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -33,29 +32,38 @@ /** * Une classe utilitaires pour les Entities du projet. - * + * * @author chemit */ public class EntityHelper { + + public static enum ActionAvailabilty { + SWING, WEB, BOTH; + } + /** - * Une énumération pour définir les types des entités du - * projet. - * + * Une énumération pour définir les types des entités du projet. + * * @author chemit */ public static enum Action { - DOWNLOAD(ExplorationApplication.class, Result.class, Library.class), - EXPORT(ExplorationApplication.class, Result.class, Library.class), - IMPORT(ExplorationApplication.class, Library.class), - DELETE(ExplorationApplication.class, ExplorationData.class); + DOWNLOAD("", ActionAvailabilty.SWING, ExplorationApplication.class, Result.class, Library.class), + EXPORT("export", ActionAvailabilty.BOTH, ExplorationApplication.class, Result.class, Library.class), + IMPORT("", ActionAvailabilty.SWING, ExplorationApplication.class, Library.class), + DELETE("delete", ActionAvailabilty.BOTH, ExplorationApplication.class, ExplorationData.class), + HISTORY("history", ActionAvailabilty.WEB, LoggableElement.class), + RIGHTS("rights", ActionAvailabilty.WEB, ExplorationApplication.class, ExplorationData.class), + DETAILS("details", ActionAvailabilty.WEB), + METADATA("metadata", ActionAvailabilty.WEB, ExplorationApplication.class, ExplorationData.class); private List<Class<?>> classes; private List<String> types; + private String actionName; + private ActionAvailabilty availabilty; public boolean accept(DefaultMutableTreeNode node) { - return node != null && node.getUserObject() != null && - accept(node.getUserObject().getClass()); + return node != null && node.getUserObject() != null && accept(node.getUserObject().getClass()); } public boolean accept(LoggableElement sNode) { @@ -65,8 +73,18 @@ public boolean accept(MetaData metaData) { return metaData != null && accept(metaData.getElementClass()); } - - private Action(Class<?>... classes) { + + public String getActionName() { + return actionName; + } + + public ActionAvailabilty getAvailabilty() { + return availabilty; + } + + private Action(String actionName, ActionAvailabilty actionAvailabilty, Class<?>... classes) { + this.actionName = actionName; + this.availabilty = actionAvailabilty; this.classes = Arrays.asList(classes); this.types = new ArrayList<String>(classes.length); for (Class<?> aClass : classes) { Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -1,12 +1,13 @@ package fr.cemagref.simexplorer.is.entities; +import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; -import static org.codelutin.i18n.I18n._; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.Constant; import fr.cemagref.simexplorer.is.entities.data.ConstantValue; +import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; import fr.cemagref.simexplorer.is.entities.data.Library; @@ -38,6 +39,9 @@ /** The Constant value. */ ConstantValue(false, n_("simexplorer.common.constantvalue"), n_("simexplorer.common.constantvalues"), ConstantValue.class), + /** The Constant value. */ + Descriptor(false, n_("simexplorer.common.descriptor"), n_("simexplorer.common.descriptors"), Descriptor.class), + /** The Exploration application. */ ExplorationApplication(true, n_("simexplorer.common.explorationapplication"), n_("simexplorer.common.explorationapplications"), ExplorationApplication.class), @@ -84,7 +88,7 @@ } return null; } - + /** * Gets the libelle. * Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,14 +18,13 @@ package fr.cemagref.simexplorer.is.entities; /** - * Le contrat a respecter par un entity pour être visiter par un - * {@link EntityVisitor} visiteur. - * + * Le contrat a respecter par un entity pour être visiter par un {@link EntityVisitor} visiteur. + * * @author chemit * @see EntityVisitor */ public interface EntityVisitable { - + /** * Méthode à implanter dans chaque visitable pour indiquer ce que le visiteur doit visiter. * Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities; - /** * Le contrat à respecter pour un visiteur à visiter des {@link EntityVisitable}.. * @@ -34,7 +33,7 @@ * */ void visit(EntityVisitable v); - + /** * Visit. * @@ -64,5 +63,5 @@ * @param v the v */ void exitComposite(Composite v); - + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/Leaf.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,8 +21,7 @@ import java.util.List; /** - * The Class Leaf. - * This class represents a leaf of the tree + * The Class Leaf. This class represents a leaf of the tree */ public abstract class Leaf implements Entity { @@ -30,8 +29,17 @@ * @see fr.cemagref.simexplorer.is.entities.pattern.Entity#getChildren() */ @Override - public final List<Entity> getChildren() { + public final List<Entity> getChildren() { return new ArrayList<Entity>(); } + public void accept(EntityVisitor visitor) { + visitor.visitLeaf(this); + } + + @Override + public String toString() { + return EntityTypeEnum.getLibelle(this); + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,9 +17,13 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.attachment; +import static org.codelutin.i18n.I18n._; + +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.lang.StringUtils; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -172,13 +176,20 @@ StringBuffer sb = new StringBuffer(); sb.append(getFileName()); if (getContentType() != null) { - sb.append(" - ").append(getContentType().getDescription()); + sb.append(" - ").append(_(getContentType().getDescription())); } return sb.toString(); } - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(getFileName()); + if (getContentType() != null) { + row.add(_(getContentType().getDescription())); + } + return row; } } 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,28 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.attachment.Attachment; public final class Attachments extends SimpleComposite<Attachment> { + private static final long serialVersionUID = 6100507219070076248L; + + // @Override + // protected boolean visitEnter(EntityVisitor visitor) { + // // do not visit attachments + // return false; + // } + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.attachment.filename")); + row.add(_("simexplorer.common.attachment.datatype")); + return row; + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,22 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.data.Code; public final class Codes extends SimpleComposite<Code> { + private static final long serialVersionUID = -8845424774771585654L; + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.code.language")); + row.add(_("simexplorer.common.code.code")); + return row; + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Components.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,4 +21,6 @@ public final class Components extends SimpleComposite<Component> { + private static final long serialVersionUID = 5467707236188600666L; + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,21 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.data.ConstantValue; public final class ConstantValues extends SimpleComposite<ConstantValue> { + private static final long serialVersionUID = -1567351689671452380L; + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.constantvalue.constant")); + row.add(_("simexplorer.common.constantvalue.value")); + return row; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,22 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.data.Constant; public final class Constants extends SimpleComposite<Constant> { + private static final long serialVersionUID = 2754488720122128335L; + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.constant.name")); + row.add(_("simexplorer.common.constant.type")); + return row; + } + } 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,8 +17,28 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; +import static org.codelutin.i18n.I18n._; + +import java.util.List; + import fr.cemagref.simexplorer.is.entities.data.Descriptor; public final class Descriptors extends SimpleComposite<Descriptor> { - + + // @Override + // protected boolean visitEnter(EntityVisitor visitor) { + // // do not visit descriptors + // return false; + // } + + private static final long serialVersionUID = -5742926033876669501L; + + @Override + public List<String> getRow() { + List<String> row = super.getRow(); + row.add(_("simexplorer.common.descriptor.name")); + row.add(_("simexplorer.common.descriptor.value")); + return row; + } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/ExplorationDatas.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,4 +21,6 @@ public final class ExplorationDatas extends SimpleComposite<ExplorationData> { + private static final long serialVersionUID = 616723755643872808L; + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Libraries.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,4 +21,6 @@ public final class Libraries extends SimpleComposite<Library> { + private static final long serialVersionUID = 3325488033333012292L; + } 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -92,7 +92,7 @@ return false; return true; } - + public Class<E> getChildrenClass() { Class<E> eClass = null; @@ -102,7 +102,7 @@ eClass = (Class<E>) paramType.getActualTypeArguments()[0]; return eClass; } - + return null; } @@ -119,6 +119,13 @@ return super.toString(); } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + return row; + } + /** * Delegate List methods */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Structures.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -21,4 +21,6 @@ public final class Structures extends SimpleComposite<Structure> { + private static final long serialVersionUID = 6543027162443829281L; + } 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,8 +18,9 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -77,13 +78,9 @@ */ @Override public String toString() { - return getCode() + " : " + getLanguage(); + return getLanguage() + " : " + getCode(); } - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); - } - @Override public int hashCode() { final int prime = 31; @@ -115,4 +112,12 @@ 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/Component.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import java.util.ArrayList; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; @@ -123,7 +122,7 @@ */ @Override public List<Entity> getChildren() { - List<Entity> directChildren = new ArrayList<Entity>(); + List<Entity> directChildren = super.getChildren(); directChildren.add(constants); directChildren.add(structures); directChildren.add(codes); 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,8 +18,9 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** The Class Constant. */ @@ -36,7 +37,7 @@ /** * Gets the name. - * + * * @return the name */ public String getName() { @@ -45,7 +46,7 @@ /** * Sets the name. - * + * * @param name the new name */ public void setName(String name) { @@ -54,7 +55,7 @@ /** * Gets the type. - * + * * @return the type */ public Class<?> getType() { @@ -63,7 +64,7 @@ /** * Sets the type. - * + * * @param type the new type */ public void setType(Class<?> type) { @@ -78,10 +79,6 @@ return getName() + " : " + getType().getSimpleName(); } - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); - } - @Override public int hashCode() { final int prime = 31; @@ -112,7 +109,14 @@ return false; 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,8 +18,9 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -72,8 +73,16 @@ this.constant = constant; } - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); + @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + if (constant != null) { + sb.append(constant.toString()).append(" = "); + } + if (value != null) { + sb.append(value); + } + return sb.toString(); } @Override @@ -107,4 +116,12 @@ 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -46,14 +48,6 @@ this.value = value; } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.entities.EntityVisitable#accept(fr.cemagref.simexplorer.is.entities.EntityVisitor) - */ - @Override - public void accept(EntityVisitor visitor) { - // nothing... yet! - } - /** * Gets the name. * @@ -91,6 +85,13 @@ } @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append(name).append(" = ").append(value); + return sb.toString(); + } + + @Override public int compareTo(Descriptor o) { if (this.getName() == null || o == null || o.getName() == null) { return 0; @@ -129,4 +130,12 @@ 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/data/ExplorationApplication.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,13 +18,11 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; import fr.cemagref.simexplorer.is.entities.composite.Components; import fr.cemagref.simexplorer.is.entities.composite.ExplorationDatas; -import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; /** * The Class ExplorationApplication. @@ -81,7 +79,7 @@ */ @Override public List<Entity> getChildren() { - List<Entity> directChildren = new ArrayList<Entity>(); + List<Entity> directChildren = super.getChildren(); directChildren.add(explorations); directChildren.add(components); return directChildren; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,7 +18,6 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; @@ -126,7 +125,7 @@ */ @Override public List<Entity> getChildren() { - List<Entity> children = new ArrayList<Entity>(); + List<Entity> children = super.getChildren(); children.add(result); children.add(constantValues); return children; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,11 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import java.util.ArrayList; -import java.util.List; - -import fr.cemagref.simexplorer.is.entities.Entity; - /** The Class Library. */ public class Library extends LoggableElement { @@ -55,11 +50,4 @@ return true; } - @Override - public List<Entity> getChildren() { - List<Entity> children = new ArrayList<Entity>(); - children.add(getAttachments()); - return children; - } - } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -22,10 +22,10 @@ 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.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.composite.Attachments; import fr.cemagref.simexplorer.is.entities.composite.Descriptors; -import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; /** @@ -59,6 +59,22 @@ return getName(); } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(EntityTypeEnum.getLibelle(this.getClass())); + return row; + } + + @Override + public List<Entity> getChildren() { + List<Entity> children = new ArrayList<Entity>(); + children.add(metadataIS); + children.add(attachments); + children.add(descriptors); + return children; + } + /** * Gets all children of LoggableElement type. * @@ -67,13 +83,15 @@ * */ private void getLEChildren(Entity entity, List<LoggableElement> list) { - if (entity instanceof LoggableElement) { - list.add((LoggableElement) entity); + if (entity != null) { + if (entity instanceof LoggableElement) { + list.add((LoggableElement) entity); + } + List<Entity> children = entity.getChildren(); + for (Entity child : children) { + getLEChildren(child, list); + } } - List<Entity> children = entity.getChildren(); - for (Entity child : children) { - getLEChildren(child, list); - } } /** Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Repository.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Repository.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Repository.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -56,8 +58,10 @@ } @Override - public void accept(EntityVisitor visitor) { - // nothing yet + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(toString()); + return row; } - } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Result.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Result.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Result.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.Leaf; /** The Class Result. */ @@ -27,15 +29,6 @@ private static final long serialVersionUID = 2111484866027162494L; @Override - public String toString() { - return "Result " + Math.abs(hashCode()); - } - - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); - } - - @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -61,4 +54,11 @@ // return false; return true; } + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + return row; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,7 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -28,10 +30,6 @@ /** The Constant serialVersionUID. */ private static final long serialVersionUID = 2594331198459134006L; - public void accept(EntityVisitor visitor) { - visitor.visitLeaf(this); - } - @Override public int hashCode() { final int prime = 31; @@ -58,4 +56,11 @@ // return false; return true; } + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,10 +17,13 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.metadata; +import static org.codelutin.i18n.I18n._; + +import java.util.ArrayList; import java.util.Date; +import java.util.List; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.Leaf; /** @@ -263,14 +266,6 @@ this.description = description; } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.entities.EntityVisitable#accept(fr.cemagref.simexplorer.is.entities.EntityVisitor) - */ - @Override - public void accept(EntityVisitor visitor) { - // nothing yet - } - /** * Gets the element class. * @@ -297,9 +292,17 @@ public EntityTypeEnum getEntityType() { return EntityTypeEnum.getEntityType(getElementClass()); } - + public String getEntityTypeLibelle() { return getEntityType().getLibelle(); } - + + @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; + } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -41,8 +41,7 @@ /** * Static public factory of Version from his string representation. * - * @param version - * the string representation of the version + * @param version the string representation of the version * * @return a new instance of version */ @@ -53,8 +52,7 @@ /** * Default constructor. * - * @param version - * String version + * @param version String version */ public Version(String version) { // Initialize list @@ -71,8 +69,7 @@ /** * Retrieve sub version. * - * @param position - * Sub version wanted + * @param position Sub version wanted * * @return the sub version number */ @@ -84,14 +81,11 @@ } /** - * TODO, this is not immuable method :) modified internal state, also we - * TODO should not to this, but return a new instance of Version - * Set a sub version. + * TODO, this is not immuable method :) modified internal state, also we TODO should not to this, but return a new + * instance of Version Set a sub version. * - * @param position - * Sub version to modify - * @param subVersion - * New value + * @param position Sub version to modify + * @param subVersion New value */ public void setVersion(int position, Integer subVersion) { while (getVersion(position) == null) { @@ -101,22 +95,18 @@ } /** - * TODO as the method modified internal state, it should be at least protected - * Add a new sub version. + * TODO as the method modified internal state, it should be at least protected Add a new sub version. * - * @param subVersion - * Sub version value + * @param subVersion Sub version value */ public void addSubVersion(Integer subVersion) { pointedVersion.add(subVersion); } /** - * Clone current instance and Increment a sub version. Note : The - * current instance is NOT modified + * Clone current instance and Increment a sub version. Note : The current instance is NOT modified * - * @param position - * Sub version position + * @param position Sub version position * * @return the new instance of version object updated */ @@ -174,8 +164,7 @@ result = 1; compared = true; } else { - result = getVersion(position).compareTo( - v.getVersion(position)); + result = getVersion(position).compareTo(v.getVersion(position)); compared = (result != 0); } } @@ -205,9 +194,7 @@ */ @Override public boolean equals(Object o) { - return this == o - || (o instanceof Version && pointedVersion - .equals(((Version) o).pointedVersion)); + return this == o || (o instanceof Version && pointedVersion.equals(((Version) o).pointedVersion)); } /* @@ -222,13 +209,11 @@ } /** - * TODO suppress it if we want a immuable class - * Safe clone. + * TODO suppress it if we want a immuable class Safe clone. * * @return the version * - * @throws RuntimeException - * the runtime exception + * @throws RuntimeException the runtime exception */ public Version safeClone() throws RuntimeException { try { Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-03-10 13:12:04 UTC (rev 1314) @@ -1,19 +1,32 @@ simexplorer.common.attachment=Attachment +simexplorer.common.attachment.datatype=Data type +simexplorer.common.attachment.filename=Filename simexplorer.common.attachments=Attachments simexplorer.common.code=Code +simexplorer.common.code.code=Code +simexplorer.common.code.language=Language simexplorer.common.codes=Codes simexplorer.common.component=Component simexplorer.common.components=Components simexplorer.common.constant=Constant +simexplorer.common.constant.name=Name +simexplorer.common.constant.type=Type simexplorer.common.constants=Constants simexplorer.common.constantvalue=Constant value +simexplorer.common.constantvalue.constant=Constant +simexplorer.common.constantvalue.value=Value simexplorer.common.constantvalues=Constant values +simexplorer.common.descriptor=Descriptor +simexplorer.common.descriptor.name=Name +simexplorer.common.descriptor.value=Value +simexplorer.common.descriptors=Descriptors simexplorer.common.explorationapplication=Exploration application simexplorer.common.explorationapplications=Exploration applications simexplorer.common.explorationdata=Exploration data simexplorer.common.explorationdatas=Exploration datas simexplorer.common.libraries=Libraries simexplorer.common.library=Library +simexplorer.common.metadata=Metadata simexplorer.common.repositories=Repositories simexplorer.common.repository=Repository simexplorer.common.result=Result Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-03-10 13:12:04 UTC (rev 1314) @@ -1,19 +1,32 @@ simexplorer.common.attachment=Fichier attach\u00E9 +simexplorer.common.attachment.datatype=Type +simexplorer.common.attachment.filename=Nom fichier simexplorer.common.attachments=Fichiers attach\u00E9s simexplorer.common.code=Code +simexplorer.common.code.code=Code +simexplorer.common.code.language=Langage simexplorer.common.codes=Codes simexplorer.common.component=Componsant simexplorer.common.components=Composants simexplorer.common.constant=Constante +simexplorer.common.constant.name=Nom +simexplorer.common.constant.type=Type simexplorer.common.constants=Constantes simexplorer.common.constantvalue=Valeur de constante +simexplorer.common.constantvalue.constant=Constante +simexplorer.common.constantvalue.value=Valeur simexplorer.common.constantvalues=Valeurs de constante +simexplorer.common.descriptor=Mot cl\u00E9 +simexplorer.common.descriptor.name=Nom +simexplorer.common.descriptor.value=Valeur +simexplorer.common.descriptors=Mots cl\u00E9s simexplorer.common.explorationapplication=Exploration d'application simexplorer.common.explorationapplications=Explorations d'application simexplorer.common.explorationdata=Donn\u00E9e d'exploration simexplorer.common.explorationdatas=Donn\u00E9es d'Explorations simexplorer.common.libraries=Librairies simexplorer.common.library=Librarie +simexplorer.common.metadata=M\u00E9tadonn\u00E9es simexplorer.common.repositories=Repositories simexplorer.common.repository=Repository simexplorer.common.result=R\u00E9sultat Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; import fr.cemagref.simexplorer.is.ui.web.tools.WebEntityVisitor; @@ -58,7 +60,7 @@ */ public List<TreeNode> getNodes() { List<TreeNode> nodes = new ArrayList<TreeNode>(); - WebEntityVisitor webEntityVisitor = new WebEntityVisitor(); + WebEntityVisitor webEntityVisitor = new WebEntityVisitor(getResources(), getMessages()); nodes.add(webEntityVisitor.treeNodeVisit(getElement())); return nodes; } 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -22,7 +22,9 @@ import java.util.List; import java.util.StringTokenizer; +import org.apache.tapestry.ComponentResources; import org.apache.tapestry.StreamResponse; +import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; @@ -138,7 +140,7 @@ */ public List<TreeNode> getNodes() { List<TreeNode> nodes = new ArrayList<TreeNode>(); - WebEntityVisitor webEntityVisitor = new WebEntityVisitor(); + WebEntityVisitor webEntityVisitor = new WebEntityVisitor(getResources(), getMessages()); nodes.add(webEntityVisitor.treeNodeVisit(getElement())); return nodes; } 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -22,10 +22,8 @@ import java.util.List; import java.util.StringTokenizer; -import org.apache.tapestry.ComponentResources; import org.apache.tapestry.Link; import org.apache.tapestry.annotations.InjectPage; -import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; @@ -41,10 +39,6 @@ /** The Constant DATE_FORMAT for formatting dates. */ public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss.SSS"); - /** The resources. */ - @Inject - private ComponentResources resources; - /** The element export. */ @InjectPage private ElementDownload elementDownload; @@ -168,7 +162,7 @@ * @return the string */ protected String generateString(String actionCaption, String action, String context) { - Link link = resources.createActionLink(action, false, context); + Link link = getResources().createActionLink(action, false, context); StringBuffer sb = new StringBuffer(""); sb.append("<a href=\""); sb.append(link.toString()); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-03-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -17,10 +17,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages.security; +import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; +import org.codelutin.i18n.I18n; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerSecurityException; @@ -56,6 +58,10 @@ @Inject private Messages messages; + /** The resources. */ + @Inject + private ComponentResources resources; + /** * On activate. * @@ -171,5 +177,20 @@ public Messages getMessages() { return messages; } + + /** + * Gets the resources. + * + * @return the resources + */ + public ComponentResources getResources() { + return resources; + } + { + I18n.initISO88591("fr", "FR"); + } + + + } \ No newline at end of file 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-08 00:45:57 UTC (rev 1313) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/WebEntityVisitor.java 2008-03-10 13:12:04 UTC (rev 1314) @@ -18,14 +18,69 @@ package fr.cemagref.simexplorer.is.ui.web.tools; import java.util.ArrayList; +import java.util.List; +import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.Link; +import org.apache.tapestry.ioc.Messages; import org.codelutin.tapestry.beans.TreeNode; +import fr.cemagref.simexplorer.is.entities.Composite; import fr.cemagref.simexplorer.is.entities.Entity; +import fr.cemagref.simexplorer.is.entities.EntityHelper; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; 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.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; public class WebEntityVisitor extends EntityVisitorTreeNode<TreeNode> { + private ComponentResources resources; + + private Messages messages; + + public WebEntityVisitor(ComponentResources resources, Messages messages) { + super(); + this.resources = resources; + this.messages = messages; + } + + /** + * Generate string. + * + * @param actionCaption the action caption + * @param action the action + * @param context the context + * + * @return the string + */ + protected String generateString(String actionCaption, String action, String context) { + Link link = resources.createActionLink(action, false, context); + StringBuffer sb = new StringBuffer(""); + sb.append("<a href=\""); + sb.append(link.toString()); + sb.append("\">"); + sb.append(actionCaption); + sb.append("</a>"); + return sb.toString(); + } + + /** + * Generate string. + * + * @param actionCaption the action caption + * @param action the action + * @param element the element + * + * @return the string + */ + protected String generateString(String actionCaption, String action, MetaData element) { + String context = element.getUuid() + "," + element.getVersion(); + return generateString(actionCaption, action, context); + } + protected TreeNode createNode(Entity v, boolean allowedChildren) { TreeNode treeNode = new TreeNode(); treeNode.setChildren(new ArrayList<TreeNode>()); @@ -36,7 +91,39 @@ treeNode.setType(TreeNode.TYPE_DOCUMENT); } - treeNode.setColumns(new String[] { v.toString() }); + List<String> row = v.getRow(); + String[] asArray = row.toArray(new String[4]); + + for (int i = 0; i < asArray.length; i++) { + if (asArray[i] == null) { + asArray[i] = ""; + } + if (v instanceof Composite) { + asArray[i] = "" + asArray[i] + ""; + } + } + + if (v instanceof LoggableElement) { + LoggableElement le = (LoggableElement) v; + StringBuffer sb = new StringBuffer(); + + Action[] actions = EntityHelper.Action.values(); + for (Action action : actions) { + if ((action.getAvailabilty() == ActionAvailabilty.WEB || action.getAvailabilty() == ActionAvailabilty.BOTH) + && action.accept(le)) { + sb.append(" "); + 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(); + } + } + + treeNode.setColumns(asArray); + if (getCurrentParent() != null) { getCurrentParent().getChildren().add(treeNode); }

1 0