Alissa Bonas has uploaded a new change for review. Change subject: core: Rename methods to start with small letter ......................................................................
core: Rename methods to start with small letter Rename private methods in StorageListModel to start with small letters based on java standards Change-Id: I958edea764d7e6e4e785703f297a190b56c3aa23 Signed-off-by: Alissa Bonas <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 40 insertions(+), 41 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/13317/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 9c017b2..c32a869 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 @@ -179,7 +179,7 @@ setRemoveCommand(new UICommand("Remove", this)); //$NON-NLS-1$ setDestroyCommand(new UICommand("Destroy", this)); //$NON-NLS-1$ - UpdateActionAvailability(); + updateActionAvailability(); getSearchNextPageCommand().setIsAvailable(true); getSearchPreviousPageCommand().setIsAvailable(true); @@ -368,25 +368,25 @@ IStorageModel item = null; switch (storage.getStorageType()) { case NFS: - item = PrepareNfsStorageForEdit(storage); + item = prepareNfsStorageForEdit(storage); boolean isNfsPathEditable = isNfsPathEditable(storage); isStorageEditable = isStorageEditable || isNfsPathEditable; break; case FCP: - item = PrepareFcpStorageForEdit(storage); + item = prepareFcpStorageForEdit(storage); break; case ISCSI: - item = PrepareIscsiStorageForEdit(storage); + item = prepareIscsiStorageForEdit(storage); break; case LOCALFS: - item = PrepareLocalStorageForEdit(storage); + item = prepareLocalStorageForEdit(storage); break; case POSIXFS: - item = PreparePosixStorageForEdit(storage); + item = preparePosixStorageForEdit(storage); break; } @@ -428,7 +428,7 @@ } } - private IStorageModel PrepareNfsStorageForEdit(StorageDomain storage) + private IStorageModel prepareNfsStorageForEdit(StorageDomain storage) { final NfsStorageModel model = new NfsStorageModel(); model.setRole(storage.getStorageDomainType()); @@ -475,7 +475,7 @@ return (storage.getStorageDomainType() == StorageDomainType.Data || storage.getStorageDomainType() == StorageDomainType.Master) && storage.getStatus() == StorageDomainStatus.Maintenance; } - private IStorageModel PrepareLocalStorageForEdit(StorageDomain storage) + private IStorageModel prepareLocalStorageForEdit(StorageDomain storage) { LocalStorageModel model = new LocalStorageModel(); model.setRole(storage.getStorageDomainType()); @@ -495,7 +495,7 @@ return model; } - private IStorageModel PreparePosixStorageForEdit(StorageDomain storage) { + private IStorageModel preparePosixStorageForEdit(StorageDomain storage) { final PosixStorageModel model = new PosixStorageModel(); model.setRole(storage.getStorageDomainType()); @@ -518,27 +518,27 @@ return model; } - private IStorageModel PrepareIscsiStorageForEdit(StorageDomain storage) + private IStorageModel prepareIscsiStorageForEdit(StorageDomain storage) { IscsiStorageModel model = new IscsiStorageModel(); model.setRole(storage.getStorageDomainType()); - PrepareSanStorageForEdit(model); + prepareSanStorageForEdit(model); return model; } - private IStorageModel PrepareFcpStorageForEdit(StorageDomain storage) + private IStorageModel prepareFcpStorageForEdit(StorageDomain storage) { FcpStorageModel model = new FcpStorageModel(); model.setRole(storage.getStorageDomainType()); - PrepareSanStorageForEdit(model); + prepareSanStorageForEdit(model); return model; } - private void PrepareSanStorageForEdit(final SanStorageModel model) + private void prepareSanStorageForEdit(final SanStorageModel model) { StorageModel storageModel = (StorageModel) getWindow(); StorageDomain storage = (StorageDomain) getSelectedItem(); @@ -548,16 +548,16 @@ storageModel.getHost().getSelectedItemChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { - PostPrepareSanStorageForEdit(model, true); + postPrepareSanStorageForEdit(model, true); } }); } else { - PostPrepareSanStorageForEdit(model, false); + postPrepareSanStorageForEdit(model, false); } } - private void PostPrepareSanStorageForEdit(SanStorageModel model, boolean isStorageActive) + private void postPrepareSanStorageForEdit(SanStorageModel model, boolean isStorageActive) { StorageModel storageModel = (StorageModel) getWindow(); StorageDomain storage = (StorageDomain) getSelectedItem(); @@ -870,23 +870,23 @@ if (model.getSelectedItem() instanceof NfsStorageModel) { - SaveNfsStorage(); + saveNfsStorage(); } else if (model.getSelectedItem() instanceof LocalStorageModel) { - SaveLocalStorage(); + saveLocalStorage(); } else if (model.getSelectedItem() instanceof PosixStorageModel) { - SavePosixStorage(); + savePosixStorage(); } else { - SaveSanStorage(); + saveSanStorage(); } } - private void SaveLocalStorage() + private void saveLocalStorage() { if (getWindow().getProgress() != null) { @@ -898,7 +898,7 @@ Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SaveLocal" }))).Run(); //$NON-NLS-1$ } - private void SaveNfsStorage() + private void saveNfsStorage() { if (getWindow().getProgress() != null) { @@ -910,7 +910,7 @@ Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SaveNfs" }))).Run(); //$NON-NLS-1$ } - private void SavePosixStorage() { + private void savePosixStorage() { if (getWindow().getProgress() != null) { return; @@ -921,7 +921,7 @@ Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] {"SavePosix"}))).Run(); //$NON-NLS-1$ } - private void SaveSanStorage() + private void saveSanStorage() { StorageModel storageModel = (StorageModel) getWindow(); SanStorageModel sanStorageModel = (SanStorageModel) storageModel.getSelectedItem(); @@ -931,7 +931,7 @@ OnSaveSanStorage(); } else { - ForceCreationWarning(usedLunsMessages); + forceCreationWarning(usedLunsMessages); } } @@ -950,7 +950,7 @@ Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SaveSan" }))).Run(); //$NON-NLS-1$ } - private void ForceCreationWarning(ArrayList<String> usedLunsMessages) { + private void forceCreationWarning(ArrayList<String> usedLunsMessages) { StorageModel storageModel = (StorageModel) getWindow(); SanStorageModel sanStorageModel = (SanStorageModel) storageModel.getSelectedItem(); sanStorageModel.setForce(true); @@ -990,7 +990,7 @@ protected void OnSelectedItemChanged() { super.OnSelectedItemChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override @@ -1035,7 +1035,7 @@ protected void SelectedItemsChanged() { super.SelectedItemsChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override @@ -1045,11 +1045,11 @@ if (e.PropertyName.equals("storage_domain_shared_status")) //$NON-NLS-1$ { - UpdateActionAvailability(); + updateActionAvailability(); } } - private void UpdateActionAvailability() + private void updateActionAvailability() { ArrayList<StorageDomain> items = getSelectedItems() != null ? Linq.<StorageDomain> Cast(getSelectedItems()) @@ -1145,7 +1145,7 @@ } } - private void SavePosixStorage(TaskContext context) { + private void savePosixStorage(TaskContext context) { this.context = context; @@ -1272,7 +1272,7 @@ this); } - private void SaveNfsStorage(TaskContext context) + private void saveNfsStorage(TaskContext context) { this.context = context; @@ -1344,7 +1344,6 @@ StorageModel model = (StorageModel) getWindow(); NfsStorageModel nfsModel = (NfsStorageModel) model.getSelectedItem(); VDS host = (VDS) model.getHost().getSelectedItem(); - connection.setconnection(path); connection.setstorage_type(nfsModel.getType()); if ((Boolean) nfsModel.getOverride().getEntity()) { @@ -1495,7 +1494,7 @@ }, this); } - private void SaveLocalStorage(TaskContext context) + private void saveLocalStorage(TaskContext context) { this.context = context; @@ -1638,7 +1637,7 @@ message }))); } - private void SaveSanStorage(TaskContext context) + private void saveSanStorage(TaskContext context) { this.context = context; @@ -1912,19 +1911,19 @@ if (StringHelper.stringsEqual(key, "SaveNfs")) //$NON-NLS-1$ { - SaveNfsStorage(context); + saveNfsStorage(context); } else if (StringHelper.stringsEqual(key, "SaveLocal")) //$NON-NLS-1$ { - SaveLocalStorage(context); + saveLocalStorage(context); } else if (StringHelper.stringsEqual(key, "SavePosix")) //$NON-NLS-1$ { - SavePosixStorage(context); + savePosixStorage(context); } else if (StringHelper.stringsEqual(key, "SaveSan")) //$NON-NLS-1$ { - SaveSanStorage(context); + saveSanStorage(context); } else if (StringHelper.stringsEqual(key, "ImportNfs")) //$NON-NLS-1$ { @@ -1965,7 +1964,7 @@ private void OnSystemTreeSelectedItemChanged() { - UpdateActionAvailability(); + updateActionAvailability(); } @Override -- To view, visit http://gerrit.ovirt.org/13317 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I958edea764d7e6e4e785703f297a190b56c3aa23 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
