[db4o-om] r62 committed - [No log message]

3 views
Skip to first unread message

codesite...@google.com

unread,
Aug 11, 2009, 1:44:39 AM8/11/09
to db4o-om-c...@googlegroups.com
Revision: 62
Author: gishac
Date: Mon Aug 10 22:41:33 2009
Log: [No log message]
http://code.google.com/p/db4o-om/source/detail?r=62

Deleted:
/trunk/objectmanager-api7.4/lib/bloat-1.0.jar
/trunk/objectmanager-api7.4/lib/db4o-instrumentation.jar
/trunk/objectmanager-api7.4/lib/db4o-java1.2.jar
/trunk/objectmanager-api7.4/lib/db4o-taj.jar
Modified:
/trunk/objectmanager-api7.4/.classpath

/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/nodes/field/CollectionFieldNode.java

/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/nodes/field/FieldNodeFactory.java

/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/query/FieldConstraint.java

=======================================
--- /trunk/objectmanager-api7.4/lib/bloat-1.0.jar Wed Dec 19 15:44:00 2007
+++ /dev/null
Binary file, no diff available.
=======================================
--- /trunk/objectmanager-api7.4/lib/db4o-instrumentation.jar Mon Aug 10
18:45:34 2009
+++ /dev/null
Binary file, no diff available.
=======================================
--- /trunk/objectmanager-api7.4/lib/db4o-java1.2.jar Mon Aug 10 18:45:34
2009
+++ /dev/null
File is too large to display a diff.
=======================================
--- /trunk/objectmanager-api7.4/lib/db4o-taj.jar Mon Aug 10 18:45:34 2009
+++ /dev/null
Binary file, no diff available.
=======================================
--- /trunk/objectmanager-api7.4/.classpath Mon Aug 10 18:45:34 2009
+++ /trunk/objectmanager-api7.4/.classpath Mon Aug 10 22:41:33 2009
@@ -3,9 +3,10 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="test.lib/db4ounit.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-api/lib/bloat-1.0.jar"/>
- <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing7.4/lib/db4o-taj.jar"/>
- <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing7.4/lib/db4o-instrumentation.jar"/>
- <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing7.4/lib/db4o-java1.2.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-api7.4/lib/db4o-7.4.106.13438-java5.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-api7.4/lib/db4o-sql-r27-db4o-7.4-java5.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-api7.4/lib/db4o-7.4.106.13438-taj.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-api7.4/lib/bloat-1.0.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-api7.4/lib/db4o-7.4.106.13438-instrumentation.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=======================================
---
/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/nodes/field/CollectionFieldNode.java
Mon Aug 10 18:45:34 2009
+++
/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/nodes/field/CollectionFieldNode.java
Mon Aug 10 22:41:33 2009
@@ -18,6 +18,7 @@

import java.io.PrintStream;

+import com.db4o.internal.Platform4;
import com.db4o.objectmanager.model.nodes.*;
import
com.db4o.objectmanager.model.nodes.partition.PartitionFieldNodeFactory;
import com.db4o.objectmanager.model.IDatabase;
@@ -46,7 +47,9 @@
*/
public boolean hasChildren() {
ReflectClass clazz = _database.reflector().forObject(value);
- return clazz. toArray(value).length > 0;
+ //gishac 10/08/2009
+ //return clazz. toArray(value).length > 0;
+ return false;
}

/* (non-Javadoc)
@@ -54,7 +57,9 @@
*/
public IModelNode[] children() {
ReflectClass clazz = _database.reflector().forObject(value);
- Object[] contents = clazz.toArray(value);
+ //gishac 10/08/2009
+ //Object[] contents = clazz.toArray(value);
+ Object[] contents = new Object[0];
IModelNode[] results = new IModelNode[contents.length];

for (int i = 0; i < results.length; i++) {
=======================================
---
/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/nodes/field/FieldNodeFactory.java
Wed Dec 19 15:44:00 2007
+++
/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/nodes/field/FieldNodeFactory.java
Mon Aug 10 22:41:33 2009
@@ -81,8 +81,9 @@
if (instance == null) {
return new FieldNode(fieldName, fieldType,instance, database);
}
-
- if (valueType.isSecondClass()) {
+ //gishac 10/08/09
+ //if (valueType.isSecondClass()) {
+ if (valueType.isPrimitive()) {
return new PrimitiveFieldNode(fieldName, fieldType,instance,
database);
}

=======================================
---
/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/query/FieldConstraint.java
Wed Dec 19 15:44:00 2007
+++
/trunk/objectmanager-api7.4/src/com/db4o/objectmanager/model/query/FieldConstraint.java
Mon Aug 10 22:41:33 2009
@@ -31,7 +31,9 @@
}

public void apply(Query query) {
- if (field.getFieldType().isSecondClass()) {
+ //gishac 10/08/09 22:00 PM
+ //if (field.getFieldType().isSecondClass()) {
+ if (field.getFieldType().isPrimitive()) {
Constraint
constraint=query.descend(field.getName()).constrain(value);
relation.apply(constraint);
} else {

Reply all
Reply to author
Forward
0 new messages