jomm-cvs Mailing List for JOMM

jomm-cvs — Inform changes about CVS-Updates.

You can subscribe to this list here.

2005	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (6)	_Sep (9)	_Oct (13)	_Nov (8)	_Dec (5)
2006	_Jan (1)	_Feb (6)	_Mar (5)	_Apr (17)	_May (28)	_Jun (5)	_Jul (34)	_Aug (6)	_Sep (2)	_Oct (1)	_Nov (33)	_Dec (5)
2007	_Jan (26)	_Feb (16)	_Mar (1)	_Apr (7)	_May (4)	_Jun (11)	_Jul	_Aug (1)	_Sep (7)	_Oct	_Nov	_Dec
2008	_Jan	_Feb (1)	_Mar (3)	_Apr (13)	_May (1)	_Jun	_Jul	_Aug (16)	_Sep	_Oct	_Nov	_Dec

1 2 3 .. 12 > >> (Page 1 of 12)

[Jomm-cvs] JOMM/test_uml2db/test ModelUtility.java,NONE,1.1

From: Hirzel P. <ph...@us...> - 2008-08-07 05:32:32

Update of /cvsroot/jomm/JOMM/test_uml2db/test
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9600/test_uml2db/test

Added Files:
	ModelUtility.java 
Log Message:
New

--- NEW FILE: ModelUtility.java ---
package test;

import ch.softenvironment.jomm.DbObjectServer;
import ch.softenvironment.util.Tracer;
/** 
 * @author generated by the umleditor
 */
public class ModelUtility {
    public static void main(java.lang.String[] args) {
        Tracer.start(Tracer.ALL);
        
        javax.jdo.PersistenceManagerFactory pmFactory = new ch.softenvironment.jomm.target.xml.XmlObjectServerFactory();
    	pmFactory.setConnectionURL("");
    	pmFactory.setNontransactionalRead(false);	// NO autoCommit while reading
    	pmFactory.setNontransactionalWrite(false);	// NO autoCommit while writing

    	DbObjectServer server = (DbObjectServer)pmFactory.getPersistenceManager("", "");
        registerClasses(server);
    }
  private ModelUtility() {}
  public static void registerClasses(DbObjectServer server) {
    server.register(test.model.agg.ClassA_2.class,"ModelAgg_ClassA_2");
    server.register(test.model.structattr.ClassA_2.class,"ModelStructAttr_ClassA_2");
    server.register(test.model.comp.ClassA_4.class,"ModelComp_ClassA_4");
    server.register(test.model.assoc.ClassB_4.class,"ModelAssoc_ClassB_4");
    server.register(test.model.agg.ClassA_4.class,"ModelAgg_ClassA_4");
    server.register(test.model.comp.ClassA_1.class,"ModelComp_ClassA_1");
    server.register(test.model.comp.ClassB_3.class,"ModelComp_ClassB_3");
    server.register(test.model.agg.ClassA_3.class,"ModelAgg_ClassA_3");
    server.register(test.model.assoc.ClassA_4.class,"ModelAssoc_ClassA_4");
    server.register(test.model.agg.ClassB_3.class,"ModelAgg_ClassB_3");
    server.register(test.model.comp.ClassA_2.class,"ModelComp_ClassA_2");
    server.register(test.model.assoc.ClassA_1.class,"ModelAssoc_ClassA_1");
    server.register(test.model.structattr.ClassB_1.class,"ModelStructAttr_ClassB_1");
    server.register(test.model.comp.ClassB_1.class,"ModelComp_ClassB_1");
    server.register(test.model.agg.ClassB_2.class,"ModelAgg_ClassB_2");
    server.register(test.model.assoc.ClassB_3.class,"ModelAssoc_ClassB_3");
    server.register(test.model.comp.ClassB_2.class,"ModelComp_ClassB_2");
    server.register(test.model.assoc.A2b_1.class,"ModelAssoc_a2b_1");
    server.register(test.model.comp.ClassB_4.class,"ModelComp_ClassB_4");
    server.register(test.model.assoc.ClassA_3.class,"ModelAssoc_ClassA_3");
    server.register(test.model.agg.A2b_1.class,"ModelAgg_a2b_1");
    server.register(test.model.agg.ClassB_4.class,"ModelAgg_ClassB_4");
    server.register(test.model.agg.ClassA_1.class,"ModelAgg_ClassA_1");
    server.register(test.model.agg.ClassB_1.class,"ModelAgg_ClassB_1");
    server.register(test.model.assoc.ClassB_1.class,"ModelAssoc_ClassB_1");
    server.register(test.model.structattr.ClassA_1.class,"ModelStructAttr_ClassA_1");
    server.register(test.model.assoc.ClassB_2.class,"ModelAssoc_ClassB_2");
    server.register(test.model.assoc.ClassA_2.class,"ModelAssoc_ClassA_2");
    server.register(test.model.structattr.ClassB_2.class,"ModelStructAttr_ClassB_2");
    server.register(test.model.comp.ClassA_3.class,"ModelComp_ClassA_3");
  }
}

[Jomm-cvs] JOMM/test_uml2db/test/model/structattr ClassB_2.java, NONE, 1.1 ClassB_1.java, NONE, 1.1 ClassA_1.java, NONE, 1.1 ClassA_2.java, NONE, 1.1

From: Hirzel P. <ph...@us...> - 2008-08-07 05:32:32

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model/structattr
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9600/test_uml2db/test/model/structattr

Added Files:
	ClassB_2.java ClassB_1.java ClassA_1.java ClassA_2.java 
Log Message:
New

--- NEW FILE: ClassB_2.java ---
package test.model.structattr;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
import ch.softenvironment.jomm.mvc.model.DbSessionBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_2 extends DbEntityBean {
  public ClassB_2(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldClassA_2_bId;
  public java.lang.Long getClassA_2_bId() {
    refresh(false); // read lazy initialized objects
    return fieldClassA_2_bId;
  }
  public void setClassA_2_bId(java.lang.Long classA_2_b) {
    java.lang.Long oldValue=fieldClassA_2_bId;
    fieldClassA_2_bId=classA_2_b;
    firePropertyChange("classA_2_bId", oldValue, fieldClassA_2_bId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_2.class);
    descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "classA_2_bId", "ClassA_2_b", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassA_2.java ---
package test.model.structattr;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_2 extends DbEntityBean {
  public ClassA_2(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldB=new java.util.ArrayList();
  public java.util.List getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(java.util.List b) {
    java.util.List oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_2.class);
    descriptor.addOneToMany(DbDescriptor.COMPOSITION, "b", "aId", new DbMultiplicityRange(1,DbMultiplicityRange.UNBOUND), ClassB_2.class, false);
    return descriptor;
  }
}

--- NEW FILE: ClassA_1.java ---
package test.model.structattr;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_1 extends DbEntityBean {
  public ClassA_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public ClassB_1 fieldB;
  public ClassB_1 getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(ClassB_1 b) {
    ClassB_1 oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_1.class);
    descriptor.addOneToOne(DbDescriptor.COMPOSITION, "b", "aId", new DbMultiplicityRange(0,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_1.java ---
package test.model.structattr;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_1 extends DbEntityBean {
  public ClassB_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldClassA_1_bId;
  public java.lang.Long getClassA_1_bId() {
    refresh(false); // read lazy initialized objects
    return fieldClassA_1_bId;
  }
  public void setClassA_1_bId(java.lang.Long classA_1_b) {
    java.lang.Long oldValue=fieldClassA_1_bId;
    fieldClassA_1_bId=classA_1_b;
    firePropertyChange("classA_1_bId", oldValue, fieldClassA_1_bId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_1.class);
    descriptor.addOneToOneReferenceId(DbDescriptor.ASSOCIATION, "classA_1_bId", "ClassA_1_b", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

[Jomm-cvs] JOMM/test_uml2db/test/model/assoc ClassA_3.java, NONE, 1.1 ClassA_2.java, NONE, 1.1 ClassB_1.java, NONE, 1.1 ClassB_3.java, NONE, 1.1 A2b_1.java, NONE, 1.1 ClassB_4.java, NONE, 1.1 ClassA_1.java, NONE, 1.1 ClassA_4.java, NONE, 1.1 ClassB_2.java, NONE, 1.1

From: Hirzel P. <ph...@us...> - 2008-08-07 05:32:31

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model/assoc
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9600/test_uml2db/test/model/assoc

Added Files:
	ClassA_3.java ClassA_2.java ClassB_1.java ClassB_3.java 
	A2b_1.java ClassB_4.java ClassA_1.java ClassA_4.java 
	ClassB_2.java 
Log Message:
New

--- NEW FILE: ClassB_3.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_3 extends DbEntityBean {
  public ClassB_3(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_3.class);
    descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "aId", "T_Id_a", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_1.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_1 extends DbEntityBean {
  public ClassB_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldAId=new java.util.ArrayList();
  public java.util.List getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.util.List a) {
    java.util.List oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_1.class);
    descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "aId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), A2b_1.class, "bId");
    return descriptor;
  }
}

--- NEW FILE: ClassA_4.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_4 extends DbEntityBean {
  public ClassA_4(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public ClassB_4 fieldB;
  public ClassB_4 getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(ClassB_4 b) {
    ClassB_4 oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_4.class);
    descriptor.addOneToOne(DbDescriptor.ASSOCIATION, "b", "aId", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_4.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_4 extends DbEntityBean {
  public ClassB_4(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_4.class);
    descriptor.addOneToOneReferenceId(DbDescriptor.ASSOCIATION, "aId", "T_Id_a", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_2.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_2 extends DbEntityBean {
  public ClassB_2(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_2.class);
    descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "aId", "T_Id_a", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassA_2.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_2 extends DbEntityBean {
  public ClassA_2(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldB=new java.util.ArrayList();
  public java.util.List getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(java.util.List b) {
    java.util.List oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_2.class);
    descriptor.addOneToMany(DbDescriptor.ASSOCIATION, "b", "aId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), ClassB_2.class, false);
    return descriptor;
  }
}

--- NEW FILE: A2b_1.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.mvc.model.DbRelationshipBean;
/**
 * @author generated by the umleditor
 */
public class A2b_1 extends DbRelationshipBean {
  public A2b_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }

  public java.lang.Long fieldBId;
  public java.lang.Long getBId() {
    refresh(false); // read lazy initialized objects
    return fieldBId;
  }
  public void setBId(java.lang.Long b) {
    java.lang.Long oldValue=fieldBId;
    fieldBId=b;
    firePropertyChange("bId", oldValue, fieldBId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(A2b_1.class);
    descriptor.addAssociationEnd(ClassA_1.class,"aId","T_Id_a");
    descriptor.addAssociationEnd(ClassB_1.class,"bId","T_Id_b");
    return descriptor;
  }
}

--- NEW FILE: ClassA_3.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_3 extends DbEntityBean {
  public ClassA_3(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldB=new java.util.ArrayList();
  public java.util.List getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(java.util.List b) {
    java.util.List oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_3.class);
    descriptor.addOneToMany(DbDescriptor.ASSOCIATION, "b", "aId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), ClassB_3.class, false);
    return descriptor;
  }
}

--- NEW FILE: ClassA_1.java ---
package test.model.assoc;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_1 extends DbEntityBean {
  public ClassA_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldBId=new java.util.ArrayList();
  public java.util.List getBId() {
    refresh(false); // read lazy initialized objects
    return fieldBId;
  }
  public void setBId(java.util.List b) {
    java.util.List oldValue=fieldBId;
    fieldBId=b;
    firePropertyChange("bId", oldValue, fieldBId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_1.class);
    descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "bId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), A2b_1.class, "aId");
    return descriptor;
  }
}

[Jomm-cvs] JOMM/test_uml2db/test/model/comp ClassB_1.java, NONE, 1.1 ClassA_3.java, NONE, 1.1 ClassB_4.java, NONE, 1.1 ClassB_3.java, NONE, 1.1 ClassA_4.java, NONE, 1.1 ClassA_2.java, NONE, 1.1 ClassA_1.java, NONE, 1.1 ClassB_2.java, NONE, 1.1

From: Hirzel P. <ph...@us...> - 2008-08-07 05:32:24

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model/comp
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9600/test_uml2db/test/model/comp

Added Files:
	ClassB_1.java ClassA_3.java ClassB_4.java ClassB_3.java 
	ClassA_4.java ClassA_2.java ClassA_1.java ClassB_2.java 
Log Message:
New

--- NEW FILE: ClassB_3.java ---
package test.model.comp;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_3 extends DbEntityBean {
  public ClassB_3(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_3.class);
    descriptor.addOneToOneReferenceId(DbDescriptor.ASSOCIATION, "aId", "T_Id_a", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_1.java ---
package test.model.comp;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_1 extends DbEntityBean {
  public ClassB_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_1.class);
    descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "aId", "T_Id_a", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassA_4.java ---
package test.model.comp;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_4 extends DbEntityBean {
  public ClassA_4(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldBId;
  public java.lang.Long getBId() {
    refresh(false); // read lazy initialized objects
    return fieldBId;
  }
  public void setBId(java.lang.Long b) {
    java.lang.Long oldValue=fieldBId;
    fieldBId=b;
    firePropertyChange("bId", oldValue, fieldBId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_4.class);
    descriptor.addOneToOneReferenceId(DbDescriptor.COMPOSITION, "bId", "T_Id_b", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_4.java ---
package test.model.comp;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_4 extends DbEntityBean {
  public ClassB_4(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public ClassA_4 fieldA;
  public ClassA_4 getA() {
    refresh(false); // read lazy initialized objects
    return fieldA;
  }
  public void setA(ClassA_4 a) {
    ClassA_4 oldValue=fieldA;
    fieldA=a;
    firePropertyChange("a", oldValue, fieldA);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_4.class);
    descriptor.addOneToOne(DbDescriptor.ASSOCIATION, "a", "bId", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_2.java ---
package test.model.comp;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_2 extends DbEntityBean {
  public ClassB_2(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_2.class);
    descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "aId", "T_Id_a", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassA_2.java ---
package test.model.comp;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_2 extends DbEntityBean {
  public ClassA_2(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldB=new java.util.ArrayList();
  public java.util.List getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(java.util.List b) {
    java.util.List oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_2.class);
    descriptor.addOneToMany(DbDescriptor.COMPOSITION, "b", "aId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), ClassB_2.class, false);
    return descriptor;
  }
}

--- NEW FILE: ClassA_3.java ---
package test.model.comp;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_3 extends DbEntityBean {
  public ClassA_3(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public ClassB_3 fieldB;
  public ClassB_3 getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(ClassB_3 b) {
    ClassB_3 oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_3.class);
    descriptor.addOneToOne(DbDescriptor.COMPOSITION, "b", "aId", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassA_1.java ---
package test.model.comp;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_1 extends DbEntityBean {
  public ClassA_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldB=new java.util.ArrayList();
  public java.util.List getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(java.util.List b) {
    java.util.List oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_1.class);
    descriptor.addOneToMany(DbDescriptor.COMPOSITION, "b", "aId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), ClassB_1.class, false);
    return descriptor;
  }
}

[Jomm-cvs] JOMM/test_uml2db/test/model/agg ClassA_1.java, NONE, 1.1 ClassB_3.java, NONE, 1.1 ClassA_3.java, NONE, 1.1 ClassA_2.java, NONE, 1.1 ClassB_4.java, NONE, 1.1 ClassB_1.java, NONE, 1.1 ClassB_2.java, NONE, 1.1 A2b_1.java, NONE, 1.1 ClassA_4.java, NONE, 1.1

From: Hirzel P. <ph...@us...> - 2008-08-07 05:32:20

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model/agg
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9600/test_uml2db/test/model/agg

Added Files:
	ClassA_1.java ClassB_3.java ClassA_3.java ClassA_2.java 
	ClassB_4.java ClassB_1.java ClassB_2.java A2b_1.java 
	ClassA_4.java 
Log Message:
New

--- NEW FILE: ClassB_3.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_3 extends DbEntityBean {
  public ClassB_3(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldA=new java.util.ArrayList();
  public java.util.List getA() {
    refresh(false); // read lazy initialized objects
    return fieldA;
  }
  public void setA(java.util.List a) {
    java.util.List oldValue=fieldA;
    fieldA=a;
    firePropertyChange("a", oldValue, fieldA);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_3.class);
    descriptor.addOneToMany(DbDescriptor.ASSOCIATION, "a", "bId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), ClassA_3.class, false);
    return descriptor;
  }
}

--- NEW FILE: ClassB_1.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_1 extends DbEntityBean {
  public ClassB_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldAId=new java.util.ArrayList();
  public java.util.List getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.util.List a) {
    java.util.List oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_1.class);
    descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "aId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), A2b_1.class, "bId");
    return descriptor;
  }
}

--- NEW FILE: ClassA_4.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_4 extends DbEntityBean {
  public ClassA_4(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public ClassB_4 fieldB;
  public ClassB_4 getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(ClassB_4 b) {
    ClassB_4 oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_4.class);
    descriptor.addOneToOne(DbDescriptor.AGGREGATION, "b", "aId", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_4.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_4 extends DbEntityBean {
  public ClassB_4(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_4.class);
    descriptor.addOneToOneReferenceId(DbDescriptor.ASSOCIATION, "aId", "T_Id_a", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassB_2.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassB_2 extends DbEntityBean {
  public ClassB_2(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassB_2.class);
    descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "aId", "T_Id_a", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassA_2.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_2 extends DbEntityBean {
  public ClassA_2(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldB=new java.util.ArrayList();
  public java.util.List getB() {
    refresh(false); // read lazy initialized objects
    return fieldB;
  }
  public void setB(java.util.List b) {
    java.util.List oldValue=fieldB;
    fieldB=b;
    firePropertyChange("b", oldValue, fieldB);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_2.class);
    descriptor.addOneToMany(DbDescriptor.AGGREGATION, "b", "aId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), ClassB_2.class, false);
    return descriptor;
  }
}

--- NEW FILE: A2b_1.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.mvc.model.DbRelationshipBean;
/**
 * @author generated by the umleditor
 */
public class A2b_1 extends DbRelationshipBean {
  public A2b_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldAId;
  public java.lang.Long getAId() {
    refresh(false); // read lazy initialized objects
    return fieldAId;
  }
  public void setAId(java.lang.Long a) {
    java.lang.Long oldValue=fieldAId;
    fieldAId=a;
    firePropertyChange("aId", oldValue, fieldAId);
  }

  public java.lang.Long fieldBId;
  public java.lang.Long getBId() {
    refresh(false); // read lazy initialized objects
    return fieldBId;
  }
  public void setBId(java.lang.Long b) {
    java.lang.Long oldValue=fieldBId;
    fieldBId=b;
    firePropertyChange("bId", oldValue, fieldBId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(A2b_1.class);
    descriptor.addAssociationEnd(ClassA_1.class,"aId","T_Id_a");
    descriptor.addAssociationEnd(ClassB_1.class,"bId","T_Id_b");
    return descriptor;
  }
}

--- NEW FILE: ClassA_3.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_3 extends DbEntityBean {
  public ClassA_3(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.lang.Long fieldBId;
  public java.lang.Long getBId() {
    refresh(false); // read lazy initialized objects
    return fieldBId;
  }
  public void setBId(java.lang.Long b) {
    java.lang.Long oldValue=fieldBId;
    fieldBId=b;
    firePropertyChange("bId", oldValue, fieldBId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_3.class);
    descriptor.addManyToOneReferenceId(DbDescriptor.AGGREGATION, "bId", "T_Id_b", new DbMultiplicityRange(1,1));
    return descriptor;
  }
}

--- NEW FILE: ClassA_1.java ---
package test.model.agg;
import ch.softenvironment.jomm.*;
import ch.softenvironment.jomm.descriptor.DbDescriptor;
import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
import ch.softenvironment.jomm.mvc.model.DbEntityBean;
/**
 * @author generated by the umleditor
 */
public class ClassA_1 extends DbEntityBean {
  public ClassA_1(ch.softenvironment.jomm.DbObjectServer objectServer) {
    super(objectServer);
  }

  public java.util.List fieldBId=new java.util.ArrayList();
  public java.util.List getBId() {
    refresh(false); // read lazy initialized objects
    return fieldBId;
  }
  public void setBId(java.util.List b) {
    java.util.List oldValue=fieldBId;
    fieldBId=b;
    firePropertyChange("bId", oldValue, fieldBId);
  }
  public static DbDescriptor createDescriptor() {
    DbDescriptor descriptor = new DbDescriptor(ClassA_1.class);
    descriptor.addAssociationAttributed(DbDescriptor.AGGREGATION, "bId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), A2b_1.class, "aId");
    return descriptor;
  }
}

[Jomm-cvs] JOMM/test_uml2db/test/model/comp - New directory

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:56

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model/comp
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9551/test_uml2db/test/model/comp

Log Message:
Directory /cvsroot/jomm/JOMM/test_uml2db/test/model/comp added to the repository

[Jomm-cvs] JOMM/test_uml2db/test/model/structattr - New directory

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:56

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model/structattr
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9551/test_uml2db/test/model/structattr

Log Message:
Directory /cvsroot/jomm/JOMM/test_uml2db/test/model/structattr added to the repository

[Jomm-cvs] JOMM/test_uml2db/test/model/assoc - New directory

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:56

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model/assoc
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9551/test_uml2db/test/model/assoc

Log Message:
Directory /cvsroot/jomm/JOMM/test_uml2db/test/model/assoc added to the repository

[Jomm-cvs] JOMM/test_uml2db/test - New directory

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:56

Update of /cvsroot/jomm/JOMM/test_uml2db/test
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9551/test_uml2db/test

Log Message:
Directory /cvsroot/jomm/JOMM/test_uml2db/test added to the repository

[Jomm-cvs] JOMM/test_uml2db/test/model/agg - New directory

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:55

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model/agg
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9551/test_uml2db/test/model/agg

Log Message:
Directory /cvsroot/jomm/JOMM/test_uml2db/test/model/agg added to the repository

[Jomm-cvs] JOMM/test_uml2db/test/model - New directory

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:55

Update of /cvsroot/jomm/JOMM/test_uml2db/test/model
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9551/test_uml2db/test/model

Log Message:
Directory /cvsroot/jomm/JOMM/test_uml2db/test/model added to the repository

[Jomm-cvs] JOMM/test_uml2db - New directory

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:55

Update of /cvsroot/jomm/JOMM/test_uml2db
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9551/test_uml2db

Log Message:
Directory /cvsroot/jomm/JOMM/test_uml2db added to the repository

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/target/xml XmlEncoder.java, 1.7, 1.8

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:19

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/target/xml
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9519/src/ch/softenvironment/jomm/target/xml

Modified Files:
	XmlEncoder.java 
Log Message:


Index: XmlEncoder.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/target/xml/XmlEncoder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XmlEncoder.java	5 Jul 2006 16:32:25 -0000	1.7
--- XmlEncoder.java	7 Aug 2008 05:31:16 -0000	1.8
***************
*** 75,79 ****
              
  	    ser = new InterlisSerializer(out); //rootObj.getObjectServer().getMapper();
! 	    ser.version("1.0", Serializer.UTF8); // MUST!
          if (!StringUtils.isNullOrEmpty(userObject.getXsl())) {
              ser.stylesheet(userObject.getXsl());
--- 75,79 ----
              
  	    ser = new InterlisSerializer(out); //rootObj.getObjectServer().getMapper();
! 	    ser.version("1.0", StringUtils.CHARSET_UTF8); // MUST!
          if (!StringUtils.isNullOrEmpty(userObject.getXsl())) {
              ser.stylesheet(userObject.getXsl());

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/serialize Serializer.java, 1.1.1.1, 1.2 XmlSerializer.java, 1.7, 1.8

From: Hirzel P. <ph...@us...> - 2008-08-07 05:31:04

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/serialize
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9130/src/ch/softenvironment/jomm/serialize

Modified Files:
	Serializer.java XmlSerializer.java 
Log Message:


Index: XmlSerializer.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/serialize/XmlSerializer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XmlSerializer.java	13 Jun 2007 20:03:46 -0000	1.7
--- XmlSerializer.java	7 Aug 2008 05:30:59 -0000	1.8
***************
*** 21,24 ****
--- 21,25 ----
  
  import ch.softenvironment.util.NlsUtils;
+ import ch.softenvironment.util.StringUtils;
  import ch.softenvironment.util.Tracer;
  
***************
*** 373,377 ****
   */
  public final void version(String number, String charSet) throws java.io.IOException {
! 	nativeContent(START_TAG + "?xml version=\"" + number + "\" encoding=\"" + (charSet == null ? UTF8 : charSet) + "\"?" + END_TAG);
  	newline();
  }
--- 374,378 ----
   */
  public final void version(String number, String charSet) throws java.io.IOException {
! 	nativeContent(START_TAG + "?xml version=\"" + number + "\" encoding=\"" + (charSet == null ? StringUtils.CHARSET_UTF8 : charSet) + "\"?" + END_TAG);
  	newline();
  }

Index: Serializer.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/serialize/Serializer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Serializer.java	25 Apr 2005 10:01:11 -0000	1.1.1.1
--- Serializer.java	7 Aug 2008 05:30:59 -0000	1.2
***************
*** 19,25 ****
   */
  public interface Serializer {
! 	// @see java.nio.charset.Charset
! 	public static final String UTF8 = "UTF-8";
! 	
      /**
       * Encode a String in a serialized manner.
--- 19,23 ----
   */
  public interface Serializer {
! 
      /**
       * Encode a String in a serialized manner.

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/mvc/view DbCodeManageView.java, 1.8, 1.9

From: Hirzel P. <ph...@us...> - 2008-08-07 05:30:47

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/view
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9119/src/ch/softenvironment/jomm/mvc/view

Modified Files:
	DbCodeManageView.java 
Log Message:


Index: DbCodeManageView.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/view/DbCodeManageView.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DbCodeManageView.java	18 Apr 2008 18:22:55 -0000	1.8
--- DbCodeManageView.java	7 Aug 2008 05:30:42 -0000	1.9
***************
*** 17,20 ****
--- 17,21 ----
   */
  
+ import java.awt.Component;
  import java.util.EventObject;
  import java.util.List;
***************
*** 24,27 ****
--- 25,29 ----
  import ch.softenvironment.jomm.mvc.model.DbCode;
  import ch.softenvironment.util.ListUtils;
+ import ch.softenvironment.view.BaseDialog;
  import ch.softenvironment.view.BaseFrame;
  import ch.softenvironment.view.CommonUserAccess;
***************
*** 407,411 ****
  	java.lang.reflect.Constructor constructor = detailView.getConstructor(types);
      BaseFrame detail = (BaseFrame)constructor.newInstance(args);
!     detail.setRelativeLocation(this);
      detail.setVisible(true);
  }
--- 409,418 ----
  	java.lang.reflect.Constructor constructor = detailView.getConstructor(types);
      BaseFrame detail = (BaseFrame)constructor.newInstance(args);
!     Component parent = BaseDialog.getFrameOwner(this);
!     if (parent == null) {
!     	detail.setRelativeLocation(BaseDialog.getDialogOwner(this));
!     } else {
!     	detail.setRelativeLocation(parent);
!     }
      detail.setVisible(true);
  }

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/mvc/model DbCode.java, 1.7, 1.8

From: Hirzel P. <ph...@us...> - 2008-08-07 05:30:33

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/model
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9099/src/ch/softenvironment/jomm/mvc/model

Modified Files:
	DbCode.java 
Log Message:


Index: DbCode.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/model/DbCode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DbCode.java	17 Apr 2007 12:28:39 -0000	1.7
--- DbCode.java	7 Aug 2008 05:30:22 -0000	1.8
***************
*** 59,63 ****
  }
  /**
!  * Return the UNIQUE ILI-Code constant.
   */
  public String getIliCode() {
--- 59,63 ----
  }
  /**
!  * Return the UNIQUE ILI-Code constant (according to INTERLIS 2).
   */
  public String getIliCode() {

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/mvc/model DbObject.java, 1.12, 1.13

From: Hirzel P. <ph...@us...> - 2008-05-02 21:55:16

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/model
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32508/src/ch/softenvironment/jomm/mvc/model

Modified Files:
	DbObject.java 
Log Message:
Bug fix: #diff() whole inheritance chain

Index: DbObject.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/model/DbObject.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DbObject.java	18 Apr 2008 18:22:53 -0000	1.12
--- DbObject.java	2 May 2008 21:55:10 -0000	1.13
***************
*** 603,630 ****
   */
  public java.util.Set diff(DbObject object) throws Throwable {
! 	if ((object == null) || (object.getClass() != this.getClass())) {
! 		throw new IllegalArgumentException("given object not of type: " + this.getClass());
  	}
- 	java.util.Set changedProperties = new HashSet();
- 	java.util.Iterator iterator = this.getObjectServer().getDescriptor(this.getClass()).iteratorProperties();
-     // last chance to refresh
- 	this.refresh(true);
- 	object.refresh(true);
-     while (iterator.hasNext()) {
-          String property = (String)iterator.next();
-          if (property.equals(DbObject.PROPERTY_ID) || property.equals(DbObject.PROPERTY_LAST_CHANGE) || property.equals(DbObject.PROPERTY_USER_ID) || property.equals(DbObject.PROPERTY_CREATE_DATE)) {
-          	// skip tech-fields: means no change
-          	continue;
-          }
-          BeanReflector thisReflector = new BeanReflector(this, property);
-          BeanReflector objectReflector = new BeanReflector(object, property);
-          if (thisReflector.getValue() == null) {
-          	if (objectReflector.getValue() != null) {
-          		changedProperties.add(property);
-          	}
-          } else if (!thisReflector.getValue().equals(objectReflector.getValue())) {
-         	 changedProperties.add(property);
-          }
-     }
  //TODO diff aggregates?    
  	return changedProperties;
--- 603,638 ----
   */
  public java.util.Set diff(DbObject object) throws Throwable {
! 	Class current = this.getClass();
! 	if ((object == null) || (object.getClass() != current)) {
! 		throw new IllegalArgumentException("given object not of type: " + current);
! 	}
! 	java.util.Set changedProperties = new HashSet();	
! 	while ((!current.equals(DbEntityBean.class)) && 
! 			(!current.equals(DbRelationshipBean.class)) &&
! 			(!current.equals(DbChangeableBean.class)) &&
! 			(!current.equals(DbCode.class))) {		
! 		java.util.Iterator iterator = this.getObjectServer().getDescriptor(current).iteratorProperties();
! 	    // last chance to refresh
! 		this.refresh(true);
! 		object.refresh(true);
! 	    while (iterator.hasNext()) {
! 	         String property = (String)iterator.next();
! 	         if (property.equals(DbObject.PROPERTY_ID) || property.equals(DbObject.PROPERTY_LAST_CHANGE) || property.equals(DbObject.PROPERTY_USER_ID) || property.equals(DbObject.PROPERTY_CREATE_DATE)) {
! 	         	// skip tech-fields: means no change
! 	         	continue;
! 	         }
! 	         BeanReflector thisReflector = new BeanReflector(this, property);
! 	         BeanReflector objectReflector = new BeanReflector(object, property);
! 	         if (thisReflector.getValue() == null) {
! 	         	if (objectReflector.getValue() != null) {
! 	         		changedProperties.add(property);
! 	         	}
! 	         } else if (!thisReflector.getValue().equals(objectReflector.getValue())) {
! 	        	 changedProperties.add(property);
! 	         }
! 	    }
! 	    // diff also parent's properties
! 		current = current.getSuperclass();
  	}
  //TODO diff aggregates?    
  	return changedProperties;

[Jomm-cvs] JOMM/test/ch/softenvironment/jomm/serialize/test CsvSerializerTestCase.java, 1.1, 1.2

From: Hirzel P. <ph...@us...> - 2008-04-18 18:30:57

Update of /cvsroot/jomm/JOMM/test/ch/softenvironment/jomm/serialize/test
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9927/test/ch/softenvironment/jomm/serialize/test

Modified Files:
	CsvSerializerTestCase.java 
Log Message:
Minor refactoring and commenting

Index: CsvSerializerTestCase.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/test/ch/softenvironment/jomm/serialize/test/CsvSerializerTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CsvSerializerTestCase.java	14 Mar 2008 20:17:22 -0000	1.1
--- CsvSerializerTestCase.java	18 Apr 2008 18:30:16 -0000	1.2
***************
*** 18,22 ****
  
  /**
!  * TestCase for XmlSerializer.
   * @author Peter Hirzel <i>soft</i>Environment
   * @version $Revision$ $Date$
--- 18,22 ----
  
  /**
!  * TestCase for CsvSerializer.
   * @author Peter Hirzel <i>soft</i>Environment
   * @version $Revision$ $Date$

[Jomm-cvs] JOMM/test/ch/softenvironment/jomm/sql/test SqlQueryBuilderTestCase.java, 1.2, 1.3

From: Hirzel P. <ph...@us...> - 2008-04-18 18:30:50

Update of /cvsroot/jomm/JOMM/test/ch/softenvironment/jomm/sql/test
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9927/test/ch/softenvironment/jomm/sql/test

Modified Files:
	SqlQueryBuilderTestCase.java 
Log Message:
Minor refactoring and commenting

Index: SqlQueryBuilderTestCase.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/test/ch/softenvironment/jomm/sql/test/SqlQueryBuilderTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SqlQueryBuilderTestCase.java	24 Jan 2007 17:12:42 -0000	1.2
--- SqlQueryBuilderTestCase.java	18 Apr 2008 18:30:15 -0000	1.3
***************
*** 15,25 ****
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
- import java.util.Date;
  
  import ch.softenvironment.jomm.DbDomainNameServer;
- import ch.softenvironment.jomm.DbMapper;
  import ch.softenvironment.jomm.DbObjectServer;
  import ch.softenvironment.jomm.DbQueryBuilder;
- import ch.softenvironment.jomm.descriptor.DbDateFieldDescriptor;
  
  /**
--- 15,22 ----
***************
*** 50,56 ****
--- 47,55 ----
          builder.append(server.getMapper().getTargetIdName(), nlsId);
          builder.append("Symbol", "Dummy");
+ /*        
          builder.append(DbMapper.ATTRIBUTE_CREATE_DATE, new Date(), DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_LAST_CHANGE, new Date(), DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_USER_ID, server.getUserId());
+ */        
          server.execute(builder);

[Jomm-cvs] JOMM/test/ch/softenvironment/jomm/datatypes/test DbNlsStringTestCase.java, 1.3, 1.4

From: Hirzel P. <ph...@us...> - 2008-04-18 18:30:50

Update of /cvsroot/jomm/JOMM/test/ch/softenvironment/jomm/datatypes/test
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9927/test/ch/softenvironment/jomm/datatypes/test

Modified Files:
	DbNlsStringTestCase.java 
Log Message:
Minor refactoring and commenting

Index: DbNlsStringTestCase.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/test/ch/softenvironment/jomm/datatypes/test/DbNlsStringTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DbNlsStringTestCase.java	5 Jul 2006 16:34:26 -0000	1.3
--- DbNlsStringTestCase.java	18 Apr 2008 18:30:15 -0000	1.4
***************
*** 206,217 ****
      private void insertTranslations(Long nlsId) {
          // NLS
!         Date timestamp = new Date();
          DbQueryBuilder builder = server.createQueryBuilder(DbQueryBuilder.INSERT, "Insert NLS");
          builder.setTableList(server.getMapper().getTargetNlsName());
          builder.append(server.getMapper().getTargetIdName(), nlsId);
          builder.append("Symbol", "Moergeli");
          builder.append(DbMapper.ATTRIBUTE_LAST_CHANGE, timestamp, DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_CREATE_DATE, timestamp, DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_USER_ID, server.getUserId());
          server.execute(builder);
          // NLS-Translation
--- 206,220 ----
      private void insertTranslations(Long nlsId) {
          // NLS
! //      Date timestamp = new Date();
          DbQueryBuilder builder = server.createQueryBuilder(DbQueryBuilder.INSERT, "Insert NLS");
          builder.setTableList(server.getMapper().getTargetNlsName());
          builder.append(server.getMapper().getTargetIdName(), nlsId);
          builder.append("Symbol", "Moergeli");
+         builder.appendInternal((String)null);
+ /*        
          builder.append(DbMapper.ATTRIBUTE_LAST_CHANGE, timestamp, DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_CREATE_DATE, timestamp, DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_USER_ID, server.getUserId());
+ */        
          server.execute(builder);
          // NLS-Translation
***************
*** 221,227 ****
--- 224,233 ----
          builder.append(DbNlsString.ATTRIBUTE_LANGUAGE, "en");
          builder.append(DbNlsString.ATTRIBUTE_NLS_TEXT, "Morning");
+         builder.appendInternal((String)null);
+ /*        
          builder.append(DbMapper.ATTRIBUTE_LAST_CHANGE, timestamp, DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_CREATE_DATE, timestamp, DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_USER_ID, server.getUserId());
+ */
          server.execute(builder);
          builder = server.createQueryBuilder(DbQueryBuilder.INSERT, "Insert Translation(de)");
***************
*** 230,236 ****
--- 236,244 ----
          builder.append(DbNlsString.ATTRIBUTE_LANGUAGE, "de");
          builder.append(DbNlsString.ATTRIBUTE_NLS_TEXT, "Morgen");
+ /*        
          builder.append(DbMapper.ATTRIBUTE_LAST_CHANGE, timestamp, DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_CREATE_DATE, timestamp, DbDateFieldDescriptor.DATETIME);
          builder.append(DbMapper.ATTRIBUTE_USER_ID, server.getUserId());
+ */
          server.execute(builder);
      }

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/mvc/controller DbTableModel.java, 1.9, 1.10

From: Hirzel P. <ph...@us...> - 2008-04-18 18:23:29

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/controller
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6032/src/ch/softenvironment/jomm/mvc/controller

Modified Files:
	DbTableModel.java 
Log Message:
Minor refactoring and commenting

Index: DbTableModel.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/controller/DbTableModel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DbTableModel.java	27 Feb 2007 17:36:46 -0000	1.9
--- DbTableModel.java	18 Apr 2008 18:22:53 -0000	1.10
***************
*** 20,24 ****
--- 20,27 ----
  
  import java.util.*;
+ 
  import ch.softenvironment.util.*;
+ import ch.softenvironment.view.ViewOptions;
+ import ch.softenvironment.view.table.NumberTableCellRenderer;
  import ch.softenvironment.jomm.*;
  import ch.softenvironment.jomm.datatypes.DbNlsString;
***************
*** 36,39 ****
--- 39,45 ----
   * better show the internals of data-Object's.
   * 
+  * Define a single selection JTable:
+  *   myJTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  * 
   * @author Peter Hirzel <i>soft</i>Environment
   * @version $Revision$ $Date$
***************
*** 61,65 ****
   */
  public void addColumnAmount(String columnName, String property, int defaultWidth) {
! 	addColumn(columnName, property, defaultWidth, new ch.softenvironment.view.table.AmountTableCellRenderer());
  }
  /**
--- 67,71 ----
   */
  public void addColumnAmount(String columnName, String property, int defaultWidth) {
! 	addColumn(columnName, property, defaultWidth, new NumberTableCellRenderer(ch.softenvironment.util.AmountFormat.getAmountInstance()));
  }
  /**
***************
*** 313,316 ****
--- 319,341 ----
  }
  /**
+  * Remove selected Items in JTable's DbTableModel.
+  * Any owner-Parent's list is not updated.
+  * @param table
+  * @param viewOptions
+  * @return
+  * @throws Throwable
+  */
+ public static List removeSelectedItems(javax.swing.JTable table, ViewOptions viewOptions, boolean historize) throws Throwable {
+ 	List removedItems = ((DbTableModel)table.getModel()).remove(table.getSelectedRows(), historize);
+ 	table.clearSelection();
+ 
+ 	if ((viewOptions != null) && (viewOptions.getViewManager() != null)) {
+ 		// related View's should have been closed before deletion of their model-Object's
+ 		viewOptions.getViewManager().closeAll(removedItems);
+ 	}
+ 
+ 	return removedItems;
+ }
+ /**
   * Return the value of Cell(row, col).
   * Cell-values are determined and rendered
***************
*** 400,408 ****
  }
  /**
   * Remove selected Objects from Target-System.
   * ReadOnly Objects are spared from removing.
   * @return List of all effectively removed items
   */
! public List remove(int selectedIndeces[]) throws Throwable {
  	List removedItems = new ArrayList();
  	
--- 425,441 ----
  }
  /**
+  * @see #remove(int[], boolean)
+  */
+ public List remove(int selectedIndeces[]) throws Throwable {
+ 	return remove(selectedIndeces, false);
+ }
+ /**
   * Remove selected Objects from Target-System.
   * ReadOnly Objects are spared from removing.
+  * @param int[] typically result of JTable#getSelectedRows()
+  * @param historize (true->add history entry for every removed object)
   * @return List of all effectively removed items
   */
! public List remove(int selectedIndeces[], boolean historize) throws Throwable {
  	List removedItems = new ArrayList();
  	
***************
*** 415,419 ****
  		
  		if (object instanceof DbChangeableBean) {
! 			((DbObject)object).getObjectServer().deletePersistent(object);
  			removedItems.add(object);
  		} else {
--- 448,453 ----
  		
  		if (object instanceof DbChangeableBean) {
! 			//((DbObject)object).getObjectServer().deletePersistent(object);
! 			((DbChangeableBean)object).remove(true, historize);
  			removedItems.add(object);
  		} else {

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/target/xml XmlMapper.java, 1.4, 1.5

From: Hirzel P. <ph...@us...> - 2008-04-18 18:23:29

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/target/xml
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6032/src/ch/softenvironment/jomm/target/xml

Modified Files:
	XmlMapper.java 
Log Message:
Minor refactoring and commenting

Index: XmlMapper.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/target/xml/XmlMapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XmlMapper.java	5 Jul 2006 16:32:25 -0000	1.4
--- XmlMapper.java	18 Apr 2008 18:22:53 -0000	1.5
***************
*** 227,229 ****
--- 227,235 ----
          return SE_NLS_TRANSLATION;
      }
+     /* (non-Javadoc)
+      * @see ch.softenvironment.jomm.DbMapper#getTargetRemoveHistoryName()
+      */
+     public String getTargetRemoveHistoryName() {
+     	return "T_RemoveHistory";
+     }
  }

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/target/sql SqlMapper.java, 1.12, 1.13 SqlObjectServer.java, 1.9, 1.10

From: Hirzel P. <ph...@us...> - 2008-04-18 18:23:29

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/target/sql
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6032/src/ch/softenvironment/jomm/target/sql

Modified Files:
	SqlMapper.java SqlObjectServer.java 
Log Message:
Minor refactoring and commenting

Index: SqlMapper.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/target/sql/SqlMapper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SqlMapper.java	18 Sep 2007 12:44:11 -0000	1.12
--- SqlMapper.java	18 Apr 2008 18:22:53 -0000	1.13
***************
*** 835,837 ****
--- 835,843 ----
      return "T_Translation";
  }
+ /* (non-Javadoc)
+  * @see ch.softenvironment.jomm.DbMapper#getTargetRemoveHistoryName()
+  */
+ public String getTargetRemoveHistoryName() {
+ 	return "T_RemoveHistory";
+ }
  }

Index: SqlObjectServer.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/target/sql/SqlObjectServer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SqlObjectServer.java	18 Sep 2007 12:45:38 -0000	1.9
--- SqlObjectServer.java	18 Apr 2008 18:22:53 -0000	1.10
***************
*** 79,82 ****
--- 79,85 ----
  						association.save();
  					} else if (association.getPersistencyState().isRemovedPending()) {
+ 						if (association.isRemoveObjectHistoryPending()) {
+ 							execute(DbQueryBuilder.createChangeRemoveHistory(association));
+ 						}
  						association.remove(true);
  						removables.add(association);
***************
*** 213,217 ****
  		
  		evict(object);
! 		execute(DbQueryBuilder.createQueryRemoveObject(object));
  	} catch(Throwable e) {
  		throw new UserException(ResourceManager.getResource(DbObjectServer.class, "CW_DeletionError"), ResourceManager.getResource(DbObjectServer.class, "CT_DeletionError"), e);
--- 216,220 ----
  		
  		evict(object);
! 		execute(DbQueryBuilder.createRemoveObject(object));
  	} catch(Throwable e) {
  		throw new UserException(ResourceManager.getResource(DbObjectServer.class, "CW_DeletionError"), ResourceManager.getResource(DbObjectServer.class, "CT_DeletionError"), e);
***************
*** 307,311 ****
              }
              
!             DbQueryBuilder builder = DbQueryBuilder.createQueryChangeObject(descriptor.getMappedClass(), object);
              if (newDbObject && getDescriptor(object.getClass()).isOrdered()) {
                  // by default set SEQUENCE like id
--- 310,314 ----
              }
              
!             DbQueryBuilder builder = DbQueryBuilder.createChangeObject(descriptor.getMappedClass(), object);
              if (newDbObject && getDescriptor(object.getClass()).isOrdered()) {
                  // by default set SEQUENCE like id
***************
*** 327,397 ****
      }
  }
- /*
- protected void makePersistent(Object pc) {
- 	DbChangeableBean object = (DbChangeableBean)pc;
- 	
- 	DbTransaction trans = null;
- 	Throwable exception = null;
- 	try {
- 		trans = openTransactionThread(false);
- 		
- 		if (transactionObjects.get(object.getClass(), object.getId()) == null) {
- 			// build reverse inheritance chain
- 			DbDescriptor descriptor = object.getObjectServer().getDescriptor(object.getClass());
- 			java.util.List inheritanceChain = new java.util.ArrayList();
- 			inheritanceChain.add(descriptor);
- 			while (getParentDescriptor(descriptor) != null) {
- 				descriptor = getParentDescriptor(descriptor);
- 				inheritanceChain.add(descriptor);
- 			}
- 			
- 			// INSERT top-down (Root/Parent-Object first) in inheritance Chain
- 			for (int i=inheritanceChain.size(); i>0; i--) {
- 				descriptor = (DbDescriptor)inheritanceChain.get(i-1);
- 
- 				// 1) save "LOCAL" Properties (flat Attributes; ForeignKey-References)
- 				if (object.isModified()) {
- 				    boolean newDbObject = (i==inheritanceChain.size()) &&
- 				    		object.jdoIsNew() && 
- 				    		object.getObjectServer().getDescriptor(object.getClass()).contains(DbObject.PROPERTY_ID);
- 				    if (newDbObject && 
- 				            (!object.getPersistencyState().isNewForwarded())) { // object.isNewForwarded() should have original ID already
- 						// set Unique ID: use Table-Name of Top-Parent for whole inheritance chain
- //TODO Tune: create empty Objects only in case related objects changed 
-                         setUniqueId(object, getMapper().getNewId(this, trans, getTargetName(descriptor.getMappedClass())));
- 					}
- 					
- 				    DbQueryBuilder builder = DbQueryBuilder.createQueryChangeObject(descriptor.getMappedClass(), object);
- 				    if (newDbObject && getDescriptor(object.getClass()).isOrdered()) {
- 					    // by default set SEQUENCE like id
- 					    builder.append(DbMapper.ATTRIBUTE_ORDERED, object.getId());
- 					}
- 					if (!builder.isSuppressable()) {
- 						if (builder.isUpdate()) {
- 							object.setLockFields(getUserId(), builder.appendInternal((String)null));
- 						}
- 						execute(trans, builder);
- 					}
- 				}
- 
- 				// PREVENT recursive allocations if associations point back to given object
- 				transactionObjects.put(object.getClass(), object);
- 				
- 				// 2) 1:n
- 				allocateOneToMany(object, descriptor);
- 				
- 				// 3) n:n
- 				allocateManyToMany(object, descriptor);
- 			}
- 			
- 			object.reset(true);
- 		} //else Tracer.getInstance().debug(this, "makePersistent(Object)", "suppress recursive allocation for <" + object.getClass().getName() + "->Id=" + object.getId());
- 	} catch(Throwable e) {
- 		exception = e;
- 	}
- 
- 	closeTransactionThread(exception, trans, "makePersistent(Object)");
- }
- */
  /**
   * Overwrites.
--- 330,333 ----

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm/mvc/model DbObject.java, 1.11, 1.12 DbChangeableBean.java, 1.6, 1.7

From: Hirzel P. <ph...@us...> - 2008-04-18 18:23:29

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/model
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6032/src/ch/softenvironment/jomm/mvc/model

Modified Files:
	DbObject.java DbChangeableBean.java 
Log Message:
Minor refactoring and commenting

Index: DbObject.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/model/DbObject.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DbObject.java	17 Apr 2007 12:28:39 -0000	1.11
--- DbObject.java	18 Apr 2008 18:22:53 -0000	1.12
***************
*** 15,18 ****
--- 15,20 ----
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
+ import java.util.HashSet;
+ 
  import ch.softenvironment.jomm.DbObjectId;
  import ch.softenvironment.jomm.DbObjectServer;
***************
*** 594,596 ****
--- 596,632 ----
  	}
  }
+ /**
+  * Return the set of properties differing in given object.
+  * @param object
+  * @return
+  * @throws Throwable
+  */
+ public java.util.Set diff(DbObject object) throws Throwable {
+ 	if ((object == null) || (object.getClass() != this.getClass())) {
+ 		throw new IllegalArgumentException("given object not of type: " + this.getClass());
+ 	}
+ 	java.util.Set changedProperties = new HashSet();
+ 	java.util.Iterator iterator = this.getObjectServer().getDescriptor(this.getClass()).iteratorProperties();
+     // last chance to refresh
+ 	this.refresh(true);
+ 	object.refresh(true);
+     while (iterator.hasNext()) {
+          String property = (String)iterator.next();
+          if (property.equals(DbObject.PROPERTY_ID) || property.equals(DbObject.PROPERTY_LAST_CHANGE) || property.equals(DbObject.PROPERTY_USER_ID) || property.equals(DbObject.PROPERTY_CREATE_DATE)) {
+          	// skip tech-fields: means no change
+          	continue;
+          }
+          BeanReflector thisReflector = new BeanReflector(this, property);
+          BeanReflector objectReflector = new BeanReflector(object, property);
+          if (thisReflector.getValue() == null) {
+          	if (objectReflector.getValue() != null) {
+          		changedProperties.add(property);
+          	}
+          } else if (!thisReflector.getValue().equals(objectReflector.getValue())) {
+         	 changedProperties.add(property);
+          }
+     }
+ //TODO diff aggregates?    
+ 	return changedProperties;
+ }
  }

Index: DbChangeableBean.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/mvc/model/DbChangeableBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DbChangeableBean.java	23 Jan 2007 22:05:52 -0000	1.6
--- DbChangeableBean.java	18 Apr 2008 18:22:53 -0000	1.7
***************
*** 16,19 ****
--- 16,20 ----
   */
  import ch.softenvironment.jomm.DbObjectServer;
+ import ch.softenvironment.jomm.DbQueryBuilder;
  import ch.softenvironment.jomm.datatypes.DbNlsString;
  import ch.softenvironment.jomm.descriptor.DbDescriptor;
***************
*** 40,43 ****
--- 41,46 ----
  	// keep changed attributes in mind
  	private transient java.util.Set changedProperties = new java.util.HashSet(); // History
+ 	// @see #remove(boolean, boolean)
+ 	private boolean removeObjectHistoryPending = false;
  /**
   * Overwrites.
***************
*** 50,53 ****
--- 53,95 ----
  }
  /**
+  * Utility method to add an aggregate to the list given by propertyName.
+  * Also promote any registered listeners to the aggregate.
+  * @param propertyName
+  * @param aggregate
+  * @throws Throwable
+  */
+ public void addAggregate(final String propertyName, DbObject aggregate) throws Throwable {
+ 	// 1) add listeners to new aggregate
+ 	java.util.Iterator iterator = iteratorObjectListener();
+ 	if (iterator != null) {
+ 		while (iterator.hasNext()) {
+ 			promoteChangeListener(aggregate, (DbObjectListener)iterator.next(), true);
+ 		}
+ 	}
+ 	
+ 	// 2) add the aggregate to the list
+ 	DbPropertyChange change = new DbPropertyChange(this, propertyName);
+ 	((List)change.getValue()).add(aggregate);
+ }
+ /**
+  * Utility method to remove an aggregate from the list given by propertyName.
+  * Also promote any registered listeners to the aggregate.
+  * @param propertyName
+  * @param aggregate
+  * @throws Throwable
+  */
+ public void removeAggregate(final String propertyName, DbObject aggregate) throws Throwable {
+ 	// 1) remove listeners to removable aggregate
+ 	java.util.Iterator iterator = iteratorObjectListener();
+ 	if (iterator != null) {
+ 		while (iterator.hasNext()) {
+ 			promoteChangeListener(aggregate, (DbObjectListener)iterator.next(), false);
+ 		}
+ 	}
+ 	// 2) remove the aggregate to the list
+ 	DbPropertyChange change = new DbPropertyChange(this, propertyName);
+ 	((List)change.getValue()).remove(aggregate);
+ }
+ /**
   * The addPropertyChangeListener method was generated to support the propertyChange field.
   * Add an "outer" listener listening to this persistent Object.
***************
*** 231,234 ****
--- 273,291 ----
  
  	getPropertyChange().firePropertyChange(propertyName, oldValue, newValue);
+ 
+ if ((newValue instanceof List) && getPersistencyState().isChanged() && (newValue != null) && newValue.equals(oldValue)) {
+ //TODO Hack/Bug fix: cheat ConsistencyController#propertyChange() because event gets absorbed otherwise (in case ONLY element in List has changed)
+ //HACK @see JavaBeans Specification chapter "7.3 indexed arrays"
+ //  => getList returns a copy of the items
+ 	Iterator it = ((List)newValue).iterator();
+ 	while (it.hasNext()) {
+ 		// @see DbBaseFrame#removeAssociations()
+ 		if (((DbObject)it.next()).getPersistencyState().isRemovedPending()) {
+ 			Tracer.getInstance().developerWarning("Cheating changed-event for List<" + propertyName + "> because REMOVED_PENDING");
+ 			getPropertyChange().firePropertyChange(propertyName, null /*CHEAT propertyChange-handler*/, newValue);
+ 			break;
+ 		}
+ 	}		
+ }
  }
  /**
***************
*** 242,258 ****
  }
  /**
!  * Forward this DbObject to another DbObjectServer.
!  * This DbObject will become persistencyState=>NewForwarded (transient) on
   * targetServer.
   * @param targetServer
!  * @deprecated (higly experimental state!!!)
   */
! public final void forward(DbObjectServer targetServer) {
      // last chance to do refresh from original server
      refresh(true);
- //TODO NYI: what happens to deep hierachy? forward aggregates as well or not?
      
!     // remove from cache
! //TODO should object be removed from original server?
      getObjectServer().evict(this);
      
--- 299,319 ----
  }
  /**
!  * Forward this DbChangeableBean to another DbObjectServer, by means it does
!  * not exist yet on targetServer.
!  * This DbChangeableBean will become persistencyState=>NewForwarded (transient) on
   * targetServer.
+  * Also forwards any superclass instances.
   * @param targetServer
!  * @param includingAggregates (false->only this object without any related aggregates; true->this object AND aggregates)
   */
! public final void forward(DbObjectServer targetServer, boolean includingAggregates) {
! if (includingAggregates) {
! //TODO NYI: what happens to deep hierarchy? forward aggregates as well
! 	throw new DeveloperException("forwarding aggregates in NOT IMPLEMENTED YET, sorry");
! }
      // last chance to do refresh from original server
      refresh(true);
      
!     // remove from cache => points on wrong server otherwise
      getObjectServer().evict(this);
      
***************
*** 260,264 ****
  	getPersistencyState().setNext(DbState.NEW_FORWARDED);
  	
! //TODO there is also the ID-question => namespace should be considered additionally
  	save();
  }
--- 321,325 ----
  	getPersistencyState().setNext(DbState.NEW_FORWARDED);
  	
! //TODO currently ID remains the same on both servers, always ok?
  	save();
  }
***************
*** 296,299 ****
--- 357,367 ----
  }
  /**
+  * Return whether the deletion history is not yet written.
+  * @return
+  */
+ public boolean isRemoveObjectHistoryPending() {
+ 	return removeObjectHistoryPending;
+ }
+ /**
   * Return an Iterator of all changed Properties since last save.
   */
***************
*** 323,331 ****
  }
  /**
!  * Utility method to set the parents ChangeListener to given change.
   * @param change (property of caller of this function)
   * @listener
   */
! protected void promoteChangeListener(Object object, DbObjectListener listener, boolean register) {
  	try {
  		Object value = object;
--- 391,399 ----
  }
  /**
!  * Utility method to add the Listener to given object.
   * @param change (property of caller of this function)
   * @listener
   */
! protected static void promoteChangeListener(Object object, DbObjectListener listener, boolean register) {
  	try {
  		Object value = object;
***************
*** 352,355 ****
--- 420,434 ----
   */
  public synchronized void remove(boolean immediately) throws Throwable {
+ 	remove(immediately, false);
+ }
+ /**
+  * With spread databases it might be useful to historize deleted objects
+  * just in case of further synchronisation actions later.
+  * @param immediately
+  * @param historized (true->write history record)
+  * @see #remove(boolean)
+  * @throws Throwable
+  */
+ public synchronized void remove(boolean immediately, boolean historized) throws Throwable {
  	if (getPersistencyState().isNew() || getPersistencyState().isUndefined() || getPersistencyState().isRemoved()) {
  		// no persistency actions necessary
***************
*** 359,370 ****
  		if (immediately) {
  			// delete in database immediately
! 			jdoGetPersistenceManager().deletePersistent(this);
! 			getPersistencyState().setNext(DbState.REMOVED);
  		} else {
  			// delay removal until next #save()
  			getPersistencyState().setNext(DbState.REMOVED_PENDING);
  		}
  	} else {
! 		throw new DeveloperException("Objekt ist schreibgeschützt und kann nicht gelöscht werden!", "Fehler beim Löschen");
  	}
  }
--- 438,465 ----
  		if (immediately) {
  			// delete in database immediately
! 			if (historized) {			    	
!     			List deletions = new ArrayList(2);
!     			// add history entry
! 		    	deletions.add(DbQueryBuilder.createChangeRemoveHistory(this).getQuery());	
! 		    	
! 		    	// delete the object
! 		    	//jdoGetPersistenceManager().deletePersistent(this);
! 		    	getObjectServer().evict(this);
! 		    	deletions.add(DbQueryBuilder.createRemoveObject(this).getQuery());
!     			
! 		    	getObjectServer().execute("Remove historized object", deletions);
! 		    	
! 				getPersistencyState().setNext(DbState.REMOVED);			    
! 			} else {
! 				jdoGetPersistenceManager().deletePersistent(this);
! 				getPersistencyState().setNext(DbState.REMOVED);
! 			}
  		} else {
+ 			removeObjectHistoryPending = historized; // make a remove-history entry later at save
  			// delay removal until next #save()
  			getPersistencyState().setNext(DbState.REMOVED_PENDING);
  		}
  	} else {
! 		throw new DeveloperException("Object is ReadOnly!", "Deletion-Error");
  	}
  }
***************
*** 426,429 ****
--- 521,525 ----
  	if (getPersistencyState().isRemovedPending()) {
  		getPersistencyState().setNext(DbState.CHANGED);
+ 		removeObjectHistoryPending = false;
  	} else {
  		throw new ch.softenvironment.util.DeveloperException("Undo of removal is not possible in current state <" + getPersistencyState().toString() + ">", "Remove not undoable");

[Jomm-cvs] JOMM/src/ch/softenvironment/jomm DbMapper.java, 1.4, 1.5 DbObjectServer.java, 1.17, 1.18

From: Hirzel P. <ph...@us...> - 2008-04-18 18:23:10

Update of /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6032/src/ch/softenvironment/jomm

Modified Files:
	DbMapper.java DbObjectServer.java 
Log Message:
Minor refactoring and commenting

Index: DbMapper.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/DbMapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DbMapper.java	6 May 2007 20:46:04 -0000	1.4
--- DbMapper.java	18 Apr 2008 18:22:54 -0000	1.5
***************
*** 49,195 ****
      // DbFieldType Attribute
      public static final String ATTRIBUTE_MAP_VALUE = "T_Value";
! /**
!  * Usually each Target-System uses its own Error-Codes thrown
!  * as an Exception in case of illegal interaction.
!  * Therefore a User might be interested in a more understandable
!  * (say less technical) verbose explanation of the exception.
!  * @return String User-like error-explanation
!  */
! String describeTargetException(Exception exception);
! /**
!  * Return an Id for a given Key (also referred as Sequence sometimes).
!  * @param objectServer
!  * @param transaction
!  * @param key
!  */
! Long getNewId(javax.jdo.PersistenceManager objectServer, javax.jdo.Transaction transaction, final String key);
! /**
!  * Return whether the given collection has a next element.
!  */
! boolean hasNext(Object collection);
! /**
!  * Map <i>Collection of Objects</i>: <b>Target-System => Java</b>.
!  * Maps values of given collection to given DbObject's Properties.
!  *
!  * <b>Only Properties of the given Descriptor are considered</b>, therefore
!  * the correct Object hierarchy must be managed by the caller.
!  *
!  * @param object
!  * @param descriptor
!  * @param collection (Query Results -> only plain attributes, such as fields and foreign key ID's)
!  */
! void mapFromTarget(DbObject instance, DbDescriptor descriptor, Object collection) throws Throwable;
! /**
!  * @see #mapFromTargetString(..)
!  */
! java.math.BigDecimal mapFromTargetBigDecimal(Object collection, String attribute);
! /**
!  * Map <i>Type</i>: <b>Target-System => Java</b>.
!  * Assumes Textdb-Field with 'T' for true and 'F' for false.
!  * @see #mapFromTargetString(..)
!  */
! Boolean mapFromTargetBoolean(Object collection, String attribute);
! /**
!  * @see #mapFromTargetString(..)
!  */
! java.util.Date mapFromTargetDate(Object collection, String attribute, final int type);
! /**
!  * Map special types.
!  */
! DbFieldType mapFromTargetDbFieldType(Object collection, String attribute);
! /**
!  * @see #mapFromTargetString(..)
!  */
! Double mapFromTargetDouble(Object collection, String attribute);
! /**
!  * @see #mapFromTargetString(..)
!  */
! Integer mapFromTargetInteger(Object collection, String attribute);
! /**
!  * @see #mapFromTargetString(..)
!  */
! Long mapFromTargetLong(Object collection, String attribute);
! /**
!  * @see mapFromTargetBoolean()
!  * @deprecated
!  */
! boolean mapFromTargetNativeBoolean(Object collection, String attribute);
! /**
!  * @see mapFromTargetInteger()
!  * @deprecated
!  */
! int mapFromTargetNativeInt(Object collection, String attribute);
! /**
!  * Maps from <b>Target-System => Java</b>.
!  * @param collection ResultSet from a query
!  * @param attribute expected Attribute in collection
!  */
! String mapFromTargetString(Object collection, String attribute);
! /**
!  * Map <i>Type</i>: <b>Java => Target-System</b>.
!  * @param value Application value of a Model
!  * @return String given value as an SQL-Query argument
!  */
! Object mapToTarget(DbFieldType value);
! /**
!  * Map <i>Type</i>: <b>Java => Target-System</b>.
!  * Only the Reference-Type of the given value will be mapped.
!  * @param value Aggregated Object as Application value of a Model
!  * @return String given value as an SQL-Query argument
!  */
! Object mapToTarget(DbObject value);
! /**
!  * Map <i>Type</i>: <b>Java => Target-System</b>.
!  * The value of given change will be mapped here.
!  * @deprecated should be done in DbQueryBuilder
!  */
! Object mapToTarget(DbPropertyChange change);
! /**
!  * Map <i>Type</i>: <b>Java => Target-System</b>.
!  * Tri-State (TRUE, FALSE or NULL).
!  *
!  * @param value Application value of a Model
!  * @return String given value as an SQL-Query argument
!  */
! Object mapToTarget(Boolean value);
! /**
!  * Map <i>Type</i>: <b>Java => Target-System</b>.
!  * @param value Application value of a Model
!  * @return String given value as an SQL-Query argument
!  */
! Object mapToTarget(Number value);
! /**
!  * Map <i>Type</i>: <b>Java => Target-System</b>.
!  * @param value Application value of a Model
!  * @return String given value as an SQL-Query argument
!  */
! Object mapToTarget(String value);
! /**
!  * Map <i>Type</i>: <b>Java => Target-System</b>.
!  * @param value Application value of a Model
!  * @param type see DbDateFieldDescriptor
!  * @return String given value as an SQL-Query argument
!  */
! Object mapToTarget(java.util.Date value, final int type);
! /**
!  * Return a qualified attribute-name on Target-System.
!  */
! String mapToTargetQualified(String qualifier, String attribute);
! /**
!  * Return the technical name of the "Identity" property.
!  * @return
!  */
! String getTargetIdName();
! /**
!  * Return the name where NLS-String's are managed.
!  * @return
!  * @see #getTargetNlsTranslationName()
!  */
! String getTargetNlsName();
! /**
!  * Return the name where NLS-Translations's are managed.
!  * @return
!  * @see #getTargetNlsName()
!  */
! String getTargetNlsTranslationName();
  }
--- 49,202 ----
      // DbFieldType Attribute
      public static final String ATTRIBUTE_MAP_VALUE = "T_Value";
!     
! 	/**
! 	 * Usually each Target-System uses its own Error-Codes thrown
! 	 * as an Exception in case of illegal interaction.
! 	 * Therefore a User might be interested in a more understandable
! 	 * (say less technical) verbose explanation of the exception.
! 	 * @return String User-like error-explanation
! 	 */
! 	String describeTargetException(Exception exception);
! 	/**
! 	 * Return an Id for a given Key (also referred as Sequence sometimes).
! 	 * @param objectServer
! 	 * @param transaction
! 	 * @param key
! 	 */
! 	Long getNewId(javax.jdo.PersistenceManager objectServer, javax.jdo.Transaction transaction, final String key);
! 	/**
! 	 * Return whether the given collection has a next element.
! 	 */
! 	boolean hasNext(Object collection);
! 	/**
! 	 * Map <i>Collection of Objects</i>: <b>Target-System => Java</b>.
! 	 * Maps values of given collection to given DbObject's Properties.
! 	 *
! 	 * <b>Only Properties of the given Descriptor are considered</b>, therefore
! 	 * the correct Object hierarchy must be managed by the caller.
! 	 *
! 	 * @param object
! 	 * @param descriptor
! 	 * @param collection (Query Results -> only plain attributes, such as fields and foreign key ID's)
! 	 */
! 	void mapFromTarget(DbObject instance, DbDescriptor descriptor, Object collection) throws Throwable;
! 	/**
! 	 * @see #mapFromTargetString(..)
! 	 */
! 	java.math.BigDecimal mapFromTargetBigDecimal(Object collection, String attribute);
! 	/**
! 	 * Map <i>Type</i>: <b>Target-System => Java</b>.
! 	 * Assumes Textdb-Field with 'T' for true and 'F' for false.
! 	 * @see #mapFromTargetString(..)
! 	 */
! 	Boolean mapFromTargetBoolean(Object collection, String attribute);
! 	/**
! 	 * @see #mapFromTargetString(..)
! 	 */
! 	java.util.Date mapFromTargetDate(Object collection, String attribute, final int type);
! 	/**
! 	 * Map special types.
! 	 */
! 	DbFieldType mapFromTargetDbFieldType(Object collection, String attribute);
! 	/**
! 	 * @see #mapFromTargetString(..)
! 	 */
! 	Double mapFromTargetDouble(Object collection, String attribute);
! 	/**
! 	 * @see #mapFromTargetString(..)
! 	 */
! 	Integer mapFromTargetInteger(Object collection, String attribute);
! 	/**
! 	 * @see #mapFromTargetString(..)
! 	 */
! 	Long mapFromTargetLong(Object collection, String attribute);
! 	/**
! 	 * @see mapFromTargetBoolean()
! 	 * @deprecated
! 	 */
! 	boolean mapFromTargetNativeBoolean(Object collection, String attribute);
! 	/**
! 	 * @see mapFromTargetInteger()
! 	 * @deprecated
! 	 */
! 	int mapFromTargetNativeInt(Object collection, String attribute);
! 	/**
! 	 * Maps from <b>Target-System => Java</b>.
! 	 * @param collection ResultSet from a query
! 	 * @param attribute expected Attribute in collection
! 	 */
! 	String mapFromTargetString(Object collection, String attribute);
! 	/**
! 	 * Map <i>Type</i>: <b>Java => Target-System</b>.
! 	 * @param value Application value of a Model
! 	 * @return String given value as an SQL-Query argument
! 	 */
! 	Object mapToTarget(DbFieldType value);
! 	/**
! 	 * Map <i>Type</i>: <b>Java => Target-System</b>.
! 	 * Only the Reference-Type of the given value will be mapped.
! 	 * @param value Aggregated Object as Application value of a Model
! 	 * @return String given value as an SQL-Query argument
! 	 */
! 	Object mapToTarget(DbObject value);
! 	/**
! 	 * Map <i>Type</i>: <b>Java => Target-System</b>.
! 	 * The value of given change will be mapped here.
! 	 * @deprecated should be done in DbQueryBuilder
! 	 */
! 	Object mapToTarget(DbPropertyChange change);
! 	/**
! 	 * Map <i>Type</i>: <b>Java => Target-System</b>.
! 	 * Tri-State (TRUE, FALSE or NULL).
! 	 *
! 	 * @param value Application value of a Model
! 	 * @return String given value as an SQL-Query argument
! 	 */
! 	Object mapToTarget(Boolean value);
! 	/**
! 	 * Map <i>Type</i>: <b>Java => Target-System</b>.
! 	 * @param value Application value of a Model
! 	 * @return String given value as an SQL-Query argument
! 	 */
! 	Object mapToTarget(Number value);
! 	/**
! 	 * Map <i>Type</i>: <b>Java => Target-System</b>.
! 	 * @param value Application value of a Model
! 	 * @return String given value as an SQL-Query argument
! 	 */
! 	Object mapToTarget(String value);
! 	/**
! 	 * Map <i>Type</i>: <b>Java => Target-System</b>.
! 	 * @param value Application value of a Model
! 	 * @param type see DbDateFieldDescriptor
! 	 * @return String given value as an SQL-Query argument
! 	 */
! 	Object mapToTarget(java.util.Date value, final int type);
! 	/**
! 	 * Return a qualified attribute-name on Target-System.
! 	 */
! 	String mapToTargetQualified(String qualifier, String attribute);
! 	/**
! 	 * Return the technical name of the "Identity" property.
! 	 * @return
! 	 */
! 	String getTargetIdName();
! 	/**
! 	 * Return the name where NLS-String's are managed.
! 	 * @return
! 	 * @see #getTargetNlsTranslationName()
! 	 */
! 	String getTargetNlsName();
! 	/**
! 	 * Return the name where NLS-Translations's are managed.
! 	 * @return
! 	 * @see #getTargetNlsName()
! 	 */
! 	String getTargetNlsTranslationName();
! 	/**
! 	 * Return the name where removed objects are historized.
! 	 * @return
! 	 * @see #getTargetNlsTranslationName()
! 	 */
! 	String getTargetRemoveHistoryName();
  }

Index: DbObjectServer.java
===================================================================
RCS file: /cvsroot/jomm/JOMM/src/ch/softenvironment/jomm/DbObjectServer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DbObjectServer.java	20 Feb 2007 13:27:03 -0000	1.17
--- DbObjectServer.java	18 Apr 2008 18:22:54 -0000	1.18
***************
*** 269,276 ****
  //TODO NYI: evtl. keep  new transient DbObject's in mind
  		setUniqueId(object, getTemporaryNewId());
! 		
  		if (dbClass.equals(DbCodeType.class)) {
  			
  		}
  	}
  	return object;
--- 269,277 ----
  //TODO NYI: evtl. keep  new transient DbObject's in mind
  		setUniqueId(object, getTemporaryNewId());
! /*		
  		if (dbClass.equals(DbCodeType.class)) {
  			
  		}
+ */        
  	}
  	return object;
***************
*** 357,361 ****
  	
  //	if (!object.jdoIsTransactional()) {
! 		if (pc instanceof DbCodeType) {
  			// uncache all codes of this type
  			codeCache.uncache(object.getClass());
--- 358,365 ----
  	
  //	if (!object.jdoIsTransactional()) {
! 		if (pc instanceof DbEnumeration) {
! 			Tracer.getInstance().developerWarning("Cannot uncache DbEnumeration=>needs a restart to change");
! 			return;
! 		} else if (pc instanceof DbCode /*Type*/) {
  			// uncache all codes of this type
  			codeCache.uncache(object.getClass());
***************
*** 697,761 ****
  	}
  }
!  /** This method locates a persistent instance in the cache of instances
!      * managed by this <code>PersistenceManager</code>.
!      * The <code>getObjectById</code> method attempts 
!      * to find an instance in the cache with the specified JDO identity. 
!      * The <code>oid</code> parameter object might have been returned by an earlier call 
!      * to <code>getObjectId</code> or <code>getTransactionalObjectId</code>,
!      * or might have been constructed by the application. 
!      * <P>If the <code>PersistenceManager</code> is unable to resolve the <code>oid</code> parameter 
!      * to an ObjectId instance, then it throws a <code>JDOUserException</code>.
!      * <P>If the <code>validate</code> flag is <code>false</code>, and there is already an instance in the
!      * cache with the same JDO identity as the <code>oid</code> parameter, then this method
!      * returns it. There is no change made to the state of the returned
!      * instance.
!      * <P>If there is not an instance already in the cache with the same JDO
!      * identity as the <code>oid</code> parameter, then this method creates an instance
!      * with the specified JDO identity and returns it. If there is no
!      * transaction in progress, the returned instance will be hollow or
!      * persistent-nontransactional, at the choice of the implementation.
!      * <P>If there is a transaction in progress, the returned instance will
!      * be hollow, persistent-nontransactional, or persistent-clean, at the
!      * choice of the implementation.
!      * <P>It is an implementation decision whether to access the data store,
!      * if required to determine the exact class. This will be the case of
!      * inheritance, where multiple <code>PersistenceCapable</code> classes share the
!      * same ObjectId class.
!      * <P>If the validate flag is <code>false</code>, and the instance does not exist in
!      * the data store, then this method might not fail. It is an
!      * implementation choice whether to fail immediately with a
!      * <code>JDODataStoreException</code>. But a subsequent access of the fields of the
!      * instance will throw a <code>JDODataStoreException</code> if the instance does not
!      * exist at that time. Further, if a relationship is established to this
!      * instance, then the transaction in which the association was made will
!      * fail.
!      * <P>If the <code>validate</code> flag is <code>true</code>, and there is already a transactional
!      * instance in the cache with the same JDO identity as the <code>oid</code> parameter,
!      * then this method returns it. There is no change made to the state of
!      * the returned instance.
!      * <P>If there is an instance already in the cache with the same JDO
!      * identity as the <code>oid</code> parameter, but the instance is not transactional,
!      * then it must be verified in the data store. If the instance does not
!      * exist in the datastore, then a <code>JDODataStoreException</code> is thrown.
!      * <P>If there is not an instance already in the cache with the same JDO
!      * identity as the <code>oid</code> parameter, then this method creates an instance
!      * with the specified JDO identity, verifies that it exists in the data
!      * store, and returns it. If there is no transaction in progress, the
!      * returned instance will be hollow or persistent-nontransactional,
!      * at the choice of the implementation.
!      * <P>If there is a data store transaction in progress, the returned
!      * instance will be persistent-clean.
!      * If there is an optimistic transaction in progress, the returned
!      * instance will be persistent-nontransactional.
!      * 
!      * For e.g.
!      *  DbCodeType code = getObjectById(new DbObjectId(MyCodeType.class, new Long(15)), false)
!      * @see #getObjectId(Object pc)
!      * @see #getTransactionalObjectId(Object pc)
!      * @return the <code>PersistenceCapable</code> instance with the specified ObjectId
!      * @param oid an ObjectId
!      * @param validate if the existence of the instance is to be validated
!      * @see javax.jdo.PersistenceManager
!      */
  public java.lang.Object getObjectById(java.lang.Object oid, boolean validate) {
  	return getObjectById(oid, validate, false);
--- 701,768 ----
  	}
  }
!  /** 
!  * This method locates a persistent instance in the cache of instances
!  * managed by this <code>PersistenceManager</code>.
!  * The <code>getObjectById</code> method attempts 
!  * to find an instance in the cache with the specified JDO identity. 
!  * The <code>oid</code> parameter object might have been returned by an earlier call 
!  * to <code>getObjectId</code> or <code>getTransactionalObjectId</code>,
!  * or might have been constructed by the application. 
!  * <P>If the <code>PersistenceManager</code> is unable to resolve the <code>oid</code> parameter 
!  * to an ObjectId instance, then it throws a <code>JDOUserException</code>.
!  * <P>If the <code>validate</code> flag is <code>false</code>, and there is already an instance in the
!  * cache with the same JDO identity as the <code>oid</code> parameter, then this method
!  * returns it. There is no change made to the state of the returned
!  * instance.
!  * <P>If there is not an instance already in the cache with the same JDO
!  * identity as the <code>oid</code> parameter, then this method creates an instance
!  * with the specified JDO identity and returns it. If there is no
!  * transaction in progress, the returned instance will be hollow or
!  * persistent-nontransactional, at the choice of the implementation.
!  * <P>If there is a transaction in progress, the returned instance will
!  * be hollow, persistent-nontransactional, or persistent-clean, at the
!  * choice of the implementation.
!  * <P>It is an implementation decision whether to access the data store,
!  * if required to determine the exact class. This will be the case of
!  * inheritance, where multiple <code>PersistenceCapable</code> classes share the
!  * same ObjectId class.
!  * <P>If the validate flag is <code>false</code>, and the instance does not exist in
!  * the data store, then this method might not fail. It is an
!  * implementation choice whether to fail immediately with a
!  * <code>JDODataStoreException</code>. But a subsequent access of the fields of the
!  * instance will throw a <code>JDODataStoreException</code> if the instance does not
!  * exist at that time. Further, if a relationship is established to this
!  * instance, then the transaction in which the association was made will
!  * fail.
!  * <P>If the <code>validate</code> flag is <code>true</code>, and there is already a transactional
!  * instance in the cache with the same JDO identity as the <code>oid</code> parameter,
!  * then this method returns it. There is no change made to the state of
!  * the returned instance.
!  * <P>If there is an instance already in the cache with the same JDO
!  * identity as the <code>oid</code> parameter, but the instance is not transactional,
!  * then it must be verified in the data store. If the instance does not
!  * exist in the datastore, then a <code>JDODataStoreException</code> is thrown.
!  * <P>If there is not an instance already in the cache with the same JDO
!  * identity as the <code>oid</code> parameter, then this method creates an instance
!  * with the specified JDO identity, verifies that it exists in the data
!  * store, and returns it. If there is no transaction in progress, the
!  * returned instance will be hollow or persistent-nontransactional,
!  * at the choice of the implementation.
!  * <P>If there is a data store transaction in progress, the returned
!  * instance will be persistent-clean.
!  * If there is an optimistic transaction in progress, the returned
!  * instance will be persistent-nontransactional.
!  * 
!  * For e.g.
!  *  DbCodeType code = getObjectById(new DbObjectId(MyCodeType.class, new Long(15)), false);
!  *  MyConcreteClass mc = (MyConcreteClass)getObjectById(new DbObjectId(MyAbstract.class, new Long(15)), false); // returns real inherited instance
!  *  
!  * @see #getObjectId(Object pc)
!  * @see #getTransactionalObjectId(Object pc)
!  * @return the <code>PersistenceCapable</code> instance with the specified ObjectId
!  * @param oid an ObjectId
!  * @param validate if the existence of the instance is to be validated
!  * @see javax.jdo.PersistenceManager
!  */
  public java.lang.Object getObjectById(java.lang.Object oid, boolean validate) {
  	return getObjectById(oid, validate, false);

Flat | Threaded

1 2 3 .. 12 > >> (Page 1 of 12)

2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (6)	Sep (9)	Oct (13)	Nov (8)	Dec (5)
2006	Jan (1)	Feb (6)	Mar (5)	Apr (17)	May (28)	Jun (5)	Jul (34)	Aug (6)	Sep (2)	Oct (1)	Nov (33)	Dec (5)
2007	Jan (26)	Feb (16)	Mar (1)	Apr (7)	May (4)	Jun (11)	Jul	Aug (1)	Sep (7)	Oct	Nov	Dec
2008	Jan	Feb (1)	Mar (3)	Apr (13)	May (1)	Jun	Jul	Aug (16)	Sep	Oct	Nov	Dec