Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix field is not final warnings in uicommonweb project ......................................................................
findbugs: Fix field is not final warnings in uicommonweb project Change-Id: I10d4143c5b2adb031e56e0cc9ac2555e3605f177 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ProvideTickEvent.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/ChangeCDModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AsyncIteratorCallback.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java 15 files changed, 31 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/14476/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ProvideTickEvent.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ProvideTickEvent.java index 3ee71df..015d5a9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ProvideTickEvent.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ProvideTickEvent.java @@ -5,7 +5,7 @@ @SuppressWarnings("unused") public final class ProvideTickEvent { - public static EventDefinition Definition; + public final static EventDefinition Definition; static { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java index 63dcef1..d746595 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java @@ -48,7 +48,7 @@ private static final BookmarksComparator COMPARATOR = new BookmarksComparator(); - public static EventDefinition NavigatedEventDefinition; + public final static EventDefinition NavigatedEventDefinition; private Event privateNavigatedEvent; public Event getNavigatedEvent() @@ -75,6 +75,7 @@ private UICommand privateEditCommand; + @Override public UICommand getEditCommand() { return privateEditCommand; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/ChangeCDModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/ChangeCDModel.java index 54d6000..d001a99 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/ChangeCDModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/ChangeCDModel.java @@ -12,7 +12,7 @@ // public event EventHandler Executed = delegate { }; - public static EventDefinition ExecutedEventDefinition; + public final static EventDefinition ExecutedEventDefinition; private Event privateExecutedEvent; public Event getExecutedEvent() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index 623ba7c..4c02277 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -22,7 +22,7 @@ public abstract class NetworkModel extends Model { - protected static String ENGINE_NETWORK = + protected final static String ENGINE_NETWORK = (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); private EntityModel privateName; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AsyncIteratorCallback.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AsyncIteratorCallback.java index f619152..6d0451b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AsyncIteratorCallback.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AsyncIteratorCallback.java @@ -7,7 +7,7 @@ public class AsyncIteratorCallback { - public static EventDefinition NotifyEventDefinition; + public final static EventDefinition NotifyEventDefinition; private Event notifyEvent; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java index 5333e72..568443a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java @@ -43,7 +43,7 @@ private static final Constants constants = ConstantsManager.getInstance().getConstants(); private static final Messages messages = ConstantsManager.getInstance().getMessages(); - public static EventDefinition RequestEditEventDefinition; + public final static EventDefinition RequestEditEventDefinition; private Event privateRequestEditEvent; public Event getRequestEditEvent() @@ -56,7 +56,7 @@ privateRequestEditEvent = value; } - public static EventDefinition RequestGOToEventsTabEventDefinition; + public final static EventDefinition RequestGOToEventsTabEventDefinition; private Event privateRequestGOToEventsTabEvent; public Event getRequestGOToEventsTabEvent() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java index 43458c1..7fedc9e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java @@ -54,7 +54,9 @@ public class HostInterfaceListModel extends SearchableListModel { - public static String ENGINE_NETWORK_NAME; + // get management network name from configuration + public final static String ENGINE_NETWORK_NAME = + (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); private UICommand privateEditCommand; @@ -333,10 +335,6 @@ public HostInterfaceListModel() { - // get management network name - ENGINE_NETWORK_NAME = - (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); - setIsTimerDisabled(true); setTitle(ConstantsManager.getInstance().getConstants().networkInterfacesTitle()); setHashName("network_interfaces"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java index f9b4e00..7e6c2a5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java @@ -37,7 +37,7 @@ public class PoolGeneralModel extends EntityModel { - public static EventDefinition UpdateCompleteEventDefinition; + public final static EventDefinition UpdateCompleteEventDefinition; private Event privateUpdateCompleteEvent; public Event getUpdateCompleteEvent() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java index 373ac5f..9e1fd87 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java @@ -1,5 +1,9 @@ package org.ovirt.engine.ui.uicommonweb.models.tags; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Map; + import org.ovirt.engine.core.common.action.TagsActionParametersBase; import org.ovirt.engine.core.common.action.TagsOperationParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -25,15 +29,11 @@ import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Map; - @SuppressWarnings("unused") public class TagListModel extends SearchableListModel { - public static EventDefinition ResetRequestedEventDefinition; + public final static EventDefinition ResetRequestedEventDefinition; private Event privateResetRequestedEvent; public Event getResetRequestedEvent() @@ -60,6 +60,7 @@ private UICommand privateEditCommand; + @Override public UICommand getEditCommand() { return privateEditCommand; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagModel.java index dc52e34..5e7ae7a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagModel.java @@ -1,25 +1,25 @@ package org.ovirt.engine.ui.uicommonweb.models.tags; +import java.util.ArrayList; +import java.util.Map; + import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.Model; +import org.ovirt.engine.ui.uicommonweb.validation.I18NNameValidation; import org.ovirt.engine.ui.uicommonweb.validation.IValidation; import org.ovirt.engine.ui.uicommonweb.validation.LengthValidation; -import org.ovirt.engine.ui.uicommonweb.validation.I18NNameValidation; import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.EventDefinition; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; -import java.util.ArrayList; -import java.util.Map; - @SuppressWarnings("unused") public class TagModel extends Model { - public static EventDefinition SelectionChangedEventDefinition; + public final static EventDefinition SelectionChangedEventDefinition; private Event privateSelectionChangedEvent; public Event getSelectionChangedEvent() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java index 0cbc8a2..f09f487 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java @@ -31,7 +31,7 @@ public class UserPortalBasicListModel extends IUserPortalListModel implements IVmPoolResolutionService { - public static EventDefinition SearchCompletedEventDefinition; + public final static EventDefinition SearchCompletedEventDefinition; private Event privateSearchCompletedEvent; public Event getSearchCompletedEvent() 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 0b0d258..5ee50cb 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 @@ -21,6 +21,7 @@ import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; @@ -30,7 +31,6 @@ import org.ovirt.engine.core.common.businessentities.VmPool; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmType; -import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -83,7 +83,7 @@ public class UserPortalListModel extends IUserPortalListModel implements IVmPoolResolutionService { - public static EventDefinition SearchCompletedEventDefinition; + public final static EventDefinition SearchCompletedEventDefinition; private Event privateSearchCompletedEvent; public Event getSearchCompletedEvent() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java index ae28668..796f815 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java @@ -33,7 +33,7 @@ public enum ClientConsoleMode { Native, Plugin, Auto }; - public static EventDefinition ErrorEventDefinition; + public final static EventDefinition ErrorEventDefinition; private Event privateErrorEvent; /** diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java index 54802d4..11aac74 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java @@ -38,7 +38,7 @@ public class VmGeneralModel extends EntityModel { - public static EventDefinition UpdateCompleteEventDefinition; + public final static EventDefinition UpdateCompleteEventDefinition; private Event privateUpdateCompleteEvent; public Event getUpdateCompleteEvent() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java index 5f872b0..d2e430e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java @@ -11,8 +11,8 @@ import org.ovirt.engine.core.common.action.gluster.GlusterVolumeActionParameters; import org.ovirt.engine.core.common.action.gluster.GlusterVolumeOptionParameters; import org.ovirt.engine.core.common.action.gluster.GlusterVolumeRebalanceParameters; -import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.StoragePool; +import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; @@ -53,8 +53,8 @@ public class VolumeListModel extends ListWithDetailsModel implements ISupportSystemTreeContext { - public static Integer REPLICATE_COUNT_DEFAULT = 2; - public static Integer STRIPE_COUNT_DEFAULT = 4; + public final static Integer REPLICATE_COUNT_DEFAULT = 2; + public final static Integer STRIPE_COUNT_DEFAULT = 4; private UICommand createVolumeCommand; -- To view, visit http://gerrit.ovirt.org/14476 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10d4143c5b2adb031e56e0cc9ac2555e3605f177 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
