Shahar Havivi has uploaded a new change for review.
Change subject: findbugs: unused local variables
......................................................................
findbugs: unused local variables
Remove unused local variables
findbugs reason:
DLS: Dead store to local variable (DLS_DEAD_LOCAL_STORE)
Change-Id: Id54992402de5a784129afadf3df66e178487252e
Signed-off-by: Shahar Havivi <shav...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDAOTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java
M
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskTemplateListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskVmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MoveHost.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/PoolItemBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
34 files changed, 7 insertions(+), 80 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/15092/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
index abbf53e..982bc8a 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
@@ -200,7 +200,6 @@
@Test
public void canAddCloneVmFromSnapshotNoConfiguration() {
- ArrayList<String> reasons = new ArrayList<String>();
final int domainSizeGB = 15;
final int sizeRequired = 4;
final Guid sourceSnapshotId = Guid.NewGuid();
@@ -213,7 +212,7 @@
doReturn(sv).when(cmd).createSnapshotsValidator();
when(snapshotDao.get(sourceSnapshotId)).thenReturn(new Snapshot());
assertFalse("Clone vm should have failed due to non existing vm
configuration", cmd.canDoAction());
- reasons = cmd.getReturnValue().getCanDoActionMessages();
+ ArrayList<String> reasons =
cmd.getReturnValue().getCanDoActionMessages();
assertTrue("Clone vm should have failed due to no configuration id",
reasons.contains(VdcBllMessages.ACTION_TYPE_FAILED_VM_SNAPSHOT_HAS_NO_CONFIGURATION.toString()));
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
index 4c966b4..9a9f3e5 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
@@ -292,8 +292,7 @@
* priority is the one being checked.
*/
private VmStatic[] initVmStaticsOrderedByPriority(List<VmStatic>
vmStatics) {
- VmStatic[] vmStaticArray = new VmStatic[NUM_OF_VM_STATIC_IN_FIXTURES];
- vmStaticArray = initVmStaticsOrderedByMigrationSupport(vmStatics);
+ VmStatic[] vmStaticArray =
initVmStaticsOrderedByMigrationSupport(vmStatics);
// Swapping the first two VmStatics
VmStatic tempVmStatic = vmStaticArray[0];
@@ -318,8 +317,7 @@
* auto_startup is the one being checked
*/
private VmStatic[] initVmStaticsOrderedByAutoStartup(List<VmStatic>
vmStatics) {
- VmStatic[] vmStaticArray = new VmStatic[NUM_OF_VM_STATIC_IN_FIXTURES];
- vmStaticArray = initVmStaticsOrderedByPriority(vmStatics);
+ VmStatic[] vmStaticArray = initVmStaticsOrderedByPriority(vmStatics);
// Swapping the first two VmStatics
VmStatic tempVmStatic = vmStaticArray[0];
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDAOTest.java
index 8e0cc09..dc4dbf0 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDAOTest.java
@@ -106,7 +106,6 @@
@Test
public void testSave() {
DiskImage newImage = new DiskImage();
- newImage = new DiskImage();
newImage.setImageId(Guid.NewGuid());
newImage.setvolumeFormat(VolumeFormat.COW);
newImage.setVolumeType(VolumeType.Sparse);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java
index a081948..5767950 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java
@@ -191,7 +191,7 @@
true));
NIC nic = getNic(false);
nic.setNetwork(new Network());
- nic = resource.update(nic);
+ resource.update(nic);
fail("expected WebApplicationException");
} catch (WebApplicationException wae) {
verifyFault(wae, CANT_DO);
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java
index 0c0463e..51a06f0 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java
@@ -80,8 +80,6 @@
mailSessionProps.put("mail.debug", "true");
}
- String mailHost =
aMailProps.getProperty(NotificationProperties.MAIL_SERVER);
-
String emailUser =
aMailProps.getProperty(NotificationProperties.MAIL_USER, true);
if (StringUtils.isEmpty(emailUser)) {
if (aMailProps.getBoolean(NotificationProperties.MAIL_ENABLE_SSL,
false) ||
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java
index 367682e..b0ed53c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java
@@ -841,7 +841,6 @@
{
forceRefresh();
} else if (command instanceof ReportCommand) {
- ReportCommand reportCommand = (ReportCommand) command;
openReport();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
index 556b979..5a4c858 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
@@ -415,7 +415,6 @@
@Override
public void onSuccess(Object model, Object result)
{
- ClusterGeneralModel innerGeneralModel = (ClusterGeneralModel)
model;
ArrayList<GlusterVolumeEntity> volumeList =
(ArrayList<GlusterVolumeEntity>) result;
int volumesUp = 0;
int volumesDown = 0;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java
index dc537dd..3ad352e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java
@@ -511,9 +511,6 @@
return;
}
- // Check name unicitate.
- String name = (String) model.getName().getEntity();
-
// if (!DataProvider.IsRoleNameUnique(name) &&
name.compareToIgnoreCase(role.getname()) != 0)
// {
// model.getName().setIsValid(false);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
index 924941e..8347d23 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
@@ -476,13 +476,11 @@
AsyncDataProvider.getStorageDomainList(new AsyncQuery(this, new
INewAsyncCallback() {
@Override
public void onSuccess(Object model, Object returnValue) {
- StorageDomain master = null;
List<StorageDomain> storageDomainList = (List<StorageDomain>)
returnValue;
for (StorageDomain a : storageDomainList)
{
if (a.getStorageDomainType() == StorageDomainType.Master)
{
- master = a;
break;
}
}
@@ -575,10 +573,9 @@
{
return;
}
- VdcActionParametersBase parametersBase = new VdcActionParametersBase();
StoragePoolParametersBase tempVar = new
StoragePoolParametersBase(((StoragePool) getSelectedItem()).getId());
tempVar.setForceDelete(true);
- parametersBase = tempVar;
+ VdcActionParametersBase parametersBase = tempVar;
Frontend.RunAction(VdcActionType.RemoveStoragePool, parametersBase);
cancel();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
index e8d8a67..c875594 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
@@ -12,7 +12,6 @@
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.ImageStatus;
import org.ovirt.engine.core.common.businessentities.Quota;
-import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmEntityType;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.mode.ApplicationMode;
@@ -407,7 +406,6 @@
private void onRemove()
{
- VM vm = (VM) getEntity();
RemoveDiskModel model = (RemoveDiskModel) getWindow();
ArrayList<VdcActionParametersBase> paramerterList = new
ArrayList<VdcActionParametersBase>();
@@ -434,7 +432,6 @@
private void updateActionAvailability()
{
- VM vm = (VM) getEntity();
Disk disk = (Disk) getSelectedItem();
ArrayList<Disk> disks = getSelectedItems() != null ? (ArrayList<Disk>)
getSelectedItems() : null;
boolean isDiskLocked = disk != null && disk.getDiskStorageType() ==
DiskStorageType.IMAGE &&
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
index 6090441..793709e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
@@ -78,7 +78,6 @@
private void updateActionAvailability()
{
- DiskImage disk = (DiskImage) getEntity();
}
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskTemplateListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskTemplateListModel.java
index 72bda7e..50ba893 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskTemplateListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskTemplateListModel.java
@@ -83,7 +83,6 @@
private void updateActionAvailability()
{
- DiskImage disk = (DiskImage) getEntity();
}
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskVmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskVmListModel.java
index 478d196..2031bf0 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskVmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskVmListModel.java
@@ -4,7 +4,6 @@
import java.util.HashMap;
import org.ovirt.engine.core.common.businessentities.Disk;
-import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.queries.GetVmsByDiskGuidParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
@@ -92,7 +91,6 @@
private void updateActionAvailability()
{
- DiskImage disk = (DiskImage) getEntity();
}
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java
index 5d40f26..d4eeed1 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java
@@ -593,7 +593,6 @@
public boolean validateReplicateBricks(int oldReplicaCount,
List<GlusterBrickEntity> existingBricks) {
- int brickCount = ((List) bricks.getItems()).size() + (existingBricks
!= null ? existingBricks.size() : 0);
int replicaCount = getReplicaCountValue();
Set<String> servers = new HashSet<String>();
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java
index a5828e2..fe4129c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java
@@ -199,7 +199,6 @@
Enlistment enlistment = context.enlistment;
EnlistmentContext enlistmentContext = (EnlistmentContext)
enlistment.getContext();
HostListModel model = enlistmentContext.getModel();
- ConfigureLocalStorageModel configureModel =
(ConfigureLocalStorageModel) model.getWindow();
VDS host = context.hostFoundById;
@@ -287,7 +286,6 @@
Enlistment enlistment = context.enlistment;
EnlistmentContext enlistmentContext = (EnlistmentContext)
enlistment.getContext();
- VdcReturnValueBase returnValue = context.changeVDSClusterReturnValue;
// Try to remove data center.
if (enlistmentContext.getDataCenterId() != null) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
index c4faeeb..fd8b1db 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
@@ -48,7 +48,6 @@
EnlistmentContext enlistmentContext = (EnlistmentContext)
context.enlistment.getContext();
HostListModel model = enlistmentContext.getModel();
- ConfigureLocalStorageModel configureModel =
(ConfigureLocalStorageModel) model.getWindow();
final VDS host = (VDS) model.getSelectedItem();
VdsActionParameters parameters = new VdsActionParameters(host.getId());
@@ -67,7 +66,6 @@
private void prepare2() {
PreparingEnlistment enlistment = (PreparingEnlistment)
context.enlistment;
- EnlistmentContext enlistmentContext = (EnlistmentContext)
enlistment.getContext();
VdcReturnValueBase returnValue = context.activateVdsReturnValue;
if (returnValue == null || !returnValue.getSucceeded()) {
@@ -195,7 +193,6 @@
private void prepare6() {
- PreparingEnlistment enlistment = (PreparingEnlistment)
context.enlistment;
VdcReturnValueBase returnValue =
context.addLocalStorageDomainReturnValue;
if (returnValue == null || !returnValue.getSucceeded()) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
index 0bd212f..502a594 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
@@ -31,7 +31,6 @@
PreparingEnlistment enlistment = (PreparingEnlistment)
context.enlistment;
EnlistmentContext enlistmentContext = (EnlistmentContext)
context.enlistment.getContext();
HostListModel model = enlistmentContext.getModel();
- ConfigureLocalStorageModel configureModel =
(ConfigureLocalStorageModel) model.getWindow();
VDS host = (VDS) model.getSelectedItem();
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
index fd4486a..a0392f2 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
@@ -370,9 +370,7 @@
}
names = new ArrayList<String>();
- if (clusters == null) {
- clusters = context.clusterList;
- } else {
+ if (clusters != null) {
for (VDSGroup cluster : clusters) {
names.add(cluster.getname());
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
index c0ee560..98e5735 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
@@ -1237,7 +1237,6 @@
}
}
}
- VdsNetworkInterface selectedItem = (VdsNetworkInterface)
getSelectedItem();
if (nic.getBonded() == null || nic.getBonded() == false)
{
parameters.setBondingOptions(null);
@@ -1314,7 +1313,6 @@
{
HostInterfaceListModel hostInterfaceListModel =
(HostInterfaceListModel) model;
ArrayList<Network> networksByCluster = (ArrayList<Network>)
ReturnValue;
- VdsNetworkInterface item = (VdsNetworkInterface)
hostInterfaceListModel.getSelectedItem();
HostBondInterfaceModel innerBondModel =
(HostBondInterfaceModel) hostInterfaceListModel.getWindow();
Network selectedNetwork = null;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java
index fe0ad19..dab4c20 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java
@@ -317,7 +317,6 @@
private void updateCanSpecify()
{
- Network network = (Network) getNetwork().getSelectedItem();
boolean isChangable = bootProtocolsAvailable && getIsStaticAddress();
getAddress().setIsChangable(isChangable);
getSubnet().setIsChangable(isChangable);
@@ -330,7 +329,6 @@
getAddress().setIsValid(true);
getSubnet().setIsValid(true);
- Network net = (Network) getNetwork().getSelectedItem();
if (getIsStaticAddress())
{
getAddress().validateEntity(new IValidation[] { new
NotEmptyValidation(), new IpAddressValidation() });
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MoveHost.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MoveHost.java
index 1c3f259..9b335e8 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MoveHost.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MoveHost.java
@@ -78,7 +78,6 @@
private void postGetHostList(ArrayList<VDS> hosts) {
VDSGroup cluster = (VDSGroup) getCluster().getSelectedItem();
- ArrayList<VDSGroup> clusters = (ArrayList<VDSGroup>)
getCluster().getItems();
ArrayList<EntityModel> items = new ArrayList<EntityModel>();
for (VDS vds : hosts)
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
index d6d36df..b55dfae 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
@@ -18,7 +18,6 @@
import org.ovirt.engine.ui.frontend.AsyncQuery;
import org.ovirt.engine.ui.frontend.Frontend;
import org.ovirt.engine.ui.frontend.INewAsyncCallback;
-import org.ovirt.engine.ui.uicommonweb.Linq;
import org.ovirt.engine.ui.uicommonweb.UICommand;
import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
import org.ovirt.engine.ui.uicommonweb.models.vms.RemoveVmInterfaceModel;
@@ -151,9 +150,6 @@
private boolean canRemoveVnics() {
List<PairQueryable<VmNetworkInterface, VM>> selectedItems =
getSelectedItems() != null ? getSelectedItems() : new
ArrayList();
- ArrayList<VmNetworkInterface> nics =
- getSelectedItems() != null ? Linq.<VmNetworkInterface>
cast(getSelectedItems())
- : new ArrayList<VmNetworkInterface>();
for (PairQueryable<VmNetworkInterface, VM> pair : selectedItems)
{
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java
index 55d5de6..0f453c0 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java
@@ -402,7 +402,6 @@
@Override
public void onSuccess(Object model, Object returnValue) {
- final QuotaListModel outer_quotaListModel = (QuotaListModel)
model;
final Quota quota = (Quota) ((VdcQueryReturnValue)
returnValue).getReturnValue();
qModel.setEntity(quota);
if (quota.getGlobalQuotaVdsGroup() != null) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
index 45a7034..f543c5e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
@@ -583,7 +583,6 @@
private void prepareSanStorageForEdit(final SanStorageModel model)
{
StorageModel storageModel = (StorageModel) getWindow();
- StorageDomain storage = (StorageDomain) getSelectedItem();
boolean isStorageEditable = storageModel.isStorageActive() ||
storageModel.isNewStorage();
if (isStorageEditable) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
index 8593771..8f0df26 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java
@@ -261,8 +261,6 @@
return;
}
- VmTemplate template = (VmTemplate) getEntity();
-
CopyDiskModel model = new CopyDiskModel();
setWindow(model);
model.setTitle(ConstantsManager.getInstance().getConstants().copyDisksTitle());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
index 3e483cb..48189c3 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java
@@ -77,8 +77,6 @@
{
super.asyncSearch();
- VmTemplate template = (VmTemplate) getEntity();
-
setAsyncResult(null);
setItems(getAsyncResult().getData());
}
@@ -152,8 +150,6 @@
private void remove()
{
- VmTemplate template = (VmTemplate) getEntity();
-
if (getWindow() != null)
{
return;
@@ -188,7 +184,6 @@
private void onRemove()
{
- VmTemplate template = (VmTemplate) getEntity();
ConfirmationModel model = (ConfirmationModel) getWindow();
ArrayList<VdcActionParametersBase> parameters = new
ArrayList<VdcActionParametersBase>();
ArrayList<DiskModel> disks = (ArrayList<DiskModel>) getSelectedItems();
@@ -241,10 +236,6 @@
private void updateActionAvailability()
{
- VmTemplate template = (VmTemplate) getEntity();
- ArrayList<StorageDomainModel> selectedItems = getSelectedItems() !=
null ?
- Linq.<StorageDomainModel> cast(getSelectedItems()) : new
ArrayList<StorageDomainModel>();
-
getRemoveCommand().setIsExecutionAllowed(isRemoveCommandAvailable());
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/PoolItemBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/PoolItemBehavior.java
index e5d096d..38c5a9d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/PoolItemBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/PoolItemBehavior.java
@@ -77,9 +77,7 @@
return;
}
- PoolItemBehavior behavior = (PoolItemBehavior)
result.getState();
VdcReturnValueBase returnValueBase =
result.getReturnValue();
- Guid Guid = (Guid)
returnValueBase.getActionReturnValue();
}
}, this);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
index 1a6e7b8..b06314e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
@@ -237,8 +237,6 @@
super.syncSearch();
// var exclude = ExcludeItems != null ? ExcludeItems.Cast<DbUser>() :
new List<DbUser>();
- String domain = (String) getDomain().getSelectedItem();
-
AsyncQuery _asyncQuery = new AsyncQuery();
_asyncQuery.setModel(this);
_asyncQuery.asyncCallback = new INewAsyncCallback() {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
index f5e7c3b..b4fc61c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
@@ -846,9 +846,6 @@
// floppy]
private void updateIsSysprepEnabled()
{
- boolean isFloppyAttached = (Boolean) getAttachFloppy().getEntity();
- boolean isVmFirstRun = (Boolean) getIsVmFirstRun().getEntity();
-
getIsSysprepEnabled().setEntity(getIsWindowsOS() && getReinitialize());
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
index 27bb311..e55954c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
@@ -394,14 +394,9 @@
String ctrlAltDel = "ctrl+alt+del"; //$NON-NLS-1$
String ctrlAltEnd = "ctrl+alt+end"; //$NON-NLS-1$
- String toggleFullScreenKeysTranslated =
-
AsyncDataProvider.getComplexValueFromSpiceRedKeysResource((toggleFullScreenKeys
!= null) ? toggleFullScreenKeys
- : "shift+f11"); //$NON-NLS-1$
String releaseCursorKeysTranslated =
AsyncDataProvider.getComplexValueFromSpiceRedKeysResource((releaseCursorKeys !=
null) ? releaseCursorKeys
: "shift+f12"); //$NON-NLS-1$
- String ctrlAltDelTranslated =
AsyncDataProvider.getComplexValueFromSpiceRedKeysResource(ctrlAltDel);
- String ctrlAltEndTranslated =
AsyncDataProvider.getComplexValueFromSpiceRedKeysResource(ctrlAltEnd);
getspice().setTitle(getEntity().getName()
+ ":%d" //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
index 562021f..2384ac9 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
@@ -235,8 +235,6 @@
{
super.asyncSearch();
- VM vm = getEntity();
-
setAsyncResult(null);
setItems(getAsyncResult().getData());
}
@@ -516,7 +514,6 @@
private void updateActionAvailability()
{
- VM vm = getEntity();
Disk disk = (Disk) getSelectedItem();
boolean isDiskLocked = disk != null && disk.getDiskStorageType() ==
DiskStorageType.IMAGE &&
((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
index c5ff497..0e0d05f 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
@@ -138,16 +138,12 @@
{
super.asyncSearch();
- VM vm = getEntity();
-
setAsyncResult(null);
setItems(getAsyncResult().getData());
}
private void newEntity()
{
- VM vm = getEntity();
-
if (getWindow() != null)
{
return;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
index 8932e54..2487250 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
@@ -608,7 +608,7 @@
Linq.sort(activeStorageDomains, new
Linq.StorageDomainByNameComparer());
for (DiskModel diskModel : disks) {
- ArrayList<StorageDomain> availableDiskStorageDomains = new
ArrayList<StorageDomain>();
+ ArrayList<StorageDomain> availableDiskStorageDomains;
diskModel.getQuota().setItems(behavior.getModel().getQuota().getItems());
ArrayList<Guid> storageIds = ((DiskImage)
diskModel.getDisk()).getStorageIds();
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
index 1781a81..11c6165 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
@@ -492,7 +492,6 @@
public void onSuccess(Object target, Object returnValue) {
VmSnapshotListModel vmSnapshotListModel =
(VmSnapshotListModel) target;
UnitVmModel model = (UnitVmModel)
vmSnapshotListModel.getWindow();
- VM selectedVm = (VM) getEntity();
CloneVmFromSnapshotModelBehavior behavior =
(CloneVmFromSnapshotModelBehavior) model.getBehavior();
VM vm = (VM) returnValue;
@@ -593,7 +592,6 @@
HashMap<Guid, DiskImage> imageToDestinationDomainMap =
model.getDisksAllocationModel().getImageToDestinationDomainMap();
- ArrayList<DiskImage> diskInfoList = createDiskInfoList();
AddVmFromSnapshotParameters parameters =
new
AddVmFromSnapshotParameters(getcurrentVm().getStaticData(), snapshot.getId());
--
To view, visit http://gerrit.ovirt.org/15092
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id54992402de5a784129afadf3df66e178487252e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shav...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
