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

r1055 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 10:31:24 +0000 (Mon, 18 Feb 2008) New Revision: 1055 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java Log: si liste vide, pas de changement de selection dans la combo goPage Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java 2008-02-18 10:30:40 UTC (rev 1054) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java 2008-02-18 10:31:24 UTC (rev 1055) @@ -165,8 +165,9 @@ } } //System.out.println("new page size : " + combo.getItemCount()); - - combo.setSelectedIndex(pagination.getCurrentPage()); + if (combo.getItemCount()>0) { + combo.setSelectedIndex(pagination.getCurrentPage()); + } boolean b = combo.getItemCount() > 1; combo.setEnabled(b); ui.getCurrentPage().setEnabled(b);

1 0

r1054 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 10:30:40 +0000 (Mon, 18 Feb 2008) New Revision: 1054 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/EntityTreeNodeHelper.java Log: une EA n'a pas de noeud parent Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/EntityTreeNodeHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/EntityTreeNodeHelper.java 2008-02-18 10:30:18 UTC (rev 1053) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/EntityTreeNodeHelper.java 2008-02-18 10:30:40 UTC (rev 1054) @@ -190,7 +190,7 @@ @Override public void visitExplorationApplication(ExplorationApplication v) { - markRootNode(explorationApplication = new EntityTreeNode(explorationDatas, v, remote, true)); + markRootNode(explorationApplication = new EntityTreeNode(null, v, remote, true)); super.visitExplorationApplication(v); }

1 0

r1053 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 10:30:18 +0000 (Mon, 18 Feb 2008) New Revision: 1053 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java Log: si liste vide, le checkSize ne doit pas g?\195?\169n?\195?\169rer d'exception TODO, ce n'est pas normal que l'on arrive dans cette m?\195?\169thode pour ce cas Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-18 10:28:45 UTC (rev 1052) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-18 10:30:18 UTC (rev 1053) @@ -153,7 +153,7 @@ } private void checkSize(int index) { - if (isEmpty() || size() < index) { + if (index>-1 && (isEmpty() || size() < index)) { throw new IllegalStateException(getClass() + " has size " + size() + " and was required index " + index); } }

1 0

r1052 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 10:28:45 +0000 (Mon, 18 Feb 2008) New Revision: 1052 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java Log: unused import + noettyage du model ?\195?\160 chaque action Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-18 10:27:59 UTC (rev 1051) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-18 10:28:45 UTC (rev 1052) @@ -21,7 +21,6 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; -import fr.cemagref.simexplorer.is.ui.swing.EntityTreeNodeHelper; import fr.cemagref.simexplorer.is.ui.swing.JSynchronizeTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.SynchronizeTabRefreshHelper; @@ -31,11 +30,8 @@ import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; -import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; @@ -104,6 +100,9 @@ // preparation du model de l'onglet SynchronizeTabModel model = (SynchronizeTabModel) SimExplorerTab.synchronize.getModel(); + // on nettoye le model avant tout + model.reset(); + // l'élément selectionné est bien la source model.setSelectedItem(selected);

1 0

r1051 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 10:27:59 +0000 (Mon, 18 Feb 2008) New Revision: 1051 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java Log: rafraichir l'onglet de list locale uniquement si liste non vide Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-18 10:26:20 UTC (rev 1050) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-18 10:27:59 UTC (rev 1051) @@ -122,7 +122,10 @@ } if (SimExplorerTab.local.isTabVisible(container)) { - ListTabRefreshHelper.refreshListTablePopupMenu((JListTab) SimExplorerTab.local.getUI(), (ListTabModel) SimExplorerTab.local.getModel()); + ListTabModel localListModel = (ListTabModel) SimExplorerTab.local.getModel(); + if (!localListModel.isEmpty()) { + ListTabRefreshHelper.refreshListTablePopupMenu((JListTab) SimExplorerTab.local.getUI(), localListModel); + } } // } //}); @@ -159,6 +162,7 @@ try { token = service.loginUser(login, password); } catch (SimExplorerException e) { + log.warn(e.getMessage(),e); token = null; } getContext().setToken(token);

1 0

r1050 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 10:26:20 +0000 (Mon, 18 Feb 2008) New Revision: 1050 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java Log: on force l'encoding lors de la creation du hash du password Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java 2008-02-18 10:25:31 UTC (rev 1049) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java 2008-02-18 10:26:20 UTC (rev 1050) @@ -25,6 +25,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.nio.charset.Charset; /** @author chemit */ public class AuthenticationServiceHelper { @@ -54,7 +55,7 @@ byte[] bytes = ConverterUtil.convert(clearString); messageDigest.update(bytes); String hashedPassword; - hashedPassword = new String(messageDigest.digest()); + hashedPassword = new String(messageDigest.digest(), Charset.forName("ISO-8859-1")); return hashedPassword; } }

1 0

r1049 - trunk/simexplorer-is/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 10:25:31 +0000 (Mon, 18 Feb 2008) New Revision: 1049 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties Log: config du serveur distant non finale Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-18 10:20:43 UTC (rev 1048) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-18 10:25:31 UTC (rev 1049) @@ -67,7 +67,7 @@ main.config.modifiers.remotePassword= main.config.definition.remoteURI=java.net.URI:jnp://localhost:1099 -main.config.modifiers.remoteURI=final,static,mandatory +main.config.modifiers.remoteURI=static,mandatory ### ### user properties

1 0

r1048 - in trunk/simexplorer-is/simexplorer-is-swing/src/resources: . properties
by tchemit＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: tchemit Date: 2008-02-18 10:20:43 +0000 (Mon, 18 Feb 2008) New Revision: 1048 Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/properties/ trunk/simexplorer-is/simexplorer-is-swing/src/resources/properties/config.properties Log: ajout fichier de configuration du service local Copied: trunk/simexplorer-is/simexplorer-is-swing/src/resources/properties/config.properties (from rev 1046, trunk/simexplorer-is/simexplorer-is-storage/src/resources/properties/config.properties) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/properties/config.properties (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/properties/config.properties 2008-02-18 10:20:43 UTC (rev 1048) @@ -0,0 +1,4 @@ +simexplorer.db=/var/local/simexplorer/db2 +simexplorer.data=/var/local/simexplorer/data2/ +simexplorer.optimizeperiod=3600 +simexplorer.adminmail=landais at codelutin.com

1 0

r1047 - trunk/simexplorer-is/simexplorer-is-ear
by glandais＠users.labs.libre-entreprise.org 18 Feb '08

18 Feb '08

Author: glandais Date: 2008-02-18 09:38:11 +0000 (Mon, 18 Feb 2008) New Revision: 1047 Added: trunk/simexplorer-is/simexplorer-is-ear/rundebug.sh Log: jboss debug run.sh Added: trunk/simexplorer-is/simexplorer-is-ear/rundebug.sh =================================================================== --- trunk/simexplorer-is/simexplorer-is-ear/rundebug.sh (rev 0) +++ trunk/simexplorer-is/simexplorer-is-ear/rundebug.sh 2008-02-18 09:38:11 UTC (rev 1047) @@ -0,0 +1,250 @@ +#!/bin/sh +### ====================================================================== ### +## ## +## JBoss Bootstrap Script ## +## ## +### ====================================================================== ### + +### $Id: run.sh 64199 2007-07-23 15:57:38Z cazzius $ ### + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` +GREP="grep" + +# Use the maximum available, or set MAX_FD != -1 to use that +MAX_FD="maximum" + +# +# Helper to complain. +# +warn() { + echo "${PROGNAME}: $*" +} + +# +# Helper to puke. +# +die() { + warn $* + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +linux=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; + + Darwin*) + darwin=true + ;; + + Linux) + linux=true + ;; +esac + +# Read an optional running configuration file +if [ "x$RUN_CONF" = "x" ]; then + RUN_CONF="$DIRNAME/run.conf" +fi +if [ -r "$RUN_CONF" ]; then + . "$RUN_CONF" +fi + +# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5 and lower +if [ "$linux" = "true" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true" +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JBOSS_HOME" ] && + JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$JAVAC_JAR" ] && + JAVAC_JAR=`cygpath --unix "$JAVAC_JAR"` +fi + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Increase the maximum file descriptors if we can +if [ "$cygwin" = "false" ]; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + # use the system max + MAX_FD="$MAX_FD_LIMIT" + fi + + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +# Setup the classpath +runjar="$JBOSS_HOME/bin/run.jar" +if [ ! -f "$runjar" ]; then + die "Missing required file: $runjar" +fi +JBOSS_BOOT_CLASSPATH="$runjar" + +# Tomcat uses the JDT Compiler +# Only include tools.jar if someone wants to use the JDK instead. +# compatible distribution which JAVA_HOME points to +if [ "x$JAVAC_JAR" = "x" ]; then + JAVAC_JAR_FILE="$JAVA_HOME/lib/tools.jar" +else + JAVAC_JAR_FILE="$JAVAC_JAR" +fi +if [ ! -f "$JAVAC_JAR_FILE" ]; then + # MacOSX does not have a seperate tools.jar + if [ "$darwin" != "true" -a "x$JAVAC_JAR" != "x" ]; then + warn "Missing file: JAVAC_JAR=$JAVAC_JAR" + warn "Unexpected results may occur." + fi + JAVAC_JAR_FILE= +fi + +if [ "x$JBOSS_CLASSPATH" = "x" ]; then + JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH" +else + JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH" +fi +if [ "x$JAVAC_JAR_FILE" != "x" ]; then + JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JAVAC_JAR_FILE" +fi + +# If -server not set in JAVA_OPTS, set it, if supported +SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"` +if [ "x$SERVER_SET" = "x" ]; then + + # Check for SUN(tm) JVM w/ HotSpot support + if [ "x$HAS_HOTSPOT" = "x" ]; then + HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot` + fi + + # Enable -server if we have Hotspot, unless we can't + if [ "x$HAS_HOTSPOT" != "x" ]; then + # MacOS does not support -server flag + if [ "$darwin" != "true" ]; then + JAVA_OPTS="-server $JAVA_OPTS" + fi + fi +fi + +# Setup JBosst Native library path +JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native" +if [ -d "$JBOSS_NATIVE_DIR" ]; then + if $cygwin ; then + export PATH="$JBOSS_NATIVE_DIR:$PATH" + JBOSS_NATIVE_DIR=`cygpath --dos "$JBOSS_NATIVE_DIR"` + fi + if [ "x$LD_LIBRARY_PATH" = "x" ]; then + LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR" + else + LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH" + fi + export LD_LIBRARY_PATH + if [ "x$JAVA_OPTS" = "x" ]; then + JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR" + else + JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR" + fi +fi + +# Setup JBoss specific properties +JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS" + +# Setup glandais specific properties +JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n $JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +# Display our environment +echo "=========================================================================" +echo "" +echo " JBoss Bootstrap Environment" +echo "" +echo " JBOSS_HOME: $JBOSS_HOME" +echo "" +echo " JAVA: $JAVA" +echo "" +echo " JAVA_OPTS: $JAVA_OPTS" +echo "" +echo " CLASSPATH: $JBOSS_CLASSPATH" +echo "" +echo "=========================================================================" +echo "" + +while true; do + if [ "x$LAUNCH_JBOSS_IN_BACKGROUND" = "x" ]; then + # Execute the JVM in the foreground + "$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -classpath "$JBOSS_CLASSPATH" \ + org.jboss.Main "$@" + JBOSS_STATUS=$? + else + # Execute the JVM in the background + "$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -classpath "$JBOSS_CLASSPATH" \ + org.jboss.Main "$@" & + JBOSS_PID=$! + # Trap common signals and relay them to the jboss process + trap "kill -HUP $JBOSS_PID" HUP + trap "kill -TERM $JBOSS_PID" INT + trap "kill -QUIT $JBOSS_PID" QUIT + trap "kill -PIPE $JBOSS_PID" PIPE + trap "kill -TERM $JBOSS_PID" TERM + # Wait until the background process exits + WAIT_STATUS=0 + while [ "$WAIT_STATUS" -ne 127 ]; do + JBOSS_STATUS=$WAIT_STATUS + wait $JBOSS_PID 2>/dev/null + WAIT_STATUS=$? + done + fi + # If restart doesn't work, check you are running JBossAS 4.0.4+ + # http://jira.jboss.com/jira/browse/JBAS-2483 + # or the following if you're running Red Hat 7.0 + # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html + if [ $JBOSS_STATUS -eq 10 ]; then + echo "Restarting JBoss..." + else + exit $JBOSS_STATUS + fi +done + Property changes on: trunk/simexplorer-is/simexplorer-is-ear/rundebug.sh ___________________________________________________________________ Name: svn:executable + *

1 0

r1046 - in trunk/simexplorer-is/simexplorer-is-web/src: java/fr/cemagref/simexplorer/is/ui/web/pages main/webapp main/webapp/WEB-INF
by glandais＠users.labs.libre-entreprise.org 17 Feb '08

17 Feb '08

Author: glandais Date: 2008-02-17 19:46:19 +0000 (Sun, 17 Feb 2008) New Revision: 1046 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementDelete.tml 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: Delete action business rules Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-02-17 19:45:33 UTC (rev 1045) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-02-17 19:46:19 UTC (rev 1046) @@ -17,16 +17,87 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; +import java.util.HashSet; +import java.util.Set; + +import org.apache.tapestry.ComponentResources; import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry.annotations.Persist; +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 de.hsofttec.t5components.annotations.SetterGetter; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; +import fr.cemagref.simexplorer.is.ui.web.tools.MetaDataModelFactory; /** * The Class ElementDelete. */ -public class ElementDelete extends ElementPage { +public class ElementDelete extends ElementPageDetail { + /** The model. */ + @Retain + private BeanModel model; + + /** The bean model source. */ + @Inject + private BeanModelSource beanModelSource; + + /** The resources. */ + @Inject + private ComponentResources resources; + + /** The used by. */ + @Persist + private MetaData[] usedBy; + + /** The all used by list. */ + @Persist + private Set<MetaData> allUsedByList; + + /** The _element. */ + @SetterGetter + private MetaData _listMetadata; + + /** + * Page loaded. + */ + void pageLoaded() { + model = MetaDataModelFactory.getMetaDataModel(beanModelSource, resources, false); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.ui.web.pages.ElementPage#setup(java.lang.String, java.lang.String) + */ + @Override + public void setup(String uuid, String version) throws SimExplorerException { + super.setup(uuid, version); + + // searching elements using element trying to be deleted + + usedBy = RemoteStorageService.getStorageService().getMetadatasUsedBy(getToken(), getMetadata().getUuid(), + getMetadata().getVersion().toString()); + if (usedBy.length == 0) { + allUsedByList = new HashSet<MetaData>(); + Version[] versions = RemoteStorageService.getStorageService().getVersions(getToken(), + getMetadata().getUuid()); + for (int i = 0; i < versions.length; i++) { + Version aVersion = versions[i]; + MetaData[] versionUsedBy = RemoteStorageService.getStorageService().getMetadatasUsedBy(getToken(), + getMetadata().getUuid(), aVersion.toString()); + for (int j = 0; j < versionUsedBy.length; j++) { + MetaData metaData = versionUsedBy[j]; + allUsedByList.add(metaData); + } + } + } + } + /** The element detail. */ @InjectPage private ElementDetail elementDetail; @@ -35,7 +106,8 @@ * On action from confirm. * * @return the object - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ public Object onActionFromConfirm() throws SimExplorerException { RemoteStorageService.getStorageService().deleteElement(getToken(), getMetadata().getUuid(), @@ -47,16 +119,97 @@ * On action from confirm all. * * @return the object - * @throws SimExplorerException + * + * @throws SimExplorerException the sim explorer exception */ public Object onActionFromConfirmAll() throws SimExplorerException { RemoteStorageService.getStorageService().deleteElement(getToken(), getMetadata().getUuid()); return elementDetail; } + /** + * Can be deleted. + * + * @return true, if successful + */ + public boolean isCanBeDeleted() { + return (usedBy.length == 0); + } + + /** + * Can be deleted in all versions. + * + * @return true, if successful + */ + public boolean isCanBeDeletedInAllVersions() { + return (allUsedByList.size() == 0); + } + + /** + * Gets the detail element context. + * + * @return the detail element context + */ + public String getDetailElementContext() { + return _listMetadata.getUuid() + "," + _listMetadata.getVersion(); + } + + /** + * Gets the model. + * + * @return the model + */ + public BeanModel getModel() { + return model; + } + + /** + * On action from detail element using. + * + * @param context the context + * + * @return the object + * + * @throws SimExplorerException the sim explorer exception + */ + public Object onActionFromDetailElementUsedBy(String context) throws SimExplorerException { + return onDetails(context); + } + + /** + * On action from detail element used by any version. + * + * @param context the context + * + * @return the object + * + * @throws SimExplorerException the sim explorer exception + */ + public Object onActionFromDetailElementUsedByAnyVersion(String context) throws SimExplorerException { + return onDetails(context); + } + + /** + * Gets the used by. + * + * @return the used by + */ + public MetaData[] getUsedBy() { + return usedBy; + } + + /** + * Gets the all used by list. + * + * @return the all used by list + */ + public Set<MetaData> getAllUsedByList() { + return allUsedByList; + } + /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.ui.web.pages.security.ProtectedPage#getWindowTitle() - */ + * @see fr.cemagref.simexplorer.is.ui.web.pages.security.ProtectedPage#getWindowTitle() + */ @Override public String getWindowTitle() { return getMessages().get("simexplorer.ui.web.title.deleteelement"); Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementDelete.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementDelete.tml 2008-02-17 19:45:33 UTC (rev 1045) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementDelete.tml 2008-02-17 19:46:19 UTC (rev 1046) @@ -1,18 +1,53 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> - <p>${message:simexplorer.ui.web.delete.confirmdelete}</p> - <p><t:actionlink t:id="confirm">${message:simexplorer.ui.web.confirm}</t:actionlink> - - <t:back label="${message:simexplorer.ui.web.cancel}" /></p> + <t:if test="canBeDeleted"> - <hr /> + <p>${message:simexplorer.ui.web.delete.confirmdelete}</p> + <p><t:actionlink t:id="confirm">${message:simexplorer.ui.web.confirm}</t:actionlink> + - <t:back label="${message:simexplorer.ui.web.cancel}" /></p> - <p>${message:simexplorer.ui.web.delete.confirmdeleteAll}</p> - <p><t:actionlink t:id="confirmall">${message:simexplorer.ui.web.confirm}</t:actionlink> - - <t:back label="${message:simexplorer.ui.web.cancel}" /></p> + <t:parameter name="else"> + {message:simexplorer.ui.web.delete.deleteimpossible} + + <table t:type="Grid" source="usedBy" row="listMetadata" model="model"> + <t:parameter name="uuidCell"> + <t:actionlink t:id="detailElementUsedBy" + context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> + </t:parameter> + </table> + </t:parameter> + + </t:if> + <hr /> + <t:if test="canBeDeleted"> + <t:if test="canBeDeletedInAllVersions"> + + <p>${message:simexplorer.ui.web.delete.confirmdeleteAll}</p> + <p><t:actionlink t:id="confirmall">${message:simexplorer.ui.web.confirm}</t:actionlink> + - <t:back label="${message:simexplorer.ui.web.cancel}" /></p> + + <t:parameter name="else"> + {message:simexplorer.ui.web.delete.deleteimpossibleAll} + + <table t:type="Grid" source="allUsedByList" row="listMetadata" + model="model"> + <t:parameter name="uuidCell"> + <t:actionlink t:id="detailElementUsedByAnyVersion" + context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> + </t:parameter> + </table> + + </t:parameter> + + </t:if> + + <hr /> + </t:if> + <p><t:back label="${message:simexplorer.ui.web.back}" /></p> </t:layout> 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-02-17 19:45:33 UTC (rev 1045) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-17 19:46:19 UTC (rev 1046) @@ -98,6 +98,8 @@ simexplorer.ui.web.delete.confirmdelete=Confirm deletion of element simexplorer.ui.web.delete.confirmdeleteAll=Confirm deletion of element in all versions +simexplorer.ui.web.delete.deleteimpossible=This item cannot be delete, as following elements are using this item : +simexplorer.ui.web.delete.deleteimpossibleAll=This item cannot be delete in all of its revisions, as following elements are using this item in a version : simexplorer.ui.web.export.downloadxml=Download XML simexplorer.ui.web.export.downloadfull=Download XML and all attachments as ZIP archive 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-02-17 19:45:33 UTC (rev 1045) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-17 19:46:19 UTC (rev 1046) @@ -98,6 +98,8 @@ simexplorer.ui.web.delete.confirmdelete=Confirmer la suppression de l'élément simexplorer.ui.web.delete.confirmdeleteAll=Confirmer la suppression de l'élément dans toutes ses versions +simexplorer.ui.web.delete.deleteimpossible=Cet élément ne peut pas être supprimé, au moins un autre élément l'utilise : +simexplorer.ui.web.delete.deleteimpossibleAll=Cet élément ne peut pas être supprimé dans toutes ses versions, au moins un autre élément l'utilise dans une de ses versions : simexplorer.ui.web.export.downloadxml=Télécharger le fichier XML simexplorer.ui.web.export.downloadfull=Télécharger le fichier XML et tous ces fichiers dans une archive ZIP

1 0