You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/07/19 23:56:53 UTC
svn commit: r423627 - in /incubator/openjpa/trunk:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/
openjpa-jdbc/src/main...
Author: pcl
Date: Wed Jul 19 14:56:52 2006
New Revision: 423627
URL: http://svn.apache.org/viewvc?rev=423627&view=rev
Log:
cleaned up some dead code
Modified:
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java Wed Jul 19 14:56:52 2006
@@ -20,7 +20,6 @@
import org.apache.openjpa.jdbc.meta.MappingRepository;
import org.apache.openjpa.lib.conf.Configuration;
import org.apache.openjpa.lib.conf.PluginValue;
-import org.apache.openjpa.lib.util.Localizer;
import serp.util.Strings;
/**
@@ -32,9 +31,6 @@
*/
public class MappingRepositoryValue
extends PluginValue {
-
- private static final Localizer _loc = Localizer.forPackage
- (MappingRepositoryValue.class);
public MappingRepositoryValue(String prop) {
super(prop, true);
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java Wed Jul 19 14:56:52 2006
@@ -35,7 +35,6 @@
import org.apache.openjpa.lib.rop.SimpleResultList;
import org.apache.openjpa.lib.rop.SoftRandomAccessResultList;
import org.apache.openjpa.lib.rop.WindowResultList;
-import org.apache.openjpa.lib.util.Localizer;
/**
* JDBC extensions to OpenJPA's {@link FetchConfiguration}.
@@ -48,9 +47,6 @@
implements JDBCFetchConfiguration {
private static final String[] EMPTY_STRINGS = new String[0];
-
- private static final Localizer _loc = Localizer.forPackage
- (JDBCFetchConfigurationImpl.class);
private int _eagerMode = 0;
private int _subclassMode = 0;
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java Wed Jul 19 14:56:52 2006
@@ -440,7 +440,6 @@
JDBCFetchConfiguration fetch = (JDBCFetchConfiguration)
ctx.getFetchConfiguration();
DBDictionary dict = _store.getDBDictionary();
- int subs = (subclasses) ? Select.SUBS_JOINABLE : Select.SUBS_NONE;
SQLBuffer[] sql = new SQLBuffer[mappings.length];
JDBCExpressionFactory jdbcFactory;
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java Wed Jul 19 14:56:52 2006
@@ -87,7 +87,6 @@
}
Object[] vals = new Object[_cols];
- Integer index;
for (int i = 0; i < vals.length; i++)
vals[i] = _res.getObject(Numbers.valueOf(i + 1),
JavaSQLTypes.JDBC_DEFAULT, null);
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java Wed Jul 19 14:56:52 2006
@@ -121,7 +121,6 @@
buf.append("(");
Object[] vals;
- int len;
Column col;
for (Iterator itr = coll.iterator(); itr.hasNext();) {
vals = (Object[]) itr.next();
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java Wed Jul 19 14:56:52 2006
@@ -47,10 +47,6 @@
public class JDBCExpressionFactory
implements ExpressionFactory {
- private static final int CACHE_NULL = 0;
- private static final int CACHE_JOINS = 1;
- private static final int CACHE_FULL = 2;
-
private static final Val NULL = new Null();
private static final Val CURRENT_DATE =
new CurrentDate(CurrentDate.DATE);
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java Wed Jul 19 14:56:52 2006
@@ -290,7 +290,7 @@
Joins joins = null;
if (sel.getSubselectPath() != null)
joins = sel.newJoins().setSubselect(sel.getSubselectPath());
- JDBCFetchConfiguration fetch = fetchState.getJDBCFetchConfiguration();
+
// build ordering clauses before select so that any eager join
// ordering gets applied after query ordering
for (int i = 0; i < exps.ordering.length; i++)
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java Wed Jul 19 14:56:52 2006
@@ -1103,7 +1103,6 @@
int constIdx = 0;
int idx;
- Column col;
for (int i = 0; i < joins.length; i++) {
// const columns are indexed after std join columns in fk IO
if (joins[i][1]instanceof Column)
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java Wed Jul 19 14:56:52 2006
@@ -24,7 +24,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.openjpa.jdbc.schema.Column;
import org.apache.openjpa.jdbc.sql.Joins;
@@ -381,7 +380,6 @@
List rpath = new ArrayList(tokens.length);
ClassMapping candidate = getCandidateTypeMapping();
FieldMapping fm = null;
- Set eagers;
for (int i = 0; i < tokens.length - 1; i++) {
fm = candidate.getFieldMapping(tokens[i]);
if (fm == null)
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java Wed Jul 19 14:56:52 2006
@@ -476,15 +476,13 @@
private void resolveMapping() {
// mark mapped columns
Column[] cols;
- int insertFlag, updateFlag;
+ int insertFlag;
if (_fk != null) {
cols = _fk.getColumns();
insertFlag = Column.FLAG_FK_INSERT;
- updateFlag = Column.FLAG_FK_UPDATE;
} else {
cols = getColumns();
insertFlag = Column.FLAG_DIRECT_INSERT;
- updateFlag = Column.FLAG_DIRECT_UPDATE;
}
ColumnIO io = getColumnIO();
for (int i = 0; i < cols.length; i++) {
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java Wed Jul 19 14:56:52 2006
@@ -21,7 +21,6 @@
import org.apache.openjpa.jdbc.schema.Index;
import org.apache.openjpa.jdbc.schema.SchemaGroup;
import org.apache.openjpa.jdbc.schema.Table;
-import org.apache.openjpa.lib.util.Localizer;
/**
* Information about the mapping from a version indicator to the schema, in
@@ -33,9 +32,6 @@
*/
public class VersionMappingInfo
extends MappingInfo {
-
- private static final Localizer _loc = Localizer.forPackage
- (VersionMappingInfo.class);
/**
* Return the columns set for this version, based on the given templates.
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java Wed Jul 19 14:56:52 2006
@@ -53,8 +53,6 @@
private static final Localizer _loc = Localizer.forPackage
(RelationToManyTableFieldStrategy.class);
- private Boolean _fkOid = null;
-
protected ClassMapping[] getIndependentElementMappings(boolean traverse) {
return (traverse)
? field.getElementMapping().getIndependentTypeMappings()
@@ -138,15 +136,6 @@
field.setOrderColumn(orderCol);
field.setOrderColumnIO(finfo.getColumnIO());
field.mapPrimaryKey(adapt);
- }
-
- public void initialize() {
- ValueMapping elem = field.getElementMapping();
- ForeignKey fk = elem.getForeignKey();
- if (fk == null)
- _fkOid = Boolean.TRUE;
- else
- _fkOid = elem.getTypeMapping().isForeignKeyObjectId(fk);
}
public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java Wed Jul 19 14:56:52 2006
@@ -130,9 +130,6 @@
*/
public static DecoratingDataSource decorateDataSource(DataSource ds,
JDBCConfiguration conf, boolean factory2) {
- String driver = (factory2)
- ? conf.getConnection2DriverName()
- : conf.getConnectionDriverName();
Options opts = Configurations.parseProperties((factory2)
? conf.getConnectionFactory2Properties()
: conf.getConnectionFactoryProperties());
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java Wed Jul 19 14:56:52 2006
@@ -331,7 +331,6 @@
// have to do fks after all schemas are imported
Table[] tabs;
ForeignKey[] fks;
- Schema clone;
for (int i = 0; i < schemas.length; i++) {
tabs = schemas[i].getTables();
for (int j = 0; j < tabs.length; j++) {
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java Wed Jul 19 14:56:52 2006
@@ -18,7 +18,6 @@
import java.io.File;
import org.apache.openjpa.lib.meta.SourceTracker;
-import org.apache.openjpa.lib.util.Localizer;
/**
* Represents a database sequence.
@@ -28,8 +27,6 @@
public class Sequence
extends ReferenceCounter
implements Comparable, SourceTracker {
-
- private static final Localizer _loc = Localizer.forPackage(Sequence.class);
private String _name = null;
private String _fullName = null;
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java Wed Jul 19 14:56:52 2006
@@ -25,7 +25,6 @@
import org.apache.commons.collections.map.LinkedMap;
import org.apache.commons.lang.StringUtils;
import org.apache.openjpa.lib.meta.SourceTracker;
-import org.apache.openjpa.lib.util.Localizer;
/**
* Represents a database table.
@@ -36,8 +35,6 @@
public class Table
extends NameSet
implements Comparable, SourceTracker {
-
- private static final Localizer _loc = Localizer.forPackage(Table.class);
private String _name = null;
private String _schemaName = null;
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java Wed Jul 19 14:56:52 2006
@@ -46,7 +46,6 @@
private static final Localizer _loc = Localizer.forPackage
(XMLSchemaSerializer.class);
- private final JDBCConfiguration _conf;
private final Collection _tables = new TreeSet();
private final Collection _seqs = new TreeSet();
@@ -55,7 +54,6 @@
*/
public XMLSchemaSerializer(JDBCConfiguration conf) {
setLog(conf.getLog(JDBCConfiguration.LOG_SCHEMA));
- _conf = conf;
}
public Table[] getTables() {
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java Wed Jul 19 14:56:52 2006
@@ -150,7 +150,6 @@
// the comparator
int least = -1;
Object orderVal = null;
- int cmp;
for (int i = 0; i < _order.length; i++) {
if (_status[i] != CURRENT)
continue;
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java Wed Jul 19 14:56:52 2006
@@ -40,7 +40,6 @@
// VALID flag in superclass uses 2 << 0
private static final byte PK_SET = 2 << 1;
private static final byte PK_WHERE = 2 << 2;
- private static final byte PK_FLUSHED = 2 << 3;
private static final byte DEPENDENT = 2 << 4;
private static final Localizer _loc = Localizer.forPackage
@@ -214,7 +213,6 @@
*/
private void recordForeignKey(ForeignKey fk, ColumnIO io,
OpenJPAStateManager sm, boolean set) {
- OpenJPAStateManager[] arr = null;
if (set) {
// force valid
if (canSetAny(io, fk.getColumns().length
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java Wed Jul 19 14:56:52 2006
@@ -25,7 +25,6 @@
import org.apache.openjpa.jdbc.schema.Table;
import org.apache.openjpa.kernel.OpenJPAStateManager;
-import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.util.InternalException;
/**
@@ -36,9 +35,6 @@
*/
public class RowManagerImpl
implements RowManager {
-
- private static final Localizer _loc = Localizer.forPackage
- (RowManagerImpl.class);
private Map _inserts = null;
private Map _updates = null;
Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java Wed Jul 19 14:56:52 2006
@@ -818,7 +818,7 @@
PathJoins pj = getJoins(joins, false);
Column[] cols = mapping.getPrimaryKeyColumns();
int seld = 0;
- for (int i = 0, idx; i < cols.length; i++)
+ for (int i = 0; i < cols.length; i++)
if (columnOperation(cols[i], sel, asc, pj, aliasOrder))
seld |= 2 << i;
Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java?rev=423627&r1=423626&r2=423627&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java Wed Jul 19 14:56:52 2006
@@ -20,8 +20,6 @@
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;