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

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

Revision: 378
          http://equanda.svn.sourceforge.net/equanda/?rev=378&view=rev
Author:   triathlon98
Date:     2008-03-13 03:29:59 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
EQ-53 add some extra validations and transformations, working towards generating working templates

Modified Paths:
--------------
    trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Action.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/CaseConversion.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Default.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DefaultInstance.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/IncludeData.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Page.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Set.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/SubSelect.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Type.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/CaseConversionValue.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DataFilterConverter.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultConverter.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultInstanceConverter.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SetConverter.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/TransformationUtil.java
    trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/ValidationUtil.java
    trunk/equanda-generate/src/main/java/org/equanda/generate/EquandaResourceLoader.java

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -26,7 +26,6 @@
 
 import org.equanda.util.IniFile;
 import org.equanda.util.SaveException;
-
 import java.io.IOException;
 
 /**

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Action.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Action.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Action.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -74,7 +74,7 @@
         for ( int i = 0; i < getParameters().size() ; i++ )
         {
             paramsNT.append( sep );
-            paramsWT.append( sep ).append( getParameters().get( i ).getType() ).append(" ");
+            paramsWT.append( sep ).append( getParameters().get( i ).getType() ).append( " " );
             paramsNT.append( "param" ).append( i );
             paramsWT.append( "param" ).append( i );
             sep = ", ";

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/CaseConversion.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/CaseConversion.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/CaseConversion.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,9 +24,9 @@
 
 package org.equanda.domain.xml;
 
+import org.equanda.domain.xml.aid.CaseConversionValue;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import org.equanda.domain.xml.aid.CaseConversionValue;
 
 /**
  * case conversion tag

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,9 +24,9 @@
 
 package org.equanda.domain.xml;
 
+import org.equanda.domain.xml.aid.DataFilterConverter;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
-import org.equanda.domain.xml.aid.DataFilterConverter;
 
 /**
  * Implementation for data-filter

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Default.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Default.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Default.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,10 +24,10 @@
 
 package org.equanda.domain.xml;
 
+import org.equanda.domain.xml.aid.DefaultConverter;
+import org.equanda.domain.xml.aid.DefaultType;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
-import org.equanda.domain.xml.aid.DefaultConverter;
-import org.equanda.domain.xml.aid.DefaultType;
 
 /**
  * default value handling

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DefaultInstance.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DefaultInstance.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DefaultInstance.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,9 +24,9 @@
 
 package org.equanda.domain.xml;
 
+import org.equanda.domain.xml.aid.DefaultInstanceConverter;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
-import org.equanda.domain.xml.aid.DefaultInstanceConverter;
 
 /**
  * default-instance tag
@@ -37,7 +37,7 @@
 @XStreamConverter( DefaultInstanceConverter.class )
 public class DefaultInstance
 {
-    @XStreamAlias("class-name")
+    @XStreamAlias( "class-name" )
     private String className;
     private boolean force;
 

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/IncludeData.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/IncludeData.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/IncludeData.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -25,10 +25,7 @@
 package org.equanda.domain.xml;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.thoughtworks.xstream.annotations.XStreamOmitField;
-
 import java.util.ArrayList;
 import java.util.List;
 

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Page.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Page.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Page.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,17 +24,13 @@
 
 package org.equanda.domain.xml;
 
+import org.equanda.util.StringUtil;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.thoughtworks.xstream.annotations.XStreamOmitField;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import org.equanda.domain.xml.transform.RootTable;
-import org.equanda.util.StringUtil;
-
 /**
  * representation of a &lt;page&gt; node
  *

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Set.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Set.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Set.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,9 +24,9 @@
 
 package org.equanda.domain.xml;
 
+import org.equanda.domain.xml.aid.SetConverter;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
-import org.equanda.domain.xml.aid.SetConverter;
 
 /**
  * representation of a &lt;set&gt; tag, as can be used inside &lt;build&gt;

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/SubSelect.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/SubSelect.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/SubSelect.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -64,7 +64,7 @@
         if ( null == name ) name = "";
         this.name = name + '_' + count;
         int subCount = 0;
-        this.select=select;
+        this.select = select;
         for ( SubSelect sub : getSubSelects() ) sub.handleTransformation( dm, root, select, getName(), ++subCount );
         for ( Selection sel : getSelections() ) sel.handleTransformation( dm, root, select );
     }
@@ -117,7 +117,7 @@
 
     String getSubQuery()
     {
-        if ( null!=query ) return query;
+        if ( null != query ) return query;
         TextBuilder ejbQlQuery = TextBuilder.newInstance();
         if ( !hasSubSelects() )
         {

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Type.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Type.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Type.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -26,7 +26,6 @@
 
 import org.equanda.domain.xml.aid.ImplicitBooleanConverter;
 import com.thoughtworks.xstream.annotations.*;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/CaseConversionValue.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/CaseConversionValue.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/CaseConversionValue.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,8 +24,6 @@
 
 package org.equanda.domain.xml.aid;
 
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-
 /**
  * ...
  *

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DataFilterConverter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DataFilterConverter.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DataFilterConverter.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,12 +24,12 @@
 
 package org.equanda.domain.xml.aid;
 
+import org.equanda.domain.xml.DataFilter;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.equanda.domain.xml.DataFilter;
 
 /**
  * Converter for overwrite-default node.

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultConverter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultConverter.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultConverter.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,12 +24,12 @@
 
 package org.equanda.domain.xml.aid;
 
+import org.equanda.domain.xml.Default;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.equanda.domain.xml.Default;
 
 /**
  * XStream converter for the "default" node

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultInstanceConverter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultInstanceConverter.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultInstanceConverter.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,13 +24,12 @@
 
 package org.equanda.domain.xml.aid;
 
+import org.equanda.domain.xml.DefaultInstance;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.equanda.domain.xml.Default;
-import org.equanda.domain.xml.DefaultInstance;
 
 /**
  * XStream converter for the "default-instance" node

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,12 +24,12 @@
 
 package org.equanda.domain.xml.aid;
 
+import org.equanda.domain.xml.OverwriteDefault;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.equanda.domain.xml.OverwriteDefault;
 
 /**
  * Converter for overwrite-default node.

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SetConverter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SetConverter.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SetConverter.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,13 +24,12 @@
 
 package org.equanda.domain.xml.aid;
 
+import org.equanda.domain.xml.Set;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.equanda.domain.xml.DataFilter;
-import org.equanda.domain.xml.Set;
 
 /**
  * Converter for overwrite-default node.

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/TransformationUtil.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/TransformationUtil.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/TransformationUtil.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -24,8 +24,8 @@
 
 package org.equanda.domain.xml.aid;
 
+import org.equanda.domain.xml.Field;
 import org.equanda.domain.xml.Parser;
-import org.equanda.domain.xml.Field;
 import org.equanda.domain.xml.transform.RootTable;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -85,7 +85,7 @@
         return null;
     }
 
-    public static Field pathToField( RootTable root, String path)
+    public static Field pathToField( RootTable root, String path )
     {
         Field field = null;
         for ( String fieldName : path.split( "\\." ) )

Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/ValidationUtil.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/ValidationUtil.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/ValidationUtil.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -68,8 +68,8 @@
         Set<Object> objects = new HashSet<Object>();
         for ( T obj : list )
         {
-            Object one = getter.get(obj);
-            if (objects.contains( one ) ) return one;
+            Object one = getter.get( obj );
+            if ( objects.contains( one ) ) return one;
             objects.add( one );
         }
         return null;

Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/EquandaResourceLoader.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/EquandaResourceLoader.java	2008-03-12 22:48:32 UTC (rev 377)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/EquandaResourceLoader.java	2008-03-13 10:29:59 UTC (rev 378)
@@ -28,7 +28,6 @@
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.resource.Resource;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
-
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -88,7 +87,7 @@
 
         // try all the possible prefixes (in order)
         int sz = prefixes.size();
-        for ( int i = 0; result == null && i < sz; i++ )
+        for ( int i = 0; result == null && i < sz ; i++ )
         {
             try
             {


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