[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/om BaseDBCondition.java, 1.
Brought to you by:
steinbeck
Menu
▾
▴
[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/om BaseDBCondition.java, 1.9, 1.10 BaseDBMachine.java, 1.1, 1.2 BaseDBMachinePeer.java, 1.1, 1.2 BaseDBMolecule.java, 1.40, 1.41 BaseDBSample.java, 1.7, 1.8 BaseDBSamplePeer.java, 1.6, 1.7 BaseNmrshiftdbUser.java, 1.23, 1.24 DBLabGroup.java, 1.3, 1.4 DBMachine.java, 1.1, 1.2 DBMachinePeer.java, 1.1, 1.2 DBSpectrum.java, 1.189, 1.190
|
From: Stefan K. <sh...@us...> - 2006-10-10 15:20:36
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12846/src/java/org/openscience/nmrshiftdb/om Modified Files: BaseDBCondition.java BaseDBMachine.java BaseDBMachinePeer.java BaseDBMolecule.java BaseDBSample.java BaseDBSamplePeer.java BaseNmrshiftdbUser.java DBLabGroup.java DBMachine.java DBMachinePeer.java DBSpectrum.java Log Message: highlighting now also works for the table Index: BaseDBCondition.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseDBCondition.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** BaseDBCondition.java 6 Oct 2006 20:12:10 -0000 1.9 --- BaseDBCondition.java 10 Oct 2006 15:20:31 -0000 1.10 *************** *** 2,14 **** ! import java.util.*; ! import java.math.*; ! import org.apache.turbine.om.*; import org.apache.turbine.om.peer.BasePeer; - import org.apache.turbine.util.db.Criteria; import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.StringUtils; ! import org.apache.turbine.util.ParameterParser; ! import org.apache.turbine.util.Log; import org.apache.turbine.util.db.pool.DBConnection; --- 2,16 ---- ! import java.util.List; ! import java.util.Vector; ! ! import org.apache.turbine.om.BaseObject; ! import org.apache.turbine.om.NumberKey; ! import org.apache.turbine.om.ObjectKey; ! import org.apache.turbine.om.Persistent; ! import org.apache.turbine.om.Retrievable; import org.apache.turbine.om.peer.BasePeer; import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.db.Criteria; import org.apache.turbine.util.db.pool.DBConnection; Index: BaseDBMachine.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseDBMachine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** BaseDBMachine.java 6 Oct 2006 20:18:37 -0000 1.1 --- BaseDBMachine.java 10 Oct 2006 15:20:31 -0000 1.2 *************** *** 2,14 **** ! import java.util.*; ! import java.math.*; ! import org.apache.turbine.om.*; import org.apache.turbine.om.peer.BasePeer; - import org.apache.turbine.util.db.Criteria; import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.StringUtils; ! import org.apache.turbine.util.ParameterParser; ! import org.apache.turbine.util.Log; import org.apache.turbine.util.db.pool.DBConnection; --- 2,16 ---- ! import java.util.List; ! import java.util.Vector; ! ! import org.apache.turbine.om.BaseObject; ! import org.apache.turbine.om.NumberKey; ! import org.apache.turbine.om.ObjectKey; ! import org.apache.turbine.om.Persistent; ! import org.apache.turbine.om.Retrievable; import org.apache.turbine.om.peer.BasePeer; import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.db.Criteria; import org.apache.turbine.util.db.pool.DBConnection; Index: BaseDBMachinePeer.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseDBMachinePeer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** BaseDBMachinePeer.java 6 Oct 2006 20:18:37 -0000 1.1 --- BaseDBMachinePeer.java 10 Oct 2006 15:20:31 -0000 1.2 *************** *** 1,19 **** package org.openscience.nmrshiftdb.om; ! import java.util.*; ! import java.math.*; ! import java.sql.*; ! import com.workingdogs.village.*; ! import org.apache.turbine.om.*; ! import org.apache.turbine.om.peer.*; ! import org.apache.turbine.util.*; ! import org.apache.turbine.util.db.*; ! import org.apache.turbine.util.db.map.*; ! import org.apache.turbine.util.db.pool.DBConnection; import org.apache.turbine.services.db.TurbineDB; ! import org.apache.turbine.util.TurbineException; ! // Local classes ! import org.openscience.nmrshiftdb.om.map.*; /** --- 1,19 ---- package org.openscience.nmrshiftdb.om; ! import java.util.Vector; ! ! import org.apache.turbine.om.NumberKey; ! import org.apache.turbine.om.ObjectKey; ! import org.apache.turbine.om.peer.BasePeer; import org.apache.turbine.services.db.TurbineDB; ! import org.apache.turbine.util.Log; ! import org.apache.turbine.util.db.Criteria; ! import org.apache.turbine.util.db.map.MapBuilder; ! import org.apache.turbine.util.db.map.TableMap; ! import org.apache.turbine.util.db.pool.DBConnection; ! import org.openscience.nmrshiftdb.om.map.DBMachineMapBuilder; ! import com.workingdogs.village.QueryDataSet; ! import com.workingdogs.village.Record; /** Index: BaseDBMolecule.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseDBMolecule.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -r1.40 -r1.41 *** BaseDBMolecule.java 6 Oct 2006 20:12:10 -0000 1.40 --- BaseDBMolecule.java 10 Oct 2006 15:20:31 -0000 1.41 *************** *** 2,14 **** ! import java.util.*; ! import java.math.*; ! import org.apache.turbine.om.*; import org.apache.turbine.om.peer.BasePeer; - import org.apache.turbine.util.db.Criteria; import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.StringUtils; ! import org.apache.turbine.util.ParameterParser; ! import org.apache.turbine.util.Log; import org.apache.turbine.util.db.pool.DBConnection; --- 2,17 ---- ! import java.util.Date; ! import java.util.List; ! import java.util.Vector; ! ! import org.apache.turbine.om.BaseObject; ! import org.apache.turbine.om.NumberKey; ! import org.apache.turbine.om.ObjectKey; ! import org.apache.turbine.om.Persistent; ! import org.apache.turbine.om.Retrievable; import org.apache.turbine.om.peer.BasePeer; import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.db.Criteria; import org.apache.turbine.util.db.pool.DBConnection; Index: BaseDBSample.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseDBSample.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** BaseDBSample.java 6 Oct 2006 20:12:10 -0000 1.7 --- BaseDBSample.java 10 Oct 2006 15:20:31 -0000 1.8 *************** *** 2,14 **** ! import java.util.*; ! import java.math.*; ! import org.apache.turbine.om.*; import org.apache.turbine.om.peer.BasePeer; - import org.apache.turbine.util.db.Criteria; import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.StringUtils; ! import org.apache.turbine.util.ParameterParser; ! import org.apache.turbine.util.Log; import org.apache.turbine.util.db.pool.DBConnection; --- 2,17 ---- ! import java.util.Date; ! import java.util.List; ! import java.util.Vector; ! ! import org.apache.turbine.om.BaseObject; ! import org.apache.turbine.om.NumberKey; ! import org.apache.turbine.om.ObjectKey; ! import org.apache.turbine.om.Persistent; ! import org.apache.turbine.om.Retrievable; import org.apache.turbine.om.peer.BasePeer; import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.db.Criteria; import org.apache.turbine.util.db.pool.DBConnection; Index: BaseDBSamplePeer.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseDBSamplePeer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** BaseDBSamplePeer.java 6 Oct 2006 20:12:10 -0000 1.6 --- BaseDBSamplePeer.java 10 Oct 2006 15:20:31 -0000 1.7 *************** *** 1,19 **** package org.openscience.nmrshiftdb.om; ! import java.util.*; ! import java.math.*; ! import java.sql.*; ! import com.workingdogs.village.*; ! import org.apache.turbine.om.*; ! import org.apache.turbine.om.peer.*; ! import org.apache.turbine.util.*; ! import org.apache.turbine.util.db.*; ! import org.apache.turbine.util.db.map.*; ! import org.apache.turbine.util.db.pool.DBConnection; import org.apache.turbine.services.db.TurbineDB; ! import org.apache.turbine.util.TurbineException; ! // Local classes ! import org.openscience.nmrshiftdb.om.map.*; /** --- 1,19 ---- package org.openscience.nmrshiftdb.om; ! import java.util.Vector; ! ! import org.apache.turbine.om.NumberKey; ! import org.apache.turbine.om.ObjectKey; ! import org.apache.turbine.om.peer.BasePeer; import org.apache.turbine.services.db.TurbineDB; ! import org.apache.turbine.util.Log; ! import org.apache.turbine.util.db.Criteria; ! import org.apache.turbine.util.db.map.MapBuilder; ! import org.apache.turbine.util.db.map.TableMap; ! import org.apache.turbine.util.db.pool.DBConnection; ! import org.openscience.nmrshiftdb.om.map.DBSampleMapBuilder; ! import com.workingdogs.village.QueryDataSet; ! import com.workingdogs.village.Record; /** Index: BaseNmrshiftdbUser.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/BaseNmrshiftdbUser.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** BaseNmrshiftdbUser.java 6 Oct 2006 20:12:10 -0000 1.23 --- BaseNmrshiftdbUser.java 10 Oct 2006 15:20:31 -0000 1.24 *************** *** 2,15 **** ! import java.util.*; ! import java.math.*; ! import org.apache.turbine.om.*; ! import org.apache.turbine.om.peer.BasePeer; import org.apache.turbine.util.db.Criteria; - import org.apache.turbine.util.ObjectUtils; - import org.apache.turbine.util.StringUtils; - import org.apache.turbine.util.ParameterParser; - import org.apache.turbine.util.Log; - import org.apache.turbine.util.db.pool.DBConnection; /** --- 2,9 ---- ! import java.util.Vector; ! ! import org.apache.turbine.om.Retrievable; import org.apache.turbine.util.db.Criteria; /** Index: DBLabGroup.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/DBLabGroup.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** DBLabGroup.java 20 Sep 2006 11:35:47 -0000 1.3 --- DBLabGroup.java 10 Oct 2006 15:20:31 -0000 1.4 *************** *** 3,11 **** // JDK classes import org.apache.turbine.om.Persistent; import org.apache.turbine.util.db.Criteria; - import java.util.Vector; - /** * You should add additional methods to this class to meet the --- 3,11 ---- // JDK classes + import java.util.Vector; + import org.apache.turbine.om.Persistent; import org.apache.turbine.util.db.Criteria; /** * You should add additional methods to this class to meet the Index: DBMachine.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/DBMachine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** DBMachine.java 6 Oct 2006 20:18:37 -0000 1.1 --- DBMachine.java 10 Oct 2006 15:20:31 -0000 1.2 *************** *** 3,17 **** // JDK classes ! import java.util.*; ! ! // Turbine classes ! import org.apache.turbine.om.*; ! import org.apache.turbine.om.peer.BasePeer; ! import org.apache.turbine.util.db.Criteria; ! import org.apache.turbine.util.ObjectUtils; ! import org.apache.turbine.util.StringUtils; ! import org.apache.turbine.util.ParameterParser; ! import org.apache.turbine.util.Log; ! import org.apache.turbine.util.db.pool.DBConnection; /** --- 3,7 ---- // JDK classes ! import org.apache.turbine.om.Persistent; /** Index: DBMachinePeer.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/DBMachinePeer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** DBMachinePeer.java 6 Oct 2006 20:18:37 -0000 1.1 --- DBMachinePeer.java 10 Oct 2006 15:20:31 -0000 1.2 *************** *** 2,19 **** // JDK classes - import java.util.*; - - // Village classes - import com.workingdogs.village.*; - - // Turbine classes - import org.apache.turbine.om.peer.*; - import org.apache.turbine.util.*; - import org.apache.turbine.util.db.*; - import org.apache.turbine.util.db.map.*; - import org.apache.turbine.util.db.pool.DBConnection; - - // Local classes - import org.openscience.nmrshiftdb.om.map.*; /** --- 2,5 ---- Index: DBSpectrum.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/DBSpectrum.java,v retrieving revision 1.189 retrieving revision 1.190 diff -C2 -r1.189 -r1.190 *** DBSpectrum.java 9 Oct 2006 13:24:37 -0000 1.189 --- DBSpectrum.java 10 Oct 2006 15:20:31 -0000 1.190 *************** *** 25,29 **** import org.apache.turbine.util.db.pool.DBConnection; import org.openscience.cdk.exception.CDKException; - import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IMolecule; import org.openscience.nmrshiftdb.util.AtomUtils; --- 25,28 ---- |
