litesoft
Diff Revisions
803
vs
804
for /trunk/Java/GWT/Client/src/org/litesoft/GWT/client/pavsupport/internal/PanelPlaceActivityHelper.java
|
@@ -3,6 +3,7 @@ |
3 |
3 |
|
import java.util.*; |
4 |
4 |
|
|
5 |
5 |
|
import org.litesoft.GWT.client.pavsupport.*; |
|
6 |
+ |
import org.litesoft.core.typeutils.*; |
6 |
7 |
|
import org.litesoft.core.util.*; |
7 |
8 |
|
|
8 |
9 |
|
import com.google.gwt.event.shared.*; |
|
@@ -120,7 +121,7 @@ |
120 |
121 |
|
notifyPlaceChangeListener( pNewPlace ); |
121 |
122 |
|
mCurrentPlace = pNewPlace; |
122 |
123 |
|
|
123 |
|
- |
Activity zNewActivity = UtilsCommon.deNull( createActivity( zIssues, pSyncFactory, pNewPlace ), NULL_ACTIVITY ); |
|
124 |
+ |
Activity zNewActivity = Objects.deNull( createActivity( zIssues, pSyncFactory, pNewPlace ), NULL_ACTIVITY ); |
124 |
125 |
|
|
125 |
126 |
|
if ( (mPendingActivity != null) && (mPendingActivity != zNewActivity) ) // The place changed again before the new Activity showed its widget |
126 |
127 |
|
{ |
|
@@ -144,7 +145,7 @@ |
144 |
145 |
|
{ |
145 |
146 |
|
if ( (mPlaceChangerRequestedPlaceSource == null) || // |
146 |
147 |
|
((mPlaceChangerRequestedPlaceSource == PlaceChangeListener.Source.Forward) && // |
147 |
|
- |
!UtilsCommon.areNonArraysEqual( mPlaceChangerRequestedPlace, pNewPlace )) ) |
|
148 |
+ |
!Objects.areNonArraysEqual( mPlaceChangerRequestedPlace, pNewPlace )) ) |
148 |
149 |
|
{ |
149 |
150 |
|
mPlaceChangerRequestedPlaceSource = PlaceChangeListener.Source.Unexpected; |
150 |
151 |
|
} |