[Equanda-svn-commit] SF.net SVN: equanda: [46] trunk

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

Revision: 46
          http://equanda.svn.sourceforge.net/equanda/?rev=46&view=rev
Author:   triathlon98
Date:     2007-08-23 02:00:17 -0700 (Thu, 23 Aug 2007)

Log Message:
-----------
remove some unneeded code, move extra code to base class (out of template)

Modified Paths:
--------------
    trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxy.java
    trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm
    trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
    trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm

Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxy.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxy.java	2007-08-22 15:19:13 UTC (rev 45)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxy.java	2007-08-23 09:00:17 UTC (rev 46)
@@ -119,8 +119,14 @@
      */
     public abstract void setEquandaType( String type );
 
-    public abstract boolean isModified();
+    public abstract boolean isModified( boolean typeFieldsOnly );
 
+    public boolean isModified()
+    {
+        return isModified( false );
+    }
+
+
     /**
      * utility routine to test equality of objects without relying on one of them being not null.
      *
@@ -136,8 +142,15 @@
 
     public abstract T cloneProxy( boolean cloneUoid );
 
-    public abstract void equandaUpdate()
-        throws EquandaPersistenceException;
+    /**
+     * Update the proxy state, client changes are persisted, and server changes retrieved.
+     * @throws EquandaPersistenceException update problems
+     */
+    public void equandaUpdate()
+        throws EquandaPersistenceException
+    {
+        equandaUpdate( false );
+    }
 
     public abstract void equandaUpdate( boolean updateTypeFieldsOnly )
         throws EquandaPersistenceException;
@@ -153,8 +166,6 @@
         this.update = update;
     }
 
-    public abstract boolean isModified( boolean typeFieldsOnly );
-
     public boolean equals( Object o )
     {
         if ( this == o ) return true;

Modified: trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm	2007-08-22 15:19:13 UTC (rev 45)
+++ trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm	2007-08-23 09:00:17 UTC (rev 46)
@@ -100,7 +100,7 @@
     protected ${table.Name}Proxy refreshObject( ${table.Name}Proxy obj )
         throws NamingException, EquandaPersistenceException
     {
-        obj.update();
+        obj.equandaUpdate();
         return obj;
     }
 

Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm	2007-08-22 15:19:13 UTC (rev 45)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm	2007-08-23 09:00:17 UTC (rev 46)
@@ -304,11 +304,6 @@
         return proxy.isModified( typeFieldsOnly );
     }
 
-    public boolean isModified()
-    {
-        return proxy.isModified( false );
-    }
-
     public String getEquandaStatus() { return proxy.equandaStatus; }
     public void setEquandaStatus( String status )
     {
@@ -552,37 +547,6 @@
     }
     #end
 
-    /**
-     * Synchronize state with the server
-     * @deprecated
-     * @see equandaUpdate()
-     */
-    public void update()
-        throws EquandaPersistenceException
-    {
-        equandaUpdate();
-    }
-
-    /**
-     * Synchronize state with the server
-     * @deprecated
-     * @see equandaUpdate()
-     */
-    public void updateProxy()
-        throws EquandaPersistenceException
-    {
-        equandaUpdate();
-    }
-
-    /**
-     * Update the proxy state, client changes are persisted, and server changes retrieved.
-     */
-    public void equandaUpdate()
-        throws EquandaPersistenceException
-    {
-        equandaUpdate( false );
-    }
-
     public void equandaUpdate( boolean updateTypeFieldsOnly )
         throws EquandaPersistenceException
     {

Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm	2007-08-22 15:19:13 UTC (rev 45)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm	2007-08-23 09:00:17 UTC (rev 46)
@@ -51,8 +51,6 @@
 public interface ${table.Name}SelectorEJB
     extends EquandaSelector
 {
-    String getEquandaName();
-
     ${table.Name}Proxy equandaCreateProxy( String type )
             throws EquandaPersistenceException;
     ${table.Name}Proxy findUOIDProxy( UOID uoid )


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