litesoft
Diff Revisions
49
vs
151
for /trunk/Java/core/Server/src/org/litesoft/orsup/base/AbstractAttributeAccessorSCDtoOne.java
|
@@ -7,13 +7,11 @@ |
7 |
7 |
|
import org.litesoft.orsup.otherattributeaccessors.*; |
8 |
8 |
|
import org.litesoft.util.*; |
9 |
9 |
|
|
10 |
|
- |
public abstract class AbstractAttributeAccessorSCDtoOne<Owner extends PersistentObjectImpl, Them extends PersistentObjectImpl> |
11 |
|
- |
extends AbstractAttributeAccessorSCDtoPO<Owner, Them> |
|
10 |
+ |
public abstract class AbstractAttributeAccessorSCDtoOne<Owner extends PersistentObjectImpl, Them extends PersistentObjectImpl> extends AbstractAttributeAccessorSCDtoPO<Owner, Them> |
12 |
11 |
|
{ |
13 |
12 |
|
private String mToOneKeyAttribute; |
14 |
13 |
|
|
15 |
|
- |
protected AbstractAttributeAccessorSCDtoOne( String pName, String pColumnName, String pToThemName, String pToOneKeyAttribute, String pBackReference, |
16 |
|
- |
boolean pThemDependantOnUs, boolean pRequired, AttributeMetaData pAMD ) |
|
14 |
+ |
protected AbstractAttributeAccessorSCDtoOne( String pName, String pColumnName, String pToThemName, String pToOneKeyAttribute, String pBackReference, boolean pThemDependantOnUs, boolean pRequired, AttributeMetaData pAMD ) |
17 |
15 |
|
{ |
18 |
16 |
|
super( pName, pColumnName, pToThemName, pBackReference, pThemDependantOnUs, pRequired, pAMD ); |
19 |
17 |
|
mToOneKeyAttribute = pToOneKeyAttribute; |
|
@@ -62,8 +60,7 @@ |
62 |
60 |
|
/** |
63 |
61 |
|
* Intended mainly for cleaning up after junit tests that might dynamically insert attributes |
64 |
62 |
|
*/ |
65 |
|
- |
public static AbstractAttributeAccessorSCDtoOne[] remove( AbstractAttributeAccessorSCDtoOne[] pOrig, |
66 |
|
- |
AttributeAccessorSCD pToRemove ) |
|
63 |
+ |
public static AbstractAttributeAccessorSCDtoOne[] remove( AbstractAttributeAccessorSCDtoOne[] pOrig, AttributeAccessorSCD pToRemove ) |
67 |
64 |
|
{ |
68 |
65 |
|
if ( (pToRemove != null) && !Utils.isNullOrEmpty( pOrig ) ) |
69 |
66 |
|
{ |
|
@@ -78,11 +75,9 @@ |
78 |
75 |
|
return pOrig; |
79 |
76 |
|
} |
80 |
77 |
|
|
81 |
|
- |
private static AbstractAttributeAccessorSCDtoOne[] remove( AbstractAttributeAccessorSCDtoOne[] pOrig, |
82 |
|
- |
int pToRemove ) |
|
78 |
+ |
private static AbstractAttributeAccessorSCDtoOne[] remove( AbstractAttributeAccessorSCDtoOne[] pOrig, int pToRemove ) |
83 |
79 |
|
{ |
84 |
|
- |
AbstractAttributeAccessorSCDtoOne[] newArray = |
85 |
|
- |
new AbstractAttributeAccessorSCDtoOne[pOrig.length - 1]; |
|
80 |
+ |
AbstractAttributeAccessorSCDtoOne[] newArray = new AbstractAttributeAccessorSCDtoOne[pOrig.length - 1]; |
86 |
81 |
|
int zDst = 0; |
87 |
82 |
|
for ( int zSrc = 0; zSrc < pOrig.length; zSrc++ ) |
88 |
83 |
|
{ |