Author: tv
Date: Thu Dec 20 13:42:45 2018
New Revision: 1849387
URL: http://svn.apache.org/viewvc?rev=1849387&view=rev
Log:
Generify ObjectKey
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm?rev=1849387&r1=1849386&r2=1849387&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/foreignKeyGetter.vm
Thu Dec 20 13:42:45 2018
@@ -50,7 +50,7 @@
return SimpleKey.keyFor(${getter}());
#end
#elseif ($referenceElements.size() > 1)
- SimpleKey[] pks = new SimpleKey[$referenceElements.size()];
+ SimpleKey<?>[] pks = new SimpleKey[$referenceElements.size()];
#set ($i = 0)
#foreach ($referenceElement in $referenceElements)
#set ($columnElement =
$referenceElement.getChild("local-column").getChild("column"))
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm?rev=1849387&r1=1849386&r2=1849387&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
Thu Dec 20 13:42:45 2018
@@ -87,7 +87,7 @@
{
#if ($argsize > 1)
#if (${useManagers} == "true")
- SimpleKey[] keys = { $arglist };
+ SimpleKey<?>[] keys = { $arglist };
$field = ${foreignTableManagerClass}.getInstance(new
ComboKey(keys));
#else
$field = ${foreignTablePeerClass}.retrieveByPK($arglist);
@@ -131,7 +131,7 @@
{
#if ($argsize > 1)
#if (${useManagers} == "true")
- SimpleKey[] keys = { $arglist };
+ SimpleKey<?>[] keys = { $arglist };
ComboKey comboid = new ComboKey(keys);
$field = ${foreignTableManagerClass}.getCachedInstance(comboid);
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm?rev=1849387&r1=1849386&r2=1849387&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm
Thu Dec 20 13:42:45 2018
@@ -120,7 +120,7 @@
#elseif ($primaryKeyColumnElements.size() > 1)
- private final SimpleKey[] pks = new
SimpleKey[$primaryKeyColumnElements.size()];
+ private final SimpleKey<?>[] pks = new
SimpleKey[$primaryKeyColumnElements.size()];
private final ComboKey comboPK = new ComboKey(pks);
/**
@@ -130,7 +130,7 @@
*/
public void setPrimaryKey(ObjectKey<?> key) throws TorqueException
{
- SimpleKey[] keys = (SimpleKey[]) key.getValue();
+ SimpleKey<?>[] keys = (SimpleKey[]) key.getValue();
#set ($i = 0)
#foreach ($columnElement in $primaryKeyColumnElements)
#set ( $columnField = $columnElement.getAttribute("field") )
@@ -237,7 +237,7 @@
#set ( $getter = $columnElement.getAttribute("getter") )
return SimpleKey.keyFor(${getter}());
#elseif ($primaryKeyColumnElements.size() > 1)
- SimpleKey[] pks = new SimpleKey[$primaryKeyColumnElements.size()];
+ SimpleKey<?>[] pks = new SimpleKey[$primaryKeyColumnElements.size()];
#set ($i = 0)
#foreach ($columnElement in $primaryKeyColumnElements)
#set ( $getter = $columnElement.getAttribute("getter") )
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm?rev=1849387&r1=1849386&r2=1849387&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm
Thu Dec 20 13:42:45 2018
@@ -44,7 +44,7 @@
public void ${setter}Key(ObjectKey<?> key) throws TorqueException
{
#if ($referenceElements.size() > 1)
- SimpleKey[] keys = (SimpleKey[]) key.getValue();
+ SimpleKey<?>[] keys = (SimpleKey[]) key.getValue();
#end
#set ($i = 0)
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm?rev=1849387&r1=1849386&r2=1849387&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm
Thu Dec 20 13:42:45 2018
@@ -43,7 +43,7 @@
#set ( $peerColumnName =
$primaryKeyColumnElement.getAttribute("peerColumnName") )
criteria.and(${peerClassName}.$peerColumnName, pk);
#else
- SimpleKey[] keys = (SimpleKey[])pk.getValue();
+ SimpleKey<?>[] keys = (SimpleKey[])pk.getValue();
#set ( $i = 0 )
#foreach ($primaryKeyColumnElement in $primaryKeyColumnElements)
#set ( $peerColumnName =
$primaryKeyColumnElement.getAttribute("peerColumnName") )
@@ -71,7 +71,7 @@
#else
for (ObjectKey<?> pk : pks)
{
- SimpleKey[] keys = (SimpleKey[])pk.getValue();
+ SimpleKey<?>[] keys = (SimpleKey[])pk.getValue();
#set ( $i = 0 )
#foreach ($primaryKeyColumnElement in $primaryKeyColumnElements)
#set ( $peerColumnName =
$primaryKeyColumnElement.getAttribute("peerColumnName"))
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm?rev=1849387&r1=1849386&r2=1849387&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm
Thu Dec 20 13:42:45 2018
@@ -179,7 +179,7 @@
#else
for (ObjectKey<?> foreignKey : foreignKeyListChunk)
{
- SimpleKey[] keys = (SimpleKey[]) foreignKey.getValue();
+ SimpleKey<?>[] keys = (SimpleKey[]) foreignKey.getValue();
#set ( $i = 0 )
#foreach ($referenceElement in $foreignKeyReferences)
#set ( $columnElement =
$referenceElement.getChild("foreign-column").getChild("column") )
@@ -213,7 +213,7 @@
#set ( $getter = $columnElement.getAttribute("getter") )
ObjectKey<?> foreignKey =
SimpleKey.keyFor(referencedObject.${getter}());
#else
- SimpleKey[] keyElementArray = new
SimpleKey[$foreignKeyReferences.size()];
+ SimpleKey<?>[] keyElementArray = new
SimpleKey[$foreignKeyReferences.size()];
#set ($i = 0)
#foreach ($referenceElement in $foreignKeyReferences)
#set ( $columnElement =
$referenceElement.getChild("foreign-column").getChild("column") )
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm?rev=1849387&r1=1849386&r2=1849387&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm
Thu Dec 20 13:42:45 2018
@@ -154,7 +154,7 @@
#set ( $localFieldGetter =
$localReferenceColumnElement.getAttribute("getter") )
ObjectKey<?> localKey =
SimpleKey.keyFor(current${localDbObjectClassName}.${localFieldGetter}());
#else
- SimpleKey[] keyElementArray = new
SimpleKey[$foreignKeyReferences.size()];
+ SimpleKey<?>[] keyElementArray = new
SimpleKey[$foreignKeyReferences.size()];
#set ($i = 0)
#foreach ($referenceElement in $foreignKeyReferences)
#set ( $localReferenceColumnElement =
$referenceElement.getChild("foreign-column").getChild("column") )
@@ -191,7 +191,7 @@
#else
for (ObjectKey<?> localKey : localKeyListChunk)
{
- SimpleKey[] keys = (SimpleKey[]) localKey.getValue();
+ SimpleKey<?>[] keys = (SimpleKey[]) localKey.getValue();
#set ( $i = 0 )
#foreach ($referenceElement in $foreignKeyReferences)
#set ( $columnElement =
$referenceElement.getChild("local-column").getChild("column") )
@@ -241,7 +241,7 @@
#set ( $localFieldGetter =
$localReferenceColumnElement.getAttribute("getter") )
ObjectKey<?> localKey =
SimpleKey.keyFor(objectToFill.${localFieldGetter}());
#else
- SimpleKey[] keyElementArray = new
SimpleKey[$foreignKeyReferences.size()];
+ SimpleKey<?>[] keyElementArray = new
SimpleKey[$foreignKeyReferences.size()];
#set ($i = 0)
#foreach ($referenceElement in $foreignKeyReferences)
#set ( $localReferenceColumnElement =
$referenceElement.getChild("foreign-column").getChild("column") )
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm?rev=1849387&r1=1849386&r2=1849387&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm
Thu Dec 20 13:42:45 2018
@@ -129,7 +129,7 @@
#set ( $localFieldGetter =
$localReferenceColumnElement.getAttribute("getter") )
ObjectKey<?> localKey =
SimpleKey.keyFor(toLinkTo.${localFieldGetter}());
#else
- SimpleKey[] keyElementArray = new
SimpleKey[$foreignKeyReferences.size()];
+ SimpleKey<?>[] keyElementArray = new
SimpleKey[$foreignKeyReferences.size()];
#set ($i = 0)
#foreach ($referenceElement in $foreignKeyReferences)
#set ( $localReferenceColumnElement =
$referenceElement.getChild("foreign-column").getChild("column") )
@@ -150,7 +150,7 @@
${foreignTablePeerClassName}.${peerColumnName},
localKey);
#else
- SimpleKey[] keys = (SimpleKey[]) localKey.getValue();
+ SimpleKey<?>[] keys = (SimpleKey[]) localKey.getValue();
#set ( $i = 0 )
#foreach ($referenceElement in $foreignKeyReferences)
#set ( $columnElement =
$referenceElement.getChild("local-column").getChild("column") )
@@ -196,7 +196,7 @@
Criterion toSaveKeyCriterion = null;
for (ObjectKey<?> toSaveKey : toSaveKeys)
{
- SimpleKey[] toSavePrimaryKeys = (SimpleKey[])
toSaveKey.getValue();
+ SimpleKey<?>[] toSavePrimaryKeys = (SimpleKey[])
toSaveKey.getValue();
#set ( $i = 0 )
#foreach ($columnElement in $foreignPrimaryKeyColumnElements)
#set ( $columnElement =
$referenceElement.getChild("local-column").getChild("column") )
@@ -283,7 +283,7 @@
Criterion toSaveKeyCriterion = null;
for (ObjectKey<?> toSaveKey : toSaveKeys)
{
- SimpleKey[] toSavePrimaryKeys = (SimpleKey[])
toSaveKey.getValue();
+ SimpleKey<?>[] toSavePrimaryKeys = (SimpleKey[])
toSaveKey.getValue();
#set ( $i = 0 )
#foreach ($columnElement in $foreignPrimaryKeyColumnElements)
#set ( $columnElement =
$referenceElement.getChild("local-column").getChild("column") )
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
