Shahar Havivi has uploaded a new change for review.
Change subject: findbugs: remove unread fields
......................................................................
findbugs: remove unread fields
findbugs reason:
UrF: Unread field (URF_UNREAD_FIELD)
Change-Id: Ied4990cd90e58e566679851b3e2c5dcde05629cd
Signed-off-by: Shahar Havivi <shav...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendActionResource.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiStorageView.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHardwareGeneralModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
11 files changed, 2 insertions(+), 44 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/15390/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendActionResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendActionResource.java
index b9e8423..fa1d9b9 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendActionResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendActionResource.java
@@ -11,11 +11,8 @@
extends AbstractBackendAsyncStatusResource<Action>
implements ActionResource {
- private String action;
-
public BackendActionResource(String action, String ids) {
super(Action.class, ids);
- this.action = action;
}
public Response get() {
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
index 2505324..9165fdd 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
@@ -200,13 +200,12 @@
*/
static class IdAwareReference<T, S> extends SoftReference<S> {
long timestamp;
- long last;
T key;
IdAwareReference(T key, S value, ReferenceQueue<S> queue) {
super(value, queue);
this.key = key;
- last = timestamp = System.currentTimeMillis();
+ timestamp = System.currentTimeMillis();
}
public T getKey() {
@@ -229,7 +228,6 @@
}
private IdAwareReference<T, S> reset() {
- last = timestamp;
timestamp = System.currentTimeMillis();
return this;
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiStorageView.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiStorageView.java
index 8f54b7e..d3d1827 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiStorageView.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiStorageView.java
@@ -69,7 +69,7 @@
private double treeCollapsedHeight = 207, treeExpandedHeight = 306,
lunsTreeHeight = 345;
private double tabContentHeight = 340, tabHeight = 175;
- private double textTop = 80, textLeft = -84, textWidth = 100;
+ private double textTop = 80, textLeft = -84;
private final Driver driver = GWT.create(Driver.class);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
index 29d1917..9f16cb3 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
@@ -32,7 +32,6 @@
TextBoxLabel defaultHost = new TextBoxLabel();
TextBoxLabel customProperties = new TextBoxLabel();
TextBoxLabel domain = new TextBoxLabel();
- TextBoxLabel timeZone = new TextBoxLabel();
TextBoxLabel compatibilityVersion = new TextBoxLabel();
BooleanLabel isHighlyAvailable;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
index 2135124..8572013 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
@@ -117,11 +117,9 @@
private TaskContext context;
private IStorageModel storageModel;
private NGuid storageId;
- private StorageServerConnections nfsConnection;
private StorageServerConnections connection;
private Guid hostId = new Guid();
private String path;
- private StorageDomainType domainType = StorageDomainType.values()[0];
private boolean removeConnection;
private ArrayList<VDSGroup> clusters;
private ArrayList<StorageDomain> allStorageDomains;
@@ -556,12 +554,10 @@
storageDomain = null;
storageModel = null;
storageId = null;
- nfsConnection = null;
connection = null;
removeConnection = false;
path = null;
hostId = new Guid();
- domainType = StorageDomainType.values()[0];
clusters = null;
allStorageDomains = null;
attachedStorageDomains = null;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHardwareGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHardwareGeneralModel.java
index c776268..e69ae7a 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHardwareGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHardwareGeneralModel.java
@@ -10,23 +10,10 @@
@SuppressWarnings("unused")
public class HostHardwareGeneralModel extends EntityModel
{
- private boolean updateUpgradeAlert;
-
@Override
public VDS getEntity()
{
return (VDS) super.getEntity();
- }
-
- @Override
- public void setEntity(Object value)
- {
- VDS vds = (VDS) value;
- updateUpgradeAlert = vds == null || getEntity() == null
- || !vds.getId().equals(getEntity().getId())
- || !vds.getStatus().equals(getEntity().getStatus());
-
- super.setEntity(value);
}
private String hardwareManufacturer;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java
index c69f459..3dcf21a 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java
@@ -5,7 +5,6 @@
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
-import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.StringHelper;
@@ -61,7 +60,6 @@
}
private VDSGroup cluster = null;
- private Boolean isLinkStateChangeable = null;
// TODO: Check if we really need the following property.
private VmTemplate getEntityStronglyTyped()
@@ -215,9 +213,6 @@
@Override
public void onSuccess(Object listModel, Object returnValue) {
cluster = (VDSGroup) returnValue;
- isLinkStateChangeable =
- (Boolean)
AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.NetworkLinkingSupported,
-
cluster.getcompatibility_version().getValue());
updateActionAvailability();
}
}),
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java
index 1a779f9..277ac82 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java
@@ -3,7 +3,6 @@
import java.util.ArrayList;
import org.ovirt.engine.core.common.businessentities.Disk;
-import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VM;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.compat.StringHelper;
@@ -33,7 +32,6 @@
private ArrayList<VmNetworkInterface> nics;
private ArrayList<Disk> disks;
- private VDSGroup cluster;
@Override
public VM getEntity()
@@ -126,7 +124,6 @@
public void resetData() {
nics = null;
disks = null;
- cluster = null;
}
private void addNetworkUpdateData() {
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 0cc65c1..89f7f41 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
@@ -9,7 +9,6 @@
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.VmGuestAgentInterface;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
-import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.StringHelper;
@@ -27,7 +26,6 @@
public class VmInterfaceListModel extends SearchableListModel
{
- private boolean isHotPlugSupported;
private UICommand privateNewCommand;
private UICommand privateEditCommand;
private UICommand privateRemoveCommand;
@@ -294,10 +292,6 @@
VM vm = getEntity();
Version clusterCompatibilityVersion =
vm.getVdsGroupCompatibilityVersion() != null
? vm.getVdsGroupCompatibilityVersion() : new Version();
-
- isHotPlugSupported =
- (Boolean)
AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.HotPlugEnabled,
- clusterCompatibilityVersion.toString());
}
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
index 4e68be9..c659876 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java
@@ -14,7 +14,6 @@
import
org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit;
import org.ovirt.engine.ui.common.widget.tree.AbstractSubTabTree;
import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
-import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
import org.ovirt.engine.ui.webadmin.widget.label.FullDateTimeLabel;
@@ -26,14 +25,12 @@
public class TemplatesTree<M extends SearchableListModel> extends
AbstractSubTabTree<M, VmTemplate, DiskImage> {
ApplicationResources resources;
- ApplicationConstants constants;
public TemplatesTree(CommonApplicationResources resources,
CommonApplicationConstants constants,
ApplicationTemplates templates) {
super(resources, constants, templates);
this.resources = (ApplicationResources) resources;
- this.constants = (ApplicationConstants) constants;
}
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
index cc9c4f3..dfe093c 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java
@@ -32,13 +32,11 @@
ApplicationResources resources;
ApplicationConstants constants;
- ApplicationTemplates templates;
public StoragesTree(ApplicationResources resources, ApplicationConstants
constants, ApplicationTemplates templates) {
super(resources, constants, templates);
this.resources = resources;
this.constants = constants;
- this.templates = templates;
setNodeSelectionEnabled(true);
}
--
To view, visit http://gerrit.ovirt.org/15390
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied4990cd90e58e566679851b3e2c5dcde05629cd
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
