litesoft
Diff Revisions
803
vs
804
for /trunk/Java/core/jvm1.5/src/org/litesoft/ui_1_5/FormInteractionHelper.java
|
@@ -5,7 +5,7 @@ |
5 |
5 |
|
|
6 |
6 |
|
import org.litesoft.*; |
7 |
7 |
|
import org.litesoft.changemanagement.*; |
8 |
|
- |
import org.litesoft.util.*; |
|
8 |
+ |
import org.litesoft.core.typeutils.*; |
9 |
9 |
|
|
10 |
10 |
|
public final class FormInteractionHelper |
11 |
11 |
|
{ |
|
@@ -100,8 +100,8 @@ |
100 |
100 |
|
{ |
101 |
101 |
|
FormInteractionIntersection zIntersection = new FormInteractionIntersection( mOurData ); |
102 |
102 |
|
if ( (pServerStateChangeSet != null) && // Message From 'us'? |
103 |
|
- |
!Utils.areNonArraysEqual( mOurData.getUniqueFormServicePeerID(), |
104 |
|
- |
pServerStateChangeSet.getSourceUniqueID() ) ) |
|
103 |
+ |
!Objects.areNonArraysEqual( mOurData.getUniqueFormServicePeerID(), |
|
104 |
+ |
pServerStateChangeSet.getSourceUniqueID() ) ) |
105 |
105 |
|
{ |
106 |
106 |
|
for ( ServerStateChange zChange : pServerStateChangeSet.getChanges() ) |
107 |
107 |
|
{ |
|
@@ -110,7 +110,7 @@ |
110 |
110 |
|
{ |
111 |
111 |
|
zIntersection.orInUpdateOthers( addUpdatedData( zFIS ) ); |
112 |
112 |
|
} |
113 |
|
- |
else if ( !Utils.areNonArraysEqual( getOurSystemUserRef(), zFIS.getSystemUserRef() ) ) |
|
113 |
+ |
else if ( !Objects.areNonArraysEqual( getOurSystemUserRef(), zFIS.getSystemUserRef() ) ) |
114 |
114 |
|
{ |
115 |
115 |
|
// Message ! from 'this' and ! from same user |
116 |
116 |
|
if ( ServerStateChange.Action.DELETED.equals( zChange.getAction() ) ) |