Author: glandais Date: 2008-03-05 18:00:37 +0000 (Wed, 05 Mar 2008) New Revision: 1291 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties Log: i18n Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -1,7 +1,7 @@ package fr.cemagref.simexplorer.is.entities; +import static org.codelutin.i18n.I18n.n_; import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -298,4 +298,8 @@ return EntityTypeEnum.getEntityType(getElementClass()); } + public String getEntityTypeLibelle() { + return getEntityType().getLibelle(); + } + } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -552,7 +552,6 @@ */ public String loginUser(String login, String password) throws SimExplorerException { if (!superAdminCheck) { - I18n.initISO88591("fr", "FR"); checkSuperAdmin(); superAdminCheck = true; } @@ -806,4 +805,8 @@ return credentialManager.getPermissionsOwnedByCount(user); } + + { + I18n.initISO88591("fr", "FR"); + } } Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-en_GB.properties 2008-03-05 18:00:37 UTC (rev 1291) @@ -21,6 +21,6 @@ simexplorer.help.menu=Help simexplorer.login.title=Authentication to remote server simexplorer.main.menu=Main -simexplorer.main.ui.title=SimExplorer SI v 0.0.1 +simexplorer.main.ui.title=SimExplorer SI v 0.1 simexplorer.node.navigation.local=Local element simexplorer.node.navigation.remote=Remote element Modified: trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-swing-jaxx/src/resources/i18n/simexplorer-is-swing-jaxx-fr_FR.properties 2008-03-05 18:00:37 UTC (rev 1291) @@ -21,6 +21,6 @@ simexplorer.help.menu=Aide simexplorer.login.title=Connexion au serveur central simexplorer.main.menu=Menu principal -simexplorer.main.ui.title=SimExplorer SI v 0.0.1 +simexplorer.main.ui.title=SimExplorer SI v 0.1 simexplorer.node.navigation.local=\u00E9l\u00E9ment local simexplorer.node.navigation.remote=\u00E9l\u00E9ment distant Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -1,26 +1,32 @@ /* -* ##% 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. -* ##% */ + * ##% 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.services; import java.io.IOException; +import org.apache.tapestry.ValueEncoder; +import org.apache.tapestry.internal.services.EnumValueEncoderFactory; +import org.apache.tapestry.internal.services.GenericValueEncoderFactory; +import org.apache.tapestry.internal.services.StringValueEncoder; +import org.apache.tapestry.internal.services.TypeCoercedValueEncoderFactory; import org.apache.tapestry.ioc.Configuration; import org.apache.tapestry.ioc.MappedConfiguration; +import org.apache.tapestry.ioc.ObjectLocator; import org.apache.tapestry.ioc.OrderedConfiguration; import org.apache.tapestry.ioc.ServiceBinder; import org.apache.tapestry.ioc.annotations.InjectService; @@ -30,6 +36,7 @@ import org.apache.tapestry.services.RequestFilter; import org.apache.tapestry.services.RequestHandler; import org.apache.tapestry.services.Response; +import org.apache.tapestry.services.ValueEncoderFactory; import org.slf4j.Logger; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; @@ -43,13 +50,14 @@ /** * Bind. * - * @param binder the binder + * @param binder + * the binder */ public static void bind(ServiceBinder binder) { /* - binder.bind(RemoteStorageService.class, RemoteStorageServiceImpl.class); - binder.bind(RemoteSecurityService.class, RemoteSecurityServiceImpl.class); - */ + * binder.bind(RemoteStorageService.class, RemoteStorageServiceImpl.class); + * binder.bind(RemoteSecurityService.class, RemoteSecurityServiceImpl.class); + */ // Make bind() calls on the binder object to define most IoC services. // Use service builder methods (example below) when the implementation @@ -60,7 +68,8 @@ /** * Contribute application defaults. * - * @param configuration the configuration + * @param configuration + * the configuration */ public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration) { configuration.add("tapestry.supported-locales", "en,fr"); @@ -70,43 +79,14 @@ /** * Contribute default data type analyzer. * - * @param configuration the configuration + * @param configuration + * the configuration */ public static void contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class<?>, String> configuration) { configuration.add(Version.class, "text"); - configuration.add(EntityTypeEnum.class, "text"); } /** - * Contribute type coercer. - * - * @param configuration the configuration - */ - public static void contributeTypeCoercer(Configuration<CoercionTuple> configuration) { - Coercion<Version, String> coercionVersionString = new Coercion<Version, String>() { - public String coerce(Version input) { - return input.toString(); - } - }; - Coercion<String, Version> coercionStringVersion = new Coercion<String, Version>() { - public Version coerce(String input) { - return Version.valueOf(input); - } - }; - Coercion<EntityTypeEnum, String> coercionEntityTypeEnumString = new Coercion<EntityTypeEnum, String>() { - public String coerce(EntityTypeEnum input) { - if (input == null) { - return ""; - } - return input.getLibelle(); - } - }; - configuration.add(new CoercionTuple<Version, String>(Version.class, String.class, coercionVersionString)); - configuration.add(new CoercionTuple<String, Version>(String.class, Version.class, coercionStringVersion)); - configuration.add(new CoercionTuple<EntityTypeEnum, String>(EntityTypeEnum.class, String.class, coercionEntityTypeEnumString)); - } - - /** * This is a service definition, the service will be named "TimingFilter". The interface, RequestFilter, is used * within the RequestHandler service pipeline, which is built from the RequestHandler service configuration. * Tapestry IoC is responsible for passing in an appropriate Log instance. Requests for static resources are handled @@ -121,7 +101,8 @@ * "RequestFilter". Since Tapestry already defines a service named "RequestFilter" we use an explicit service id * that we can reference inside the contribution method. * - * @param log the log + * @param log + * the log * * @return the request filter */ @@ -151,8 +132,10 @@ * This is a contribution to the RequestHandler service configuration. This is how we extend Tapestry using the * timing filter. A common use for this kind of filter is transaction management or security. * - * @param configuration the configuration - * @param filter the filter + * @param configuration + * the configuration + * @param filter + * the filter */ public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration, @InjectService("TimingFilter") Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-03-05 18:00:37 UTC (rev 1291) @@ -17,11 +17,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.tools; +import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.List; import org.apache.tapestry.ComponentResources; +import org.apache.tapestry.PropertyConduit; import org.apache.tapestry.beaneditor.BeanModel; +import org.apache.tapestry.beaneditor.PropertyModel; import org.apache.tapestry.services.BeanModelSource; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -56,12 +59,13 @@ wantedProperties.add("uuid"); wantedProperties.add("version"); wantedProperties.add("name"); - wantedProperties.add("entityType"); + wantedProperties.add("entityTypeLibelle"); if (!securityList) { wantedProperties.add("description"); wantedProperties.add("creationDate"); } + List<String> properties = model.getPropertyNames(); for (String property : properties) { if (!sortable) { @@ -69,7 +73,7 @@ } if (!wantedProperties.contains(property)) { model = model.remove(property); - } + } } if (securityList) { model.add("owner", null); Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-03-05 18:00:37 UTC (rev 1291) @@ -147,3 +147,28 @@ simexplorer.ui.web.error.security=Not enough rights to perform that action. simexplorer.ui.web.generatedata=Generate data + +uuid-label=Details +version-label=Version +name-label=Name +entityTypeLibelle-label=Type +description-label=Description +creationDate-label=Creation date +owner-label=Owner +read-label=Reader +write-label=Writer +admin-label=Admin +rights-label=Rights +edit-label=Edit +delete-label=Delete +login-label=Login +superAdmin-label=Super admin + +AllFields=All fields +Name=Name +Description=Description +Descriptors=Descriptors +AttachmentsName=Attachment names +AttachmentsContent=Attachment content + +searchField-label=Searched content Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-03-05 17:59:23 UTC (rev 1290) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-03-05 18:00:37 UTC (rev 1291) @@ -113,7 +113,7 @@ simexplorer.ui.web.import.explorationapplication=Application d'exploration simexplorer.ui.web.import.library=Librairie -simexplorer.ui.web.elementlist.details=Details +simexplorer.ui.web.elementlist.details=Détails simexplorer.ui.web.elementmanage.filterowner=Seulement les éléments dont le propriétaire est simexplorer.ui.web.elementmanage.ok=Ok @@ -147,3 +147,28 @@ simexplorer.ui.web.error.security=Pas assez de droits pour réaliser cette action. simexplorer.ui.web.generatedata=Generate data + +uuid-label=Détails +version-label=Version +name-label=Nom +entityTypeLibelle-label=Type +description-label=Description +creationDate-label=Date création +owner-label=Propriétaire +read-label=Lecture +write-label=Ecriture +admin-label=Admin +rights-label=Droits +edit-label=Edition +delete-label=Suppression +login-label=Login +superAdmin-label=Super admin + +AllFields=Tous les champs +Name=Nom +Description=Description +Descriptors=Mots-clés +AttachmentsName=Noms fichiers +AttachmentsContent=Contenu fichiers + +searchField-label=Texte recherché