Revision: 154
http://polepos.svn.sourceforge.net/polepos/?rev=154&view=rev
Author: carlrosenberger
Date: 2010-12-02 16:28:24 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
cr + acv: Removed the previous field in ComplexHolder0, because we didn't get it to work with Hiberante.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/data/ComplexHolder0.java
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java
trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
Modified: trunk/polepos/src/org/polepos/data/ComplexHolder0.java
===================================================================
--- trunk/polepos/src/org/polepos/data/ComplexHolder0.java 2010-12-02 15:52:05 UTC (rev 153)
+++ trunk/polepos/src/org/polepos/data/ComplexHolder0.java 2010-12-02 16:28:24 UTC (rev 154)
@@ -31,23 +31,15 @@
// makes JDBC coding easier, not used for object databases (db4o , VOD )
private transient int _id;
- private ComplexHolder0 _previous;
-
private String _name;
private List<ComplexHolder0> _children = new ArrayList<ComplexHolder0>();
private ComplexHolder0[] _array;
- public static void main(String[] args) {
- ComplexHolder0 root = generate(10, 1);
- System.out.println(root.checkSum());
- }
-
public static ComplexHolder0 generate(int depth, int leafs){
ComplexHolder0 complexHolder = new ComplexHolder0();
complexHolder._name = "root";
- complexHolder._previous = complexHolder;
createChildren(complexHolder, depth -1, leafs);
return complexHolder;
}
@@ -69,7 +61,6 @@
for (int childIdx = 0; childIdx < numChildren; childIdx++) {
ComplexHolder0 curChild = curFactory.run();
curChild._name = String.valueOf(holderIdx);
- curChild._previous = previous;
curChild._array = createArray(holderIdx);
curChild.setSpecial(holderIdx);
curParent.addChild(curChild);
@@ -176,9 +167,6 @@
child.internalTraverse(visited, preVisitor, postVisitor);
}
}
- if(_previous != null) {
- _previous.internalTraverse(visited, preVisitor, postVisitor);
- }
postVisitor.visit(this);
}
@@ -194,10 +182,6 @@
return _name;
}
- public void setPrevious(ComplexHolder0 holder) {
- _previous = holder;
- }
-
public void setName(String name) {
_name = name;
}
@@ -206,10 +190,6 @@
return _children;
}
- public ComplexHolder0 getPrevious() {
- return _previous;
- }
-
public ComplexHolder0[] getArray() {
return _array;
}
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml 2010-12-02 16:28:24 UTC (rev 154)
@@ -3,9 +3,8 @@
<hibernate-mapping package="org.polepos.teams.hibernate.data">
<class name="ComplexHolder0" table="tComplexHolder0">
- <id name="id" column="fid" type="int" />
- <many-to-one name="previous" column="fprevious" cascade="all"/>
- <property name="name" column="fname" type="string"/>
+ <id name="id" column="fid" type="long" />
+ <property name="name" column="fname" type="string"/>
<list name="children" access="field" cascade="all">
<key column="parentId" />
<index column="elementIndex"/>
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java 2010-12-02 15:52:05 UTC (rev 153)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java 2010-12-02 16:28:24 UTC (rev 154)
@@ -28,10 +28,8 @@
public class ComplexHolder0 implements CheckSummable {
- private int id;
+ private long id;
- private ComplexHolder0 previous;
-
private String name;
private List<ComplexHolder0> children = new ArrayList<ComplexHolder0>();
@@ -41,23 +39,16 @@
private static IdGenerator _idGenerator = new IdGenerator();
public ComplexHolder0() {
- id = (int) _idGenerator.nextId();
+ id = _idGenerator.nextId();
}
- public static void main(String[] args) {
- ComplexHolder0 root = generate(10, 1);
- System.out.println(root.checkSum());
- }
-
public static ComplexHolder0 generate(int depth, int leafs){
ComplexHolder0 complexHolder = new ComplexHolder0();
complexHolder.name = "root";
- complexHolder.previous = complexHolder;
createChildren(complexHolder, depth -1, leafs);
return complexHolder;
}
-
private static void createChildren(ComplexHolder0 root, int depth, int numChildren) {
if(depth < 1){
return;
@@ -69,17 +60,14 @@
Closure4<ComplexHolder0> curFactory = FACTORIES[factoryIdx];
List<ComplexHolder0> childLevel = new ArrayList<ComplexHolder0>();
- ComplexHolder0 previous = null;
for (ComplexHolder0 curParent : parentLevel) {
for (int childIdx = 0; childIdx < numChildren; childIdx++) {
ComplexHolder0 curChild = curFactory.run();
curChild.name = String.valueOf(holderIdx);
- curChild.previous = previous;
curChild.array = createArray(holderIdx);
curChild.setSpecial(holderIdx);
curParent.addChild(curChild);
childLevel.add(curChild);
- previous = curChild;
holderIdx++;
}
}
@@ -155,7 +143,6 @@
@Override
public void visit(ComplexHolder0 holder) {
- System.err.println(holder.getName() + holder.ownCheckSum());
checkSum += Math.abs(holder.ownCheckSum());
}
}
@@ -170,11 +157,8 @@
private void internalTraverse(IdentityHashMap<ComplexHolder0, ComplexHolder0> visited, Visitor<ComplexHolder0> preVisitor, Visitor<ComplexHolder0> postVisitor) {
if(visited.containsKey(this)) {
- System.err.println("already found " + getName() + " " + System.identityHashCode(this));
-
return;
}
- System.err.println("Adding " + getName() + " " + System.identityHashCode(this));
visited.put(this, this);
preVisitor.visit(this);
for (ComplexHolder0 child : getChildren()) {
@@ -185,9 +169,6 @@
child.internalTraverse(visited, preVisitor, postVisitor);
}
}
- if(getPrevious() != null) {
- getPrevious().internalTraverse(visited, preVisitor, postVisitor);
- }
postVisitor.visit(this);
}
@@ -207,14 +188,6 @@
this.name = name;
}
- public ComplexHolder0 getPrevious() {
- return previous;
- }
-
- public void setPrevious(ComplexHolder0 holder) {
- previous = holder;
- }
-
public List<ComplexHolder0> getChildren() {
return children;
}
@@ -231,11 +204,11 @@
this.array = array;
}
- public int getId() {
+ public long getId() {
return id;
}
- public void setId(int id) {
+ public void setId(long id) {
this.id = id;
}
Modified: trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java 2010-12-02 15:52:05 UTC (rev 153)
+++ trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java 2010-12-02 16:28:24 UTC (rev 154)
@@ -49,12 +49,10 @@
private static final int ID = 1;
- private static final int PREVIOUS = 2;
+ private static final int NAME = 2;
- private static final int NAME = 3;
+ private static final int TYPE = 3;
- private static final int TYPE = 4;
-
private static final int INT_FIELD = 2;
private static final int CHILD = 2;
@@ -72,8 +70,8 @@
dropTable(CHILDREN_TABLE);
dropTable(ARRAY_TABLE);
- createTable( HOLDER_TABLE0, new String[]{ "id", "previous", "name", "type" },
- new Class[]{Integer.TYPE, Integer.TYPE, String.class, Integer.TYPE} );
+ createTable( HOLDER_TABLE0, new String[]{ "id", "name", "type" },
+ new Class[]{Integer.TYPE, String.class, Integer.TYPE} );
createTable(CHILDREN_TABLE,
new String[]{ "parent", "child", "pos"},
@@ -110,7 +108,7 @@
_idGenerator = new IdGenerator(ROOT_ID);
final Stack<Integer> parentIds = new Stack<Integer>();
- final PreparedStatement complexHolder0Stat = prepareStatement("insert into complexHolder0 (id, previous, name, type) values (?,?,?,?)");
+ final PreparedStatement complexHolder0Stat = prepareStatement("insert into complexHolder0 (id, name, type) values (?,?,?)");
final PreparedStatement[] complexHolderStats = new PreparedStatement[4];
for (int i = 0; i < complexHolderStats.length; i++) {
int idx = i + 1;
@@ -163,10 +161,9 @@
complexHolderStats[3].addBatch();
}
- complexHolder0Stat.setInt(1, id);
- complexHolder0Stat.setInt(2, holder.getPrevious() == null ? 0 : ids.get(holder.getPrevious()));
- complexHolder0Stat.setString(3, holder.getName());
- complexHolder0Stat.setInt(4, type);
+ complexHolder0Stat.setInt(ID, id);
+ complexHolder0Stat.setString(NAME, holder.getName());
+ complexHolder0Stat.setInt(TYPE, type);
complexHolder0Stat.addBatch();
@@ -296,18 +293,7 @@
read.put(id, holder);
holder.setName(resultSet0.getString(NAME));
- int previousId = resultSet0.getInt(PREVIOUS);
close(resultSet0);
- if(previousId> 0){
- holder.setPrevious(
- readHolder(
- read,
- complexHolder0Stat,
- complexHolderStats,
- arrayStat,
- childrenStat,
- previousId));
- }
if(holder instanceof ComplexHolder1){
ComplexHolder1 complexHolder1 = (ComplexHolder1) holder;
@@ -455,7 +441,7 @@
@Override
public void update() {
final PreparedStatement nameStat = prepareStatement("update complexholder0 set name=? where id=?");
- final PreparedStatement complexHolder0Stat = prepareStatement("insert into complexHolder0 (id, previous, name, type) values (?,?,?,?)");
+ final PreparedStatement complexHolder0Stat = prepareStatement("insert into complexHolder0 (id, name, type) values (?,?,?)");
final PreparedStatement[] complexHolderStats = new PreparedStatement[2];
for (int i = 0; i < complexHolderStats.length; i++) {
int idx = i + 1;
@@ -479,10 +465,9 @@
holder.addChild(newChild);
int childId = (int) _idGenerator.nextId();
- complexHolder0Stat.setInt(1, childId);
- complexHolder0Stat.setInt(2, 0);
- complexHolder0Stat.setString(3, "added");
- complexHolder0Stat.setInt(4, 2);
+ complexHolder0Stat.setInt(ID, childId);
+ complexHolder0Stat.setString(NAME, "added");
+ complexHolder0Stat.setInt(TYPE, 2);
complexHolder0Stat.addBatch();
for (int i = 0; i < complexHolderStats.length; i++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
