[db4o-om] r61 committed - [No log message]
codesite...@google.com
Author: gishac
Date: Mon Aug 10 22:40:07 2009
Log: [No log message]
http://code.google.com/p/db4o-om/source/detail?r=61
Deleted:
/trunk/objectmanager-swing7.4/lib/db4o-sql.jar
Modified:
/trunk/objectmanager-swing7.4/.classpath
/trunk/objectmanager-swing7.4/build.xml
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/FieldInfoTableModel.java
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/MainPanel.java
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/Version
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/connections/ConnectionHelper.java
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/query/QueryResultsTableModel.java
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/tree/ObjectTreeModel.java
=======================================
--- /trunk/objectmanager-swing7.4/lib/db4o-sql.jar Wed Dec 19 15:44:00 2007
+++ /dev/null
Binary file, no diff available.
=======================================
--- /trunk/objectmanager-swing7.4/.classpath Thu May 22 23:04:29 2008
+++ /trunk/objectmanager-swing7.4/.classpath Mon Aug 10 22:40:07 2009
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry combineaccessrules="false" exported="true" kind="src"
path="/objectmanager-api"/>
- <classpathentry kind="lib" path="lib/db4o-sql.jar"/>
<classpathentry kind="lib" path="lib/forms-1.0.7.jar"/>
<classpathentry kind="lib" path="lib/looks-2.0.4.jar"/>
<classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.2.1.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_03"/>
- <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing/lib/db4o-java1.2.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing7.4/lib/db4o-sql-r27-db4o-7.4-java5.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing7.4/lib/db4o-7.4.106.13438-java5.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing7.4/lib/bloat-1.0.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing7.4/lib/db4o-7.4.106.13438-instrumentation.jar"/>
+ <classpathentry kind="lib" path="G:/Mis Documentos/Java
Workspace/objectmanager-swing7.4/lib/db4o-7.4.106.13438-taj.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/objectmanager-api7.4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=======================================
--- /trunk/objectmanager-swing7.4/build.xml Thu May 22 23:04:29 2008
+++ /trunk/objectmanager-swing7.4/build.xml Mon Aug 10 22:40:07 2009
@@ -11,7 +11,7 @@
<property name="docs" location="docs"/>
<property name="launch" location="launch"/>
<property name="dist.root" location="dist"/>
- <property name="dist.version" value="7.2"/>
+ <property name="dist.version" value="7.4"/>
<property name="version.info" value="${dist.version}"/>
<property name="webstart" value="webstart"/>
<property name="dist-webstart" value="dist-webstart"/>
@@ -39,18 +39,18 @@
<target name="compile" depends="init"
description="compile the source ">
<!-- build dependencies -->
- <ant antfile="../objectmanager-api/build.xml"
- dir="../objectmanager-api"
+ <ant antfile="../objectmanager-api7.4/build.xml"
+ dir="../objectmanager-api7.4"
target="dist"
inheritAll="false">
<property name="om-api.jar" value="${om-api.jar}" />
</ant>
<!-- copy dependencies -->
<copy todir="./lib/">
- <fileset dir="../objectmanager-api/lib/"/>
+ <fileset dir="../objectmanager-api7.4/lib/"/>
</copy>
<copy todir="${lib}" >
- <fileset dir="../objectmanager-api/dist/lib/">
+ <fileset dir="../objectmanager-api7.4/dist/lib/">
<include name="objectmanager-api*.jar" />
</fileset>
</copy>
@@ -85,7 +85,7 @@
<jar jarfile="${dist}/${om.jar}" basedir="${build}">
<manifest>
<attribute name="Class-Path"
- value="lib/${db4o.version} lib/db4o-sql.jar
lib/looks-2.0.4.jar lib/forms-1.0.7.jar lib/${om-api.jar}
lib/db4o-java1.2.jar lib/db4o-taj.jar lib/db4o-instrumentation.jar
lib/bloat-1.0.jar"/>
+ value="lib/${db4o.version}
lib/db4o-sql-r27-db4o-7.4-java5.jar lib/looks-2.0.4.jar lib/forms-1.0.7.jar
lib/${om-api.jar} lib/db4o-7.4.106.13438-java5.jar
lib/db4o-7.4.106.13438-taj.jar lib/db4o-7.4.106.13438-instrumentation.jar
lib/bloat-1.0.jar"/>
<attribute name="Main-Class"
value="com.db4o.objectManager.v2.Dashboard"/>
</manifest>
</jar>
@@ -133,7 +133,7 @@
<!-- There's gotta be a better way than this -->
<signjar jar="${wslib}/${db4o.version}" alias="${alias}"
storepass="secret" keystore="${keystore}"/>
- <signjar jar="${wslib}/db4o-sql.jar" alias="${alias}"
storepass="secret" keystore="${keystore}"/>
+ <signjar jar="${wslib}/db4o-sql-r27-db4o-7.4-java5.jar"
alias="${alias}" storepass="secret" keystore="${keystore}"/>
<signjar jar="${wslib}/forms-1.0.7.jar" alias="${alias}"
storepass="secret" keystore="${keystore}"/>
<signjar jar="${wslib}/looks-2.0.4.jar" alias="${alias}"
storepass="secret" keystore="${keystore}"/>
<signjar jar="${wslib}/${om-api.jar}"
=======================================
---
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/FieldInfoTableModel.java
Wed Dec 19 15:44:00 2007
+++
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/FieldInfoTableModel.java
Mon Aug 10 22:40:07 2009
@@ -4,13 +4,14 @@
import com.db4o.ext.StoredClass;
import com.db4o.ext.StoredField;
import com.db4o.objectmanager.api.helpers.ReflectHelper2;
-import com.spaceprogram.db4o.sql.util.ReflectHelper;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
+import com.spaceprogram.db4o.sql.util.*;
+
/**
* User: treeder
* Date: Sep 11, 2006
=======================================
---
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/MainPanel.java
Wed Dec 19 15:44:00 2007
+++
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/MainPanel.java
Mon Aug 10 22:40:07 2009
@@ -1,42 +1,57 @@
package com.db4o.objectManager.v2;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseListener;
+import java.util.List;
+
+import javax.swing.AbstractButton;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JToggleButton;
+import javax.swing.JToolBar;
+import javax.swing.JTree;
+import javax.swing.KeyStroke;
+import javax.swing.SwingConstants;
+import javax.swing.border.EmptyBorder;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeModel;
+
+import com.spaceprogram.db4o.sql.util.*;
+
import com.db4o.ObjectContainer;
-import com.db4o.reflect.ReflectClass;
-import com.db4o.reflect.ReflectField;
-import com.db4o.objectManager.v2.uif_lite.component.Factory;
-import com.db4o.objectManager.v2.uif_lite.panel.SimpleInternalFrame;
-import com.db4o.objectManager.v2.util.Log;
-import com.db4o.objectManager.v2.util.DateFormatter;
-import com.db4o.objectManager.v2.query.QueryResultsPanel;
+import com.db4o.objectManager.v2.connections.ConnectionHelper;
import com.db4o.objectManager.v2.query.QueryBarPanel;
+import com.db4o.objectManager.v2.query.QueryResultsPanel;
+import com.db4o.objectManager.v2.resources.ResourceManager;
import com.db4o.objectManager.v2.shortcuts.ShortcutsListener;
import com.db4o.objectManager.v2.shortcuts.TabShortCutsListener;
-import com.db4o.objectManager.v2.resources.ResourceManager;
-import com.db4o.objectManager.v2.connections.ConnectionHelper;
+import com.db4o.objectManager.v2.uif_lite.component.Factory;
+import com.db4o.objectManager.v2.uif_lite.panel.SimpleInternalFrame;
+import com.db4o.objectManager.v2.util.DateFormatter;
+import com.db4o.objectManager.v2.util.Log;
import com.db4o.objectmanager.api.DatabaseInspector;
import com.db4o.objectmanager.api.impl.DatabaseInspectorImpl;
import com.db4o.objectmanager.api.prefs.Preferences;
import com.db4o.objectmanager.model.Db4oConnectionSpec;
+import com.db4o.reflect.ReflectClass;
+import com.db4o.reflect.ReflectField;
+import com.jgoodies.forms.factories.Borders;
import com.jgoodies.looks.Options;
import com.jgoodies.looks.plastic.PlasticLookAndFeel;
import com.jgoodies.looks.windows.WindowsLookAndFeel;
-import com.jgoodies.forms.factories.Borders;
-import com.spaceprogram.db4o.sql.util.ReflectHelper;
-
-import javax.swing.*;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.border.EmptyBorder;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseListener;
-import java.util.List;
/**
* <p/>
=======================================
--- /trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/Version Thu
May 22 23:04:29 2008
+++ /trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/Version Mon
Aug 10 22:40:07 2009
@@ -1,1 +1,1 @@
-version=7.2
+version=7.4
=======================================
---
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/connections/ConnectionHelper.java
Wed Dec 19 15:44:00 2007
+++
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/connections/ConnectionHelper.java
Mon Aug 10 22:40:07 2009
@@ -30,8 +30,10 @@
private static ObjectContainer connectToFile(Component frame,
Db4oConnectionSpec connectionSpec) throws Exception {
try {
+
//Db4o.openFile(Db4o.newConfiguration(), "C:\\db\\complexObjectTest.yap");
assertFileExists(connectionSpec.getFullPath());
return Db4o.openFile(connectionSpec.newConfiguration(),
connectionSpec.getFullPath());
+ //return Db4o.openFile(Db4o.newConfiguration(),
connectionSpec.getFullPath());
} catch (DatabaseFileLockedException e) {
OptionPaneHelper.showErrorMessage(frame, "Database file is locked.
Another process must be using it.", "Database File Locked");
throw e;
=======================================
---
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/query/QueryResultsTableModel.java
Thu May 22 23:04:29 2008
+++
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/query/QueryResultsTableModel.java
Mon Aug 10 22:40:07 2009
@@ -5,6 +5,10 @@
import javax.swing.*;
import javax.swing.table.*;
+import com.spaceprogram.db4o.sql.util.*;
+import com.spaceprogram.db4o.sql.*;
+
+
import com.db4o.*;
import com.db4o.activation.ActivationPurpose;
import com.db4o.objectManager.v2.resources.*;
@@ -13,8 +17,6 @@
import com.db4o.objectmanager.api.helpers.*;
import com.db4o.reflect.*;
import com.db4o.ta.*;
-import com.spaceprogram.db4o.sql.*;
-import com.spaceprogram.db4o.sql.util.*;
/**
* User: treeder
@@ -165,7 +167,8 @@
ReflectField[] rfs = ReflectHelper.getDeclaredFieldsInHeirarchy(rc);
if (rfs.length > col - extraColumns) {
ReflectField rf = rfs[col - extraColumns];
- rf.setAccessible();
+ //gishac 10/08/09
+ //rf.setAccessible();
rf.set(o, value);
//System.out.println("Set value on field: " + rf.getName() + " " +
rf.getFieldType() + " new value: " + rf.get(o));
queryResultsPanel.addObjectToBatch(o);
=======================================
---
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/tree/ObjectTreeModel.java
Thu May 22 23:04:29 2008
+++
/trunk/objectmanager-swing7.4/src/com/db4o/objectManager/v2/tree/ObjectTreeModel.java
Mon Aug 10 22:40:07 2009
@@ -6,6 +6,8 @@
import javax.swing.event.*;
import javax.swing.tree.*;
+import com.spaceprogram.db4o.sql.util.*;
+
import com.db4o.activation.ActivationPurpose;
import com.db4o.objectManager.v2.*;
import com.db4o.objectManager.v2.util.*;
@@ -13,8 +15,6 @@
import com.db4o.reflect.*;
import com.db4o.reflect.generic.*;
import com.db4o.ta.*;
-import com.spaceprogram.db4o.sql.util.*;
-
/**
* User: treeder
* Date: Sep 8, 2006
@@ -62,8 +62,10 @@
}
} else {
// todo: could try caching all this reflect information if performance
is bad -> get from ObjectSetMetaData
+ //ReflectHelper.
ReflectField[] fields =
ReflectHelper.getDeclaredFieldsInHeirarchy(reflectClass);
- fields[index].setAccessible();
+ //gishac 10/08/09
+ //fields[index].setAccessible();
Object value = fields[index].get(parentObject);
//System.out.println("getChild parent:" +
parentNode.getObject().getClass() + " index:" + index + " field:" +
fields[index].getName() + " value:" + value);
return new ObjectTreeNode(parentNode, fields[index], value);
@@ -187,7 +189,8 @@
storeSuper = true;
} else {
ReflectField rf = aNode.getField();
- rf.setAccessible();
+ //gishac 10/08/09
+ //rf.setAccessible();
rf.set(parentObject, newOb);
}
if (storeSuper) {