bugfix in expression parsing

[mir.git] / source / mir / entity / EntityRelation.java

diff --git a/source/mir/entity/EntityRelation.java b/source/mir/entity/EntityRelation.java
index 161855d..3c49dbb 100755 (executable)
--- a/source/mir/entity/EntityRelation.java
+++ b/source/mir/entity/EntityRelation.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mir.entity;
 
 import mir.storage.*;
@@ -45,20 +76,6 @@ public class EntityRelation {
   }
 
   /**
-   *   @return Liefert ein freemarker.template.SimpleHash mit den verknuepften
-   *           Entities, wenn es sich um eine TO_ONE Beziehung handelt, ansonsten
-   *           null.
-   */
-
-  public SimpleHash getOneAsSimpleHash(Entity entity) throws StorageObjectException {
-    if (type==TO_ONE) {
-        Entity returnEntity = getOne(entity);
-        if (returnEntity!=null) return HTMLTemplateProcessor.makeSimpleHash(returnEntity);
-    }
-    return null;
-  }
-
-  /**
    *   @return Liefert eine freemarker.template.SimpleList mit den verknuepften
    *           Entities, wenn es sich um eine TO_MANY Liste handelt, ansonsten
    *           null.
@@ -83,7 +100,7 @@ public class EntityRelation {
     }
     else return null;
   }
-  
+
   /**
    *   @return Liefert eine freemarker.template.SimpleList mit den verknuepften
    *           Entities, wenn es sich um eine TO_MANY Liste handelt, ansonsten
@@ -98,54 +115,7 @@ public class EntityRelation {
   }
 
   /**
-   *   @return Liefert eine freemarker.template.SimpleList mit den verknuepften
-   *           Entities, wenn es sich um eine TO_MANY Liste handelt, ansonsten
-   *           null.
-   */
-
-  public SimpleList getManyAsSimpleList(Entity entity)
-    throws StorageObjectException {
-
-    if (type==TO_MANY) {
-      EntityList returnList = getMany(entity);
-      if (returnList!=null) return HTMLTemplateProcessor.makeSimpleList(returnList);
-    }
-    return null;
-  }
-
-  /**
-   *   @return Liefert eine freemarker.template.SimpleList mit den verknuepften
-   *           Entities, wenn es sich um eine TO_MANY Liste handelt, ansonsten
-   *           null.
-   */
-
-  public SimpleList getManyAsSimpleList(Entity entity, String order)
-    throws StorageObjectException {
-
-    if (type==TO_MANY) {
-      EntityList returnList = getMany(entity, order);
-      if (returnList!=null) return HTMLTemplateProcessor.makeSimpleList(returnList);
-    }
-    return null;
-  }
-  
-  /**
-   *   @return Liefert eine freemarker.template.SimpleList mit den verknuepften
-   *           Entities, wenn es sich um eine TO_MANY Liste handelt, ansonsten
-   *           null.
-   */
-
-  public SimpleList getManyAsSimpleList(Entity entity, String order, String whereClause)
-    throws StorageObjectException {
-
-    if (type==TO_MANY) {
-      EntityList returnList = getMany(entity, order, whereClause);
-      if (returnList!=null) return HTMLTemplateProcessor.makeSimpleList(returnList);
-    }
-    return null;
-  }
-  /**
-   *   @return Liefert den Referenznamen der abhaengigen Tabelle
+   *   @return The reference name of the related table.
    */
 
   public String getName() {