[Equanda-svn-commit] SF.net SVN: equanda: [206] trunk/equanda-generate/src/main

[<tri...@us...>]

Revision: 206
          http://equanda.svn.sourceforge.net/equanda/?rev=206&view=rev
Author:   triathlon98
Date:     2007-12-14 06:00:27 -0800 (Fri, 14 Dec 2007)

Log Message:
-----------
EQ-99 more fixes in generation (equandaType)

Modified Paths:
--------------
    trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
    trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm

Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java	2007-12-14 13:05:10 UTC (rev 205)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java	2007-12-14 14:00:27 UTC (rev 206)
@@ -24,10 +24,11 @@
 
 package org.equanda.persistence.xml;
 
+import javolution.lang.TextBuilder;
 import org.equanda.util.SaveException;
+import org.equanda.util.StringUtil;
 import org.equanda.util.xml.tree.Node;
 import org.equanda.util.xml.tree.NodeList;
-import javolution.lang.TextBuilder;
 
 import java.util.*;
 
@@ -511,6 +512,37 @@
             return name;
         }
 
+        public List<TableType> getIncluded()
+        {
+            OMTable ref = getTable( name );
+            ArrayList<TableType> res = new ArrayList<TableType>();
+            for ( OMTable p : ref.getParentTables() ) res.add( new TableType( p.getType(), p.getName() ) );
+            res.add( this );
+            return res;
+        }
+
+        public List<TableType> getExcluded()
+        {
+            List<TableType> res = getTypes();
+            List<TableType> inc = getIncluded();
+            for ( TableType tt : inc ) res.remove( tt );
+            return res;
+        }
+
+        public int hashCode()
+        {
+            int res = 0;
+            if ( type != null ) res += type.hashCode();
+            if ( name != null ) res += 3 * name.hashCode();
+            return res;
+        }
+
+        public boolean equals( Object o )
+        {
+            if ( o == null || !( o instanceof TableType ) ) return false;
+            TableType other = (TableType) o;
+            return StringUtil.objectEquals( type, other.getType() ) && StringUtil.objectEquals( name, other.getName() );
+        }
     }
 
     public ArrayList<TableType> getTypes()

Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm	2007-12-14 13:05:10 UTC (rev 205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm	2007-12-14 14:00:27 UTC (rev 206)
@@ -1,21 +1,16 @@
 <div class="${table.Name}-EquandaType ${table.Name}-type-">
     <t:label for="equandaType"/>
     <div style="display:none;">
-    <a href="javascript:;" id="Show-${table.Name}-type-" onclick="
-    $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
-    $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='none';});
-    $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='none';});
-    ">BASE</a>
-    <a href="javascript:;" id="Show-${table.Name}-type-INTE" onclick="
-    $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
-    $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='block';});
-    $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='none';});
-    ">INTE</a>
-    <a href="javascript:;" id="Show-${table.Name}-type-PERS" onclick="
-    $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
-    $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='block';});
-    $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='block';});
-    ">PERS</a>
+#foreach( $type in $table.Types )
+    <a href="javascript:;" id="Show-${table.Name}-type-${type.TrimmedType}" onclick="
+#foreach( $st in $type.Included )
+    $$('.${table.Name}-type-${st.TrimmedType}').each(function show(object){object.style.display='block';});
+#end
+#foreach( $st in $type.Excluded )
+    $$('.${table.Name}-type-${st.TrimmedType}').each(function show(object){object.style.display='none';});
+#end
+    ">${type.TrimmedType}</a>
+#end##foreach types
     </div>
     <input class="${table.Name}-type-Selector" t:type="Select" t:label="EquandaType" t:id="equandaType" t:value="value.EquandaType" t:disabled="isTypeKnown()" model="TypeModel" encoder="TypeEncoder" onchange="$(('Show-${table.Name}-type-'+this.options[this.selectedIndex].value).trim()).onclick();"/>
     <br/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.