[Engine-patches] Change in ovirt-engine[master]: userportal, webadmin: removed duplicates

[mmucha]

Martin Mucha has uploaded a new change for review.

Change subject: userportal,webadmin: removed duplicates
......................................................................

userportal,webadmin: removed duplicates

• 2 duplicate anonymous IAsyncConverter class refactored to sole inner
class
• removed duplicate method.

Change-Id: Ic8ee48edeacd5719a421a7a3d3a78f2f54dc11bf
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
1 file changed, 29 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/41278/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index 1a5a349..e65f8d3 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -635,56 +635,24 @@
     }
 
     public void getIrsImageList(AsyncQuery aQuery, Guid storagePoolId, boolean 
forceRefresh) {
-        aQuery.converterCallback = new IAsyncConverter() {
-            @Override
-            public Object Convert(Object source, AsyncQuery _asyncQuery)
-            {
-                if (source != null)
-                {
-                    ArrayList<RepoImage> repoList = (ArrayList<RepoImage>) 
source;
-                    ArrayList<String> fileNameList = new ArrayList<String>();
-                    for (RepoImage repoImage : repoList)
-                    {
-                        fileNameList.add(repoImage.getRepoImageId());
-                    }
-
-                    Collections.sort(fileNameList, 
String.CASE_INSENSITIVE_ORDER);
-                    return fileNameList;
-                }
-                return new ArrayList<String>();
-            }
-        };
-
-        GetImagesListByStoragePoolIdParameters parameters =
-                new GetImagesListByStoragePoolIdParameters(storagePoolId, 
ImageFileType.ISO);
-        parameters.setForceRefresh(forceRefresh);
-        
Frontend.getInstance().runQuery(VdcQueryType.GetImagesListByStoragePoolId, 
parameters, aQuery);
+        ImageFileType imageFileType = ImageFileType.ISO;
+        getIrsImageList(aQuery, storagePoolId, forceRefresh, imageFileType);
     }
 
     public void getFloppyImageList(AsyncQuery aQuery, Guid storagePoolId) {
-        aQuery.converterCallback = new IAsyncConverter() {
-            @Override
-            public Object Convert(Object source, AsyncQuery _asyncQuery)
-            {
-                if (source != null)
-                {
-                    ArrayList<RepoImage> repoList = (ArrayList<RepoImage>) 
source;
-                    ArrayList<String> fileNameList = new ArrayList<String>();
-                    for (RepoImage repoImage : repoList)
-                    {
-                        fileNameList.add(repoImage.getRepoImageId());
-                    }
+        getIrsImageList(aQuery, storagePoolId, false, ImageFileType.Floppy);
+    }
 
-                    Collections.sort(fileNameList, 
String.CASE_INSENSITIVE_ORDER);
-                    return fileNameList;
-                }
-                return new ArrayList<String>();
-            }
-        };
+    public void getIrsImageList(AsyncQuery aQuery,
+            Guid storagePoolId,
+            boolean forceRefresh,
+            ImageFileType imageFileType) {
+        aQuery.converterCallback = new 
RepoImageToImageFileNameAsyncConverter();
 
-        
Frontend.getInstance().runQuery(VdcQueryType.GetImagesListByStoragePoolId,
-                new GetImagesListByStoragePoolIdParameters(storagePoolId, 
ImageFileType.Floppy),
-                aQuery);
+        GetImagesListByStoragePoolIdParameters parameters =
+                new GetImagesListByStoragePoolIdParameters(storagePoolId, 
imageFileType);
+        parameters.setForceRefresh(forceRefresh);
+        
Frontend.getInstance().runQuery(VdcQueryType.GetImagesListByStoragePoolId, 
parameters, aQuery);
     }
 
     public void getDefaultManagementNetwork(AsyncQuery aQuery, Guid 
dataCenterId) {
@@ -4222,4 +4190,20 @@
                 aQuery);
     }
 
+    private static class RepoImageToImageFileNameAsyncConverter implements 
IAsyncConverter {
+        @Override
+        public Object Convert(Object source, AsyncQuery _asyncQuery) {
+            if (source != null) {
+                ArrayList<RepoImage> repoList = (ArrayList<RepoImage>) source;
+                ArrayList<String> fileNameList = new ArrayList<String>();
+                for (RepoImage repoImage : repoList) {
+                    fileNameList.add(repoImage.getRepoImageId());
+                }
+
+                Collections.sort(fileNameList, String.CASE_INSENSITIVE_ORDER);
+                return fileNameList;
+            }
+            return new ArrayList<String>();
+        }
+    }
 }


-- 
To view, visit https://gerrit.ovirt.org/41278
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8ee48edeacd5719a421a7a3d3a78f2f54dc11bf
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Mucha <mmu...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches