Author: aadamchik
Date: Sun May 30 16:37:30 2010
New Revision: 949529
URL: http://svn.apache.org/viewvc?rev=949529&view=rev
Log:
cleanup, refactoring...
* unused imports
* deprecation notes without a release #
* removing EventManager method 'getEventQueue' that returns non-public Dispatch
class (it is unused in Cayenne anyways)
* source formatting
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/DefaultEventManager.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/EventManager.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DefaultEntityResultSegment.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java?rev=949529&r1=949528&r2=949529&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
Sun May 30 16:37:30 2010
@@ -62,7 +62,7 @@ public class ColumnDescriptor implements
* Creates a column descriptor with user-specified parameters.
*
* @since 1.2
- * @deprecated use ColumnDescriptor(String columnName, int jdbcType)
instead
+ * @deprecated since 3.1 use ColumnDescriptor(String columnName, int
jdbcType) instead
*/
@Deprecated
public ColumnDescriptor(String columnName, int jdbcType, String javaClass)
{
@@ -219,9 +219,10 @@ public class ColumnDescriptor implements
}
public String
getQualifiedColumnNameWithQuoteSqlIdentifiers(QuotingStrategy strategy) {
- String nameWithQuoteSqlIdentifiers = strategy.quoteString( name );
- return (namePrefix != null) ? strategy.quoteString( namePrefix ) + '.'
+
- nameWithQuoteSqlIdentifiers: nameWithQuoteSqlIdentifiers;
+ String nameWithQuoteSqlIdentifiers = strategy.quoteString(name);
+ return (namePrefix != null) ? strategy.quoteString(namePrefix)
+ + '.'
+ + nameWithQuoteSqlIdentifiers : nameWithQuoteSqlIdentifiers;
}
public int getJdbcType() {
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java?rev=949529&r1=949528&r2=949529&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
Sun May 30 16:37:30 2010
@@ -49,7 +49,7 @@ class EntityRowReader implements RowRead
if (classDescriptor != null) {
this.entityName = classDescriptor.getEntity().getName();
}
-
+
int segmentWidth = segmentMetadata.getFields().size();
this.startIndex = segmentMetadata.getColumnOffset();
this.converters = new ExtendedType[segmentWidth];
@@ -65,11 +65,14 @@ class EntityRowReader implements RowRead
// query translator may change the order of fields compare to the
entity
// result, so figure out DataRow labels by doing reverse lookup of
// RowDescriptor labels...
- if(columns[startIndex + i].getDataRowKey().contains(".")){
- // if the dataRowKey contains ".", it is prefetched column and
we can use it instead of search the name by alias
- labels[i]=columns[startIndex + i].getDataRowKey();
- }else{
- labels[i] = segmentMetadata.getColumnPath(columns[startIndex +
i].getDataRowKey());
+ if (columns[startIndex + i].getDataRowKey().contains(".")) {
+ // if the dataRowKey contains ".", it is prefetched column and
we can use
+ // it instead of search the name by alias
+ labels[i] = columns[startIndex + i].getDataRowKey();
+ }
+ else {
+ labels[i] = segmentMetadata.getColumnPath(columns[startIndex +
i]
+ .getDataRowKey());
}
}
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/DefaultEventManager.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/DefaultEventManager.java?rev=949529&r1=949528&r2=949529&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/DefaultEventManager.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/DefaultEventManager.java
Sun May 30 16:37:30 2010
@@ -92,19 +92,6 @@ public class DefaultEventManager impleme
}
/**
- * Returns a list of currently queued events. Queue is returned by copy.
This method
- * is useful for inspecting the state of the event queue at any particular
moment, but
- * doesn't allow callers to alter the queue state.
- *
- * @since 1.1
- */
- public List<Dispatch> getEventQueue() {
- synchronized (eventQueue) {
- return new ArrayList<Dispatch>(eventQueue);
- }
- }
-
- /**
* Stops event threads. After the EventManager is stopped, it can not be
restarted and
* should be discarded.
*
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/EventManager.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/EventManager.java?rev=949529&r1=949528&r2=949529&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/EventManager.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/event/EventManager.java
Sun May 30 16:37:30 2010
@@ -20,9 +20,6 @@
package org.apache.cayenne.event;
import java.util.EventObject;
-import java.util.List;
-
-import org.apache.cayenne.event.DefaultEventManager.Dispatch;
/**
* This class acts as bridge between an Object that wants to inform others
about its
@@ -43,15 +40,6 @@ public interface EventManager {
boolean isSingleThreaded();
/**
- * Returns a list of currently queued events. Queue is returned by copy.
This method
- * is useful for inspecting the state of the event queue at any particular
moment, but
- * doesn't allow callers to alter the queue state.
- *
- * @since 1.1
- */
- List<Dispatch> getEventQueue();
-
- /**
* Stops event threads. After the EventManager is stopped, it can not be
restarted and
* should be discarded.
*
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DefaultEntityResultSegment.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DefaultEntityResultSegment.java?rev=949529&r1=949528&r2=949529&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DefaultEntityResultSegment.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DefaultEntityResultSegment.java
Sun May 30 16:37:30 2010
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.map;
-import java.util.HashMap;
import java.util.Map;
import org.apache.cayenne.query.EntityResultSegment;
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java?rev=949529&r1=949528&r2=949529&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java
Sun May 30 16:37:30 2010
@@ -60,9 +60,10 @@ public class EntityResult {
Map<String, String> dbFields = new HashMap<String, String>();
for (FieldResult field : fields) {
-
if(field.isDbAttribute()||field.getAttributeName().startsWith("fetch.")){
+ if (field.isDbAttribute() ||
field.getAttributeName().startsWith("fetch.")) {
dbFields.put(field.getAttributeName(), field.getColumn());
- } else {
+ }
+ else {
ObjEntity entity = field.getEntityName() != null ? resolver
.getObjEntity(field.getEntityName()) :
getRootEntity(resolver);
