Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs errors in system tree models classes ......................................................................
findbugs: Fix fingbugs errors in system tree models classes Change-Id: Ia4821d7365cc26c09c60378a252c9cd9a38f51c5 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java 4 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/14474/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemModel.java index b740ed3..9b02e9a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemModel.java @@ -79,13 +79,13 @@ setChildren(new ObservableCollection<SystemTreeItemModel>()); } - public static SystemTreeItemModel FindAncestor(SystemTreeItemType type, SystemTreeItemModel root) + public static SystemTreeItemModel findAncestor(SystemTreeItemType type, SystemTreeItemModel root) { if (root.getType() != type) { if (root.getParent() != null) { - return FindAncestor(type, root.getParent()); + return findAncestor(type, root.getParent()); } return null; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java index b038354..0fc5cf9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Map; -import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StoragePool; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.mode.ApplicationMode; @@ -36,7 +36,7 @@ public class SystemTreeModel extends SearchableListModel implements IFrontendMultipleQueryAsyncCallback { - public static EventDefinition ResetRequestedEventDefinition; + public final static EventDefinition resetRequestedEventDefinition; private Event privateResetRequestedEvent; public Event getResetRequestedEvent() @@ -163,12 +163,12 @@ static { - ResetRequestedEventDefinition = new EventDefinition("ResetRequested", SystemTreeModel.class); //$NON-NLS-1$ + resetRequestedEventDefinition = new EventDefinition("ResetRequested", SystemTreeModel.class); //$NON-NLS-1$ } public SystemTreeModel() { - setResetRequestedEvent(new Event(ResetRequestedEventDefinition)); + setResetRequestedEvent(new Event(resetRequestedEventDefinition)); setResetCommand(new UICommand("Reset", this)); //$NON-NLS-1$ setExpandAllCommand(new UICommand("ExpandAll", this)); //$NON-NLS-1$ @@ -346,39 +346,39 @@ if (command == getResetCommand()) { - Reset(); + reset(); } else if (command == getExpandAllCommand()) { - ExpandAll(); + expandAll(); } else if (command == getCollapseAllCommand()) { - CollapseAll(); + collapseAll(); } } - private void CollapseAll() + private void collapseAll() { - SetIsExpandedRecursively(false, getItems().get(0)); + setIsExpandedRecursively(false, getItems().get(0)); } - private void ExpandAll() + private void expandAll() { - SetIsExpandedRecursively(true, getItems().get(0)); + setIsExpandedRecursively(true, getItems().get(0)); } - private void SetIsExpandedRecursively(boolean value, SystemTreeItemModel root) + private void setIsExpandedRecursively(boolean value, SystemTreeItemModel root) { root.setIsExpanded(value); for (SystemTreeItemModel model : root.getChildren()) { - SetIsExpandedRecursively(value, model); + setIsExpandedRecursively(value, model); } } - private void Reset() + private void reset() { getResetRequestedEvent().raise(this, EventArgs.Empty); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java index db6aa86..03ad01f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java @@ -103,7 +103,7 @@ } private void initDcList(final NetworkModel networkModel) { - SystemTreeItemModel treeSelectedDc = SystemTreeItemModel.FindAncestor(SystemTreeItemType.DataCenter, getSystemTreeSelectedItem()); + SystemTreeItemModel treeSelectedDc = SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, getSystemTreeSelectedItem()); if (treeSelectedDc != null) { StoragePool dc = (StoragePool) treeSelectedDc.getEntity(); networkModel.getDataCenters().setItems(Arrays.asList(dc)); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java index 6c06c43..249b022 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java @@ -395,7 +395,7 @@ case Storages: case Storage: { SystemTreeItemModel dataCenterItem = - SystemTreeItemModel.FindAncestor(SystemTreeItemType.DataCenter, getSystemTreeSelectedItem()); + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, getSystemTreeSelectedItem()); StoragePool dc = (StoragePool) dataCenterItem.getEntity(); getDataCenter().setItems(new ArrayList<StoragePool>(Arrays.asList(new StoragePool[] { dc }))); @@ -413,7 +413,7 @@ getHost().setSelectedItem(host); SystemTreeItemModel dataCenterItem = - SystemTreeItemModel.FindAncestor(SystemTreeItemType.DataCenter, getSystemTreeSelectedItem()); + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, getSystemTreeSelectedItem()); StoragePool dc = (StoragePool) dataCenterItem.getEntity(); getDataCenter().setItems(new ArrayList<StoragePool>(Arrays.asList(new StoragePool[] { dc }))); -- To view, visit http://gerrit.ovirt.org/14474 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4821d7365cc26c09c60378a252c9cd9a38f51c5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
