Author: tfischer
Date: Fri May 11 02:38:13 2012
New Revision: 1337009
URL: http://svn.apache.org/viewvc?rev=1337009&view=rev
Log:
- Class is not serializable because instance field contains a non-serializable
class
- added final modifiers to non-modifiable fields
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java?rev=1337009&r1=1337008&r2=1337009&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
Fri May 11 02:38:13 2012
@@ -37,11 +37,8 @@ import org.apache.torque.Column;
* @author <a href="mailto:[email protected]";>Greg Monroe</a>
* @version $Id$
*/
-public class ColumnMap implements java.io.Serializable, Column
+public class ColumnMap implements Column
{
- /** The serialVersionUID for this class. */
- private static final long serialVersionUID = -5971184507395399165L;
-
/** A sample object having the same java Type as the column. */
private Object type = null;
@@ -64,10 +61,10 @@ public class ColumnMap implements java.i
private boolean notNull = false;
/** The TableMap for this column. */
- private TableMap table;
+ private final TableMap table;
/** The name of the column. */
- private String columnName;
+ private final String columnName;
/**
* The Java Name of this column as defined in XML or created by the
@@ -101,7 +98,7 @@ public class ColumnMap implements java.i
private boolean useInheritance;
/** Associated of inheritance maps. */
- private Map<String, InheritanceMap> inheritanceMaps
+ private final Map<String, InheritanceMap> inheritanceMaps
= Collections.synchronizedMap(
new LinkedHashMap<String, InheritanceMap>());
@@ -115,7 +112,7 @@ public class ColumnMap implements java.i
private int position = -1;
/** Associated of inheritance maps. */
- private Map<String, String> optionsMap = Collections
+ private final Map<String, String> optionsMap = Collections
.synchronizedMap(new LinkedHashMap<String, String>());
/**
@@ -163,6 +160,7 @@ public class ColumnMap implements java.i
*
* @deprecated use getSqlExpression() instead.
*/
+ @Deprecated
public String getFullyQualifiedName()
{
return table.getName() + "." + columnName;
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java?rev=1337009&r1=1337008&r2=1337009&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
Fri May 11 02:38:13 2012
@@ -42,11 +42,8 @@ import org.apache.torque.adapter.IDMetho
* @author <a href="mailto:[email protected]";>Greg Monroe</a>
* @version $Id$
*/
-public class TableMap implements java.io.Serializable
+public class TableMap
{
- /** The serialVersionUID for this class. */
- private static final long serialVersionUID = -9053174532511492818L;
-
/** The columns in the table. XML Order is preserved. */
private final Map<String, ColumnMap> columns
= Collections.synchronizedMap(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
