[FOray-commit] SF.net SVN: foray: [7342] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7342
Author:   victormote
Date:     2006-05-31 12:10:21 -0700 (Wed, 31 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7342&view=rev

Log Message:
-----------
Conform to axsl change: Eliminate duplicate method by clarifying that only FObj instances need an explicit record of who generated them.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-05-31 18:38:27 UTC (rev 7341)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-05-31 19:10:21 UTC (rev 7342)
@@ -131,7 +131,7 @@
         this.children.remove(areaNode);
     }
 
-    protected FOrayFOLinkage getFObjProxy(FONode fobj) {
+    protected FOrayFOLinkage getFObjProxy(FObj fobj) {
         if (fobj == null) {
             return null;
         }
@@ -447,7 +447,7 @@
         return true;
     }
 
-    public FOLinkage getFOLinkage(FONode foNode) {
+    public FOLinkage getFOLinkage(FObj foNode) {
         FOrayFOLinkage linkage = (FOrayFOLinkage) foNode.getResult();
         if (linkage == null) {
             linkage = new FOrayFOLinkage(foNode);

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java	2006-05-31 18:38:27 UTC (rev 7341)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java	2006-05-31 19:10:21 UTC (rev 7342)
@@ -28,6 +28,7 @@
 import org.axsl.areaW.AreaNode;
 import org.axsl.areaW.FOLinkage;
 import org.axsl.foR.FONode;
+import org.axsl.foR.FObj;
 
 import java.util.ArrayList;
 
@@ -38,7 +39,7 @@
 public class FOrayFOLinkage implements FOLinkage {
 
     /** The FONode which generated the Areas in {@link #generatedAreas}. */
-    private FONode realFONode;
+    private FObj realFONode;
 
     /**
      * The ordered list of Area instances generated by {@link #realFONode}.
@@ -48,7 +49,7 @@
      */
     private ArrayList generatedAreas = new ArrayList();
 
-    public FOrayFOLinkage(FONode realFObj) {
+    public FOrayFOLinkage(FObj realFObj) {
         this.realFONode = realFObj;
     }
 
@@ -63,7 +64,7 @@
              * If the parent was generated by the same FObj, then we shouldn't
              * register this one also.
              */
-            if (areaNode.getGeneratedBy() == parent.getGeneratedBy()) {
+            if (areaNode.traitGeneratedBy() == parent.traitGeneratedBy()) {
                 return;
             }
         }


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