You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by br...@apache.org on 2004/11/03 20:11:48 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/metadata SequenceDescriptor.java ObjectCacheDescriptor.java
brj 2004/11/03 11:11:48
Modified: src/java/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
TransactionImpl.java ObjectEnvelopeTable.java
src/java/org/apache/ojb/broker/accesslayer Tag:
OJB_1_0_RELEASE PkIterator.java
src/java/org/apache/ojb/otm/core Tag: OJB_1_0_RELEASE
ConcreteEditingContext.java
src/test/org/apache/ojb/broker Tag: OJB_1_0_RELEASE
PersistenceBrokerTest.java
src/xdoclet/java/src/xdoclet/modules/ojb Tag:
OJB_1_0_RELEASE OjbTagsHandler.java
src/java/org/apache/ojb/broker/util/logging Tag:
OJB_1_0_RELEASE Log4jLoggerImpl.java
src/java/org/apache/ojb/broker/metadata Tag: OJB_1_0_RELEASE
SequenceDescriptor.java ObjectCacheDescriptor.java
Log:
make it compile with java 1.5
Revision Changes Path
No revision
No revision
1.59.2.6 +16 -16 db-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java
Index: TransactionImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java,v
retrieving revision 1.59.2.5
retrieving revision 1.59.2.6
diff -u -r1.59.2.5 -r1.59.2.6
--- TransactionImpl.java 30 Oct 2004 22:11:37 -0000 1.59.2.5
+++ TransactionImpl.java 3 Nov 2004 19:11:47 -0000 1.59.2.6
@@ -357,10 +357,10 @@
try
{
- Enumeration enum = objectEnvelopeTable.elements();
- while (enum.hasMoreElements())
+ Enumeration en = objectEnvelopeTable.elements();
+ while (en.hasMoreElements())
{
- Object obj = ((ObjectEnvelope) enum.nextElement()).getObject();
+ Object obj = ((ObjectEnvelope) en.nextElement()).getObject();
removeLock(obj, Transaction.WRITE);
}
@@ -1165,28 +1165,28 @@
protected void performTransactionAwareBeforeCommit()
{
- Enumeration enum = objectEnvelopeTable.elements();
- while (enum.hasMoreElements())
+ Enumeration en = objectEnvelopeTable.elements();
+ while (en.hasMoreElements())
{
- ((ObjectEnvelope) enum.nextElement()).beforeCommit();
+ ((ObjectEnvelope) en.nextElement()).beforeCommit();
}
}
protected void performTransactionAwareAfterCommit()
{
- Enumeration enum = objectEnvelopeTable.elements();
- while (enum.hasMoreElements())
+ Enumeration en = objectEnvelopeTable.elements();
+ while (en.hasMoreElements())
{
- ((ObjectEnvelope) enum.nextElement()).afterCommit();
+ ((ObjectEnvelope) en.nextElement()).afterCommit();
}
}
protected void performTransactionAwareBeforeRollback()
{
- Enumeration enum = objectEnvelopeTable.elements();
- while (enum.hasMoreElements())
+ Enumeration en = objectEnvelopeTable.elements();
+ while (en.hasMoreElements())
{
try
{
- ((ObjectEnvelope) enum.nextElement()).beforeAbort();
+ ((ObjectEnvelope) en.nextElement()).beforeAbort();
}
catch(Exception e)
{
@@ -1196,10 +1196,10 @@
}
protected void performTransactionAwareAfterRollback()
{
- Enumeration enum = objectEnvelopeTable.elements();
- while (enum.hasMoreElements())
+ Enumeration en = objectEnvelopeTable.elements();
+ while (en.hasMoreElements())
{
- ((ObjectEnvelope) enum.nextElement()).afterAbort();
+ ((ObjectEnvelope) en.nextElement()).afterAbort();
}
}
}
1.32.2.6 +3 -3 db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
Index: ObjectEnvelopeTable.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java,v
retrieving revision 1.32.2.5
retrieving revision 1.32.2.6
diff -u -r1.32.2.5 -r1.32.2.6
--- ObjectEnvelopeTable.java 30 Oct 2004 22:11:37 -0000 1.32.2.5
+++ ObjectEnvelopeTable.java 3 Nov 2004 19:11:47 -0000 1.32.2.6
@@ -527,10 +527,10 @@
{
ToStringBuilder buf = new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE);
buf.append("### ObjectEnvelopeTable dump:");
- Enumeration enum = elements();
- while (enum.hasMoreElements())
+ Enumeration en = elements();
+ while (en.hasMoreElements())
{
- ObjectEnvelope mod = (ObjectEnvelope) enum.nextElement();
+ ObjectEnvelope mod = (ObjectEnvelope) en.nextElement();
buf.append(mod.toString());
}
return buf.toString();
No revision
No revision
1.8.2.1 +3 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/PkIterator.java
Index: PkIterator.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/PkIterator.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- PkIterator.java 22 May 2004 09:51:26 -0000 1.8
+++ PkIterator.java 3 Nov 2004 19:11:47 -0000 1.8.2.1
@@ -27,9 +27,9 @@
static final long serialVersionUID = 1906110293623601724L;
private Enumeration internalEnum;
- public PkIterator(Enumeration enum)
+ public PkIterator(Enumeration en)
{
- internalEnum = enum;
+ internalEnum = en;
}
public boolean hasNext()
No revision
No revision
1.47.2.1 +2 -2 db-ojb/src/java/org/apache/ojb/otm/core/ConcreteEditingContext.java
Index: ConcreteEditingContext.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/ConcreteEditingContext.java,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -u -r1.47 -r1.47.2.1
--- ConcreteEditingContext.java 22 May 2004 11:39:18 -0000 1.47
+++ ConcreteEditingContext.java 3 Nov 2004 19:11:47 -0000 1.47.2.1
@@ -885,9 +885,9 @@
{
return (fld1 == fld2);
}
- else if (fld1 instanceof BigDecimal)
+ else if ((fld1 instanceof BigDecimal) && (fld2 instanceof BigDecimal))
{
- return (((BigDecimal) fld1).compareTo(fld2) == 0);
+ return (((BigDecimal) fld1).compareTo((BigDecimal) fld2) == 0);
}
else if ((fld1 instanceof Date) && (fld2 instanceof Date))
{
No revision
No revision
1.42.2.2 +8 -8 db-ojb/src/test/org/apache/ojb/broker/PersistenceBrokerTest.java
Index: PersistenceBrokerTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/PersistenceBrokerTest.java,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -u -r1.42.2.1 -r1.42.2.2
--- PersistenceBrokerTest.java 4 Oct 2004 13:25:52 -0000 1.42.2.1
+++ PersistenceBrokerTest.java 3 Nov 2004 19:11:47 -0000 1.42.2.2
@@ -1319,14 +1319,14 @@
Criteria criteria = new Criteria();
criteria.addEqualTo("articleName", name);
Query query = QueryFactory.newQuery(Article.class, criteria);
- Enumeration enum = broker.getPKEnumerationByQuery(ArticlePrimaryKey.class, query);
- while (enum.hasMoreElements())
+ Enumeration en = broker.getPKEnumerationByQuery(ArticlePrimaryKey.class, query);
+ while (en.hasMoreElements())
{
- ArticlePrimaryKey pk = (ArticlePrimaryKey) enum.nextElement();
+ ArticlePrimaryKey pk = (ArticlePrimaryKey) en.nextElement();
deleteArticle(pk.id);
}
- enum = broker.getPKEnumerationByQuery(ArticlePrimaryKey.class, query);
- assertTrue("size of collection should be zero", !enum.hasMoreElements());
+ en = broker.getPKEnumerationByQuery(ArticlePrimaryKey.class, query);
+ assertTrue("size of collection should be zero", !en.hasMoreElements());
//2. insert 3 matching items
int id1 = 4001;
int id2 = 4002;
@@ -1343,12 +1343,12 @@
broker.store(a3);
broker.commitTransaction();
// 3. check if all items are found
- enum = broker.getPKEnumerationByQuery(ArticlePrimaryKey.class, query);
+ en = broker.getPKEnumerationByQuery(ArticlePrimaryKey.class, query);
int count = 0;
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
count++;
- Article tmp = readArticleByIdentity(((ArticlePrimaryKey) enum.nextElement()).id);
+ Article tmp = readArticleByIdentity(((ArticlePrimaryKey) en.nextElement()).id);
assertEquals("should be same value", name, tmp.getArticleName());
}
assertEquals("Iterator should produce 3 items", 3, count);
No revision
No revision
1.13.2.1 +4 -4 db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java
Index: OjbTagsHandler.java
===================================================================
RCS file: /home/cvs/db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- OjbTagsHandler.java 28 Jun 2004 20:42:19 -0000 1.13
+++ OjbTagsHandler.java 3 Nov 2004 19:11:47 -0000 1.13.2.1
@@ -1184,9 +1184,9 @@
}
attributes.remove(ATTRIBUTE_NAME);
- for (Enumeration enum = attributes.keys(); enum.hasMoreElements();)
+ for (Enumeration en = attributes.keys(); en.hasMoreElements();)
{
- key = (String)enum.nextElement();
+ key = (String)en.nextElement();
value = attributes.getProperty(key);
mods.setProperty(key, value);
}
@@ -1266,9 +1266,9 @@
}
attributes.remove(ATTRIBUTE_NAME);
- for (Enumeration enum = attributes.keys(); enum.hasMoreElements();)
+ for (Enumeration en = attributes.keys(); en.hasMoreElements();)
{
- key = (String)enum.nextElement();
+ key = (String)en.nextElement();
value = attributes.getProperty(key);
mods.setProperty(key, value);
}
No revision
No revision
1.16.2.1 +3 -3 db-ojb/src/java/org/apache/ojb/broker/util/logging/Log4jLoggerImpl.java
Index: Log4jLoggerImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/Log4jLoggerImpl.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- Log4jLoggerImpl.java 1 Jun 2004 21:42:21 -0000 1.16
+++ Log4jLoggerImpl.java 3 Nov 2004 19:11:48 -0000 1.16.2.1
@@ -71,9 +71,9 @@
if (log4jConfigured)
return true;
- Enumeration enum = org.apache.log4j.Logger.getRootLogger().getAllAppenders();
+ Enumeration en = org.apache.log4j.Logger.getRootLogger().getAllAppenders();
- if (!(enum instanceof org.apache.log4j.helpers.NullEnumeration))
+ if (!(en instanceof org.apache.log4j.helpers.NullEnumeration))
{
log4jConfigured = true;
return true;
No revision
No revision
1.11.2.1 +3 -3 db-ojb/src/java/org/apache/ojb/broker/metadata/SequenceDescriptor.java
Index: SequenceDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/SequenceDescriptor.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- SequenceDescriptor.java 13 Jun 2004 08:26:01 -0000 1.11
+++ SequenceDescriptor.java 3 Nov 2004 19:11:48 -0000 1.11.2.1
@@ -133,10 +133,10 @@
return "";
StringBuffer buf = new StringBuffer();
- Enumeration enum = prop.keys();
- while( enum.hasMoreElements() )
+ Enumeration en = prop.keys();
+ while( en.hasMoreElements() )
{
- String key = ( String ) enum.nextElement();
+ String key = ( String ) en.nextElement();
String value = prop.getProperty( key );
buf.append( " <attribute attribute-name=\"" );
buf.append( key );
1.6.2.1 +3 -3 db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectCacheDescriptor.java
Index: ObjectCacheDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectCacheDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- ObjectCacheDescriptor.java 13 Jun 2004 08:26:00 -0000 1.6
+++ ObjectCacheDescriptor.java 3 Nov 2004 19:11:48 -0000 1.6.2.1
@@ -119,10 +119,10 @@
if(prop == null || prop.isEmpty()) return "";
StringBuffer buf = new StringBuffer(1024);
- Enumeration enum = prop.keys();
- while (enum.hasMoreElements())
+ Enumeration en = prop.keys();
+ while (en.hasMoreElements())
{
- String key = (String) enum.nextElement();
+ String key = (String) en.nextElement();
String value = prop.getProperty(key);
buf.append(" <attribute attribute-name=\"");
buf.append(key);
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org