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

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

23 Jan '08

Author: tchemit Date: 2008-01-23 21:24:59 +0000 (Wed, 23 Jan 2008) New Revision: 454 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java Log: utilisation implantation par d?\195?\169faut + m?\195?\169thode collapseAll et expandAll Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java 2008-01-23 21:24:03 UTC (rev 453) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java 2008-01-23 21:24:59 UTC (rev 454) @@ -18,44 +18,41 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import java.util.Arrays; -import java.util.Enumeration; -import java.util.LinkedList; -import java.util.Queue; /** * Le TreeNode de base pour afficher des LoggableElement dans un arbre. + * <p/> + * <b>Attention, l'objet interne au node n'est pas forcement un LoggableElement, + * par exemple pour le noeud 'Components' qui sera un simple String.</b> * * @author chemit */ -public class LoggableElementTreeNode implements TreeNode { +public class LoggableElementTreeNode extends DefaultMutableTreeNode { - protected LoggableElementTreeNode parent; + static protected Log log = LogFactory.getLog(LoggableElementTreeNode.class); - protected LoggableElementTreeNode[] childs; + private static final long serialVersionUID = -7544097600554338499L; - protected boolean allowedChildren; - - protected LoggableElement userObject; - - public LoggableElementTreeNode(LoggableElementTreeNode parent, LoggableElement root, boolean allowedChildren) { - this.parent = parent; - this.allowedChildren = allowedChildren; - this.userObject = root; + public LoggableElementTreeNode(LoggableElementTreeNode parent, Object userObject, boolean allowedChildren) { + super(userObject, allowedChildren); + if (parent != null) { + parent.add(this); + } + log.info("Parent " + parent + ", userObject : " + userObject + ", type : " + userObject.getClass().getSimpleName()); } public void collaspeAll(JTree tree) { if (isLeaf()) { return; } - for (LoggableElementTreeNode child : childs) { - child.collaspeAll(tree); + for (Object child : children) { + ((LoggableElementTreeNode) child).collaspeAll(tree); } tree.collapsePath(new TreePath(getPath())); } @@ -65,97 +62,9 @@ return; } tree.expandPath(new TreePath(getPath())); - for (LoggableElementTreeNode child : childs) { - child.expandAll(tree); + for (Object child : children) { + ((LoggableElementTreeNode) child).expandAll(tree); } } - @Override - public TreeNode getChildAt(int childIndex) { - if (childIndex < 0 || childIndex > getChildCount()) { - return null; - } - return childs[childIndex]; - } - - @Override - public int getChildCount() { - return childs == null ? 0 : childs.length; - } - - public TreeNode getParent() { - return parent; - } - - public int getIndex(TreeNode node) { - if (getChildCount() == 0) { - return -1; - } - for (int i = 0; i < childs.length; i++) { - LoggableElementTreeNode child = childs[i]; - if (node.equals(child)) { - return i; - } - } - return -1; - } - - public String toString() { - if (userObject == null) { - return null; - } else { - return userObject.toString(); - } - } - - @Override - public boolean getAllowsChildren() { - return allowedChildren; - } - - @Override - public boolean isLeaf() { - return getChildCount() == 0; - } - - public Enumeration children() { - return childs == null ? DefaultMutableTreeNode.EMPTY_ENUMERATION : new MyEnumeration<LoggableElementTreeNode>(childs); - } - - public TreeNode[] getPath() { - return getPathToRoot(this, 0); - } - - protected TreeNode[] getPathToRoot(TreeNode aNode, int depth) { - TreeNode[] retNodes; - if (aNode == null) { - if (depth == 0) { - return null; - } else { - retNodes = new TreeNode[depth]; - } - } else { - depth++; - retNodes = getPathToRoot(aNode.getParent(), depth); - retNodes[retNodes.length - depth] = aNode; - } - return retNodes; - } - - class MyEnumeration<T> implements Enumeration<T> { - - Queue<T> queue; - - MyEnumeration(T[] queue) { - this.queue = new LinkedList<T>(Arrays.asList(queue)); - } - - public boolean hasMoreElements() { - return !queue.isEmpty(); - } - - public T nextElement() { - return queue.poll(); - } - } }

1 0

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

23 Jan '08

Author: tchemit Date: 2008-01-23 21:24:03 +0000 (Wed, 23 Jan 2008) New Revision: 453 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java Log: helper pour construire l'arbre Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-01-23 21:24:03 UTC (rev 453) @@ -0,0 +1,193 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui.swing.model; + +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.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.ExplorationData; +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.ui.SimExplorerRuntimeException; +import static org.codelutin.i18n.I18n._; + +import javax.swing.tree.TreeNode; + +/** + * Une classe d'utilitaire pour construire les arbres de LoggableElement + * + * @author chemit + * @see LoggableElementTreeNode + */ +public class LoggableElementTreeHelper { + + public enum TypeNode { + explorationApplication(ExplorationApplication.class), + explorationData(ExplorationData.class), + component(Component.class), + result(Result.class), + library(Library.class); + + private Class<?> klass; + + TypeNode(Class<?> aClass) { + this.klass = aClass; + } + + public Class<?> getKlass() { + return klass; + } + } + + public static TypeNode getTypeNode(LoggableElementTreeNode node) { + Object userObject = node.getUserObject(); + if (userObject instanceof String) { + // do not treate string + return null; + } + for (TypeNode typeNode : TypeNode.values()) { + if (typeNode.getKlass() == node.getClass()) { + return typeNode; + } + } + return null; + } + + public static TreeNode buildLoggableElementNode(LoggableElement element) { + if (element instanceof ExplorationApplication) { + return buildExplorationApplicationNode(null, (ExplorationApplication) element); + } + if (element instanceof Component) { + return buildComponentNode(null, (Component) element); + } + if (element instanceof ExplorationData) { + return buildExplorationDataNode(null, (ExplorationData) element); + } + throw new SimExplorerRuntimeException("could not foud a builder for " + element); + + } + + public static TreeNode buildExplorationApplicationNode(LoggableElementTreeNode parent, ExplorationApplication element) { + LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true); + LoggableElementTreeNode tmpNode; + // build components node and his childs + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.components"), true); + for (Component component : element.getComponents()) { + buildComponentNode(tmpNode, component); + } + + // build explorations node and his childs + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.explorations"), true); + for (ExplorationData explorationData : element.getExplorations()) { + buildExplorationDataNode(tmpNode, explorationData); + } + return result; + } + + public static TreeNode buildComponentNode(LoggableElementTreeNode parent, Component element) { + + LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true); + LoggableElementTreeNode tmpNode; + + // build constantes nodes + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constants"), true); + for (Constant constante : element.getConstants()) { + buildConstantNode(tmpNode, constante); + } + + // build structures nodes + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.structures"), true); + for (Structure structure : element.getStructures()) { + buildStructureNode(tmpNode, structure); + } + + // build Codes nodes + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.codes"), true); + for (Code code : element.getCodes()) { + buildCodeNode(tmpNode, code); + } + + // build libraries nodes + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.libraries"), true); + for (Library library : element.getLibraries()) { + buildLibraryNode(tmpNode, library); + } + + return result; + } + + public static LoggableElementTreeNode buildExplorationDataNode(LoggableElementTreeNode parent, ExplorationData element) { + LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true); + LoggableElementTreeNode tmpNode; + // build constant values nodes + tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constantvalues"), true); + for (ConstantValue library : element.getValuesMap()) { + buildConstantValueNode(tmpNode, library); + } + // build result node + buildResultNode(result, element.getResult()); + return result; + } + + public static TreeNode buildLibraryNode(LoggableElementTreeNode parent, Library element) { + LoggableElementTreeNode result; + result = new LoggableElementTreeNode(parent, element, false); + return result; + } + + public static TreeNode buildCodeNode(LoggableElementTreeNode parent, Code element) { + LoggableElementTreeNode result; + result = new LoggableElementTreeNode(parent, element, false); + return result; + } + + public static TreeNode buildStructureNode(LoggableElementTreeNode parent, Structure element) { + LoggableElementTreeNode result; + result = new LoggableElementTreeNode(parent, element, false); + return result; + } + + public static TreeNode buildConstantNode(LoggableElementTreeNode parent, Constant element) { + LoggableElementTreeNode result; + result = new LoggableElementTreeNode(parent, element, false); + return result; + } + + + public static TreeNode buildConstantValueNode(LoggableElementTreeNode parent, ConstantValue element) { + LoggableElementTreeNode result; + result = new LoggableElementTreeNode(parent, element.getConstant().getName(), true); + result.add(new LoggableElementTreeNode(result, element.getValue(), false)); + return result; + } + + public static TreeNode buildResultNode(LoggableElementTreeNode parent, Result element) { + LoggableElementTreeNode result; + result = new LoggableElementTreeNode(parent, element, false); + return result; + } + + protected LoggableElementTreeHelper() { + // no instance please + } +}

1 0

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

23 Jan '08

Author: tchemit Date: 2008-01-23 21:21:45 +0000 (Wed, 23 Jan 2008) New Revision: 452 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: i18n pour l'arbre Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-01-23 20:55:00 UTC (rev 451) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-01-23 21:21:45 UTC (rev 452) @@ -1,4 +1,4 @@ -#Wed Jan 23 08:20:58 GMT 2008 +#Wed Jan 23 21:11:49 GMT 2008 simexplorer.action.about=About simexplorer.action.about.help= simexplorer.action.about.tooltip=Show About dialog @@ -137,6 +137,13 @@ simexplorer.main.menu=Main simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= +simexplorer.node.codes=Codes +simexplorer.node.components=Components +simexplorer.node.constants=Constants +simexplorer.node.constantvalues=Constants +simexplorer.node.explorations=Exlorations +simexplorer.node.libraries=Librairies +simexplorer.node.structures=Structures simexplorer.option.description.config=change value of configuration property (with **key**) by value **value**. simexplorer.option.description.configFile=configuration's file simexplorer.option.description.editConfig=to launch UI of configuration modifier Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-01-23 20:55:00 UTC (rev 451) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-01-23 21:21:45 UTC (rev 452) @@ -1,4 +1,4 @@ -#Wed Jan 23 08:20:58 GMT 2008 +#Wed Jan 23 21:11:49 GMT 2008 simexplorer.action.about=A propos simexplorer.action.about.help= simexplorer.action.about.tooltip=Afficher les cr\u00E9dits @@ -137,6 +137,13 @@ simexplorer.main.menu=Menu principal simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= +simexplorer.node.codes=Codes +simexplorer.node.components=Composants +simexplorer.node.constants=Constantes +simexplorer.node.constantvalues=Constantes +simexplorer.node.explorations=Exlorations +simexplorer.node.libraries=Librairies +simexplorer.node.structures=Structures simexplorer.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**. simexplorer.option.description.configFile=le fichier de configuration utilis\u00E9 simexplorer.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration

1 0

r451 - trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 20:55:00 +0000 (Wed, 23 Jan 2008) New Revision: 451 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/DataEntity.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java Log: ajout toString sur pojo (est actuellement utilis?\195?\169 pour le rendu dans les arbres, si une modification intervient...) ajout serialVersionUID manquant sur les classes interm?\195?\169daires Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-01-23 19:50:09 UTC (rev 450) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-01-23 20:55:00 UTC (rev 451) @@ -42,4 +42,8 @@ this.code = code; } + @Override + public String toString() { + return getCode() + " : " + getLanguage(); + } } Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-01-23 19:50:09 UTC (rev 450) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-01-23 20:55:00 UTC (rev 451) @@ -42,4 +42,8 @@ this.type = type; } + @Override + public String toString() { + return getName()+ " : " +getType().getSimpleName(); + } } Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/DataEntity.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/DataEntity.java 2008-01-23 19:50:09 UTC (rev 450) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/DataEntity.java 2008-01-23 20:55:00 UTC (rev 451) @@ -22,6 +22,7 @@ public abstract class DataEntity extends BaseEntity { private DataEntity parentData; + private static final long serialVersionUID = -2570073990226703994L; public LoggableElement getParentLoggableElement() { LoggableElement parentLoggableElement = null; Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 2008-01-23 19:50:09 UTC (rev 450) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Structure.java 2008-01-23 20:55:00 UTC (rev 451) @@ -19,4 +19,5 @@ public abstract class Structure extends DataEntity { + private static final long serialVersionUID = 2594331198459134006L; }

1 0

r450 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: glandais Date: 2008-01-23 19:50:09 +0000 (Wed, 23 Jan 2008) New Revision: 450 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java Log: Null pointer bug Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-23 19:46:34 UTC (rev 449) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-23 19:50:09 UTC (rev 450) @@ -89,8 +89,9 @@ } else { TreeNode parentNode = null; for (TreeNode treeNode : nodes) { - if (getVersion(treeNode).getVersion(pos) == mde.getVersion() - .getVersion(pos)) { + if (getVersion(treeNode).getVersion(pos) != null + && getVersion(treeNode).getVersion(pos).equals( + mde.getVersion().getVersion(pos))) { parentNode = treeNode; } }

1 0

r449 - trunk/simexplorer-is-web
by glandais＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: glandais Date: 2008-01-23 19:46:34 +0000 (Wed, 23 Jan 2008) New Revision: 449 Modified: trunk/simexplorer-is-web/pom.xml Log: Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-01-23 19:20:30 UTC (rev 448) +++ trunk/simexplorer-is-web/pom.xml 2008-01-23 19:46:34 UTC (rev 449) @@ -64,7 +64,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>0.0.3</version> + <version>0.0.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId>

1 0

r448 - in trunk: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-web simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: glandais Date: 2008-01-23 19:20:30 +0000 (Wed, 23 Jan 2008) New Revision: 448 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java trunk/simexplorer-is-web/pom.xml trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java Log: History page Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-01-23 18:23:10 UTC (rev 447) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-01-23 19:20:30 UTC (rev 448) @@ -111,6 +111,15 @@ return result; } + /** + * Length of version + * + * @return Number of subversions + */ + public int getLength() { + return pointedVersion.size(); + } + @Override public String toString() { StringBuffer result = new StringBuffer(); Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-01-23 18:23:10 UTC (rev 447) +++ trunk/simexplorer-is-web/pom.xml 2008-01-23 19:20:30 UTC (rev 448) @@ -64,7 +64,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>0.0.1</version> + <version>0.0.3</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-23 18:23:10 UTC (rev 447) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-23 19:20:30 UTC (rev 448) @@ -28,6 +28,7 @@ import org.apache.tapestry.ComponentResources; import org.apache.tapestry.Link; import org.apache.tapestry.StreamResponse; +import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; @@ -60,6 +61,9 @@ @Persist private LoggableElement element; + @InjectPage + private ElementHistory elementHistory; + /** * Prepare page * @@ -123,7 +127,8 @@ StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); - return null; + elementHistory.setup(uuid); + return elementHistory; } public Object onRights(String context) throws Exception { @@ -139,7 +144,8 @@ MetaDataEntity mde = RemoteStorageService.getStorageService() .getMetadata(getToken(), uuid, version); - RemoteInputStream ris = RemoteStorageService.getStorageService().retrieveData(getToken(), uuid, version, "_xml"); + RemoteInputStream ris = RemoteStorageService.getStorageService() + .retrieveData(getToken(), uuid, version, "_xml"); InputStream stream = RemoteInputStreamClient.wrap(ris); response = new AttachmentStreamResponse(stream, "_xml"); @@ -235,31 +241,31 @@ .getMetaData().getName(), element.getMetaData().getVersion() .toString(), element, "export", "history")); - TreeNode[] children = new TreeNode[2]; - children[0] = new TreeNode(); - children[0].setType(TreeNode.TYPE_FOLDER); - children[0].setColumns(generateStringArray("Components", "", "")); - children[0] - .setChildren(generateComponents((ExplorationApplication) element)); + List<TreeNode> children = new ArrayList<TreeNode>(); + TreeNode node1 = new TreeNode(); + node1.setType(TreeNode.TYPE_FOLDER); + node1.setColumns(generateStringArray("Components", "", "")); + node1.setChildren(generateComponents((ExplorationApplication) element)); + children.add(node1); - children[1] = new TreeNode(); - children[1].setType(TreeNode.TYPE_FOLDER); - children[1].setColumns(generateStringArray("Explorations", "", "")); - children[1] + TreeNode node2 = new TreeNode(); + node2.setType(TreeNode.TYPE_FOLDER); + node2.setColumns(generateStringArray("Explorations", "", "")); + node2 .setChildren(generateExplorations((ExplorationApplication) element)); + children.add(node2); node.setChildren(children); return node; } - private TreeNode[] generateExplorations( + private List<TreeNode> generateExplorations( ExplorationApplication explorationApplication) { - TreeNode[] res = new TreeNode[explorationApplication.getExplorations() - .size()]; + List<TreeNode> res = new ArrayList<TreeNode>(); int i = 0; for (ExplorationData explorationData : explorationApplication .getExplorations()) { - res[i] = generateExplorationData(explorationData); + res.add(generateExplorationData(explorationData)); i++; } return res; @@ -274,31 +280,31 @@ .getMetaData().getVersion().toString(), explorationData, "history")); - TreeNode[] children = new TreeNode[2]; + List<TreeNode> children = new ArrayList<TreeNode>(); - children[0] = generateResult(explorationData); + children.add(generateResult(explorationData)); - children[1] = new TreeNode(); - children[1].setType(TreeNode.TYPE_FOLDER); - children[1].setColumns(generateStringArray("Values", - generateHeader("Type"), generateHeader("Value"))); - children[1].setChildren(generateValues(explorationData)); + TreeNode node1 = new TreeNode(); + node1.setType(TreeNode.TYPE_FOLDER); + node1.setColumns(generateStringArray("Values", generateHeader("Type"), + generateHeader("Value"))); + node1.setChildren(generateValues(explorationData)); + children.add(node1); explorationDataNode.setChildren(children); return explorationDataNode; } - private TreeNode[] generateValues(ExplorationData explorationData) { + private List<TreeNode> generateValues(ExplorationData explorationData) { Set<ConstantValue> values = explorationData.getValuesMap(); - TreeNode[] res = new TreeNode[values.size()]; - int i = 0; + List<TreeNode> res = new ArrayList<TreeNode>(); for (ConstantValue value : values) { - res[i] = new TreeNode(); - res[i].setType(TreeNode.TYPE_DOCUMENT); - res[i].setColumns(generateStringArray( - value.getConstant().getName(), value.getConstant() - .getType().getSimpleName(), value.getValue())); - i++; + TreeNode node = new TreeNode(); + node.setType(TreeNode.TYPE_DOCUMENT); + node.setColumns(generateStringArray(value.getConstant().getName(), + value.getConstant().getType().getSimpleName(), value + .getValue())); + res.add(node); } return res; @@ -313,20 +319,24 @@ return res; } - private TreeNode[] generateComponents( + private List<TreeNode> generateComponents( ExplorationApplication explorationApplication) { Set<Component> components = explorationApplication.getComponents(); - TreeNode[] res = new TreeNode[components.size()]; + List<TreeNode> res = new ArrayList<TreeNode>(); - int i = 0; for (Component component : components) { - res[i] = generateComponent(component); - i++; + res.add(generateComponent(component)); } return res; } + private TreeNode initNode() { + TreeNode node = new TreeNode(); + node.setType(TreeNode.TYPE_FOLDER); + return node; + } + private TreeNode generateComponent(Component component) { TreeNode componentNode = new TreeNode(); componentNode.setType(TreeNode.TYPE_FOLDER); @@ -335,79 +345,90 @@ .getMetaData().getName(), component.getMetaData().getVersion() .toString(), component, "history")); - TreeNode[] children = new TreeNode[4]; - for (int j = 0; j < children.length; j++) { - children[j] = new TreeNode(); - children[j].setType(TreeNode.TYPE_FOLDER); - } + List<TreeNode> children = new ArrayList<TreeNode>(); - children[0].setColumns(generateStringArray("Constants", + TreeNode node = null; + + node = initNode(); + node.setColumns(generateStringArray("Constants", generateHeader("Name"), generateHeader("Type"))); - children[0].setChildren(generateConstants(component.getConstants())); + node.setChildren(generateConstants(component.getConstants())); - children[1].setColumns(generateStringArray("Structures", "", "")); - children[1].setChildren(generateStructures(component.getStructures())); + children.add(node); + node = initNode(); - children[2].setColumns(generateStringArray("Codes", + node.setColumns(generateStringArray("Structures", "", "")); + node.setChildren(generateStructures(component.getStructures())); + + children.add(node); + node = initNode(); + + node.setColumns(generateStringArray("Codes", generateHeader("Language"), generateHeader("Code"))); - children[2].setChildren(generateCodes(component.getCodes())); + node.setChildren(generateCodes(component.getCodes())); - children[3].setColumns(generateStringArray("Libraries", "", "")); - children[3].setChildren(generateLibraries(component.getLibraries())); + children.add(node); + node = initNode(); + node.setColumns(generateStringArray("Libraries", "", "")); + node.setChildren(generateLibraries(component.getLibraries())); + + children.add(node); + componentNode.setChildren(children); return componentNode; } - private TreeNode[] generateLibraries(Set<Library> libraries) { - TreeNode[] res = new TreeNode[libraries.size()]; + private List<TreeNode> generateLibraries(Set<Library> libraries) { + List<TreeNode> res = new ArrayList<TreeNode>(); int i = 0; for (Library library : libraries) { - res[i] = new TreeNode(); - res[i].setType(TreeNode.TYPE_DOCUMENT); + TreeNode node = new TreeNode(); + node.setType(TreeNode.TYPE_DOCUMENT); - res[i].setColumns(generateStringArray("Library", library + node.setColumns(generateStringArray("Library", library .getMetaData().getName(), library.getMetaData() .getVersion().toString(), library, "download")); - i++; + + res.add(node); } return res; } - private TreeNode[] generateCodes(Set<Code> codes) { - TreeNode[] res = new TreeNode[codes.size()]; + private List<TreeNode> generateCodes(Set<Code> codes) { + List<TreeNode> res = new ArrayList<TreeNode>(); int i = 0; for (Code code : codes) { - res[i] = new TreeNode(); - res[i].setType(TreeNode.TYPE_DOCUMENT); - res[i].setColumns(generateStringArray("Code", code.getLanguage(), + TreeNode node = new TreeNode(); + node.setType(TreeNode.TYPE_DOCUMENT); + node.setColumns(generateStringArray("Code", code.getLanguage(), code.getCode())); - i++; + res.add(node); } return res; } - private TreeNode[] generateStructures(Set<Structure> structures) { - TreeNode[] res = new TreeNode[structures.size()]; + private List<TreeNode> generateStructures(Set<Structure> structures) { + List<TreeNode> res = new ArrayList<TreeNode>(); int i = 0; for (Structure structure : structures) { - res[i] = new TreeNode(); - res[i].setType(TreeNode.TYPE_DOCUMENT); - res[i].setColumns(generateStringArray("Structure", "", "")); - i++; + TreeNode node = new TreeNode(); + node.setType(TreeNode.TYPE_DOCUMENT); + node.setColumns(generateStringArray("Structure", "", "")); + res.add(node); } return res; } - private TreeNode[] generateConstants(Set<Constant> constants) { - TreeNode[] res = new TreeNode[constants.size()]; + private List<TreeNode> generateConstants(Set<Constant> constants) { + List<TreeNode> res = new ArrayList<TreeNode>(); int i = 0; for (Constant constant : constants) { - res[i] = new TreeNode(); - res[i].setType(TreeNode.TYPE_DOCUMENT); - res[i].setColumns(generateStringArray("Constant", constant - .getName(), constant.getType().getSimpleName())); - i++; + TreeNode node = new TreeNode(); + node.setType(TreeNode.TYPE_DOCUMENT); + node.setColumns(generateStringArray("Constant", constant.getName(), + constant.getType().getSimpleName())); + res.add(node); } return res; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-23 18:23:10 UTC (rev 447) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-23 19:20:30 UTC (rev 448) @@ -25,8 +25,8 @@ import org.apache.tapestry.annotations.Persist; import org.codelutin.tapestry.beans.TreeNode; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; @@ -71,27 +71,67 @@ private TreeNode generateNodes() { Arrays.sort(versions, new MetadataVersionComparator()); - int pos = 0; - int added = 0; TreeNode rootNode = new TreeNode(); rootNode.setType(TreeNode.TYPE_FOLDER); - rootNode.setColumns(generateStringArray("Root", "")); - rootNode.setChildren(new TreeNode[0]); + rootNode.setColumns(generateStringArray("History", "")); + rootNode.setObject(new Version("")); + rootNode.setChildren(new ArrayList<TreeNode>()); for (MetaDataEntity mde : versions) { - insertNode(mde, rootNode); + insertNode(mde, 0, rootNode); } - return null; + return rootNode; } - private void insertNode(MetaDataEntity mde, TreeNode node) { - TreeNode[] nodes = node.getChildren(); - for (TreeNode treeNode : nodes) { - if (mde.getVersion().toString().startsWith(treeNode.getColumns()[2])) { - insertNode(mde, treeNode); + private void insertNode(MetaDataEntity mde, int pos, TreeNode parent) { + List<TreeNode> nodes = parent.getChildren(); + if (pos == mde.getVersion().getLength()) { + nodes.add(generateLeaf(mde)); + } else { + TreeNode parentNode = null; + for (TreeNode treeNode : nodes) { + if (getVersion(treeNode).getVersion(pos) == mde.getVersion() + .getVersion(pos)) { + parentNode = treeNode; + } } + if (parentNode == null) { + parentNode = generateFolder(mde, pos, parent); + nodes.add(parentNode); + } + insertNode(mde, pos + 1, parentNode); } } + private TreeNode generateFolder(MetaDataEntity mde, int pos, TreeNode parent) { + TreeNode node = new TreeNode(); + node.setChildren(new ArrayList<TreeNode>()); + Version v = generateVersion(mde.getVersion(), pos); + node.setColumns(generateStringArray(v.toString())); + node.setObject(v); + node.setType(TreeNode.TYPE_FOLDER); + return node; + } + + private Version generateVersion(Version version, int pos) { + Version v = new Version(""); + for (int i = 0; i <= pos; i++) { + v.setVersion(i, version.getVersion(i)); + } + return v; + } + + private TreeNode generateLeaf(MetaDataEntity mde) { + TreeNode node = new TreeNode(); + node.setColumns(generateStringArray(mde.getVersion().toString())); + node.setObject(mde.getVersion()); + node.setType(TreeNode.TYPE_DOCUMENT); + return node; + } + + private Version getVersion(TreeNode treeNode) { + return (Version) treeNode.getObject(); + } + private String[] generateStringArray(String... s) { return s; }

1 0

r447 - in trunk: simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine simexplorer-is-web simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid simexplorer-is-web/s
by glandais＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: glandais Date: 2008-01-23 18:23:10 +0000 (Wed, 23 Jan 2008) New Revision: 447 Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is-web/pom.xml trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/AttachmentStreamResponse.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/XMLAttachment.java trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.properties Log: Detail page Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-23 18:23:10 UTC (rev 447) @@ -17,6 +17,7 @@ * ##% */ package fr.cemagref.simexplorer.is.security.dao; +import java.util.Date; import java.util.List; import javax.ejb.Stateless; @@ -24,7 +25,6 @@ import javax.persistence.PersistenceContext; import javax.persistence.Query; -import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.LoginAction; import fr.cemagref.simexplorer.is.security.entities.Permission; @@ -110,6 +110,8 @@ .setParameter("token", token)); if (loginAction != null) { loggedUser = loginAction.getLoggedUser(); + loginAction.setTime(new Date()); + em.merge(loginAction); } return loggedUser; } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-23 18:23:10 UTC (rev 447) @@ -239,7 +239,7 @@ public Group[] getGroups(String token) { List<Group> groups = dao.getGroups(); - Group[] result = groups.toArray(new Group[0]); + Group[] result = groups.toArray(new Group[groups.size()]); return result; } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-23 18:23:10 UTC (rev 447) @@ -26,6 +26,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; /** * Service interface @@ -113,6 +114,17 @@ String uuid, String version) throws Exception; /** + * Retrieve data related to an entity + * + * @param token + * @param uuid + * @param dataKey + * @param remoteStream + */ + RemoteInputStream retrieveData(String token, String uuid, String version, + String dataKey) throws Exception; + + /** * Retrieve number of elements matching query * * @param query @@ -172,4 +184,13 @@ LoggableElement getElement(String token, String uuid, String version) throws Exception; + /** + * Get all version of an element + * + * @param token + * @param uuid + * @return + */ + MetaDataEntity[] getVersions(String token, String uuid) throws Exception; + } Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-01-23 18:23:10 UTC (rev 447) @@ -20,6 +20,7 @@ import java.io.InputStream; import java.util.List; import java.util.Map; +import java.util.Set; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; @@ -67,7 +68,8 @@ * @return The element * @throws Exception */ - public abstract MetaDataEntity getMetadata(String token, String uuid) throws Exception; + public abstract MetaDataEntity getMetadata(String token, String uuid) + throws Exception; /** * Retrieve versions of an element<br> @@ -79,9 +81,20 @@ * * @throws Exception */ - public abstract List<Version> getVersions(String token, String uuid) throws Exception; + public abstract List<Version> getVersions(String token, String uuid) + throws Exception; /** + * Retrieve all version of a metadata + * + * @param token + * @param uuid + * @return + */ + public abstract Set<MetaDataEntity> getElementVersions(String token, + String uuid) throws Exception; + + /** * Retrieve an element in a specific version * * @param uuid @@ -89,8 +102,8 @@ * @return * @throws Exception */ - public abstract MetaDataEntity getMetadata(String token, String uuid, Version version) - throws Exception; + public abstract MetaDataEntity getMetadata(String token, String uuid, + Version version) throws Exception; /** * Get data associated to an element @@ -102,8 +115,8 @@ * @return Data stream * @throws Exception */ - public abstract InputStream retrieveData(String token, MetaDataEntity entity, String field) - throws Exception; + public abstract InputStream retrieveData(String token, + MetaDataEntity entity, String field) throws Exception; /** * Get number of items corresponding to query @@ -113,8 +126,8 @@ * @return * @throws Exception */ - public abstract int findFullTextCount(String token, String query, boolean onlyLatest) - throws Exception; + public abstract int findFullTextCount(String token, String query, + boolean onlyLatest) throws Exception; /** * Retrieve list of items corresponding to query @@ -142,8 +155,8 @@ * @return * @throws Exception */ - public abstract MetaDataEntity[] findElementsByType(String token, String type, - boolean onlyLatest, int start, int count, int dateOrder) + public abstract MetaDataEntity[] findElementsByType(String token, + String type, boolean onlyLatest, int start, int count, int dateOrder) throws Exception; /** @@ -154,8 +167,8 @@ * @return * @throws Exception */ - public abstract int findElementsByTypeCount(String token, String type, boolean onlyLatest) - throws Exception; + public abstract int findElementsByTypeCount(String token, String type, + boolean onlyLatest) throws Exception; /** * Delete elements @@ -163,7 +176,8 @@ * @param uuid * @throws Exception */ - public abstract void deleteElements(String token, String uuid) throws Exception; + public abstract void deleteElements(String token, String uuid) + throws Exception; /** * Delete one element @@ -172,8 +186,8 @@ * @param version * @throws Exception */ - public abstract void deleteElement(String token, String uuid, Version version) - throws Exception; + public abstract void deleteElement(String token, String uuid, + Version version) throws Exception; /** * Store temporary data, for stream duplication Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-01-23 18:23:10 UTC (rev 447) @@ -262,4 +262,8 @@ attachmentHandler.deleteData(mdTmp, id); } + public Set<MetaDataEntity> getElementVersions(String token, String uuid) throws Exception { + return database.findElementsById(uuid, false); + } + } Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/pom.xml 2008-01-23 18:23:10 UTC (rev 447) @@ -64,7 +64,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.0.1</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-01-23 18:23:10 UTC (rev 447) @@ -136,12 +136,4 @@ return elementList.isUserSuperAdmin(); } - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-01-23 18:23:10 UTC (rev 447) @@ -17,46 +17,75 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.grid; -import javax.naming.NamingException; - import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.beaneditor.PropertyModel; import org.apache.tapestry.grid.GridDataSource; -import org.apache.tapestry.ioc.annotations.Inject; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; +/** + * Datasource of element list + * + * @author glandais + * + */ public class ElementDataSource implements GridDataSource { + /** + * Query being searched + */ private String query = ""; + /** + * Bookmark on first item index + */ private int indexStart = 0; + /** + * Cached entities + */ private MetaDataEntity[] entities = null; - @ApplicationState + /** + * Authentification token + */ private String token; - - public ElementDataSource(String query) { + + /** + * Build datasource with text query + * + * @param token + * @param query + */ + public ElementDataSource(String token, String query) { super(); this.query = query; + this.token = token; } - public ElementDataSource() { + /** + * Build datasource without text query + * + * @param token + */ + public ElementDataSource(String token) { super(); this.query = ""; + this.token = token; } + /* (non-Javadoc) + * @see org.apache.tapestry.grid.GridDataSource#getAvailableRows() + */ public int getAvailableRows() { int result = 0; try { if (query.equals("")) { - result = RemoteStorageService.getStorageService().findApplicationsCount(token, false); + result = RemoteStorageService.getStorageService() + .findApplicationsCount(token, false); } else { - result = RemoteStorageService.getStorageService().findFullTextCount(token, query, false); + result = RemoteStorageService.getStorageService() + .findFullTextCount(token, query, false); } - } catch (NamingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -64,14 +93,23 @@ return result; } + /* (non-Javadoc) + * @see org.apache.tapestry.grid.GridDataSource#getRowType() + */ public Class getRowType() { return MetaDataEntity.class; } + /* (non-Javadoc) + * @see org.apache.tapestry.grid.GridDataSource#getRowValue(int)token + */ public Object getRowValue(int index) { return entities[index - indexStart]; } + /* (non-Javadoc) + * @see org.apache.tapestry.grid.GridDataSource#prepare(int, int, org.apache.tapestry.beaneditor.PropertyModel, boolean) + */ public void prepare(int startIndex, int endIndex, PropertyModel sortModel, boolean ascending) { try { @@ -92,9 +130,9 @@ .findApplications(token, false, startIndex, 1 + endIndex - startIndex, dateOrder); } else { - entities = RemoteStorageService.getStorageService().findFullText(token, - query, false, startIndex, 1 + endIndex - startIndex, - dateOrder); + entities = RemoteStorageService.getStorageService() + .findFullText(token, query, false, startIndex, + 1 + endIndex - startIndex, dateOrder); } } catch (Exception e) { // TODO Auto-generated catch block @@ -104,6 +142,11 @@ } } + /** + * Current query + * + * @return Current text query + */ public String getQuery() { return query; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-23 18:23:10 UTC (rev 447) @@ -19,6 +19,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -31,6 +32,8 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; +import com.healthmarketscience.rmiio.RemoteInputStream; +import com.healthmarketscience.rmiio.RemoteInputStreamClient; import com.healthmarketscience.rmiio.RemoteOutputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteOutputStream; @@ -42,11 +45,11 @@ import fr.cemagref.simexplorer.is.entities.data.ExplorationData; 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.MetaDataEntity; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; +import fr.cemagref.simexplorer.is.ui.web.tools.AttachmentStreamResponse; import fr.cemagref.simexplorer.is.ui.web.tools.XMLAttachment; public class ElementDetail extends UserPage { @@ -57,17 +60,31 @@ @Persist private LoggableElement element; + /** + * Prepare page + * + * @param uuid + * Id of element to display + * @param version + * Version of element to display + * @throws Exception + */ public void setup(String uuid, String version) throws Exception { element = RemoteStorageService.getStorageService().getElement( getToken(), uuid, version); } + /** + * Headers of tree grid + * + * @return Headers + */ public List<String> getHeaders() { List<String> result = new ArrayList<String>(); - result.add(""); - result.add(""); - result.add(""); - result.add(""); + result.add("Type"); + result.add("Name"); + result.add("Version"); + result.add("Actions"); return result; } @@ -77,7 +94,7 @@ return nodes; } - public Object exportElement(String uuid, String version) throws Exception { + private Object exportElement(String uuid, String version) throws Exception { StreamResponse response; ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -95,39 +112,47 @@ return response; } - public Object onExportElement(String context) throws Exception { + public Object onExport(String context) throws Exception { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); return exportElement(uuid, version); } - private String[] generateStringArray(String s1, String s2, String s3) { - List<String> result = new ArrayList<String>(); - result.add(s1); - result.add(s2); - result.add(s3); - result.add(""); - return result.toArray(new String[result.size()]); + public Object onHistory(String context) throws Exception { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + return null; } - private String[] generateStringArray(String s1, String s2, String s3, - String actionCaption, String action, Object context) { - List<String> result = new ArrayList<String>(); - result.add(s1); - result.add(s2); - result.add(s3); - 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>"); - result.add(sb.toString()); - return result.toArray(new String[result.size()]); + public Object onRights(String context) throws Exception { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + return null; } + private Object downloadElement(String uuid, String version) + throws Exception { + StreamResponse response; + + MetaDataEntity mde = RemoteStorageService.getStorageService() + .getMetadata(getToken(), uuid, version); + RemoteInputStream ris = RemoteStorageService.getStorageService().retrieveData(getToken(), uuid, version, "_xml"); + InputStream stream = RemoteInputStreamClient.wrap(ris); + response = new AttachmentStreamResponse(stream, "_xml"); + + return response; + } + + public Object onDownload(String context) throws Exception { + StringTokenizer st = new StringTokenizer(context, ","); + String uuid = st.nextToken(); + String version = st.nextToken(); + return downloadElement(uuid, version); + } + private TreeNode generateElement() { TreeNode node = null; if (element instanceof ExplorationApplication) { @@ -143,6 +168,63 @@ return node; } + private String generateString(String actionCaption, String action, + LoggableElement element) { + String context = element.getMetaData().getUuid() + "," + + element.getMetaData().getVersion(); + 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(); + } + + private String generateActions(LoggableElement element, StringBuilder sb, + String... actions) { + String res; + for (String anAction : actions) { + sb.append("<br>"); + sb.append(generateString(anAction, anAction, element)); + } + sb.append("<br>"); + sb.append(generateString("rights", "rights", element)); + // TODO add security + + res = sb.substring(4); + return res; + } + + private String[] generateStringArray(String s1, String s2, String s3, + LoggableElement element, String... actions) { + List<String> result = new ArrayList<String>(); + result.add(s1); + result.add(s2); + result.add(s3); + String s4 = ""; + StringBuilder sb = new StringBuilder(""); + if (element != null) { + s4 = generateActions(element, sb, actions); + } + result.add(s4); + + return result.toArray(new String[result.size()]); + } + + private String[] generateStringArray(String s1, String s2, String s3) { + return generateStringArray(s1, s2, s3, null); + } + + private String generateHeader(String caption) { + StringBuilder sb = new StringBuilder(); + sb.append("<b>"); + sb.append(caption); + sb.append("</b>"); + return sb.toString(); + } + private TreeNode generateExplorationApplication() { TreeNode node; node = new TreeNode(); @@ -150,10 +232,8 @@ node.setType(TreeNode.TYPE_FOLDER); node.setColumns(generateStringArray("Application exploration", element - .getMetaData().getDescription(), element.getMetaData() - .getVersion().toString(), "Export", "exportElement", element - .getMetaData().getUuid() - + "," + element.getMetaData().getVersion())); + .getMetaData().getName(), element.getMetaData().getVersion() + .toString(), element, "export", "history")); TreeNode[] children = new TreeNode[2]; children[0] = new TreeNode(); @@ -188,17 +268,22 @@ private TreeNode generateExplorationData(ExplorationData explorationData) { TreeNode explorationDataNode = new TreeNode(); explorationDataNode.setType(TreeNode.TYPE_FOLDER); + explorationDataNode.setColumns(generateStringArray("Exploration data", - explorationData.getMetaData().getDescription(), explorationData - .getMetaData().getVersion().toString(), "Export", - "exportElement", explorationData.getMetaData().getUuid() + "," - + explorationData.getMetaData().getVersion())); + explorationData.getMetaData().getName(), explorationData + .getMetaData().getVersion().toString(), + explorationData, "history")); + TreeNode[] children = new TreeNode[2]; - children[0] = generateResult(explorationData.getResult()); + + children[0] = generateResult(explorationData); + children[1] = new TreeNode(); children[1].setType(TreeNode.TYPE_FOLDER); - children[1].setColumns(generateStringArray("Values", "", "")); + children[1].setColumns(generateStringArray("Values", + generateHeader("Type"), generateHeader("Value"))); children[1].setChildren(generateValues(explorationData)); + explorationDataNode.setChildren(children); return explorationDataNode; } @@ -211,18 +296,20 @@ res[i] = new TreeNode(); res[i].setType(TreeNode.TYPE_DOCUMENT); res[i].setColumns(generateStringArray( - value.getConstant().getName(), value.getValue(), value - .getConstant().getType().getSimpleName())); + value.getConstant().getName(), value.getConstant() + .getType().getSimpleName(), value.getValue())); i++; } return res; } - private TreeNode generateResult(Result result) { + private TreeNode generateResult(ExplorationData explorationData) { TreeNode res = new TreeNode(); res.setType(TreeNode.TYPE_DOCUMENT); - res.setColumns(generateStringArray("Result", "", "")); + + res.setColumns(generateStringArray("Result", "", "", explorationData, + "download")); return res; } @@ -243,24 +330,31 @@ private TreeNode generateComponent(Component component) { TreeNode componentNode = new TreeNode(); componentNode.setType(TreeNode.TYPE_FOLDER); + componentNode.setColumns(generateStringArray("Component", component - .getMetaData().getDescription(), component.getMetaData() - .getVersion().toString(), "Export", "exportElement", component - .getMetaData().getUuid() - + "," + component.getMetaData().getVersion())); + .getMetaData().getName(), component.getMetaData().getVersion() + .toString(), component, "history")); + TreeNode[] children = new TreeNode[4]; for (int j = 0; j < children.length; j++) { children[j] = new TreeNode(); children[j].setType(TreeNode.TYPE_FOLDER); } - children[0].setColumns(generateStringArray("Constants", "", "")); + + children[0].setColumns(generateStringArray("Constants", + generateHeader("Name"), generateHeader("Type"))); children[0].setChildren(generateConstants(component.getConstants())); + children[1].setColumns(generateStringArray("Structures", "", "")); children[1].setChildren(generateStructures(component.getStructures())); - children[2].setColumns(generateStringArray("Codes", "", "")); + + children[2].setColumns(generateStringArray("Codes", + generateHeader("Language"), generateHeader("Code"))); children[2].setChildren(generateCodes(component.getCodes())); + children[3].setColumns(generateStringArray("Libraries", "", "")); children[3].setChildren(generateLibraries(component.getLibraries())); + componentNode.setChildren(children); return componentNode; } @@ -271,7 +365,10 @@ for (Library library : libraries) { res[i] = new TreeNode(); res[i].setType(TreeNode.TYPE_DOCUMENT); - res[i].setColumns(generateStringArray("Library", "", "")); + + res[i].setColumns(generateStringArray("Library", library + .getMetaData().getName(), library.getMetaData() + .getVersion().toString(), library, "download")); i++; } return res; Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-01-23 18:23:10 UTC (rev 447) @@ -0,0 +1,99 @@ +/* +* ##% 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.ui.web.pages; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; + +import org.apache.tapestry.annotations.Persist; +import org.codelutin.tapestry.beans.TreeNode; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; +import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; + +public class ElementHistory extends UserPage { + + public class MetadataVersionComparator implements + Comparator<MetaDataEntity> { + + public int compare(MetaDataEntity arg0, MetaDataEntity arg1) { + return arg0.getVersion().compareTo(arg1.getVersion()); + } + + } + + @Persist + private MetaDataEntity[] versions; + + public void setup(String uuid) throws Exception { + versions = RemoteStorageService.getStorageService().getVersions( + getToken(), uuid); + } + + /** + * Headers of tree grid + * + * @return Headers + */ + public List<String> getHeaders() { + List<String> result = new ArrayList<String>(); + result.add("Version"); + result.add("Author"); + result.add("Name"); + result.add("Description"); + return result; + } + + public List<TreeNode> getVersions() { + List<TreeNode> nodes = new ArrayList<TreeNode>(); + nodes.add(generateNodes()); + return nodes; + } + + private TreeNode generateNodes() { + Arrays.sort(versions, new MetadataVersionComparator()); + int pos = 0; + int added = 0; + TreeNode rootNode = new TreeNode(); + rootNode.setType(TreeNode.TYPE_FOLDER); + rootNode.setColumns(generateStringArray("Root", "")); + rootNode.setChildren(new TreeNode[0]); + for (MetaDataEntity mde : versions) { + insertNode(mde, rootNode); + } + return null; + } + + private void insertNode(MetaDataEntity mde, TreeNode node) { + TreeNode[] nodes = node.getChildren(); + for (TreeNode treeNode : nodes) { + if (mde.getVersion().toString().startsWith(treeNode.getColumns()[2])) { + insertNode(mde, treeNode); + } + } + } + + private String[] generateStringArray(String... s) { + return s; + } + +} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-01-23 18:23:10 UTC (rev 447) @@ -70,7 +70,7 @@ model = model.remove(property); } } - elementDataSource = new ElementDataSource(); + elementDataSource = new ElementDataSource(getToken()); } public BeanModel getModel() { @@ -79,15 +79,15 @@ public void searchQuery(String query) { if (query == null || query.equals("")) { - elementDataSource = new ElementDataSource(); + elementDataSource = new ElementDataSource(getToken()); } else { - elementDataSource = new ElementDataSource(query); + elementDataSource = new ElementDataSource(getToken(), query); } } public ElementDataSource getElements() { if (elementDataSource == null) { - elementDataSource = new ElementDataSource(); + elementDataSource = new ElementDataSource(getToken()); } return elementDataSource; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-23 18:23:10 UTC (rev 447) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.ui.web.pages.security; import org.apache.tapestry.annotations.ApplicationState; +import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.ioc.annotations.Inject; import fr.cemagref.simexplorer.is.security.entities.User; @@ -28,17 +29,43 @@ @ApplicationState private String token; + @Persist + private User user; + + @Persist + private boolean userLogged; + + @Persist + private boolean userAdmin; + + @Persist + private boolean userSuperAdmin; + Object onActivate() { - if (!hasAccessToPage()) + getUserRights(); + if (!userLogged) return "Login"; return null; } + private void getUserRights() { + user = computeUserLogged(); + if (user != null) { + userLogged = true; + userAdmin = user.isAdmin(); + userSuperAdmin = user.isSuperAdmin(); + } else { + userLogged = false; + userAdmin = false; + userSuperAdmin = false; + } + } + public String getToken() { return token; } - public User getUserLogged() { + private User computeUserLogged() { User loggedUser = null; if (token != null) { try { @@ -51,44 +78,22 @@ return loggedUser; } + abstract boolean hasAccessToPage(); + + public User getUserLogged() { + return user; + } + public boolean isUserLogged() { - boolean result = false; - try { - if (getUserLogged() != null) { - result = true; - } - } catch (Exception e) { - // TODO: handle exception - } - return result; + return userLogged; } public boolean isUserAdmin() { - boolean result = false; - try { - User user = getUserLogged(); - if (user != null && user.isAdmin()) { - result = true; - } - } catch (Exception e) { - // TODO: handle exception - } - return result; + return userAdmin; } public boolean isUserSuperAdmin() { - boolean result = false; - try { - User user = getUserLogged(); - if (user != null && user.isSuperAdmin()) { - result = true; - } - } catch (Exception e) { - // TODO: handle exception - } - return result; + return userSuperAdmin; } - abstract boolean hasAccessToPage(); - } \ No newline at end of file Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/AttachmentStreamResponse.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/AttachmentStreamResponse.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/AttachmentStreamResponse.java 2008-01-23 18:23:10 UTC (rev 447) @@ -26,23 +26,17 @@ public class AttachmentStreamResponse implements StreamResponse { private InputStream is = null; - protected String contentType = "text/plain"; + protected String contentType = "application/octet-stream"; - protected String extension = "txt"; + protected String extension = null; - protected String filename = "default"; + protected String filename = null; public AttachmentStreamResponse(InputStream is, String filenameIn) { this.is = is; - if (filenameIn != null) { - this.filename = filenameIn; - } + this.filename = filenameIn; } - public AttachmentStreamResponse(InputStream is) { - this.is = is; - } - public String getContentType() { return contentType; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/XMLAttachment.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/XMLAttachment.java 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/XMLAttachment.java 2008-01-23 18:23:10 UTC (rev 447) @@ -27,10 +27,4 @@ this.extension = "xml"; } - public XMLAttachment(InputStream is) { - super(is); - this.contentType = "text/xml"; - this.extension = "xml"; - } - } Added: trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml (rev 0) +++ trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml 2008-01-23 18:23:10 UTC (rev 447) @@ -0,0 +1,7 @@ +<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" + title="message:windowtitle"> + + <table t:type="cl/TreeGrid" source="versions" columnHeaders="headers"> + </table> + +</t:layout> Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties 2008-01-23 18:23:10 UTC (rev 447) @@ -15,6 +15,6 @@ layout-logout=Logout -layout-copyright=Copyright © 2007. Code Lutin - GPL +layout-copyright=Copyright © 2008. Cemagref - GPL search=Search \ No newline at end of file Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.properties 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.properties 2008-01-23 18:23:10 UTC (rev 447) @@ -1,3 +1,4 @@ +windowtitle=Edit group name=Name userMembers=User members groupMembers=Group members Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.properties 2008-01-23 16:40:14 UTC (rev 446) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.properties 2008-01-23 18:23:10 UTC (rev 447) @@ -1,3 +1,4 @@ +windowtitle=Edit user name=Name firstname=First name mail=Mail

1 0

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

23 Jan '08

Author: tchemit Date: 2008-01-23 16:40:14 +0000 (Wed, 23 Jan 2008) New Revision: 446 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java Log: ajout toString sur Node pour obtenir le rendu Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java 2008-01-23 16:39:45 UTC (rev 445) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java 2008-01-23 16:40:14 UTC (rev 446) @@ -50,7 +50,6 @@ this.userObject = root; } - public void collaspeAll(JTree tree) { if (isLeaf()) { return; @@ -71,6 +70,7 @@ } } + @Override public TreeNode getChildAt(int childIndex) { if (childIndex < 0 || childIndex > getChildCount()) { return null; @@ -100,8 +100,17 @@ return -1; } + public String toString() { + if (userObject == null) { + return null; + } else { + return userObject.toString(); + } + } + + @Override public boolean getAllowsChildren() { - return false; + return allowedChildren; } @Override @@ -117,14 +126,14 @@ return getPathToRoot(this, 0); } - protected TreeNode[] getPathToRoot(TreeNode aNode, int depth) { TreeNode[] retNodes; if (aNode == null) { - if (depth == 0) + if (depth == 0) { return null; - else + } else { retNodes = new TreeNode[depth]; + } } else { depth++; retNodes = getPathToRoot(aNode.getParent(), depth);

1 0

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

23 Jan '08

Author: tchemit Date: 2008-01-23 16:39:45 +0000 (Wed, 23 Jan 2008) New Revision: 445 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: ajout du model de Node pour les LoggableElement Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 16:16:27 UTC (rev 444) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 16:39:45 UTC (rev 445) @@ -18,15 +18,18 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeNode; import java.awt.event.ActionEvent; /** @@ -59,16 +62,15 @@ DetailTabModel model = (DetailTabModel) getModel(); if (model.isRemote()) { listModel = (ListTabModel) SimExplorerTab.remote.getModel(); - } else { listModel = (ListTabModel) SimExplorerTab.local.getModel(); } MetaDataEntity data = listModel.get(model.getIndex()); String uuid = data.getUuid(); Version version = data.getVersion(); - log.info("show detail uuid:" + uuid + ", version:" + version+" (remote ?"+model.isRemote()+")"); + log.info("show detail uuid:" + uuid + ", version:" + version + " (remote ?" + model.isRemote() + ")"); // chargement de l'élément à partir du service - LoggableElement element = getElement(model.isRemote(), uuid, version.toString()); + LoggableElement element = getElement(model.isRemote(), uuid, version.toString()); // push dans le model model.setBean(element); return true; @@ -80,6 +82,8 @@ DetailTabModel model = (DetailTabModel) getModel(); // get ui JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + TreeNode root = new LoggableElementTreeNode(null, model.getBean(), true); + ui.getTree().setModel(new DefaultTreeModel(root)); // refresh ui getMainUI().refreshDetailTabUI(model, ui); }

1 0