Author: dumoulin Date: 2008-08-28 14:56:13 +0000 (Thu, 28 Aug 2008) New Revision: 1528 Added: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java 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/data/Component.java trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java Log: entity ComponentType added to represent the class of a component at exploration runtime 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-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -22,6 +22,7 @@ import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ComponentType; import fr.cemagref.simexplorer.is.entities.data.Constant; import fr.cemagref.simexplorer.is.entities.data.ConstantValue; import fr.cemagref.simexplorer.is.entities.data.Descriptor; @@ -51,6 +52,8 @@ /** The Component. */ Component(true, n_("simexplorer.common.component"), n_("simexplorer.common.components"), Component.class), + ComponentType(false, n_("simexplorer.common.componenttype"), null, ComponentType.class), + /** The Constant. */ Constant(false, n_("simexplorer.common.constant"), n_("simexplorer.common.constants"), Constant.class), @@ -108,7 +111,7 @@ return value; } } - log.info("Entity not fund for class " + klass); + log.info("Entity not found for class " + klass); return null; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -1,28 +1,30 @@ /* -* ##% Copyright (C) 2008 Cemagref -* -* 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 3 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, see <http://www.gnu.org/licenses/>. -* ##% */ + * ##% Copyright (C) 2008 Cemagref + * + * 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 3 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, see <http://www.gnu.org/licenses/>. + * ##% */ package fr.cemagref.simexplorer.is.entities.data; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; +import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.composite.Codes; import fr.cemagref.simexplorer.is.entities.composite.Constants; import fr.cemagref.simexplorer.is.entities.composite.Libraries; import fr.cemagref.simexplorer.is.entities.composite.Structures; +import java.util.ArrayList; /** * The Class Component. @@ -32,21 +34,26 @@ /** The Constant serialVersionUID. */ private static final long serialVersionUID = 1; - + /** The component type */ + ComponentType type; /** The constants. */ Constants constants; - /** The structures. */ Structures structures; - /** The codes. */ Codes codes; - /** The libraries. */ Libraries libraries; + private static final String[] excludeFields = {"excludeFields", "metadataIS"}; - private static final String[] excludeFields = { "excludeFields", "metadataIS" }; + public ComponentType getType() { + return type; + } + public void setType(ComponentType type) { + this.type = type; + } + /** * Gets the constants. * @@ -132,6 +139,13 @@ return directChildren; } + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(EntityTypeEnum.getLibelle(this.getClass())+" ("+type+")"); + return row; + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.entities.Entity#getExcludeFields() */ @@ -139,5 +153,4 @@ protected String[] getExcludeFields() { return excludeFields; } - } Added: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ComponentType.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -0,0 +1,69 @@ +/* + * Copyright © 2008, Cemagref + * + * 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 3 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., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ +package fr.cemagref.simexplorer.is.entities.data; + +import fr.cemagref.simexplorer.is.entities.Leaf; +import java.util.ArrayList; +import java.util.List; + +/** + * Used to represent the class of the component at the exploration runtime + * + * @author dumoulin + */ +public class ComponentType extends Leaf { + + /** The Constant serialVersionUID. */ + private static final long serialVersionUID = 1; + private static final String[] excludeFields = {"excludeFields"}; + Class<?> type; + + public ComponentType(Class type) { + this.type = type; + } + + public Class<?> getType() { + return type; + } + + public void setType(Class<?> type) { + this.type = type; + } + + @Override + public String toString() { + assert type != null; + return type.getCanonicalName().toString(); + } + + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(toString()); + return row; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.Entity#getExcludeFields() + */ + @Override + protected String[] getExcludeFields() { + return excludeFields; + } +} Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-08-28 14:56:13 UTC (rev 1528) @@ -8,6 +8,7 @@ simexplorer.common.codes=Codes simexplorer.common.component=Component simexplorer.common.components=Components +simexplorer.common.componenttype=Type of the component simexplorer.common.constant=Constant simexplorer.common.constant.name=Name simexplorer.common.constant.type=Type Modified: trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-08-28 14:56:13 UTC (rev 1528) @@ -8,6 +8,7 @@ simexplorer.common.codes=Codes simexplorer.common.component=Composant simexplorer.common.components=Composants +simexplorer.common.componenttype=Type du composant simexplorer.common.constant=Constante simexplorer.common.constant.name=Nom simexplorer.common.constant.type=Type Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -38,6 +38,7 @@ import fr.cemagref.simexplorer.is.entities.composite.Structures; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ComponentType; import fr.cemagref.simexplorer.is.entities.data.Constant; import fr.cemagref.simexplorer.is.entities.data.ConstantValue; import fr.cemagref.simexplorer.is.entities.data.Descriptor; @@ -263,6 +264,7 @@ * @throws Exception the exception */ private void processComponent(Component component) throws Exception { + component.setType(new ComponentType(Object.class)); Constants constants = generateComposite(Constants.class); for (Constant constant : constants) { processConstant(constant); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-08-28 14:19:42 UTC (rev 1527) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-08-28 14:56:13 UTC (rev 1528) @@ -51,7 +51,7 @@ public Object onActionFromGenerateData() throws Exception { StorageServiceGenerator storageServiceGenerator = new StorageServiceGenerator(); storageServiceGenerator.generateLotsExplorationApplication(RemoteStorageService.getStorageService(), - getToken(), 10); + getToken(), 1); return elementList; }