Allon Mureinik has uploaded a new change for review.
Change subject: core: Removed comparators' Compare methods
......................................................................
core: Removed comparators' Compare methods
This is probably a leftover from the C# days.
In java, comparators have a compare(T, T) method.
Change-Id: I0fa2e830a9560dc4db9929053bd7ceced48a135d
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmTemplateComparerByDiskSize.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparer.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparerByDiskSize.java
4 files changed, 3 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/14413/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
index a5e28a1..3627b53 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
@@ -38,7 +38,7 @@
VM vm1 = vms.get(o1.getVmId());
VM vm2 = vms.get(o2.getVmId());
- return vmComparator.Compare(vm1, vm2);
+ return vmComparator.compare(vm1, vm2);
}
}));
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmTemplateComparerByDiskSize.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmTemplateComparerByDiskSize.java
index ef0eccb..1e0e7f5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmTemplateComparerByDiskSize.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmTemplateComparerByDiskSize.java
@@ -10,10 +10,6 @@
@Override
public int compare(VmTemplate x, VmTemplate y) {
- return Compare(x, y);
- }
-
- public int Compare(VmTemplate x, VmTemplate y) {
return (int) (x.getActualDiskSize() - y.getActualDiskSize());
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparer.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparer.java
index f90b314..558362e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparer.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparer.java
@@ -9,11 +9,7 @@
@Override
public int compare(VM o1, VM o2) {
- return Compare(o1, o2);
- }
-
- public int Compare(VM x, VM y) {
- return x.getPriority() - y.getPriority();
+ return o1.getPriority() - o2.getPriority();
}
public VmsComparer() {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparerByDiskSize.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparerByDiskSize.java
index 99e0e29..068b841 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparerByDiskSize.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comparators/VmsComparerByDiskSize.java
@@ -9,11 +9,7 @@
@Override
public int compare(VM o1, VM o2) {
- return Compare(o1, o2);
- }
-
- public int Compare(VM x, VM y) {
- return (int) (x.getActualDiskWithSnapshotsSize() -
y.getActualDiskWithSnapshotsSize());
+ return (int) (o1.getActualDiskWithSnapshotsSize() -
o2.getActualDiskWithSnapshotsSize());
}
public VmsComparerByDiskSize() {
--
To view, visit http://gerrit.ovirt.org/14413
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fa2e830a9560dc4db9929053bd7ceced48a135d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
