Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs errors in ListModel class ......................................................................
findbugs: Fix fingbugs errors in ListModel class Change-Id: I1e2395f9657f2c602e5450a03bc57fc6ec1870f8 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java 3 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/14472/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index f3a7f12..238e6e2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -826,7 +826,7 @@ { super.eventRaised(ev, sender, args); - if (ev.matchesDefinition(SelectedItemsChangedEventDefinition) && sender == getTagList()) + if (ev.matchesDefinition(selectedItemsChangedEventDefinition) && sender == getTagList()) { tagListModelSelectedItemsChanged(sender, args); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java index 8802c99..f346351 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java @@ -1,5 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models; +import java.util.List; + import org.ovirt.engine.ui.uicommonweb.validation.IValidation; import org.ovirt.engine.ui.uicommonweb.validation.ValidationResult; import org.ovirt.engine.ui.uicompat.Event; @@ -12,13 +14,11 @@ import org.ovirt.engine.ui.uicompat.ProvideCollectionChangedEvent; import org.ovirt.engine.ui.uicompat.ProvidePropertyChangedEvent; -import java.util.List; - @SuppressWarnings("unused") public class ListModel extends EntityModel { - public static EventDefinition selectedItemChangedEventDefinition; + public final static EventDefinition selectedItemChangedEventDefinition; private Event privateSelectedItemChangedEvent; public Event getSelectedItemChangedEvent() @@ -31,7 +31,7 @@ privateSelectedItemChangedEvent = value; } - public static EventDefinition SelectedItemsChangedEventDefinition; + public final static EventDefinition selectedItemsChangedEventDefinition; private Event privateSelectedItemsChangedEvent; public Event getSelectedItemsChangedEvent() @@ -44,7 +44,7 @@ privateSelectedItemsChangedEvent = value; } - public static EventDefinition ItemsChangedEventDefinition; + public final static EventDefinition itemsChangedEventDefinition; private Event privateItemsChangedEvent; public Event getItemsChangedEvent() @@ -147,15 +147,15 @@ static { selectedItemChangedEventDefinition = new EventDefinition("SelectedItemChanged", ListModel.class); //$NON-NLS-1$ - SelectedItemsChangedEventDefinition = new EventDefinition("SelectedItemsChanged", ListModel.class); //$NON-NLS-1$ - ItemsChangedEventDefinition = new EventDefinition("ItemsChanged", ListModel.class); //$NON-NLS-1$ + selectedItemsChangedEventDefinition = new EventDefinition("SelectedItemsChanged", ListModel.class); //$NON-NLS-1$ + itemsChangedEventDefinition = new EventDefinition("ItemsChanged", ListModel.class); //$NON-NLS-1$ } public ListModel() { setSelectedItemChangedEvent(new Event(selectedItemChangedEventDefinition)); - setSelectedItemsChangedEvent(new Event(SelectedItemsChangedEventDefinition)); - setItemsChangedEvent(new Event(ItemsChangedEventDefinition)); + setSelectedItemsChangedEvent(new Event(selectedItemsChangedEventDefinition)); + setItemsChangedEvent(new Event(itemsChangedEventDefinition)); } protected void onSelectedItemChanging(Object newValue, Object oldValue) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 3e4ba8a..0b0d258 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -1378,27 +1378,27 @@ super.eventRaised(ev, sender, args); UnitVmModel model = (UnitVmModel) getWindow(); - if (ev.matchesDefinition(ItemsChangedEventDefinition) && sender == model.getDataCenter()) + if (ev.matchesDefinition(itemsChangedEventDefinition) && sender == model.getDataCenter()) { VmModel_DataCenter_ItemsChanged(); } - else if (ev.matchesDefinition(ItemsChangedEventDefinition) && sender == model.getCluster()) + else if (ev.matchesDefinition(itemsChangedEventDefinition) && sender == model.getCluster()) { VmModel_Cluster_ItemsChanged(); } - else if (ev.matchesDefinition(ItemsChangedEventDefinition) && sender == model.getDefaultHost()) + else if (ev.matchesDefinition(itemsChangedEventDefinition) && sender == model.getDefaultHost()) { VmModel_DefaultHost_ItemsChanged(); } - else if (ev.matchesDefinition(ItemsChangedEventDefinition) && sender == model.getDisplayProtocol()) + else if (ev.matchesDefinition(itemsChangedEventDefinition) && sender == model.getDisplayProtocol()) { VmModel_DisplayProtocol_ItemsChanged(); } - else if (ev.matchesDefinition(ItemsChangedEventDefinition) && sender == model.getPriority()) + else if (ev.matchesDefinition(itemsChangedEventDefinition) && sender == model.getPriority()) { VmModel_Priority_ItemsChanged(); } - else if (ev.matchesDefinition(ItemsChangedEventDefinition) && sender == model.getTimeZone()) + else if (ev.matchesDefinition(itemsChangedEventDefinition) && sender == model.getTimeZone()) { VmModel_TimeZone_ItemsChanged(); } -- To view, visit http://gerrit.ovirt.org/14472 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e2395f9657f2c602e5450a03bc57fc6ec1870f8 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
