Author: glandais Date: 2008-03-13 09:18:45 +0000 (Thu, 13 Mar 2008) New Revision: 1325 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java Log: UI presentation Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -21,6 +21,7 @@ import java.util.List; +import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; /** @@ -31,11 +32,10 @@ /** The Constant serialVersionUID. */ private static final long serialVersionUID = 6100507219070076248L; - // @Override - // protected boolean visitEnter(EntityVisitor visitor) { - // // do not visit attachments - // return false; - // } + @Override + protected boolean visitEnter(EntityVisitor visitor) { + return visitEnterIfNotEmpty(visitor); + } @Override public List<String> getRow() { Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -21,6 +21,7 @@ import java.util.List; +import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.data.Descriptor; /** @@ -28,15 +29,14 @@ */ public final class Descriptors extends SimpleComposite<Descriptor> { - // @Override - // protected boolean visitEnter(EntityVisitor visitor) { - // // do not visit descriptors - // return false; - // } - /** The Constant serialVersionUID. */ private static final long serialVersionUID = -5742926033876669501L; + @Override + protected boolean visitEnter(EntityVisitor visitor) { + return visitEnterIfNotEmpty(visitor); + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.entities.composite.SimpleComposite#getRow() */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -28,6 +28,7 @@ import fr.cemagref.simexplorer.is.entities.Composite; import fr.cemagref.simexplorer.is.entities.Entity; import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; +import fr.cemagref.simexplorer.is.entities.EntityVisitor; /** * The Class SimpleComposite. @@ -60,6 +61,13 @@ this.elements = elements; } + protected boolean visitEnterIfNotEmpty(EntityVisitor visitor) { + if (size() == 0) { + return false; + } + return visitEnter(visitor); + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.entities.Entity#getChildren() */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Code.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -82,6 +82,15 @@ } @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(getLanguage()); + row.add(getCode()); + return row; + } + + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -112,12 +121,5 @@ return true; } - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(""); - row.add(getLanguage()); - row.add(getCode()); - return row; - } + } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Constant.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -80,6 +80,15 @@ } @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(getName()); + row.add(getType().getSimpleName()); + return row; + } + + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -110,13 +119,4 @@ return true; } - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(""); - row.add(getName()); - row.add(getType().getSimpleName()); - return row; - } - } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ConstantValue.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -86,6 +86,15 @@ } @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(constant.toString()); + row.add(value); + return row; + } + + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -116,12 +125,4 @@ return true; } - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(""); - row.add(constant.toString()); - row.add(value); - return row; - } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Descriptor.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -92,6 +92,15 @@ } @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(""); + row.add(name); + row.add(value); + return row; + } + + @Override public int compareTo(Descriptor o) { if (this.getName() == null || o == null || o.getName() == null) { return 0; @@ -130,12 +139,4 @@ return true; } - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(""); - row.add(name); - row.add(value); - return row; - } } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-12 17:07:27 UTC (rev 1324) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-03-13 09:18:45 UTC (rev 1325) @@ -78,6 +78,18 @@ return sb.toString(); } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.entities.Entity#getRow() + */ + @Override + public List<String> getRow() { + List<String> row = new ArrayList<String>(); + row.add(_("simexplorer.common.metadata")); + row.add(getName()); + row.add(getVersion().toString()); + return row; + } + /** * Gets the uuid. * @@ -302,15 +314,4 @@ return getEntityType().getLibelle(); } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.entities.Entity#getRow() - */ - @Override - public List<String> getRow() { - List<String> row = new ArrayList<String>(); - row.add(_("simexplorer.common.metadata")); - row.add(getName()); - row.add(getVersion().toString()); - return row; - } }