Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs errors in EntityModel class ......................................................................
findbugs: Fix fingbugs errors in EntityModel class Change-Id: I22664795e8f38628216f167978051f4c8c1ea81d Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/EntityModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java 9 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/14471/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/EntityModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/EntityModel.java index e243bf0..d3820e9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/EntityModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/EntityModel.java @@ -14,7 +14,7 @@ public class EntityModel extends Model { - public static EventDefinition EntityChangedEventDefinition; + final public static EventDefinition entityChangedEventDefinition; private Event privateEntityChangedEvent; public Event getEntityChangedEvent() @@ -70,12 +70,12 @@ static { - EntityChangedEventDefinition = new EventDefinition("EntityChanged", EntityModel.class); //$NON-NLS-1$ + entityChangedEventDefinition = new EventDefinition("EntityChanged", EntityModel.class); //$NON-NLS-1$ } public EntityModel() { - setEntityChangedEvent(new Event(EntityChangedEventDefinition)); + setEntityChangedEvent(new Event(entityChangedEventDefinition)); } public EntityModel(Object entity) { @@ -123,7 +123,7 @@ { super.eventRaised(ev, sender, args); - if (ev.matchesDefinition(EntityChangedEventDefinition)) + if (ev.matchesDefinition(entityChangedEventDefinition)) { onEntityChanged(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java index ec6edad..140e1d4 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java @@ -201,7 +201,7 @@ { super.eventRaised(ev, sender, args); - if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getUserName()) + if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition) && sender == getUserName()) { UserName_EntityChanged(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java index 3f25b6c..c1c36fd 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java @@ -889,7 +889,7 @@ Version_SelectedItemChanged(args); } } - else if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition)) + else if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition)) { EntityModel senderEntityModel = (EntityModel) sender; if ((Boolean) senderEntityModel.getEntity()) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java index 3ca8407..fcb4eec 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java @@ -180,11 +180,11 @@ @Override public void eventRaised(Event ev, Object sender, EventArgs args) { super.eventRaised(ev, sender, args); - if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getPath()) { + if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition) && sender == getPath()) { // Notify about path change. getPathChangedEvent().raise(this, EventArgs.Empty); } - else if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getOverride()) { + else if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition) && sender == getOverride()) { Override_EntityChanged(args); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java index c9f5624..764d023 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java @@ -297,7 +297,7 @@ { SanTargetModel_LoggedIn(sender, args); } - else if (ev.matchesDefinition(EntityChangedEventDefinition)) + else if (ev.matchesDefinition(entityChangedEventDefinition)) { UseUserAuth_EntityChanged(sender, args); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java index 06f542c..a9cc1ef 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java @@ -719,15 +719,15 @@ public void eventRaised(Event ev, Object sender, EventArgs args) { super.eventRaised(ev, sender, args); - if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getIsWipeAfterDelete()) + if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition) && sender == getIsWipeAfterDelete()) { WipeAfterDelete_EntityChanged(args); } - else if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getIsAttachDisk()) + else if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition) && sender == getIsAttachDisk()) { AttachDisk_EntityChanged(args); } - else if (ev.matchesDefinition(ListModel.EntityChangedEventDefinition) && sender == getIsInternal()) + else if (ev.matchesDefinition(ListModel.entityChangedEventDefinition) && sender == getIsInternal()) { IsInternal_EntityChanged(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java index e6b19cc..b107655 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java @@ -184,7 +184,7 @@ } setIsSameVdsMessageVisible(gethasSameVdsMessage()); } - else if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition)) + else if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition)) { if (sender == getSelectHostAutomatically_IsSelected()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java index 01d10a5..aecee87 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java @@ -764,7 +764,7 @@ SysPrepDomainName_SelectedItemChanged(); } } - else if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition)) + else if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition)) { if (sender == getAttachFloppy()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index 56da68d..86b2def 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -1308,7 +1308,7 @@ behavior.updateCpuPinningVisibility(); } } - else if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition)) + else if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition)) { if (sender == getMemSize()) { -- To view, visit http://gerrit.ovirt.org/14471 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22664795e8f38628216f167978051f4c8c1ea81d 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
