Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: format StorageListModel ......................................................................
webadmin: format StorageListModel using eclipse formatter. Change-Id: Iac9b645eb610545d94b117c0b3d007daf304294b Signed-off-by: Gilad Chaplik <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/31105/1 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 006baf5..1c59c3f 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 @@ -438,7 +438,7 @@ model.getTimeout().setEntity(connection.getNfsTimeo()); model.getMountOptions().setEntity(connection.getMountOptions()); for (EntityModel<NfsVersion> item : model.getVersion().getItems()) { - EntityModel itemModel = (EntityModel) item; + EntityModel itemModel = item; boolean noNfsVersion = itemModel.getEntity() == null && connection.getNfsVersion() == null; boolean foundNfsVersion = itemModel.getEntity() != null && itemModel.getEntity().equals(connection.getNfsVersion()); @@ -585,7 +585,7 @@ StorageDomain storage = (StorageDomain) getSelectedItem(); model.setStorageDomain(storage); - VDS host = (VDS) storageModel.getHost().getSelectedItem(); + VDS host = storageModel.getHost().getSelectedItem(); Guid hostId = host != null && isStorageActive ? host.getId() : null; AsyncDataProvider.getInstance().getLunsByVgId(new AsyncQuery(model, new INewAsyncCallback() { @@ -650,7 +650,7 @@ model.startProgress(ConstantsManager.getInstance().getConstants().importingStorageDomainProgress()); - VDS host = (VDS) model.getHost().getSelectedItem(); + VDS host = model.getHost().getSelectedItem(); // Save changes. if (model.getSelectedItem() instanceof NfsStorageModel) @@ -816,7 +816,7 @@ return; } - VDS host = (VDS) model.getHostList().getSelectedItem(); + VDS host = model.getHostList().getSelectedItem(); RemoveStorageDomainParameters tempVar = new RemoveStorageDomainParameters(storage.getId()); tempVar.setVdsId(host.getId()); @@ -1217,7 +1217,7 @@ boolean isNew = model.getStorage() == null; storageModel = model.getSelectedItem(); PosixStorageModel posixModel = (PosixStorageModel) storageModel; - path = (String) posixModel.getPath().getEntity(); + path = posixModel.getPath().getEntity(); storageDomain = isNew ? new StorageDomainStatic() : (StorageDomainStatic) Cloner.clone(selectedItem.getStorageStaticData()); storageDomain.setStorageType(isNew ? storageModel.getType() : storageDomain.getStorageType()); @@ -1225,7 +1225,7 @@ storageDomain.setStorageName(model.getName().getEntity()); storageDomain.setDescription(model.getDescription().getEntity()); storageDomain.setComment(model.getComment().getEntity()); - storageDomain.setStorageFormat((StorageFormatType) model.getFormat().getSelectedItem()); + storageDomain.setStorageFormat(model.getFormat().getSelectedItem()); if (isNew) { AsyncDataProvider.getInstance().getStorageDomainsByConnection(new AsyncQuery(this, new INewAsyncCallback() { @@ -1267,15 +1267,15 @@ StorageModel model = (StorageModel) getWindow(); PosixStorageModel posixModel = (PosixStorageModel) model.getSelectedItem(); - VDS host = (VDS) model.getHost().getSelectedItem(); + VDS host = model.getHost().getSelectedItem(); hostId = host.getId(); // Create storage connection. StorageServerConnections connection = new StorageServerConnections(); connection.setconnection(path); connection.setstorage_type(posixModel.getType()); - connection.setVfsType((String) posixModel.getVfsType().getEntity()); - connection.setMountOptions((String) posixModel.getMountOptions().getEntity()); + connection.setVfsType(posixModel.getVfsType().getEntity()); + connection.setMountOptions(posixModel.getMountOptions().getEntity()); this.connection = connection; ArrayList<VdcActionType> actionTypes = new ArrayList<VdcActionType>(); @@ -1347,13 +1347,13 @@ boolean isNew = model.getStorage() == null; storageModel = model.getSelectedItem(); GlusterStorageModel glusterModel = (GlusterStorageModel) storageModel; - path = (String) glusterModel.getPath().getEntity(); + path = glusterModel.getPath().getEntity(); storageDomain = isNew ? new StorageDomainStatic() : (StorageDomainStatic) Cloner.clone(selectedItem.getStorageStaticData()); storageDomain.setStorageType(isNew ? storageModel.getType() : storageDomain.getStorageType()); storageDomain.setStorageDomainType(isNew ? storageModel.getRole() : storageDomain.getStorageDomainType()); storageDomain.setStorageName(model.getName().getEntity()); - storageDomain.setStorageFormat((StorageFormatType) model.getFormat().getSelectedItem()); + storageDomain.setStorageFormat(model.getFormat().getSelectedItem()); if (isNew) { AsyncDataProvider.getInstance().getStorageDomainsByConnection(new AsyncQuery(this, new INewAsyncCallback() { @@ -1380,15 +1380,15 @@ StorageModel model = (StorageModel) getWindow(); GlusterStorageModel glusterModel = (GlusterStorageModel) model.getSelectedItem(); - VDS host = (VDS) model.getHost().getSelectedItem(); + VDS host = model.getHost().getSelectedItem(); hostId = host.getId(); // Create storage connection. StorageServerConnections connection = new StorageServerConnections(); connection.setconnection(path); connection.setstorage_type(glusterModel.getType()); - connection.setVfsType((String) glusterModel.getVfsType().getEntity()); - connection.setMountOptions((String) glusterModel.getMountOptions().getEntity()); + connection.setVfsType(glusterModel.getVfsType().getEntity()); + connection.setMountOptions(glusterModel.getMountOptions().getEntity()); this.connection = connection; ArrayList<VdcActionType> actionTypes = new ArrayList<VdcActionType>(); @@ -1460,7 +1460,7 @@ boolean isNew = model.getStorage() == null; storageModel = model.getSelectedItem(); NfsStorageModel nfsModel = (NfsStorageModel) storageModel; - path = (String) nfsModel.getPath().getEntity(); + path = nfsModel.getPath().getEntity(); storageDomain = isNew ? new StorageDomainStatic() @@ -1473,7 +1473,7 @@ storageDomain.setStorageName(model.getName().getEntity()); storageDomain.setDescription(model.getDescription().getEntity()); storageDomain.setComment(model.getComment().getEntity()); - storageDomain.setStorageFormat((StorageFormatType) model.getFormat().getSelectedItem()); + storageDomain.setStorageFormat(model.getFormat().getSelectedItem()); if (isNew) { @@ -1506,7 +1506,7 @@ private void updatePath() { StorageModel model = (StorageModel) getWindow(); - VDS host = (VDS) model.getHost().getSelectedItem(); + VDS host = model.getHost().getSelectedItem(); Guid hostId = Guid.Empty; if (host != null) { @@ -1540,7 +1540,7 @@ private void updateNFSProperties(IStorageModel storageModel) { NfsStorageModel nfsModel = (NfsStorageModel) storageModel; - if ((Boolean) nfsModel.getOverride().getEntity()) { + if (nfsModel.getOverride().getEntity()) { connection.setNfsVersion((NfsVersion) ((EntityModel) nfsModel.getVersion().getSelectedItem()).getEntity()); connection.setNfsRetrans(nfsModel.getRetransmissions().asConvertible().nullableShort()); connection.setNfsTimeo(nfsModel.getTimeout().asConvertible().nullableShort()); @@ -1562,18 +1562,18 @@ { StorageModel model = (StorageModel) getWindow(); NfsStorageModel nfsModel = (NfsStorageModel) model.getSelectedItem(); - VDS host = (VDS) model.getHost().getSelectedItem(); + VDS host = model.getHost().getSelectedItem(); hostId = host.getId(); // Create storage connection. StorageServerConnections tempVar = new StorageServerConnections(); tempVar.setconnection(path); tempVar.setstorage_type(nfsModel.getType()); - if ((Boolean) nfsModel.getOverride().getEntity()) { + if (nfsModel.getOverride().getEntity()) { tempVar.setNfsVersion((NfsVersion) ((EntityModel) nfsModel.getVersion().getSelectedItem()).getEntity()); tempVar.setNfsRetrans(nfsModel.getRetransmissions().asConvertible().nullableShort()); tempVar.setNfsTimeo(nfsModel.getTimeout().asConvertible().nullableShort()); - tempVar.setMountOptions((String) nfsModel.getMountOptions().getEntity()); + tempVar.setMountOptions(nfsModel.getMountOptions().getEntity()); } connection = tempVar; @@ -1651,7 +1651,7 @@ { StorageModel model = (StorageModel) getWindow(); SanStorageModel sanModel = (SanStorageModel) model.getSelectedItem(); - VDS host = (VDS) model.getHost().getSelectedItem(); + VDS host = model.getHost().getSelectedItem(); boolean force = sanModel.isForce(); ArrayList<String> lunIds = new ArrayList<String>(); @@ -1694,11 +1694,11 @@ StorageDomain selectedItem = (StorageDomain) getSelectedItem(); StorageModel model = (StorageModel) getWindow(); - VDS host = (VDS) model.getHost().getSelectedItem(); + VDS host = model.getHost().getSelectedItem(); boolean isNew = model.getStorage() == null; storageModel = model.getSelectedItem(); LocalStorageModel localModel = (LocalStorageModel) storageModel; - path = (String) localModel.getPath().getEntity(); + path = localModel.getPath().getEntity(); storageDomain = isNew ? new StorageDomainStatic() @@ -1754,7 +1754,7 @@ { StorageModel model = (StorageModel) getWindow(); LocalStorageModel localModel = (LocalStorageModel) model.getSelectedItem(); - VDS host = (VDS) model.getHost().getSelectedItem(); + VDS host = model.getHost().getSelectedItem(); hostId = host.getId(); // Create storage connection. @@ -2026,7 +2026,7 @@ tempVar.setstorage_type(storageListModel.storageType); if (storageModel instanceof NfsStorageModel) { NfsStorageModel nfsModel = (NfsStorageModel) storageModel; - if ((Boolean) nfsModel.getOverride().getEntity()) { + if (nfsModel.getOverride().getEntity()) { tempVar.setNfsVersion((NfsVersion) ((EntityModel) nfsModel.getVersion().getSelectedItem()).getEntity()); tempVar.setNfsRetrans(nfsModel.getRetransmissions().asConvertible().nullableShort()); tempVar.setNfsTimeo(nfsModel.getTimeout().asConvertible().nullableShort()); @@ -2034,8 +2034,8 @@ } if (storageModel instanceof PosixStorageModel) { PosixStorageModel posixModel = (PosixStorageModel) storageModel; - tempVar.setVfsType((String) posixModel.getVfsType().getEntity()); - tempVar.setMountOptions((String) posixModel.getMountOptions().getEntity()); + tempVar.setVfsType(posixModel.getVfsType().getEntity()); + tempVar.setMountOptions(posixModel.getMountOptions().getEntity()); } storageListModel.fileConnection = tempVar; storageListModel.importFileStorageConnect(); -- To view, visit http://gerrit.ovirt.org/31105 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac9b645eb610545d94b117c0b3d007daf304294b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
