equanda-svn-commit Mailing List for equanda Java EE code generator (Page 47)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 93
          http://equanda.svn.sourceforge.net/equanda/?rev=93&view=rev
Author:   triathlon98
Date:     2007-09-24 05:34:26 -0700 (Mon, 24 Sep 2007)

Log Message:
-----------
EQ-5 more small improvements

Modified Paths:
--------------
    trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm
    trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm

Added Paths:
-----------
    trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java

Modified: trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm
===================================================================

--- trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm	2007-09-24 12:30:07 UTC (rev 92)
+++ trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm	2007-09-24 12:34:26 UTC (rev 93)
@@ -80,7 +80,7 @@
 #if( $select.isSingle() )
                 return selector.find${select.Name}EJB( $params );
 #else
-                List<${table.Name}EJB> col = (List<${table.Name}EJB>)selector.find${select.Name}EJB( $params );
+                List<${table.Name}EJB> col = selector.find${select.Name}EJB( $params );
                 if ( col.size() > 1 )
                 {
                     throw new ImportHandlerException( "Dubious update, $table.Name/$select.Name selected multiple records" );
@@ -113,25 +113,7 @@
                 #else
                     Collection res = null;
                 #end
-                Collection ccPar;
-
-                // make sure we have a collection which contains collections
-                // with parameters, for consistent processing
-                if ( !( parameters instanceof Collection ) )
-                {
-                    ccPar = new ArrayList();
-                    Collection coll = new ArrayList();
-                    coll.add( parameters );
-                }
-                else
-                {
-                    ccPar = (Collection) parameters;
-                    if ( !( ccPar.iterator().next() instanceof Collection ) )
-                    {
-                        ccPar = new ArrayList();
-                        ccPar.add( parameters );
-                    }
-                }
+                Collection ccPar = getCollection( parameters );
                 ${table.Name}SelectorEJB selector = null;
                 try
                 {
@@ -204,8 +186,7 @@
         {
             public ${table.Name}EJB find( ${table.Name}SelectorEJB selector, Import${table.Name} val ) throws Exception
             {
-                UOID uoid;
-                ${table.Name}EJB obj = EquandaGlobal.get${table.Name}();
+                ${table.Name}EJB obj = null;
                 selector = EquandaGlobal.get${table.Name}Selector();
 
                 // try all local&single finders that match
@@ -214,6 +195,7 @@
                 {
                     if ( selector.findUOID( val.getUOID() ) != null )
                     {
+                        obj = EquandaGlobal.get${table.Name}();
                         obj.init( val.getUOID() );
                         return obj;
                     }
@@ -229,12 +211,8 @@
                 if ( $paramsif )
 #end
                 {
-                    uoid = selector.find${select.Name}UOID( $params );
-                    if ( uoid != null )
-                    {
-                        obj.init( uoid );
-                        return obj;
-                    }
+                    obj = selector.find${select.Name}EJB( $params );
+                    if ( obj != null ) return obj;
                 }
 #end ## isSingle
 #end

Modified: trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm	2007-09-24 12:30:07 UTC (rev 92)
+++ trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm	2007-09-24 12:34:26 UTC (rev 93)
@@ -32,7 +32,7 @@
 import ${ejbPackage}.client.*;
 
 public class ${table.Name}TableHandler
-    implements TableHandler
+    extends TableHandlerBase
 {
     public Import${table.Name} getEmptyObject()
     {

Added: trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java	                        (rev 0)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java	2007-09-24 12:34:26 UTC (rev 93)
@@ -0,0 +1,60 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.ymport;
+
+import java.util.Collection;
+import java.util.ArrayList;
+
+/**
+ * Base implementation for a TableHandler
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public abstract class TableHandlerBase
+    implements TableHandler
+{
+    public Collection<Collection<Object>> getCollection( Object par )
+    {
+        Collection<Collection<Object>> ccPar;
+        if ( !( par instanceof Collection ) )
+        {
+            ccPar = new ArrayList<Collection<Object>>();
+            Collection<Object> coll = new ArrayList<Object>();
+            coll.add( par );
+            ccPar.add( coll );
+        }
+        else
+        {
+            ccPar = (Collection<Collection<Object>>) par;
+            if ( !( ccPar.iterator().next() instanceof Collection ) )
+            {
+                ccPar = new ArrayList<Collection<Object>>();
+                ccPar.add( (Collection<Object>)par );
+            }
+        }
+        return ccPar;
+    }
+
+}


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




2007	Jan	Feb	Mar	Apr	May	Jun	Jul (6)	Aug (41)	Sep (44)	Oct (31)	Nov (54)	Dec (53)
2008	Jan (71)	Feb (66)	Mar (65)	Apr (73)	May (68)	Jun (69)	Jul (28)	Aug (49)	Sep (44)	Oct (77)	Nov (64)	Dec (78)
2009	Jan (50)	Feb (28)	Mar (41)	Apr (30)	May (5)	Jun (30)	Jul (6)	Aug (2)	Sep (18)	Oct (11)	Nov (6)	Dec (10)
2010	Jan (5)	Feb (8)	Mar (4)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

equanda-svn-commit Mailing List for equanda Java EE code generator (Page 47)

equanda-svn-commit — svn commits