git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@378 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/mobile/service/impl/PurchaseChangeServiceImpl.java

@@ -38,12 +38,12 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 
 			@Override
 			public boolean isLast() {
-				return orderChangePage.isLast();
+				return orderChangePage.getNumber() == orderChangePage.getTotalPages();
 			}
 
 			@Override
 			public boolean isFirst() {
-				return orderChangePage.isFirst();
+				return orderChangePage.getNumber() == 1;
 			}
 
 			@Override
@@ -93,28 +93,24 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 				return changes;
 			}
 
-			@SuppressWarnings("deprecation")
 			@Override
 			public boolean isLastPage() {
-				return orderChangePage.isLastPage();
+				return orderChangePage.isLast();
 			}
 
-			@SuppressWarnings("deprecation")
 			@Override
 			public boolean isFirstPage() {
-				return orderChangePage.isFirstPage();
+				return orderChangePage.isFirst();
 			}
 
-			@SuppressWarnings("deprecation")
 			@Override
 			public boolean hasPreviousPage() {
-				return orderChangePage.hasPreviousPage();
+				return !orderChangePage.isFirst();
 			}
 
-			@SuppressWarnings("deprecation")
 			@Override
 			public boolean hasNextPage() {
-				return orderChangePage.hasNextPage();
+				return !orderChangePage.isLast();
 			}
 
 			@Override

src/main/java/com/uas/platform/b2b/mobile/service/impl/PurchaseServiceImpl.java

@@ -70,12 +70,12 @@ public class PurchaseServiceImpl implements PurchaseService {
 
 			@Override
 			public boolean isFirst() {
-				return orderPage.isFirst();
+				return orderPage.getNumber() == 1;
 			}
 
 			@Override
 			public boolean isLast() {
-				return orderPage.isLast();
+				return orderPage.getNumber() == orderPage.getTotalPages();
 			}
 
 			@Override
@@ -103,28 +103,24 @@ public class PurchaseServiceImpl implements PurchaseService {
 				return orderPage.getTotalPages();
 			}
 
-			@SuppressWarnings("deprecation")
 			@Override
 			public boolean hasNextPage() {
-				return orderPage.hasNextPage();
+				return !isLast();
 			}
 
-			@SuppressWarnings("deprecation")
 			@Override
 			public boolean hasPreviousPage() {
-				return orderPage.hasPreviousPage();
+				return !orderPage.isFirst();
 			}
 
-			@SuppressWarnings("deprecation")
 			@Override
 			public boolean isFirstPage() {
-				return orderPage.isFirstPage();
+				return orderPage.isFirst();
 			}
 
-			@SuppressWarnings("deprecation")
 			@Override
 			public boolean isLastPage() {
-				return orderPage.isLastPage();
+				return orderPage.isLast();
 			}
 
 		};