java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java
| 4
java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java
| 4
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
| 18 -
java/code/src/com/redhat/rhn/common/filediff/Trace.java
| 24 -
java/code/src/com/redhat/rhn/common/hibernate/ForceRecreationListType.java
| 4
java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
| 10
java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
| 10
java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java
| 28 -
java/code/src/com/redhat/rhn/common/security/acl/ConfigAclHandler.java
| 23 -
java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java
| 8
java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java
| 4
java/code/src/com/redhat/rhn/common/util/DatePicker.java
| 4
java/code/src/com/redhat/rhn/common/util/OvalFileAggregator.java
| 10
java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java
| 20 -
java/code/src/com/redhat/rhn/common/util/RpmVersionComparator.java
| 4
java/code/src/com/redhat/rhn/common/util/StringUtil.java
| 32 --
java/code/src/com/redhat/rhn/common/util/XPathLite.java
| 8
java/code/src/com/redhat/rhn/common/validator/SchemaParser.java
| 4
java/code/src/com/redhat/rhn/common/validator/ValidatorException.java
| 4
java/code/src/com/redhat/rhn/domain/channel/Channel.java
| 8
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
| 8
java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java
| 4
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
| 44 --
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
| 8
java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
| 4
java/code/src/com/redhat/rhn/domain/kickstart/KickstartSession.java
| 4
java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
| 16 -
java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
| 4
java/code/src/com/redhat/rhn/domain/monitoring/ServerProbe.java
| 6
java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java
| 4
java/code/src/com/redhat/rhn/domain/monitoring/notification/NotificationFactory.java
| 4
java/code/src/com/redhat/rhn/domain/monitoring/suite/ProbeSuite.java
| 4
java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
| 4
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageArch.java
| 4
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
| 13
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKey.java
| 4
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKeyType.java
| 4
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageName.java
| 4
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProvider.java
| 4
java/code/src/com/redhat/rhn/domain/rhnpackage/profile/ProfileEntry.java
| 4
java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
| 10
java/code/src/com/redhat/rhn/domain/server/Server.java
| 4
java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
| 6
java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java
| 24 -
java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java
| 4
java/code/src/com/redhat/rhn/domain/user/UserFactory.java
| 4
java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
| 16 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
| 6
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
| 26 -
java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java
| 5
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
| 16 -
java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java
| 20 -
java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java
| 4
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java
| 8
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java
| 6
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java
| 22 -
java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java
| 28 -
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java
| 10
java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java
| 20 -
java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java
| 14
java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
| 4
java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java
| 18 -
java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
| 10
java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java
| 148 ++++------
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
| 12
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPreservationListSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java
| 6
java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java
| 10
java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
| 4
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
| 60 +---
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java
| 14
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java
| 14
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/satellite/test/TestConfigureCertificateCommand.java
| 4
java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java
| 12
java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsFilterMatcher.java
| 29 -
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java
| 19 -
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
| 14
java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
| 4
java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java
| 4
java/code/src/com/redhat/rhn/frontend/context/Context.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java
| 33 --
java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/OrgEntitlementDto.java
| 12
java/code/src/com/redhat/rhn/frontend/dto/OrgSoftwareEntitlementDto.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/PackageMetadata.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/SoftwareEntitlementDto.java
| 8
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/VirtualSystemOverview.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOptionValue.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOverviewSystemsDto.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java
| 8
java/code/src/com/redhat/rhn/frontend/dto/monitoring/ProbeDto.java
| 4
java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java
| 8
java/code/src/com/redhat/rhn/frontend/events/BaseMailAction.java
| 14
java/code/src/com/redhat/rhn/frontend/filter/StringMatcher.java
| 14
java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
| 6
java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java
| 12
java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java
| 36 +-
java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.java
| 4
java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java
| 8
java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java
| 4
java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java
| 22 -
java/code/src/com/redhat/rhn/frontend/taglibs/HighlightTag.java
| 4
java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java
| 4
java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
| 22 -
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
| 46 +--
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagHelper.java
| 12
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
| 14
java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/SelectableWebList.java
| 7
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
| 4
java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelper.java
| 7
java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java
| 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
| 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
| 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
| 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
| 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
| 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
| 14
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
| 16 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java
| 4
java/code/src/com/redhat/rhn/manager/action/ActionManager.java
| 18 -
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
| 36 --
java/code/src/com/redhat/rhn/manager/common/CreateFileListCommand.java
| 4
java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
| 10
java/code/src/com/redhat/rhn/manager/entitlement/EntitlementManager.java
| 8
java/code/src/com/redhat/rhn/manager/errata/cache/ErrataCacheManager.java
| 34 --
java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
| 8
java/code/src/com/redhat/rhn/manager/kickstart/FilePreservationListsCommand.java
| 4
java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
| 4
java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java
| 4
java/code/src/com/redhat/rhn/manager/kickstart/KickstartIpCommand.java
| 4
java/code/src/com/redhat/rhn/manager/kickstart/KickstartPrePostCommand.java
| 20 -
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
| 12
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
| 4
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java
| 8
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
| 8
java/code/src/com/redhat/rhn/manager/kickstart/crypto/BaseCryptoKeyCommand.java
| 4
java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java
| 4
java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
| 58 +--
java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java
| 88 ++---
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
| 20 -
java/code/src/com/redhat/rhn/manager/satellite/ConfigureBootstrapCommand.java
| 4
java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java
| 4
java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
| 10
java/code/src/com/redhat/rhn/manager/satellite/RestartCommand.java
| 4
java/code/src/com/redhat/rhn/manager/system/SystemManager.java
| 32 --
java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
| 8
java/code/src/com/redhat/rhn/manager/user/UserManager.java
| 4
java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
| 48 +--
java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
| 4
java/code/src/com/redhat/rhn/taskomatic/core/BaseDaemon.java
| 4
java/code/src/com/redhat/rhn/taskomatic/task/CobblerSyncTask.java
| 24 -
java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java
| 6
java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
| 6
java/code/src/com/redhat/rhn/testing/TestUtils.java
| 4
java/spacewalk-java.spec
| 40 ++
rel-eng/packages/spacewalk-java
| 2
187 files changed, 781 insertions(+), 1343 deletions(-)
New commits:
commit d6698861e504453a5e11e58f4f68a32987731ef5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:38:30 2012 +0100
Automatic commit of package [spacewalk-java] release [1.7.48-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 48c5c06..52f4095 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.7.47
+Version: 1.7.48
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -585,6 +585,44 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Feb 28 2012 Tomas Lestach <tlestach(a)redhat.com> 1.7.48-1
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/testing/TestUtils.java (tlestach(a)redhat.com)
+- remove unnecessary else statements in java/code/src/com/redhat/rhn/manager/
+ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/manager/system/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/manager/kickstart/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/taskomatic/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in rest of
+ java/code/src/com/redhat/rhn/frontend/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/frontend/xmlrpc/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/frontend/action/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/frontend/dto/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/frontend/action/configuration/
+ (tlestach(a)redhat.com)
+- remove unnecessary else statements in java/code/src/com/redhat/rhn/domain/
+ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/domain/kickstart/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in rest of
+ java/code/src/com/redhat/rhn/common/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/common/validator/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/src/com/redhat/rhn/common/util/ (tlestach(a)redhat.com)
+- remove unnecessary else statements in
+ java/code/internal/src/com/redhat/rhn/internal/doclet (tlestach(a)redhat.com)
+
* Tue Feb 28 2012 Tomas Lestach <tlestach(a)redhat.com> 1.7.47-1
- access static fields in a static way (tlestach(a)redhat.com)
- access static fields in a static way (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8d7e515..9d82fef 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.7.47-1 java/
+1.7.48-1 java/
commit f80d8ba868fe7f79c8291357e24a0794719a3305
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:34:10 2012 +0100
remove unnecessary else statements in
java/code/src/com/redhat/rhn/testing/TestUtils.java
diff --git a/java/code/src/com/redhat/rhn/testing/TestUtils.java
b/java/code/src/com/redhat/rhn/testing/TestUtils.java
index 31e98e0..84c0ff4 100644
--- a/java/code/src/com/redhat/rhn/testing/TestUtils.java
+++ b/java/code/src/com/redhat/rhn/testing/TestUtils.java
@@ -143,9 +143,7 @@ public class TestUtils {
if (url == null) {
return null;
}
- else {
- return readAll(url.openStream());
- }
+ return readAll(url.openStream());
}
/**
commit 5bb5be6eccb6e81bd0ca626e05cecd8b046374ea
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:33:48 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/manager/
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 21116c9..cb96e89 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1155,10 +1155,8 @@ public class ActionManager extends BaseManager {
return (PackageAction) schedulePackageAction(scheduler, pkgs,
ActionFactory.TYPE_PACKAGES_REMOVE, earliestAction, srvr);
}
- else {
- return (PackageAction) schedulePackageAction(scheduler, pkgs,
- ActionFactory.TYPE_SOLARISPKGS_REMOVE, earliestAction, srvr);
- }
+ return (PackageAction) schedulePackageAction(scheduler, pkgs,
+ ActionFactory.TYPE_SOLARISPKGS_REMOVE, earliestAction, srvr);
}
/**
@@ -1239,10 +1237,8 @@ public class ActionManager extends BaseManager {
return (PackageAction) schedulePackageAction(scheduler, pkgs,
ActionFactory.TYPE_PACKAGES_UPDATE, earliestAction, srvr);
}
- else {
- return (PackageAction) schedulePackageAction(scheduler, pkgs,
- ActionFactory.TYPE_SOLARISPKGS_INSTALL, earliestAction, srvr);
- }
+ return (PackageAction) schedulePackageAction(scheduler, pkgs,
+ ActionFactory.TYPE_SOLARISPKGS_INSTALL, earliestAction, srvr);
}
/**
@@ -1290,10 +1286,8 @@ public class ActionManager extends BaseManager {
return (PackageAction) schedulePackageAction(scheduler, srvr, pkgs,
ActionFactory.TYPE_PACKAGES_UPDATE, earliestAction);
}
- else {
- return (PackageAction) schedulePackageAction(scheduler, srvr, pkgs,
- ActionFactory.TYPE_SOLARISPKGS_INSTALL, earliestAction);
- }
+ return (PackageAction) schedulePackageAction(scheduler, srvr, pkgs,
+ ActionFactory.TYPE_SOLARISPKGS_INSTALL, earliestAction);
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/common/CreateFileListCommand.java
b/java/code/src/com/redhat/rhn/manager/common/CreateFileListCommand.java
index 6a2c430..461925d 100644
--- a/java/code/src/com/redhat/rhn/manager/common/CreateFileListCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/common/CreateFileListCommand.java
@@ -47,9 +47,7 @@ public class CreateFileListCommand extends BaseFileListEditCommand {
CommonFactory.saveFileList(this.list);
return null;
}
- else {
- return new ValidatorError("preservation.key.labelexists");
- }
+ return new ValidatorError("preservation.key.labelexists");
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
index 9f3672b..4247f12 100644
--- a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
@@ -2196,15 +2196,11 @@ public class ConfigurationManager extends BaseManager {
if (dr == null || dr.size() == 0) {
return null;
}
- else {
- ConfigSystemDto csd = (ConfigSystemDto)dr.get(0);
- sid = csd.getId().longValue();
- }
+ ConfigSystemDto csd = (ConfigSystemDto)dr.get(0);
+ sid = csd.getId().longValue();
return sid;
}
- else {
- return null;
- }
+ return null;
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/entitlement/EntitlementManager.java
b/java/code/src/com/redhat/rhn/manager/entitlement/EntitlementManager.java
index c977fde..55a55a1 100644
--- a/java/code/src/com/redhat/rhn/manager/entitlement/EntitlementManager.java
+++ b/java/code/src/com/redhat/rhn/manager/entitlement/EntitlementManager.java
@@ -182,9 +182,7 @@ public class EntitlementManager extends BaseManager {
if (sg != null) {
return sg.getCurrentMembers();
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -198,8 +196,6 @@ public class EntitlementManager extends BaseManager {
if (sg != null) {
return sg.getMaxMembers();
}
- else {
- return null;
- }
+ return null;
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/errata/cache/ErrataCacheManager.java
b/java/code/src/com/redhat/rhn/manager/errata/cache/ErrataCacheManager.java
index c05f096..60621ad 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/cache/ErrataCacheManager.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/cache/ErrataCacheManager.java
@@ -67,11 +67,9 @@ public class ErrataCacheManager extends HibernateFactory {
if (dr.isEmpty()) {
return 0;
}
- else {
- Map record = (Map) dr.get(0);
- Long cnt = (Long) record.get("num_items");
- return (cnt != null) ? cnt.intValue() : 0;
- }
+ Map record = (Map) dr.get(0);
+ Long cnt = (Long) record.get("num_items");
+ return (cnt != null) ? cnt.intValue() : 0;
}
/**
@@ -152,14 +150,12 @@ public class ErrataCacheManager extends HibernateFactory {
params.put("package_id", packageId);
return m.executeUpdate(params);
}
- else {
- WriteMode m = ModeFactory.getWriteMode("ErrataCache_queries",
- "delete_needed_package_cache_null_errata");
- Map params = new HashMap();
- params.put("server_id", sid);
- params.put("package_id", packageId);
- return m.executeUpdate(params);
- }
+ WriteMode m = ModeFactory.getWriteMode("ErrataCache_queries",
+ "delete_needed_package_cache_null_errata");
+ Map params = new HashMap();
+ params.put("server_id", sid);
+ params.put("package_id", packageId);
+ return m.executeUpdate(params);
}
/**
@@ -208,13 +204,11 @@ public class ErrataCacheManager extends HibernateFactory {
params.put("errata_id", eid);
return m.executeUpdate(params);
}
- else {
- WriteMode m = ModeFactory.getWriteMode("ErrataCache_queries",
- "delete_needed_errata_cache_null_errata");
- Map params = new HashMap();
- params.put("server_id", sid);
- return m.executeUpdate(params);
- }
+ WriteMode m = ModeFactory.getWriteMode("ErrataCache_queries",
+ "delete_needed_errata_cache_null_errata");
+ Map params = new HashMap();
+ params.put("server_id", sid);
+ return m.executeUpdate(params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java
b/java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java
index 20bfb1b..b8a0221 100644
--- a/java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java
+++ b/java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java
@@ -495,9 +495,7 @@ public class MonitoringManager extends BaseManager {
if (CommandGroup.ALL_GROUP_NAME.equals(group.getGroupName())) {
return MonitoringFactory.loadAllCommands();
}
- else {
- return new ArrayList(group.getCommands());
- }
+ return new ArrayList(group.getCommands());
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
index d13d943..6c01e99 100644
--- a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
@@ -140,39 +140,37 @@ public class CreateOrgCommand {
if (errors != null && errors.length > 0) {
return errors;
}
- else {
- createdOrg = OrgFactory.save(createdOrg);
- cmd.setOrg(createdOrg);
- cmd.storeNewUser();
- this.newOrg = createdOrg;
-
- // Lookup the SSL crypto key for the default org and copy it to the new:
- Org defaultOrg = OrgFactory.getSatelliteOrg();
- List<CryptoKey> defaultOrgKeys =
KickstartFactory.lookupCryptoKeys(defaultOrg);
- CryptoKey ssl = null;
- // Search for the first key of type ssl:
- for (CryptoKey key : defaultOrgKeys) {
- if (key.getCryptoKeyType().equals(KickstartFactory.KEY_TYPE_SSL)) {
- ssl = key;
- break;
- }
- }
- if (ssl != null) {
- // TODO
- log.debug("Found a SSL key for the default org to copy: " +
- ssl.getId());
- CreateCryptoKeyCommand createCryptoKey =
- new CreateCryptoKeyCommand(createdOrg);
- createCryptoKey.setContents(ssl.getKeyString());
- createCryptoKey.setDescription(ssl.getDescription());
- createCryptoKey.setType("SSL");
- createCryptoKey.store();
+ createdOrg = OrgFactory.save(createdOrg);
+ cmd.setOrg(createdOrg);
+ cmd.storeNewUser();
+ this.newOrg = createdOrg;
+
+ // Lookup the SSL crypto key for the default org and copy it to the new:
+ Org defaultOrg = OrgFactory.getSatelliteOrg();
+ List<CryptoKey> defaultOrgKeys =
KickstartFactory.lookupCryptoKeys(defaultOrg);
+ CryptoKey ssl = null;
+ // Search for the first key of type ssl:
+ for (CryptoKey key : defaultOrgKeys) {
+ if (key.getCryptoKeyType().equals(KickstartFactory.KEY_TYPE_SSL)) {
+ ssl = key;
+ break;
}
+ }
+ if (ssl != null) {
+ // TODO
+ log.debug("Found a SSL key for the default org to copy: " +
+ ssl.getId());
+ CreateCryptoKeyCommand createCryptoKey =
+ new CreateCryptoKeyCommand(createdOrg);
+ createCryptoKey.setContents(ssl.getKeyString());
+ createCryptoKey.setDescription(ssl.getDescription());
+ createCryptoKey.setType("SSL");
+ createCryptoKey.store();
+ }
- ChannelFamilyFactory.lookupOrCreatePrivateFamily(createdOrg);
+ ChannelFamilyFactory.lookupOrCreatePrivateFamily(createdOrg);
- return null;
- }
+ return null;
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java
b/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java
index 59983f1..d83c17a 100644
--- a/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java
+++ b/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java
@@ -249,57 +249,55 @@ public class ProfileManager extends BaseManager {
// therefore, it may be skipped
continue;
}
+ log.debug("Checking on : " +
profpkgitem.getEvr());
+
+ if (compareArch(syspkgitem.getArch(),
+ profpkgitem.getArch()) != 0) {
+ // if the arch of the packages doesn't match, we
don't
+ // need to compare the EVR; therefore, if at end of the
+ // list, add both packages to the result
+ if ((j + 1) == plist.size()) {
+ PackageMetadata pm = createPackageMetadata(
+ syspkgitem, null,
+ PackageMetadata.KEY_THIS_ONLY, param);
+ skipPkg.add(syspkgitem.getNevra());
+ result.add(pm);
+
+ pm = createPackageMetadata(null, profpkgitem,
+ PackageMetadata.KEY_OTHER_ONLY, param);
+ skipPkg.add(profpkgitem.getNevra());
+ result.add(pm);
+ }
+ }
else {
- log.debug("Checking on : " +
profpkgitem.getEvr());
+ PackageMetadata pm = compareAndCreatePackageMetaData(
+ syspkgitem, profpkgitem, param);
+ String evrKey = pm.getSystemEvr() + "|" +
+ pm.getOtherEvr();
+ // If the package exists on one but not the other we
+ // need to add it to the compare map
+ if (pm.getComparisonAsInt() !=
+ PackageMetadata.KEY_NO_DIFF) {
- if (compareArch(syspkgitem.getArch(),
- profpkgitem.getArch()) != 0) {
- // if the arch of the packages doesn't match, we
don't
- // need to compare the EVR; therefore, if at end of
the
- // list, add both packages to the result
if ((j + 1) == plist.size()) {
- PackageMetadata pm = createPackageMetadata(
- syspkgitem, null,
- PackageMetadata.KEY_THIS_ONLY, param);
+ // this is the last entry in plist; therefore,
+ // this must be a difference between pkgs
+ log.debug("Adding to cm: " + evrKey +
+ " comp: " +
pm.getComparison());
+ pm.setComparison(
+ PackageMetadata.KEY_OTHER_ONLY);
+ compareMap.put(evrKey, pm);
skipPkg.add(syspkgitem.getNevra());
- result.add(pm);
-
- pm = createPackageMetadata(null, profpkgitem,
- PackageMetadata.KEY_OTHER_ONLY, param);
skipPkg.add(profpkgitem.getNevra());
- result.add(pm);
}
}
else {
- PackageMetadata pm =
compareAndCreatePackageMetaData(
- syspkgitem, profpkgitem, param);
- String evrKey = pm.getSystemEvr() + "|" +
- pm.getOtherEvr();
- // If the package exists on one but not the other we
- // need to add it to the compare map
- if (pm.getComparisonAsInt() !=
- PackageMetadata.KEY_NO_DIFF) {
-
- if ((j + 1) == plist.size()) {
- // this is the last entry in plist;
therefore,
- // this must be a difference between pkgs
- log.debug("Adding to cm: " + evrKey
+
- " comp: " +
pm.getComparison());
- pm.setComparison(
- PackageMetadata.KEY_OTHER_ONLY);
- compareMap.put(evrKey, pm);
- skipPkg.add(syspkgitem.getNevra());
- skipPkg.add(profpkgitem.getNevra());
- }
- }
- else {
- log.debug("Removing from cm: " +
evrKey);
- compareMap.remove(evrKey);
- skipPkg.add(profpkgitem.getNevra());
- // pkg found in both plist & syslist, skip to
next
- // syslist entry
- break;
- }
+ log.debug("Removing from cm: " + evrKey);
+ compareMap.remove(evrKey);
+ skipPkg.add(profpkgitem.getNevra());
+ // pkg found in both plist & syslist, skip to
next
+ // syslist entry
+ break;
}
}
}
@@ -436,9 +434,7 @@ public class ProfileManager extends BaseManager {
if (((a1 == null) && (a2 == null)) || (a1.equals(a2))) {
return 0;
}
- else {
- return 1;
- }
+ return 1;
}
private static PackageMetadata compareAndCreatePackageMetaData(
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
index 0511939..bcdfc19 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -473,9 +473,7 @@ public class PackageManager extends BaseManager {
Long id = (Long) ((Map) dr.get(0)).get("id");
return new Long(id.longValue());
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -496,9 +494,7 @@ public class PackageManager extends BaseManager {
if (dr.size() > 0) {
return (Map) dr.get(0);
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -813,11 +809,9 @@ public class PackageManager extends BaseManager {
"Package_queries", "packages_by_name_smart");
return m.execute(params);
}
- else {
- SelectMode m = ModeFactory.getMode(
- "Package_queries", "packages_by_name_clabel");
- return m.execute(params);
- }
+ SelectMode m = ModeFactory.getMode(
+ "Package_queries", "packages_by_name_clabel");
+ return m.execute(params);
}
/**
@@ -1281,9 +1275,7 @@ public class PackageManager extends BaseManager {
if (list.isEmpty()) {
return null;
}
- else {
- return list.get(0);
- }
+ return list.get(0);
}
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureBootstrapCommand.java
b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureBootstrapCommand.java
index bf8bfba..cb9a242 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureBootstrapCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureBootstrapCommand.java
@@ -101,9 +101,7 @@ public class ConfigureBootstrapCommand extends BaseConfigureCommand
errors[0] = new ValidatorError(errorKey);
return errors;
}
- else {
- return null;
- }
+ return null;
}
diff --git
a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java
b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java
index 50380f6..c9a06c3 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java
@@ -95,9 +95,7 @@ public class ConfigureCertificateCommand
errors[0] = new ValidatorError(errorKey);
return errors;
}
- else {
- return null;
- }
+ return null;
}
protected void writeStringToFile() throws FileNotFoundException {
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
index 6a6c40f..33e0c19 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
@@ -180,14 +180,12 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand
}
return retval;
}
- else {
- this.keysToBeUpdated.clear();
+ this.keysToBeUpdated.clear();
- if (logger.isDebugEnabled()) {
- logger.debug("storeConfiguration() - end - return value=" +
null);
- }
- return null;
+ if (logger.isDebugEnabled()) {
+ logger.debug("storeConfiguration() - end - return value=" +
null);
}
+ return null;
}
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/RestartCommand.java
b/java/code/src/com/redhat/rhn/manager/satellite/RestartCommand.java
index 5d7d57c..99c9da3 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/RestartCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/RestartCommand.java
@@ -51,9 +51,7 @@ public class RestartCommand extends BaseConfigureCommand
errors[0] = new ValidatorError("restart.config.error");
return errors;
}
- else {
- return null;
- }
+ return null;
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/user/UserManager.java
b/java/code/src/com/redhat/rhn/manager/user/UserManager.java
index e46987f..bca9fac 100644
--- a/java/code/src/com/redhat/rhn/manager/user/UserManager.java
+++ b/java/code/src/com/redhat/rhn/manager/user/UserManager.java
@@ -964,9 +964,7 @@ public class UserManager extends BaseManager {
if (pref == null) {
return true;
}
- else {
- return !pref.getValue().equals("0");
- }
+ return !pref.getValue().equals("0");
}
/**
commit 96834185ded81668baf6bf8c22d236faf63a75ce
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:29:20 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/manager/system/
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 165759f..29008a1 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -1194,10 +1194,8 @@ public class SystemManager extends BaseManager {
if (flush) {
return (Server) HibernateFactory.reload(server);
}
- else {
- HibernateFactory.getSession().refresh(server);
- return server;
- }
+ HibernateFactory.getSession().refresh(server);
+ return server;
}
/**
@@ -1326,10 +1324,8 @@ public class SystemManager extends BaseManager {
if (flush) {
return (Server)HibernateFactory.reload(server);
}
- else {
- HibernateFactory.getSession().refresh(server);
- return server;
- }
+ HibernateFactory.getSession().refresh(server);
+ return server;
}
@@ -1601,9 +1597,7 @@ public class SystemManager extends BaseManager {
ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME + "
installed.");
return result;
}
- else {
- scheduleVirtualizationHostPackageInstall(server, user, result);
- }
+ scheduleVirtualizationHostPackageInstall(server, user, result);
return result;
}
@@ -1912,10 +1906,8 @@ public class SystemManager extends BaseManager {
e.setLocalizedReason2(ls.getMessage("lookup.jsp.reason2.system"));
throw e;
}
- else {
- HibernateFactory.getSession().delete(server.getLock());
- server.setLock(null);
- }
+ HibernateFactory.getSession().delete(server.getLock());
+ server.setLock(null);
}
/**
@@ -1935,13 +1927,11 @@ public class SystemManager extends BaseManager {
e.setLocalizedReason2(ls.getMessage("lookup.jsp.reason2.system"));
throw e;
}
- else {
- ServerLock sl = new ServerLock(locker,
- server,
- reason);
+ ServerLock sl = new ServerLock(locker,
+ server,
+ reason);
- server.setLock(sl);
- }
+ server.setLock(sl);
}
diff --git a/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
b/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
index cbe3768..64b2f2f 100644
--- a/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
@@ -92,9 +92,7 @@ public class UpdateChildChannelsCommand extends BaseUpdateChannelCommand
{
if (channel == null) {
throw new InvalidChannelException();
}
- else {
- throw new ChannelSubscriptionException(channel.getLabel());
- }
+ throw new ChannelSubscriptionException(channel.getLabel());
}
}
}
@@ -112,9 +110,7 @@ public class UpdateChildChannelsCommand extends
BaseUpdateChannelCommand {
if (failedChannels) {
return new ValidatorError("sdc.channels.edit.failed_channels");
}
- else {
- return null;
- }
+ return null;
}
private static boolean subscribeToNewChannels(User loggedInUser,
commit af0bf2f36a9181590fb95d05b349f2709e24c40c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:27:59 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/manager/kickstart/
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
index f3178ce..57dbb42 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
@@ -137,9 +137,7 @@ public class BaseKickstartScriptCommand extends BaseKickstartCommand
{
if (this.script.getScriptType() != null) {
return this.script.getScriptType();
}
- else {
- return KickstartScript.TYPE_PRE;
- }
+ return KickstartScript.TYPE_PRE;
}
/**
@@ -150,9 +148,7 @@ public class BaseKickstartScriptCommand extends BaseKickstartCommand
{
if (this.script != null) {
return this.script.getRaw();
}
- else {
- return true;
- }
+ return true;
}
/**
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/FilePreservationListsCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/FilePreservationListsCommand.java
index eb2d1c2..6f00f45 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/FilePreservationListsCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/FilePreservationListsCommand.java
@@ -84,9 +84,7 @@ public class FilePreservationListsCommand extends BaseKickstartCommand
{
if (ksdata.getPreserveFileLists() != null) {
return ksdata.getPreserveFileLists();
}
- else {
- return Collections.EMPTY_SET;
- }
+ return Collections.EMPTY_SET;
}
}
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
index e4801d4..5ea0e98 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
@@ -104,9 +104,7 @@ public class KickstartActivationKeysCommand extends
BaseKickstartCommand {
if (this.ksdata.getDefaultRegTokens() != null) {
return this.ksdata.getDefaultRegTokens();
}
- else {
- return Collections.EMPTY_SET;
- }
+ return Collections.EMPTY_SET;
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java
index ba3442a..6eccf63 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java
@@ -107,9 +107,7 @@ public class KickstartCryptoKeyCommand extends BaseKickstartCommand {
if (ksdata.getCryptoKeys() != null) {
return ksdata.getCryptoKeys();
}
- else {
- return Collections.EMPTY_SET;
- }
+ return Collections.EMPTY_SET;
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartIpCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartIpCommand.java
index a1a7ffd..eb7fc25 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartIpCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartIpCommand.java
@@ -83,9 +83,7 @@ public class KickstartIpCommand extends BaseKickstartCommand {
store();
return true;
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPrePostCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPrePostCommand.java
index 608473b..a7206d2 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPrePostCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPrePostCommand.java
@@ -147,9 +147,7 @@ public class KickstartPrePostCommand extends BaseKickstartCommand {
if (kss != null) {
return kss.getInterpreter();
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -161,10 +159,8 @@ public class KickstartPrePostCommand extends BaseKickstartCommand {
if (kss != null) {
return kss.getDataContents();
}
- else {
- // return ksdata.getPreContents();
- return null;
- }
+ // return ksdata.getPreContents();
+ return null;
}
/**
@@ -176,10 +172,8 @@ public class KickstartPrePostCommand extends BaseKickstartCommand {
if (kss != null) {
return kss.getDataContents();
}
- else {
- // return ksdata.getPostContents();
- return null;
- }
+ // return ksdata.getPostContents();
+ return null;
}
/**
@@ -191,9 +185,7 @@ public class KickstartPrePostCommand extends BaseKickstartCommand {
if (kss != null) {
return kss.getInterpreter();
}
- else {
- return null;
- }
+ return null;
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index 7703f0c..d8d8d1f 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -995,13 +995,11 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
log.debug(" ** getToolsChannel() returning ksdata's
channel");
return ksdata.getChannel();
}
- else {
- log.debug(" ** getToolsChannel() looking for tools channel as a
child");
- Channel kschannel = ksdata.getChannel();
- Channel toolsChannel = ChannelManager.getToolsChannel(kschannel, user);
- if (toolsChannel != null) {
- return toolsChannel;
- }
+ log.debug(" ** getToolsChannel() looking for tools channel as a
child");
+ Channel kschannel = ksdata.getChannel();
+ Channel toolsChannel = ChannelManager.getToolsChannel(kschannel, user);
+ if (toolsChannel != null) {
+ return toolsChannel;
}
log.error("Tools channel not found! " +
"This means we can't find the rhn-kickstart package.");
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
index 8b563d8..6261bcd 100755
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
@@ -188,8 +188,6 @@ public abstract class CobblerCommand {
if (user == null) {
return CobblerXMLRPCHelper.getAutomatedConnection();
}
- else {
- return CobblerXMLRPCHelper.getConnection(user);
- }
+ return CobblerXMLRPCHelper.getConnection(user);
}
}
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java
index 4329aa9..493da54 100644
---
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java
+++
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java
@@ -120,9 +120,7 @@ public class CobblerDistroSyncCommand extends CobblerCommand {
if (messages.length() == 0) {
return null;
}
- else {
- return new ValidatorError("kickstart.cobbler.distro.syncfail",
messages);
- }
+ return new ValidatorError("kickstart.cobbler.distro.syncfail",
messages);
}
@@ -180,9 +178,7 @@ public class CobblerDistroSyncCommand extends CobblerCommand {
if (messages.length() == 0) {
return null;
}
- else {
- return new ValidatorError("kickstart.cobbler.distro.syncfail",
messages);
- }
+ return new ValidatorError("kickstart.cobbler.distro.syncfail",
messages);
}
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
index eea142f..bc30e74 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
@@ -173,13 +173,9 @@ public abstract class CobblerProfileCommand extends CobblerCommand {
if (tree.getCobblerXenId() == null) {
return null;
}
- else {
- return Distro.lookupById(con, tree.getCobblerXenId());
- }
- }
- else {
- return Distro.lookupById(con, tree.getCobblerId());
+ return Distro.lookupById(con, tree.getCobblerXenId());
}
+ return Distro.lookupById(con, tree.getCobblerId());
}
}
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/crypto/BaseCryptoKeyCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/crypto/BaseCryptoKeyCommand.java
index 4416a32..45033b1 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/crypto/BaseCryptoKeyCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/crypto/BaseCryptoKeyCommand.java
@@ -77,9 +77,7 @@ public abstract class BaseCryptoKeyCommand {
if (this.key != null && this.key.getCryptoKeyType() != null) {
return this.key.getCryptoKeyType().getLabel();
}
- else {
- return null;
- }
+ return null;
}
/**
commit b5ae769227d4662f5a5588977715bb8403e41d00
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:26:23 2012 +0100
remove unnecessary else statements in
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 822cefc..40a5e8f 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -440,9 +440,7 @@ public class ChannelManager extends BaseManager {
if (dr != null && !dr.isEmpty()) {
return (ChannelOverview) dr.get(0);
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -1743,9 +1741,7 @@ public class ChannelManager extends BaseManager {
foundChannel = dcm.getChannel();
break;
}
- else {
- log.debug("no subscriptions available.");
- }
+ log.debug("no subscriptions available.");
}
}
}
@@ -1818,9 +1814,7 @@ public class ChannelManager extends BaseManager {
if (tokens.length <= 1) {
return originalRelease;
}
- else {
- return tokens[0];
- }
+ return tokens[0];
}
if (tokens.length <= 3) {
@@ -1852,9 +1846,7 @@ public class ChannelManager extends BaseManager {
if (dr.size() == 0) {
return null;
}
- else {
- return dr;
- }
+ return dr;
}
/**
* Return the list of ISO channels with SUPPORTED distributions
@@ -1872,9 +1864,7 @@ public class ChannelManager extends BaseManager {
if (dr.size() == 0) {
return null;
}
- else {
- return dr;
- }
+ return dr;
}
/**
* Return the list of ISO channels for RETIRED distributions
@@ -1892,9 +1882,7 @@ public class ChannelManager extends BaseManager {
if (dr.size() == 0) {
return null;
}
- else {
- return dr;
- }
+ return dr;
}
/**
@@ -1929,9 +1917,7 @@ public class ChannelManager extends BaseManager {
if (dr.size() == 0) {
return null;
}
- else {
- return dr;
- }
+ return dr;
}
/**
@@ -2788,9 +2774,7 @@ public class ChannelManager extends BaseManager {
"list_errata_needing_sync");
return m.execute(params);
}
- else {
- return Collections.EMPTY_LIST;
- }
+ return Collections.EMPTY_LIST;
}
/**
@@ -2815,9 +2799,7 @@ public class ChannelManager extends BaseManager {
"list_packages_needing_sync_from_set");
return m.execute(params);
}
- else {
- return Collections.EMPTY_LIST;
- }
+ return Collections.EMPTY_LIST;
}
/**
commit a5d9fc442ef09756a1f1349cf97b92d287dea75d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:25:15 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/taskomatic/
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
index 5d9a69a..dcfa884 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
@@ -249,11 +249,9 @@ public class TaskoFactory extends HibernateFactory {
return singleton.listObjectsByNamedQuery(
"TaskoSchedule.listActiveInSat", params);
}
- else {
- params.put("org_id", orgId);
- return singleton.listObjectsByNamedQuery(
- "TaskoSchedule.listActiveByOrg", params);
- }
+ params.put("org_id", orgId);
+ return singleton.listObjectsByNamedQuery(
+ "TaskoSchedule.listActiveByOrg", params);
}
/**
@@ -271,11 +269,9 @@ public class TaskoFactory extends HibernateFactory {
return singleton.listObjectsByNamedQuery(
"TaskoSchedule.listActiveInSatByLabel", params);
}
- else {
- params.put("org_id", orgId);
- return singleton.listObjectsByNamedQuery(
- "TaskoSchedule.listActiveByOrgAndLabel", params);
- }
+ params.put("org_id", orgId);
+ return singleton.listObjectsByNamedQuery(
+ "TaskoSchedule.listActiveByOrgAndLabel", params);
}
/**
@@ -295,11 +291,9 @@ public class TaskoFactory extends HibernateFactory {
return singleton.listObjectsByNamedQuery(
"TaskoSchedule.listActiveInSatByBunch", params);
}
- else {
- params.put("org_id", orgId);
- return singleton.listObjectsByNamedQuery(
- "TaskoSchedule.listActiveByOrgAndBunch", params);
- }
+ params.put("org_id", orgId);
+ return singleton.listObjectsByNamedQuery(
+ "TaskoSchedule.listActiveByOrgAndBunch", params);
}
@@ -390,11 +384,9 @@ public class TaskoFactory extends HibernateFactory {
return singleton.listObjectsByNamedQuery(
"TaskoSchedule.listInSat", params);
}
- else {
- params.put("org_id", orgId);
- return singleton.listObjectsByNamedQuery(
- "TaskoSchedule.listByOrg", params);
- }
+ params.put("org_id", orgId);
+ return singleton.listObjectsByNamedQuery(
+ "TaskoSchedule.listByOrg", params);
}
/**
@@ -435,11 +427,9 @@ public class TaskoFactory extends HibernateFactory {
return singleton.listObjectsByNamedQuery(
"TaskoSchedule.listInSatByBunch",
params);
}
- else {
- params.put("org_id", orgId);
- return singleton.listObjectsByNamedQuery(
- "TaskoSchedule.listByOrgAndBunch",
params);
- }
+ params.put("org_id", orgId);
+ return singleton.listObjectsByNamedQuery(
+ "TaskoSchedule.listByOrgAndBunch", params);
}
/**
@@ -456,11 +446,9 @@ public class TaskoFactory extends HibernateFactory {
return singleton.listObjectsByNamedQuery(
"TaskoSchedule.listInSatByLabel",
params);
}
- else {
- params.put("org_id", orgId);
- return singleton.listObjectsByNamedQuery(
- "TaskoSchedule.listByOrgAndLabel",
params);
- }
+ params.put("org_id", orgId);
+ return singleton.listObjectsByNamedQuery(
+ "TaskoSchedule.listByOrgAndLabel", params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
index 865d5b9..8adbc34 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
@@ -260,9 +260,7 @@ public class TaskomaticApi {
if (task == null) {
return null;
}
- else {
- return (String) task.get("cron_expr");
- }
+ return (String) task.get("cron_expr");
}
/**
diff --git a/java/code/src/com/redhat/rhn/taskomatic/core/BaseDaemon.java
b/java/code/src/com/redhat/rhn/taskomatic/core/BaseDaemon.java
index 9f7679b..9de0234 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/core/BaseDaemon.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/core/BaseDaemon.java
@@ -75,9 +75,7 @@ public abstract class BaseDaemon implements WrapperListener {
if (retval == BaseDaemon.SUCCESS) {
return 0;
}
- else {
- return retval;
- }
+ return retval;
}
/**
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/CobblerSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/CobblerSyncTask.java
index f14e1b2..798664f 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/CobblerSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/CobblerSyncTask.java
@@ -85,20 +85,18 @@ public class CobblerSyncTask extends RhnJavaJob {
log.debug("Cobbler mtime is less than last change, skipping");
return;
}
- else {
- log.debug("Syncing distros and profiles.");
+ log.debug("Syncing distros and profiles.");
- ve = distSync.store();
- if (ve != null) {
- TaskHelper.sendErrorEmail(log, ve.getMessage());
- }
+ ve = distSync.store();
+ if (ve != null) {
+ TaskHelper.sendErrorEmail(log, ve.getMessage());
+ }
- CobblerProfileSyncCommand profSync = new CobblerProfileSyncCommand();
- profSync.store();
+ CobblerProfileSyncCommand profSync = new CobblerProfileSyncCommand();
+ profSync.store();
- CobblerSystemSyncCommand systemSync = new CobblerSystemSyncCommand();
- systemSync.store();
- }
+ CobblerSystemSyncCommand systemSync = new CobblerSystemSyncCommand();
+ systemSync.store();
LAST_UPDATED.set((new Date()).getTime() / 1000 + 1);
}
@@ -112,9 +110,7 @@ public class CobblerSyncTask extends RhnJavaJob {
log.error("re-throwing exception since we havent yet.");
throw re;
}
- else {
- log.error("Not re-throwing any more errors.");
- }
+ log.error("Not re-throwing any more errors.");
}
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java
b/java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java
index cc46d3f..1c7ae25 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java
@@ -116,10 +116,8 @@ public class SummaryPopulation extends RhnJavaJob {
if (count.intValue() == 0) {
return m.executeUpdate(params);
}
- else {
- log.warn("Skipping " + orgId + " because it's already
queued");
- return 0;
- }
+ log.warn("Skipping " + orgId + " because it's already
queued");
+ return 0;
}
catch (RuntimeException e) {
log.warn(e.getMessage(), e);
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
index a6ba771..300a0c9 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
@@ -207,10 +207,8 @@ class ErrataQueueWorker implements QueueWorker {
if (queuedStatus != null) {
return queuedStatus;
}
- else {
- logger.error("Couldn't locate \"queued\" action
status");
- return null;
- }
+ logger.error("Couldn't locate \"queued\" action
status");
+ return null;
}
commit eb25629d09df2321ab8170d4652304cefda8c343
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:23:18 2012 +0100
remove unnecessary else statements in rest of java/code/src/com/redhat/rhn/frontend/
diff --git a/java/code/src/com/redhat/rhn/frontend/context/Context.java
b/java/code/src/com/redhat/rhn/frontend/context/Context.java
index f50c939..6847f64 100644
--- a/java/code/src/com/redhat/rhn/frontend/context/Context.java
+++ b/java/code/src/com/redhat/rhn/frontend/context/Context.java
@@ -78,9 +78,7 @@ public class Context {
if (this.locale == null) {
return LocalizationService.DEFAULT_LOCALE;
}
- else {
- return this.locale;
- }
+ return this.locale;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/events/BaseMailAction.java
b/java/code/src/com/redhat/rhn/frontend/events/BaseMailAction.java
index df0b031..5edb48d 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/BaseMailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/BaseMailAction.java
@@ -52,14 +52,12 @@ public abstract class BaseMailAction {
if (clazz == null) {
return new SmtpMail();
}
- else {
- try {
- Class cobj = Class.forName(clazz);
- return (Mail) cobj.newInstance();
- }
- catch (Exception e) {
- return new SmtpMail();
- }
+ try {
+ Class cobj = Class.forName(clazz);
+ return (Mail) cobj.newInstance();
+ }
+ catch (Exception e) {
+ return new SmtpMail();
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/filter/StringMatcher.java
b/java/code/src/com/redhat/rhn/frontend/filter/StringMatcher.java
index 47b7e47..abc8416 100644
--- a/java/code/src/com/redhat/rhn/frontend/filter/StringMatcher.java
+++ b/java/code/src/com/redhat/rhn/frontend/filter/StringMatcher.java
@@ -34,14 +34,12 @@ class StringMatcher implements Matcher {
StringUtils.isBlank(filterColumn)) {
return true; ///show all if I entered a blank value
}
- else {
- String value = ((String)MethodUtil.callMethod(obj,
- StringUtil.beanify("get " +
- filterColumn),
- new Object[0]));
- if (!StringUtils.isBlank(value)) {
- return value.toUpperCase().indexOf(filterData.toUpperCase()) >= 0;
- }
+ String value = ((String)MethodUtil.callMethod(obj,
+ StringUtil.beanify("get " +
+ filterColumn),
+ new Object[0]));
+ if (!StringUtils.isBlank(value)) {
+ return value.toUpperCase().indexOf(filterData.toUpperCase()) >= 0;
}
return false;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
b/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
index c50ad87..6ec9ac2 100644
--- a/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
+++ b/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
@@ -159,10 +159,8 @@ public class IntegrationService {
log.debug("encodedRandom found. valid!");
return true;
}
- else {
- log.debug("encodedRandom not found. invalid!");
- return false;
- }
+ log.debug("encodedRandom not found. invalid!");
+ return false;
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java
b/java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java
index 4a2de9b..aa16df6 100644
--- a/java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java
+++ b/java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java
@@ -203,9 +203,7 @@ public class RhnHttpServletRequest extends HttpServletRequestWrapper
{
if (ACTIVE_LANG_ATTR.equals(name)) {
return Context.getCurrentContext().getActiveLocaleLabel();
}
- else {
- return super.getAttribute(name);
- }
+ return super.getAttribute(name);
}
/**
* {@inheritDoc}
@@ -225,9 +223,7 @@ public class RhnHttpServletRequest extends HttpServletRequestWrapper
{
if (ACTIVE_LANG_ATTR.equals(name)) {
return;
}
- else {
- super.removeAttribute(name);
- }
+ super.removeAttribute(name);
}
/**
* {@inheritDoc}
@@ -236,9 +232,7 @@ public class RhnHttpServletRequest extends HttpServletRequestWrapper
{
if (ACTIVE_LANG_ATTR.equals(name)) {
return;
}
- else {
- super.setAttribute(name, value);
- }
+ super.setAttribute(name, value);
}
void configureLocale() {
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java
b/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java
index 4531e22..87fbc03 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java
@@ -55,22 +55,20 @@ public abstract class BaseListAction extends RhnListAction {
return
strutsDelegate.forwardParams(mapping.findForward("preconditionfailed"),
request.getParameterMap());
}
- else {
- User user = requestContext.getCurrentUser();
- PageControl pc = getNewPageControl(requestContext);
- processPageControl(pc);
-
- if (pc != null) {
- clampListBounds(pc, request, user);
- }
- DataResult dr = getDataResult(requestContext, pc);
-
- request.setAttribute(RequestContext.PAGE_LIST, dr);
- processRequestAttributes(requestContext);
- processForm(requestContext, formIn);
- return
strutsDelegate.forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ User user = requestContext.getCurrentUser();
+ PageControl pc = getNewPageControl(requestContext);
+ processPageControl(pc);
+
+ if (pc != null) {
+ clampListBounds(pc, request, user);
}
+ DataResult dr = getDataResult(requestContext, pc);
+
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
+ processRequestAttributes(requestContext);
+ processForm(requestContext, formIn);
+ return strutsDelegate.forwardParams(mapping.findForward("default"),
+ request.getParameterMap());
}
/**
@@ -82,11 +80,9 @@ public abstract class BaseListAction extends RhnListAction {
if (rctx.isRequestedExport()) {
return null;
}
- else {
- PageControl pc = new PageControl();
- pc.setPageSize(rctx.getLoggedInUser().getPageSize());
- return pc;
- }
+ PageControl pc = new PageControl();
+ pc.setPageSize(rctx.getLoggedInUser().getPageSize());
+ return pc;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.java
b/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.java
index febd8aa..5557c34 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.java
@@ -116,9 +116,7 @@ public abstract class RhnLookupDispatchAction extends
LookupDispatchAction {
SUBMITTED + "'");
}
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java
b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java
index a986294..d205f87 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java
@@ -297,9 +297,7 @@ public class StrutsDelegate {
p.readForm(form);
return p.getDate();
}
- else {
- return new Date();
- }
+ return new Date();
}
/**
@@ -368,9 +366,7 @@ public class StrutsDelegate {
return new DatePicker(name, TimeZone.getDefault(), Locale.getDefault(),
yearDirection);
}
- else {
- return new DatePicker(name, ctx.getTimezone(), ctx.getLocale(),
yearDirection);
- }
+ return new DatePicker(name, ctx.getTimezone(), ctx.getLocale(), yearDirection);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java
b/java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java
index 5a45459..64f6b2c 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java
@@ -102,9 +102,7 @@ public abstract class RhnWizardAction extends RhnAction {
if (wizardStep != null) {
return wizardStep.invoke(mapping, form, ctx, response, this);
}
- else {
- return null;
- }
+ return null;
}
protected List findMethods(String methodPrefix) {
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java
index 81f2f01..75d5029 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java
@@ -80,19 +80,17 @@ public class DWRItemSelector {
}
return set.size();
}
- else {
- RhnSetDecl decl = RhnSetDecl.find(setLabel);
- if (decl != null) {
- RhnSet set = decl.get(new RequestContext(req).getLoggedInUser());
- if (isOn) {
- set.addElements(which);
- }
- else {
- set.removeElements(which);
- }
- RhnSetManager.store(set);
- return set.size();
+ RhnSetDecl decl = RhnSetDecl.find(setLabel);
+ if (decl != null) {
+ RhnSet set = decl.get(new RequestContext(req).getLoggedInUser());
+ if (isOn) {
+ set.addElements(which);
}
+ else {
+ set.removeElements(which);
+ }
+ RhnSetManager.store(set);
+ return set.size();
}
return null;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/HighlightTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/HighlightTag.java
index 39ab8de..d1236e1 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/HighlightTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/HighlightTag.java
@@ -130,9 +130,7 @@ public class HighlightTag extends BodyTagSupport {
throw new JspException("Tag error: must define tag " +
"or both startTag and endTag");
}
- else {
- return;
- }
+ return;
}
/*
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java
index f0bef4e..5d6880d 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java
@@ -433,9 +433,7 @@ public class ColumnTag extends BodyTagSupport {
if (sortAttribute != null) {
return sortAttribute;
}
- else {
- return attributeName;
- }
+ return attributeName;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
index a9461ff..1acffff 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
@@ -397,18 +397,16 @@ public class DataSetManipulator {
filterValue == null || filterValue.length() == 0) {
return;
}
- else {
- filter = f;
- HtmlTag filterClass = new HtmlTag("input");
- filterClass.setAttribute("type", "hidden");
- filterClass.setAttribute("name",
ListTagUtil.makeFilterClassLabel(uniqueName));
- filterClass.setAttribute("value",
f.getClass().getCanonicalName());
- ListTagUtil.write(context, filterClass.render());
-
- dataset = ListFilterHelper.filter(dataset, f, filterBy, filterValue,
- searchParent, searchChild);
- totalDataSetSize = dataset.size();
- }
+ filter = f;
+ HtmlTag filterClass = new HtmlTag("input");
+ filterClass.setAttribute("type", "hidden");
+ filterClass.setAttribute("name",
ListTagUtil.makeFilterClassLabel(uniqueName));
+ filterClass.setAttribute("value", f.getClass().getCanonicalName());
+ ListTagUtil.write(context, filterClass.render());
+
+ dataset = ListFilterHelper.filter(dataset, f, filterBy, filterValue,
+ searchParent, searchChild);
+ totalDataSetSize = dataset.size();
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index a1b86dc..2aa20a3 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -553,31 +553,29 @@ public class ListTag extends BodyTagSupport {
renderEmptyList();
return BodyTagSupport.SKIP_BODY;
}
+ ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
+ ListCommand.RENDER);
+ if (iterator.hasNext()) {
+ Object obj = iterator.next();
+ if (RhnListTagFunctions.isExpandable(obj)) {
+ parentObject = obj;
+ }
+ currentObject = obj;
+ }
else {
+ currentObject = null;
+ }
+ if (currentObject == null) {
+ ListTagUtil.write(pageContext, "</tbody>");
ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
- ListCommand.RENDER);
- if (iterator.hasNext()) {
- Object obj = iterator.next();
- if (RhnListTagFunctions.isExpandable(obj)) {
- parentObject = obj;
- }
- currentObject = obj;
- }
- else {
- currentObject = null;
- }
- if (currentObject == null) {
- ListTagUtil.write(pageContext, "</tbody>");
- ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
- ListCommand.TBL_FOOTER);
- }
- else {
- ListTagUtil.write(pageContext, "<tr");
- renderRowClassAndId();
+ ListCommand.TBL_FOOTER);
+ }
+ else {
+ ListTagUtil.write(pageContext, "<tr");
+ renderRowClassAndId();
- ListTagUtil.write(pageContext, ">");
- pageContext.setAttribute(rowName, currentObject);
- }
+ ListTagUtil.write(pageContext, ">");
+ pageContext.setAttribute(rowName, currentObject);
}
}
else if (haveTblFootersRendered) {
@@ -897,9 +895,7 @@ public class ListTag extends BodyTagSupport {
if (size < 1 || size > pageSizes.get(pageSizes.size() - 1)) {
return;
}
- else {
- pageSize = size;
- }
+ pageSize = size;
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagHelper.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagHelper.java
index a72ae88..62d772d 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagHelper.java
@@ -113,9 +113,7 @@ public class ListTagHelper {
if (page == null) {
return 0;
}
- else {
- return Integer.parseInt(page);
- }
+ return Integer.parseInt(page);
}
/**
@@ -218,13 +216,9 @@ public class ListTagHelper {
if (oldValue != null && !oldValue.equals("null")) {
return oldValue;
}
- else {
- return "";
- }
- }
- else {
- return newValue;
+ return "";
}
+ return newValue;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index 8f24c19..f7370a4 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -118,9 +118,7 @@ public class ListTagUtil {
if (parent != null) {
return (ListCommand) ctx.getAttribute(parent.getUniqueName() +
"_cmd");
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -723,13 +721,11 @@ public class ListTagUtil {
if (token.indexOf(listName) > -1 &&
token.indexOf("_page=") > -1) {
continue;
}
+ if (url.endsWith("?")) {
+ url += token;
+ }
else {
- if (url.endsWith("?")) {
- url += token;
- }
- else {
- url = url + "&" + token;
- }
+ url = url + "&" + token;
}
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/SelectableWebList.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/SelectableWebList.java
index f1d2cf8..f735523 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/SelectableWebList.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/SelectableWebList.java
@@ -76,11 +76,8 @@ abstract class SelectableWebList extends WebList {
if (size() > 0) {
return;
}
- else {
- if (!ignoreEmptySelection) {
- RhnHelper.handleEmptySelection(request);
- }
-
+ if (!ignoreEmptySelection) {
+ RhnHelper.handleEmptySelection(request);
}
}
setupDataSet();
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
index 49d775b..f23ffb5 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
@@ -170,9 +170,7 @@ public class PageSizeDecorator extends BaseListDecorator {
if (prev == 0) {
return sz;
}
- else {
- return prev;
- }
+ return prev;
}
prev = sz;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelper.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelper.java
index 50a2577..f22d78f 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelper.java
@@ -160,11 +160,8 @@ abstract class ListSetHelper extends ListHelper {
dispatched = true;
return;
}
- else {
- if (!ignoreEmptySelection) {
- RhnHelper.handleEmptySelection(request);
- }
-
+ if (!ignoreEmptySelection) {
+ RhnHelper.handleEmptySelection(request);
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java
index e948204..d2822b4 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java
@@ -43,9 +43,7 @@ public class ExpandableRowRenderer extends RowRenderer {
rowNum++;
return rowClasses[rowNum % rowClasses.length];
}
- else {
- return rowClasses[rowNum % rowClasses.length];
- }
+ return rowClasses[rowNum % rowClasses.length];
}
/**
commit bce5def65f4c1eab354b70b47cd89566ba1f5671
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:22:43 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/frontend/xmlrpc/
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 20c8b88..74c2c73 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -618,9 +618,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
if (cnt == null) {
return 0;
}
- else {
- return cnt.intValue();
- }
+ return cnt.intValue();
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index 739fb42..b408eb3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -987,9 +987,7 @@ public class ErrataHandler extends BaseHandler {
if (value == null || StringUtils.isEmpty(value.toString())) {
throw new MissingErrataAttributeException(attribute);
}
- else {
- return value;
- }
+ return value;
}
/**
@@ -1178,9 +1176,7 @@ public class ErrataHandler extends BaseHandler {
if (publish) {
return publish(newErrata, channels, loggedInUser, false);
}
- else {
- return newErrata;
- }
+ return newErrata;
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
index 68e2027..6a0730d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
@@ -106,9 +106,7 @@ public class CryptoKeysHandler extends BaseHandler {
if (errors == null) {
return 1;
}
- else {
- throw new KickstartKeyAlreadyExistsException();
- }
+ throw new KickstartKeyAlreadyExistsException();
}
/**
@@ -138,9 +136,7 @@ public class CryptoKeysHandler extends BaseHandler {
if (errors == null) {
return 1;
}
- else {
- throw new KickstartKeyDeleteException();
- }
+ throw new KickstartKeyDeleteException();
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
index 127b3f9..4d4a23f 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
@@ -632,9 +632,7 @@ public class SystemDetailsHandler extends BaseHandler {
if (fileList == null) {
throw new FileListNotFoundException(name);
}
- else {
- fileLists.add(fileList);
- }
+ fileLists.add(fileList);
}
// Cycle through the list of file list objects retrieved and add
// them to the profile. We do this on a second pass because, we
@@ -698,9 +696,7 @@ public class SystemDetailsHandler extends BaseHandler {
if (fileList == null) {
throw new FileListNotFoundException(name);
}
- else {
- fileLists.add(fileList);
- }
+ fileLists.add(fileList);
}
// Cycle through the list of file list objects retrieved and remove
// them from the profile. We do this on a second pass because, we
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
index 8685577..da42c44 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
@@ -112,9 +112,7 @@ public class ProxyHandler extends BaseHandler {
return node.getScoutSharedKey();
}
- else {
- return "";
- }
+ return "";
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 0ec3d4c..0014c7d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -2529,10 +2529,8 @@ public class SystemHandler extends BaseHandler {
if (server.getRunningKernel() != null) {
return server.getRunningKernel();
}
- else {
- return LocalizationService.getInstance().getMessage(
- "server.runningkernel.unknown");
- }
+ return LocalizationService.getInstance().getMessage(
+ "server.runningkernel.unknown");
}
catch (LookupException e) {
throw new NoSuchSystemException(e);
@@ -3535,9 +3533,7 @@ public class SystemHandler extends BaseHandler {
!map.containsValue(country)) {
throw new UnrecognizedCountryException(country);
}
- else {
- server.getLocation().setCountry(country);
- }
+ server.getLocation().setCountry(country);
}
if (details.containsKey("building")) {
server.getLocation().setBuilding((String)details.get("building"));
@@ -4912,9 +4908,7 @@ public class SystemHandler extends BaseHandler {
if (server.isVirtualGuest()) {
return server.getVirtualInstance().getUuid();
}
- else {
- return "";
- }
+ return "";
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
index 474485c..e00f2b4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
@@ -89,16 +89,14 @@ public class ServerConfigHandler extends BaseHandler {
dtos.elaborate();
return dtos;
}
- else {
- List<ConfigFileNameDto> files = new
LinkedList<ConfigFileNameDto>();
- List <ConfigFileDto> currentFiles = cm.listCurrentFiles(loggedInUser,
- server.getSandboxOverride(), null);
- for (ConfigFileDto dto : currentFiles) {
- files.add(ConfigFileNameDtoSerializer.toNameDto(dto,
- ConfigChannelType.SANDBOX, null));
- }
- return files;
+ List<ConfigFileNameDto> files = new LinkedList<ConfigFileNameDto>();
+ List <ConfigFileDto> currentFiles = cm.listCurrentFiles(loggedInUser,
+ server.getSandboxOverride(), null);
+ for (ConfigFileDto dto : currentFiles) {
+ files.add(ConfigFileNameDtoSerializer.toNameDto(dto,
+ ConfigChannelType.SANDBOX, null));
}
+ return files;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java
index e962aa5..8fff3f1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java
@@ -941,9 +941,7 @@ public class UserHandler extends BaseHandler {
if (d != null) {
return d;
}
- else {
- throw new UserNeverLoggedInException();
- }
+ throw new UserNeverLoggedInException();
}
commit 7ce2b5067fe11810a7b4ddd8001a283de3b70992
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 19:17:00 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/frontend/action/
diff --git a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
index c01b7a8..3f19f05 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
@@ -139,9 +139,7 @@ public class SearchAction extends RhnAction {
return mapping.findForward("error");
}
}
- else {
- return mapping.findForward("error");
- }
+ return mapping.findForward("error");
}
protected void performRedirect(String url,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
b/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
index 2f0b626..caeaf2c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
@@ -129,16 +129,14 @@ public class YourRhnAction extends RhnAction {
if (parts.length < 2) {
return key;
}
- else {
- StringBuffer buf = new StringBuffer();
- buf.append(parts[0].toLowerCase());
- for (int x = 1; x < parts.length; x++) {
- String s = parts[x].substring(0, 1);
- String r = parts[x].substring(1);
- buf.append(s.toUpperCase()).append(r.toLowerCase());
- }
- return buf.toString();
+ StringBuffer buf = new StringBuffer();
+ buf.append(parts[0].toLowerCase());
+ for (int x = 1; x < parts.length; x++) {
+ String s = parts[x].substring(0, 1);
+ String r = parts[x].substring(1);
+ buf.append(s.toUpperCase()).append(r.toLowerCase());
}
+ return buf.toString();
}
private Map getDisplayPanes(User user) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
index 11088ef..3de83b9 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
@@ -90,10 +90,8 @@ public class DeleteChannelAction extends RhnAction {
createSuccessMessage(request, "message.channeldeleted",
channel.getName());
return actionMapping.findForward("success");
}
- else {
- addMessage(request,
"message.channel.delete.systemssubscribed");
- return actionMapping.findForward("default");
- }
+ addMessage(request, "message.channel.delete.systemssubscribed");
+ return actionMapping.findForward("default");
}
else if (channel.containsDistributions()) {
createErrorMessage(request,
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
index 029e55b..2d8bd2c 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
@@ -87,21 +87,19 @@ public class RepoDetailsAction extends RhnAction {
mapping.findForward("default"),
new HashMap());
}
+ if (isCreateMode(request)) {
+ createSuccessMessage(request,
+ "repos.jsp.create.success", repo.getLabel());
+ }
else {
- if (isCreateMode(request)) {
- createSuccessMessage(request,
- "repos.jsp.create.success",
repo.getLabel());
- }
- else {
- createSuccessMessage(request,
- "repos.jsp.update.success",
repo.getLabel());
- }
- request.removeAttribute(CREATE_MODE);
- setupRepo(request, form, repo);
- return getStrutsDelegate().forwardParam(
- mapping.findForward("success"),
"id",
- repo.getId().toString());
- }
+ createSuccessMessage(request,
+ "repos.jsp.update.success", repo.getLabel());
+ }
+ request.removeAttribute(CREATE_MODE);
+ setupRepo(request, form, repo);
+ return getStrutsDelegate().forwardParam(
+ mapping.findForward("success"), "id",
+ repo.getId().toString());
}
catch (ValidatorException ve) {
getStrutsDelegate().saveMessages(request, ve.getResult());
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java
index 9f2ac2b..75e7abf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java
@@ -201,9 +201,7 @@ public class BaseSubscribeAction extends RhnLookupDispatchAction {
return
strutsDelegate.forwardParams(mapping.findForward("success"),
new HashMap());
}
- else {
- newBase = ChannelManager.lookupByIdAndUser(newBaseChannelId, user);
- }
+ newBase = ChannelManager.lookupByIdAndUser(newBaseChannelId, user);
}
if (oldBase != null) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java
index 56215a1..f90c089 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java
@@ -74,10 +74,7 @@ public class ChildChannelAction extends RhnAction {
processList(user, request);
return mapping.findForward("success");
}
- // Otherwise let the JSP display the list
- else {
- return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
- }
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
// Get the list of child-channels available to the System Set
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index 3b23e52..1a648da 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -253,15 +253,13 @@ public class DownloadFile extends DownloadAction {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return mapping.findForward("error");
}
- else {
- HashMap params = new HashMap();
- params.put(TYPE, DownloadManager.DOWNLOAD_TYPE_KICKSTART);
- params.put(TREE, tree);
- params.put(CHILD, child);
- params.put(FILENAME, path);
- request.setAttribute(PARAMS, params);
- return null;
- }
+ HashMap params = new HashMap();
+ params.put(TYPE, DownloadManager.DOWNLOAD_TYPE_KICKSTART);
+ params.put(TREE, tree);
+ params.put(CHILD, child);
+ params.put(FILENAME, path);
+ request.setAttribute(PARAMS, params);
+ return null;
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
index bd060e5..aa3ba48 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
@@ -77,9 +77,7 @@ public class AffectedSystemsSetupAction extends RhnListAction {
return
strutsDelegate.forwardParams(mapping.findForward("confirm"),
request.getParameterMap());
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
if (ListTagHelper.getListAction(LIST_NAME, request) != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java
b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java
index 1197bfe..c9ed977 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java
@@ -153,8 +153,6 @@ public class CreateAction extends RhnAction {
String url = form.getString("buglistUrl");
return ErrataManager.createNewUnpublishedBug(id, summary, url);
}
- else {
- return null;
- }
+ return null;
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java
index a18ee5a..202c803 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java
@@ -95,16 +95,14 @@ public class ErrataDetailsSetupAction extends RhnAction {
if (files == null || files.size() == 0) {
return null;
}
- else {
- ErrataFile ef = (ErrataFile) files.get(0);
- StringBuffer buf = new StringBuffer();
- buf.append("<a
href=\"/rhn/oval?errata=").append(errataId).append("\">");
- String name = ef.getErrata().getAdvisoryName().toLowerCase();
- name = name.replaceAll(":", "");
- buf.append("com.redhat.").append(name).append(".xml");
- buf.append("</a>");
- retval = buf.toString();
- }
+ ErrataFile ef = (ErrataFile) files.get(0);
+ StringBuffer buf = new StringBuffer();
+ buf.append("<a
href=\"/rhn/oval?errata=").append(errataId).append("\">");
+ String name = ef.getErrata().getAdvisoryName().toLowerCase();
+ name = name.replaceAll(":", "");
+ buf.append("com.redhat.").append(name).append(".xml");
+ buf.append("</a>");
+ retval = buf.toString();
return retval;
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
index d9c9e9f..aa6758a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
@@ -74,13 +74,11 @@ public class CreateGroupAction extends RhnAction {
return mapping.findForward("success");
}
- else {
- request.setAttribute("name",
daForm.getString("name"));
- request.setAttribute("description",
- daForm.getString("description"));
+ request.setAttribute("name", daForm.getString("name"));
+ request.setAttribute("description",
+ daForm.getString("description"));
- return mapping.findForward("error");
- }
+ return mapping.findForward("error");
}
return mapping.findForward("default");
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java
index 728156e..347ea07 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java
@@ -166,55 +166,53 @@ public class CreateProfileWizardAction extends RhnWizardAction {
if (!validateInput(form, fields, ctx)) {
return this.dispatch(step.getPrevious(), mapping, form, ctx, response);
}
- else {
- try {
+ try {
- String kickstartLabel = form.getString(KICKSTART_LABEL_PARAM);
- KickstartBuilder builder = new KickstartBuilder(ctx.getLoggedInUser());
+ String kickstartLabel = form.getString(KICKSTART_LABEL_PARAM);
+ KickstartBuilder builder = new KickstartBuilder(ctx.getLoggedInUser());
- try {
- builder.validateNewLabel(kickstartLabel);
- }
- catch (ValidatorException ve) {
- getStrutsDelegate().saveMessages(ctx.getRequest(), ve.getResult());
- return this.dispatch(step.getPrevious(), mapping, form, ctx,
response);
- }
-
-
- KickstartHelper helper = new KickstartHelper(ctx.getRequest());
-
- Long treeId = (Long) form.get(KSTREE_ID_PARAM);
- KickstartWizardHelper cmd = new
KickstartWizardHelper(ctx.getCurrentUser());
- ActionForward retval = null;
- form.set(PREV_STEP_PARAM, "first");
- form.set(NEXT_STEP_PARAM, "third");
- form.set(DEFAULT_DOWNLOAD_LOCN, getDefaultDisplayDownloadLocation(
- cmd.getKickstartableTree(treeId), helper.getKickstartHost()));
-
- KickstartableTree tree = cmd.getKickstartableTree(treeId);
- ctx.getRequest().setAttribute("selectedTree", tree);
-
- //validate we have a distro for the tree + virt type combination
- String typeParam = form.getString(VIRTUALIZATION_TYPE_LABEL_PARAM);
- KickstartVirtualizationType vType =
-
KickstartFactory.lookupKickstartVirtualizationTypeByLabel(typeParam);
- Distro distro = CobblerProfileCommand.getCobblerDistroForVirtType(tree,
- vType, ctx.getLoggedInUser());
- if (distro == null) {
- ValidatorException.raiseException(
- "kickstart.cobbler.profile.nodistribution");
- }
-
- if (form.get(DEFAULT_DOWNLOAD_PARAM) == null) {
- form.set(DEFAULT_DOWNLOAD_PARAM, Boolean.TRUE);
- }
- retval = mapping.findForward("second");
- return retval;
+ try {
+ builder.validateNewLabel(kickstartLabel);
}
catch (ValidatorException ve) {
getStrutsDelegate().saveMessages(ctx.getRequest(), ve.getResult());
return this.dispatch(step.getPrevious(), mapping, form, ctx, response);
}
+
+
+ KickstartHelper helper = new KickstartHelper(ctx.getRequest());
+
+ Long treeId = (Long) form.get(KSTREE_ID_PARAM);
+ KickstartWizardHelper cmd = new KickstartWizardHelper(ctx.getCurrentUser());
+ ActionForward retval = null;
+ form.set(PREV_STEP_PARAM, "first");
+ form.set(NEXT_STEP_PARAM, "third");
+ form.set(DEFAULT_DOWNLOAD_LOCN, getDefaultDisplayDownloadLocation(
+ cmd.getKickstartableTree(treeId), helper.getKickstartHost()));
+
+ KickstartableTree tree = cmd.getKickstartableTree(treeId);
+ ctx.getRequest().setAttribute("selectedTree", tree);
+
+ //validate we have a distro for the tree + virt type combination
+ String typeParam = form.getString(VIRTUALIZATION_TYPE_LABEL_PARAM);
+ KickstartVirtualizationType vType =
+ KickstartFactory.lookupKickstartVirtualizationTypeByLabel(typeParam);
+ Distro distro = CobblerProfileCommand.getCobblerDistroForVirtType(tree,
+ vType, ctx.getLoggedInUser());
+ if (distro == null) {
+ ValidatorException.raiseException(
+ "kickstart.cobbler.profile.nodistribution");
+ }
+
+ if (form.get(DEFAULT_DOWNLOAD_PARAM) == null) {
+ form.set(DEFAULT_DOWNLOAD_PARAM, Boolean.TRUE);
+ }
+ retval = mapping.findForward("second");
+ return retval;
+ }
+ catch (ValidatorException ve) {
+ getStrutsDelegate().saveMessages(ctx.getRequest(), ve.getResult());
+ return this.dispatch(step.getPrevious(), mapping, form, ctx, response);
}
}
@@ -237,17 +235,15 @@ public class CreateProfileWizardAction extends RhnWizardAction {
form.set(DEFAULT_DOWNLOAD_PARAM, Boolean.FALSE);
return this.dispatch(step.getPrevious(), mapping, form, ctx, response);
}
- else {
- String userDownload = form.getString(USER_DOWNLOAD_PARAM);
- userDownload = userDownload.toLowerCase();
- if (!userDownload.startsWith("http://") &&
- !userDownload.startsWith("ftp://")) {
- ActionErrors errs = new ActionErrors();
- errs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("invalidUserDefinedDownload"));
- saveMessages(ctx.getRequest(), errs);
- return this.dispatch(step.getPrevious(), mapping, form, ctx,
response);
- }
+ String userDownload = form.getString(USER_DOWNLOAD_PARAM);
+ userDownload = userDownload.toLowerCase();
+ if (!userDownload.startsWith("http://") &&
+ !userDownload.startsWith("ftp://")) {
+ ActionErrors errs = new ActionErrors();
+ errs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("invalidUserDefinedDownload"));
+ saveMessages(ctx.getRequest(), errs);
+ return this.dispatch(step.getPrevious(), mapping, form, ctx, response);
}
}
form.set(PREV_STEP_PARAM, "second");
@@ -269,30 +265,28 @@ public class CreateProfileWizardAction extends RhnWizardAction {
form.getString(ROOT_PASSWORD_CONFIRM_PARAM), ctx)) {
return this.dispatch(step.getPrevious(), mapping, form, ctx, response);
}
+ KickstartableTree tree = cmd.getKickstartableTree(
+ (Long)form.get(KSTREE_ID_PARAM));
+ Boolean useDefault = (Boolean) form.get(DEFAULT_DOWNLOAD_PARAM);
+ String downloadUrl = null;
+ if (useDefault != null && Boolean.TRUE.equals(useDefault)) {
+ downloadUrl = getDefaultDownloadLocation(tree);
+ }
else {
- KickstartableTree tree = cmd.getKickstartableTree(
- (Long)form.get(KSTREE_ID_PARAM));
- Boolean useDefault = (Boolean) form.get(DEFAULT_DOWNLOAD_PARAM);
- String downloadUrl = null;
- if (useDefault != null && Boolean.TRUE.equals(useDefault)) {
- downloadUrl = getDefaultDownloadLocation(tree);
- }
- else {
- downloadUrl = form.getString(USER_DOWNLOAD_PARAM);
- }
- log.debug("Using default download location: " + downloadUrl);
- String ksLabel = form.getString(KICKSTART_LABEL_PARAM);
- String rootPass = form.getString(ROOT_PASSWORD_PARAM);
- String virtType = form.getString(VIRTUALIZATION_TYPE_LABEL_PARAM);
- KickstartBuilder builder = new KickstartBuilder(ctx.getCurrentUser());
- KickstartData ksdata = builder.create(ksLabel, tree, virtType, downloadUrl,
- rootPass, helper.getKickstartHost());
-
- String url = ctx.getRequest().getContextPath() + "/kickstart/" +
- "KickstartDetailsEdit.do?ksid=" + ksdata.getId();
- response.sendRedirect(url);
- return null;
+ downloadUrl = form.getString(USER_DOWNLOAD_PARAM);
}
+ log.debug("Using default download location: " + downloadUrl);
+ String ksLabel = form.getString(KICKSTART_LABEL_PARAM);
+ String rootPass = form.getString(ROOT_PASSWORD_PARAM);
+ String virtType = form.getString(VIRTUALIZATION_TYPE_LABEL_PARAM);
+ KickstartBuilder builder = new KickstartBuilder(ctx.getCurrentUser());
+ KickstartData ksdata = builder.create(ksLabel, tree, virtType, downloadUrl,
+ rootPass, helper.getKickstartHost());
+
+ String url = ctx.getRequest().getContextPath() + "/kickstart/" +
+ "KickstartDetailsEdit.do?ksid=" + ksdata.getId();
+ response.sendRedirect(url);
+ return null;
}
private void loadTrees(KickstartWizardHelper cmd, DynaActionForm form,
@@ -378,9 +372,7 @@ public class CreateProfileWizardAction extends RhnWizardAction {
if (tree != null) {
return tree.getDefaultDownloadLocation(host);
}
- else {
- return "";
- }
+ return "";
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
index bdd5e57..4512c2f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
@@ -67,9 +67,7 @@ public class EditPackagesAction extends RhnAction {
addMessage(request, "kickstart.edit.pkgs.updated");
return returnForward;
}
- else {
- return display(mapping, dynaForm, request, response, ctx, ksdata);
- }
+ return display(mapping, dynaForm, request, response, ctx, ksdata);
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
index a171ee5..75ea81a 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
@@ -54,9 +54,7 @@ public class KickstartCryptoKeysSetupAction extends
BaseKickstartListSetupAction
if (ksdata.getCryptoKeys() != null) {
return ksdata.getCryptoKeys().iterator();
}
- else {
- return Collections.EMPTY_LIST.iterator();
- }
+ return Collections.EMPTY_LIST.iterator();
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
index 2a5f248..ab69cf2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
@@ -280,9 +280,7 @@ public class KickstartHelper {
log.debug("Kickstart host from proxy header: " + firstProxy);
return firstProxy;
}
- else {
- return ConfigDefaults.get().getCobblerHost();
- }
+ return ConfigDefaults.get().getCobblerHost();
}
/**
@@ -405,9 +403,7 @@ public class KickstartHelper {
if (ksdata.isRhel4() || ksdata.isRhel3() || ksdata.isRhel2()) {
return hasPackages(ksdata.getChannel(),
KickstartFormatter.UPDATE_PKG_NAMES);
}
- else {
- return true;
- }
+ return true;
}
private boolean hasFresh(KickstartData ksdata) {
@@ -425,9 +421,7 @@ public class KickstartHelper {
return hasPackages(ksdata.getChannel(),
KickstartFormatter.FRESH_PKG_NAMES_RHEL34);
}
- else {
- return true;
- }
+ return true;
}
private boolean hasPackages(Channel c, String[] packageNames) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPreservationListSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPreservationListSetupAction.java
index a0f1c0a..25302e5 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPreservationListSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPreservationListSetupAction.java
@@ -54,8 +54,6 @@ public class KickstartPreservationListSetupAction extends
BaseKickstartListSetup
if (ksdata.getPreserveFileLists() != null) {
return ksdata.getPreserveFileLists().iterator();
}
- else {
- return Collections.EMPTY_LIST.iterator();
- }
+ return Collections.EMPTY_LIST.iterator();
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
index 43686dc..8ca06fb 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
@@ -241,9 +241,7 @@ public class KickstartSoftwareEditAction extends
BaseKickstartEditAction {
if (ve != null) {
return ve;
}
- else {
- return null;
- }
+ return null;
}
private void setupRepos(RequestContext context,
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
index 5f45f9c..de97467 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
@@ -706,9 +706,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
if (!isPost) {
return ret.getKernelOptionsString();
}
- else {
- return ret.getKernelPostOptionsString();
- }
+ return ret.getKernelPostOptionsString();
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
index 006db4b..b6a7fdb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
@@ -79,9 +79,7 @@ public class SystemDetailsEditAction extends RhnAction {
if (isSubmitted(dynaForm)) {
return updateSystemDetails(mapping, dynaForm, request, response);
}
- else {
- return viewSystemDetails(mapping, dynaForm, request, response);
- }
+ return viewSystemDetails(mapping, dynaForm, request, response);
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java
index 1a1bbca..ffe88ae 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java
@@ -63,10 +63,8 @@ public abstract class BaseTreeAction extends BaseEditAction {
rctx.getRequest().setAttribute(HIDE_SUBMIT, "true");
return;
}
- else {
- rctx.getRequest().setAttribute(CHANNELS,
- createLabelValueList(i, "getName", "getId"));
- }
+ rctx.getRequest().setAttribute(CHANNELS,
+ createLabelValueList(i, "getName", "getId"));
Channel selectedBaseChannel = getSelectedBaseChannel(rctx);
if (selectedBaseChannel == null) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java
index 58628c0..962593c 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java
@@ -68,9 +68,7 @@ public abstract class BaseProbeSuiteEditAction extends RhnAction {
return strutsDelegate.forwardParam(mapping.findForward(forwardName),
RequestContext.SUITE_ID, suite.getId().toString());
}
- else {
- return mapping.findForward(forwardName);
- }
+ return mapping.findForward(forwardName);
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditSetupAction.java
index ca248b1..176c338 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditSetupAction.java
@@ -41,9 +41,7 @@ public class ProbeSuiteSystemsEditSetupAction extends BaseSetListAction
{
rctx.getRequest().setAttribute("probeSuite", suite);
return "probesuitesystemsedit.jsp.addprobesfirst";
}
- else {
- return null;
- }
+ return null;
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java
index 50913c2..ec61763 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java
@@ -98,12 +98,10 @@ public abstract class BaseMethodEditAction extends RhnAction {
}
return returnActionForward;
}
- else {
- ValidatorError[] verrors = new ValidatorError[1];
- verrors[0] = e;
-
errors.add(RhnValidationHelper.validatorErrorToActionErrors(verrors));
- strutsDelegate.saveMessages(request, errors);
- }
+ ValidatorError[] verrors = new ValidatorError[1];
+ verrors[0] = e;
+ errors.add(RhnValidationHelper.validatorErrorToActionErrors(verrors));
+ strutsDelegate.saveMessages(request, errors);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
index 64f8857..e1173ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
@@ -67,9 +67,7 @@ public class RendererHelper {
Arrays.sort(overviews, new SystemOverviewComparator());
return new DataResult(Arrays.asList(overviews));
}
- else {
- return dr;
- }
+ return dr;
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java
index a064241..48a93ff 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java
@@ -78,9 +78,7 @@ public abstract class BaseSystemPackagesAction extends RhnAction {
if (!sessionSet.isEmpty()) {
return handleDispatchAction(mapping, requestContext);
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
DataResult dataSet = getDataResult(server);
// if its a list action update the set and the selections
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java
index 95bd2bd..e2cc562 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java
@@ -33,8 +33,6 @@ public class InstallPackageSetupAction extends BaseSystemPackagesAction
{
if (!server.isSolaris()) {
return PackageManager.systemAvailablePackages(server.getId(), null);
}
- else {
- return SolarisManager.systemAvailablePackageList(server.getId(), null);
- }
+ return SolarisManager.systemAvailablePackageList(server.getId(), null);
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
index d597ff1..553d8a1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
@@ -137,42 +137,40 @@ public class PackageDetailsAction extends RhnAction {
return mapping.findForward("default");
}
- else { //we have to guess
- PackageListItem item =
PackageListItem.parse(request.getParameter("id_combo"));
- Package pkg;
- long nameId = item.getIdOne();
- long evrId = item.getIdTwo();
- long archId = 0;
- if (item.getIdThree() != null) {
- archId = item.getIdThree();
- }
-
- Long cid = requestContext.getParamAsLong("cid");
- Long sid = requestContext.getParamAsLong("sid");
- if (cid != null) {
- pkg = PackageManager.guestimatePackageByChannel(
- cid, nameId, evrId, user.getOrg());
+ PackageListItem item =
PackageListItem.parse(request.getParameter("id_combo"));
+ Package pkg;
+ long nameId = item.getIdOne();
+ long evrId = item.getIdTwo();
+ long archId = 0;
+ if (item.getIdThree() != null) {
+ archId = item.getIdThree();
+ }
- }
- else if (sid != null) {
- pkg = PackageManager.guestimatePackageBySystem(
- sid, nameId, evrId, archId, user.getOrg());
+ Long cid = requestContext.getParamAsLong("cid");
+ Long sid = requestContext.getParamAsLong("sid");
+ if (cid != null) {
+ pkg = PackageManager.guestimatePackageByChannel(
+ cid, nameId, evrId, user.getOrg());
- }
- else {
- throw new BadParameterException("pid, cid, or sid");
- }
+ }
+ else if (sid != null) {
+ pkg = PackageManager.guestimatePackageBySystem(
+ sid, nameId, evrId, archId, user.getOrg());
- // show permission error if pid is invalid like we did before
- if (pkg == null) {
- throw new NoSuchPackageException();
- }
+ }
+ else {
+ throw new BadParameterException("pid, cid, or sid");
+ }
- Map params = new HashMap();
- params.put("pid", pkg.getId());
- return
getStrutsDelegate().forwardParams(mapping.findForward("package"),
- params);
+ // show permission error if pid is invalid like we did before
+ if (pkg == null) {
+ throw new NoSuchPackageException();
}
+
+ Map params = new HashMap();
+ params.put("pid", pkg.getId());
+ return
getStrutsDelegate().forwardParams(mapping.findForward("package"),
+ params);
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java
index ec738c7..78027c4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java
@@ -33,8 +33,6 @@ public class PackageListSetupAction extends BaseSystemPackagesAction {
if (!server.isSolaris()) {
return PackageManager.systemPackageList(server.getId(), null);
}
- else {
- return SolarisManager.systemPackageList(server.getId(), null);
- }
+ return SolarisManager.systemPackageList(server.getId(), null);
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java
index 0fa1c90..a3a01c7 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java
@@ -29,9 +29,7 @@ public class UpgradableListSetupAction extends BaseSystemPackagesAction
{
if (!server.isSolaris()) {
return PackageManager.upgradable(server.getId(), null);
}
- else {
- return SolarisManager.systemUpgradablePackageList(server.getId(), null);
- }
+ return SolarisManager.systemUpgradablePackageList(server.getId(), null);
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java
index 91b05f6..4585786 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java
@@ -78,14 +78,12 @@ public class CompareProfileSetupAction extends RhnAction {
if (!sessionSet.isEmpty()) {
return handleDispatchAction(mapping, requestContext);
}
- else {
- RhnHelper.handleEmptySelection(request);
- Map params = new HashMap();
- params.put(RequestContext.SID, sid.toString());
- params.put(RequestContext.PRID, prid.toString());
- return getStrutsDelegate().forwardParams(
- mapping.findForward("error"), params);
- }
+ RhnHelper.handleEmptySelection(request);
+ Map params = new HashMap();
+ params.put(RequestContext.SID, sid.toString());
+ params.put(RequestContext.PRID, prid.toString());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("error"), params);
}
DataResult dataSet = getDataResult(requestContext);
// if its a list action update the set and the selections
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java
index 214901c..a6c12a4 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java
@@ -74,14 +74,12 @@ public class CompareSystemSetupAction extends RhnAction {
if (!sessionSet.isEmpty()) {
return handleDispatchAction(mapping, requestContext);
}
- else {
- RhnHelper.handleEmptySelection(request);
- Map params = new HashMap();
- params.put(RequestContext.SID, sid.toString());
- params.put(RequestContext.SID1, sid1.toString());
- return getStrutsDelegate().forwardParams(
- mapping.findForward("error"), params);
- }
+ RhnHelper.handleEmptySelection(request);
+ Map params = new HashMap();
+ params.put(RequestContext.SID, sid.toString());
+ params.put(RequestContext.SID1, sid1.toString());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("error"), params);
}
DataResult dataSet = getDataResult(requestContext);
// if its a list action update the set and the selections
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
index 01d046a..4857678 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
@@ -222,8 +222,6 @@ public class MissingPackageAction extends BaseProfilesAction {
if (isSystemSync(context)) {
return DECL_SYSTEM_ACTION.getDecl(sid);
}
- else {
- return DECL_PROFILE_ACTION.getDecl(sid);
- }
+ return DECL_PROFILE_ACTION.getDecl(sid);
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/TestConfigureCertificateCommand.java
b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/TestConfigureCertificateCommand.java
index 95e055b..b96f60f 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/TestConfigureCertificateCommand.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/TestConfigureCertificateCommand.java
@@ -37,9 +37,7 @@ public class TestConfigureCertificateCommand extends
ConfigureCertificateCommand
retval[0] = new ValidatorError("some.error.key");
return retval;
}
- else {
- return null;
- }
+ return null;
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java
index ba312b5..69f1066 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java
@@ -111,9 +111,7 @@ public class InProgressSystemsAction extends RhnSetAction {
if (remainingSystems > 0) {
return strutsDelegate.forwardParams(mapping.findForward("default"),
params);
}
- else {
- return mapping.findForward("noSystemsLeft");
- }
+ return mapping.findForward("noSystemsLeft");
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java
index a923f3a..12d38ee 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java
@@ -74,9 +74,7 @@ public class ErrataConfirmSetupAction extends RhnAction implements
Listable {
if (!set.isEmpty()) {
return confirmErrata(mapping, formIn, request, response);
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
//Setup the datepicker widget
DatePicker picker = getStrutsDelegate().prepopulateDatePicker(request,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
index 214d5b7..aab4a3e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
@@ -295,9 +295,7 @@ public class ErrataSetupAction extends RhnAction implements Listable
{
if (currency) {
return SystemManager.relevantCurrencyErrata(user, sid, eType, synopsis);
}
- else {
- return SystemManager.relevantErrata(user, sid, typeList);
- }
+ return SystemManager.relevantErrata(user, sid, typeList);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java
index 656a4b1..756dad7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java
@@ -952,9 +952,7 @@ public class SystemSearchHelper {
if (sortLowToHigh) {
return lng1.compareTo(lng2);
}
- else {
- return lng2.compareTo(lng1);
- }
+ return lng2.compareTo(lng1);
}
catch (NumberFormatException e) {
// String isn't a Long so continue;
@@ -965,9 +963,7 @@ public class SystemSearchHelper {
if (sortLowToHigh) {
return doub1.compareTo(doub2);
}
- else {
- return doub2.compareTo(doub1);
- }
+ return doub2.compareTo(doub1);
}
catch (NumberFormatException e) {
// String isn't a Double so continue;
@@ -976,9 +972,7 @@ public class SystemSearchHelper {
if (sortLowToHigh) {
return val1.compareTo(val2);
}
- else {
- return val2.compareTo(val1);
- }
+ return val2.compareTo(val1);
}
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsFilterMatcher.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsFilterMatcher.java
index f0cb2bb..ea57fa8 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsFilterMatcher.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsFilterMatcher.java
@@ -36,23 +36,20 @@ public class VirtualSystemsFilterMatcher implements Matcher {
StringUtils.isBlank(filterColumn)) {
return true; ///show all if I entered a blank value
}
+ VirtualSystemOverview current = (VirtualSystemOverview) obj;
+ String value = "";
+ if (current.getIsVirtualHost()) {
+ value = current.getServerName();
+ }
+ else if (current.getVirtualSystemId() == null) {
+ value = current.getName();
+ }
else {
- VirtualSystemOverview current = (VirtualSystemOverview) obj;
- String value = "";
- if (current.getIsVirtualHost()) {
- value = current.getServerName();
- }
- else if (current.getVirtualSystemId() == null) {
- value = current.getName();
- }
- else {
- value = current.getServerName();
- }
- if (!StringUtils.isBlank(value)) {
- return value.toUpperCase().indexOf(filterData.toUpperCase()) >= 0;
- }
- return false;
-
+ value = current.getServerName();
+ }
+ if (!StringUtils.isBlank(value)) {
+ return value.toUpperCase().indexOf(filterData.toUpperCase()) >= 0;
}
+ return false;
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java
index 2a01bd5..6a3adb7 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java
@@ -83,14 +83,10 @@ public class EligibleFlexGuestAction extends RhnAction implements
Listable {
if (requestContext.getRequest().getParameter("show") == null) {
return
requestContext.getRequest().getParameter("selected_family");
}
- else {
- String selected =
requestContext.getRequest().getParameter(SELECTED_FAMILY);
- return selected == null ? "" : selected;
- }
- }
- else {
- return ALL;
+ String selected = requestContext.getRequest().getParameter(SELECTED_FAMILY);
+ return selected == null ? "" : selected;
}
+ return ALL;
}
@@ -167,12 +163,9 @@ public class EligibleFlexGuestAction extends RhnAction implements
Listable {
}
return new ArrayList(sysMap.values());
}
- else {
-
- for (ChannelFamilySystemGroup grp : list) {
- if (grp.getId().toString().equals(famId)) {
- return grp.expand();
- }
+ for (ChannelFamilySystemGroup grp : list) {
+ if (grp.getId().toString().equals(famId)) {
+ return grp.expand();
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
index f7b57d2..7baffca 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
@@ -231,9 +231,7 @@ public abstract class BaseProbeCreateAction extends BaseProbeAction {
ls.getMessage("punctuation.colonwithspace") +
ls.getMessage(command.getDescription());
}
- else {
- return ls.getMessage(command.getDescription());
- }
+ return ls.getMessage(command.getDescription());
}
private ArrayList toLabelValue(CommandGroup group, List commands) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
index cd652a5..dde3e72 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
@@ -105,9 +105,7 @@ public class SystemDetailsEditAction extends RhnAction {
"sid",
s.getId().toString());
}
- else {
- forwardName = "error";
- }
+ forwardName = "error";
}
else {
forwardName = "error";
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
index 4590aba..4bf6d24 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
@@ -127,9 +127,7 @@ public class SystemMigrateAction extends RhnAction {
return mapping.findForward(forwardName);
}
- else {
- forwardName = "error";
- }
+ forwardName = "error";
}
else {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
index f244c60..ae09a5b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
@@ -180,9 +180,7 @@ public class SystemOverviewAction extends RhnAction {
Arrays.sort(probes, new ServerProbeComparator());
return new DataResult(Arrays.asList(probes));
}
- else {
- return dr;
- }
+ return dr;
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
index 07eee0c..90bd50b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
@@ -123,16 +123,14 @@ public class ActivationKeyDetailsAction extends RhnAction {
return handleFailure(mapping, context);
}
}
- else {
- setupPossibleChannels(context);
- setupEntitlements(context);
- if (EDIT_MODE.equals(mapping.getParameter())) {
- ActivationKey key = context.lookupAndBindActivationKey();
+ setupPossibleChannels(context);
+ setupEntitlements(context);
+ if (EDIT_MODE.equals(mapping.getParameter())) {
+ ActivationKey key = context.lookupAndBindActivationKey();
- populateForm(form, key, context);
- }
- return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ populateForm(form, key, context);
}
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
index 32da153..4ec8250 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
@@ -77,9 +77,7 @@ public class DisabledListSetupAction extends RhnAction {
if (!set.isEmpty()) {
return handleDispatchAction(mapping, context);
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
DataResult dr = UserManager.disabledInOrg(user, pc);
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
index 6636b62..ffad1d2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
@@ -82,9 +82,7 @@ public class EnableConfirmSetupAction extends RhnListAction {
if (!set.isEmpty()) {
return handleDispatchAction(mapping, requestContext);
}
- else {
- RhnHelper.handleEmptySelection(request);
- }
+ RhnHelper.handleEmptySelection(request);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java
b/java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java
index 25189d4..296be70 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java
@@ -80,9 +80,7 @@ public class UserLocalePrefAction extends BaseUserSetupAction {
fwd.setRedirect(true);
return fwd;
}
- else {
- return mapping.findForward("display");
- }
+ return mapping.findForward("display");
}
private ActionForward display(ActionMapping mapping, RequestContext ctx,
commit 91e19235a174ae8dc4d32c82e7e0ce4baacfc62b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 18:57:58 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/frontend/dto/
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
index 7bc4194..0860503 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
@@ -156,9 +156,7 @@ public class ActivationKeyDto extends BaseDto {
if (isOrgDefault()) {
return ls.getMessage("yes");
}
- else {
- return ls.getMessage("no");
- }
+ return ls.getMessage("no");
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java
b/java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java
index 28bd254..cfa951b 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java
@@ -175,9 +175,7 @@ public class ChannelTreeNode extends BaseDto implements BaseListDto,
if (parentId == null) {
return 1L;
} //if it's a child the depth is 2
- else {
- return 2L;
- }
+ return 2L;
}
/**
@@ -262,9 +260,7 @@ public class ChannelTreeNode extends BaseDto implements BaseListDto,
if (parentId != null) {
return "c" + id;
}
- else {
- return "p" + id;
- }
+ return "p" + id;
}
/**
@@ -288,9 +284,7 @@ public class ChannelTreeNode extends BaseDto implements BaseListDto,
if (isParent()) {
return id;
}
- else {
- return parentId;
- }
+ return parentId;
}
@@ -395,12 +389,9 @@ public class ChannelTreeNode extends BaseDto implements BaseListDto,
if (this.getParentOrSelfId().equals(arg0.getParentOrSelfId())) {
return this.getUpperName().compareTo(arg0.getUpperName());
}
- //if they don't have the same parent
- else {
- Channel one = ChannelFactory.lookupById(this.getParentOrSelfId());
- Channel two = ChannelFactory.lookupById(arg0.getParentOrSelfId());
- return
one.getName().toUpperCase().compareTo(two.getName().toUpperCase());
- }
+ Channel one = ChannelFactory.lookupById(this.getParentOrSelfId());
+ Channel two = ChannelFactory.lookupById(arg0.getParentOrSelfId());
+ return one.getName().toUpperCase().compareTo(two.getName().toUpperCase());
}
//If the first one is a parent, but the 2nd one isn't
if (this.isParent() && !arg0.isParent()) {
@@ -408,10 +399,8 @@ public class ChannelTreeNode extends BaseDto implements BaseListDto,
if (this.getId().equals(arg0.getParentOrSelfId())) {
return -1;
}
- else { //compare a's name to b's parent's name
- Channel two = ChannelFactory.lookupById(arg0.getParentOrSelfId());
- return this.getUpperName().compareTo(two.getName().toUpperCase());
- }
+ Channel two = ChannelFactory.lookupById(arg0.getParentOrSelfId());
+ return this.getUpperName().compareTo(two.getName().toUpperCase());
}
if (!this.isParent() && arg0.isParent()) {
@@ -419,10 +408,8 @@ public class ChannelTreeNode extends BaseDto implements BaseListDto,
if (this.getParentOrSelfId().equals(arg0.getId())) {
return 1;
} //else if this is just some random child
- else {
- Channel two = ChannelFactory.lookupById(parentId);
- return two.getName().toUpperCase().compareTo(arg0.getUpperName());
- }
+ Channel two = ChannelFactory.lookupById(parentId);
+ return two.getName().toUpperCase().compareTo(arg0.getUpperName());
}
return 0;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java
index 2dae1bf..b1db634 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/OperationDetailsDto.java
@@ -62,9 +62,7 @@ public class OperationDetailsDto {
if (ls.hasMessage(getDescription())) {
return ls.getMessage(getDescription());
}
- else {
- return description;
- }
+ return description;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OrgEntitlementDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/OrgEntitlementDto.java
index ab6a073..b57955a 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/OrgEntitlementDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/OrgEntitlementDto.java
@@ -52,9 +52,7 @@ public class OrgEntitlementDto extends EntitlementDto {
if (count == null) {
return new Long(0);
}
- else {
- return count;
- }
+ return count;
}
/**
@@ -66,9 +64,7 @@ public class OrgEntitlementDto extends EntitlementDto {
if (count == null) {
return new Long(0);
}
- else {
- return count;
- }
+ return count;
}
/**
@@ -80,9 +76,7 @@ public class OrgEntitlementDto extends EntitlementDto {
if (count == null) {
return new Long(0);
}
- else {
- return count;
- }
+ return count;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OrgSoftwareEntitlementDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/OrgSoftwareEntitlementDto.java
index 23d0e77..d1aa54c 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/OrgSoftwareEntitlementDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/OrgSoftwareEntitlementDto.java
@@ -94,9 +94,7 @@ public class OrgSoftwareEntitlementDto {
if (maxMembers == null) {
return ls.getMessage("softwareEntitlements.unlimited");
}
- else {
- return maxMembers.toString();
- }
+ return maxMembers.toString();
}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
index 275751f..9780612 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
@@ -471,9 +471,7 @@ public class PackageListItem extends IdComboDto {
if (getNvrea() != null) {
return getIdCombo() + "~*~" + getNvrea();
}
- else {
- return getIdCombo() + "~*~" + getNvre();
- }
+ return getIdCombo() + "~*~" + getNvre();
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageMetadata.java
b/java/code/src/com/redhat/rhn/frontend/dto/PackageMetadata.java
index 0ecea72..6cd860b 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageMetadata.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageMetadata.java
@@ -336,9 +336,7 @@ public class PackageMetadata extends BaseDto implements Comparable {
if (comparison == KEY_THIS_ONLY) {
return system.getNevra();
}
- else {
- return other.getNevra();
- }
+ return other.getNevra();
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java
b/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java
index ad685a7..6dfa4bf 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java
@@ -138,9 +138,7 @@ public class PackageOverview extends BaseDto {
throw new RuntimeException(e);
}
}
- else {
- return null;
- }
+ return null;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SoftwareEntitlementDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/SoftwareEntitlementDto.java
index cb53ee8..7e65bb3 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SoftwareEntitlementDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SoftwareEntitlementDto.java
@@ -99,9 +99,7 @@ public class SoftwareEntitlementDto {
if (allocated == null) {
return ls.getMessage("softwareEntitlements.unlimited");
}
- else {
- return allocated.toString();
- }
+ return allocated.toString();
}
/**
@@ -144,9 +142,7 @@ public class SoftwareEntitlementDto {
if (notInUse == null) {
return ls.getMessage("softwareEntitlements.notApplicable");
}
- else {
- return notInUse.toString();
- }
+ return notInUse.toString();
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
index 6d58252..6384935 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
@@ -497,9 +497,7 @@ public class SystemOverview extends BaseDto implements Serializable
{
// Save the list as entitlementLevel
return retval.toString();
}
- else { //unentitled
- return ls.getMessage("unentitled");
- }
+ return ls.getMessage("unentitled");
}
/**
* Display only..
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/VirtualSystemOverview.java
b/java/code/src/com/redhat/rhn/frontend/dto/VirtualSystemOverview.java
index a6b297d..c011cf0 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/VirtualSystemOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/VirtualSystemOverview.java
@@ -278,9 +278,7 @@ public class VirtualSystemOverview extends SystemOverview
if (getIsVirtualHost()) {
return 0;
}
- else {
- return 1;
- }
+ return 1;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOptionValue.java
b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOptionValue.java
index e18bfa6..2550916 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOptionValue.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOptionValue.java
@@ -77,9 +77,7 @@ public class KickstartOptionValue implements
Comparable<KickstartOptionValue> {
if (arg != null) {
return arg.replaceAll("\"", """);
}
- else {
- return arg;
- }
+ return arg;
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOverviewSystemsDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOverviewSystemsDto.java
index 74a48a5..242af16 100644
---
a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOverviewSystemsDto.java
+++
b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartOverviewSystemsDto.java
@@ -128,9 +128,7 @@ public class KickstartOverviewSystemsDto extends BaseDto {
if (!getIsBareMetal()) {
return getNewServerId() == null ? getOldServerId() : getNewServerId();
}
- else {
- return null; //this should never happen
- }
+ return null; //this should never happen
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java
index 0c24597..4ec5ab4 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/ScriptDto.java
@@ -112,13 +112,9 @@ public class ScriptDto extends BaseDto {
if (this.chroot.toLowerCase().equals("n")) {
return CHROOTPOST;
}
- else {
- return POST;
- }
- }
- else {
- return PRE;
+ return POST;
}
+ return PRE;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ProbeDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ProbeDto.java
index d007bdd..f0640fa 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ProbeDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ProbeDto.java
@@ -86,9 +86,7 @@ public class ProbeDto implements Comparable {
if (getProbe().getState().getOutput() != null) {
return StringUtil.htmlifyText(getProbe().getState().getOutput());
}
- else {
- return null;
- }
+ return null;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java
index c7bb758..bb6c701 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java
@@ -84,9 +84,7 @@ public class ServerProbeDto extends CheckProbeDto {
if (output != null) {
return StringUtil.htmlifyText(output);
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -130,9 +128,7 @@ public class ServerProbeDto extends CheckProbeDto {
if (state == null) {
return MonitoringConstants.PROBE_STATE_PENDING;
}
- else {
- return state;
- }
+ return state;
}
/**
commit 5c210ad13eca331dbbde790dea8fad29f8afa604
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 18:54:01 2012 +0100
remove unnecessary else statements in
java/code/src/com/redhat/rhn/frontend/action/configuration/
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java
index df007e1..11c4f55 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java
@@ -172,17 +172,13 @@ public abstract class ConfigActionHelper {
if (cfid != null) {
return ConfigurationManager.getInstance().lookupConfigFile(user, cfid);
}
- else {
- Long crid = requestContext.getParamAsLong(REVISION_ID);
- if (crid != null) {
- ConfigRevision cr = ConfigurationManager.getInstance().
- lookupConfigRevision(user, crid);
- return cr.getConfigFile();
- }
- else {
- return null;
- }
+ Long crid = requestContext.getParamAsLong(REVISION_ID);
+ if (crid != null) {
+ ConfigRevision cr = ConfigurationManager.getInstance().
+ lookupConfigRevision(user, crid);
+ return cr.getConfigFile();
}
+ return null;
}
/**
@@ -200,9 +196,7 @@ public abstract class ConfigActionHelper {
if (crid != null) {
return ConfigurationManager.getInstance().lookupConfigRevision(user, crid);
}
- else {
- return file.getLatestConfigRevision();
- }
+ return file.getLatestConfigRevision();
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java
index 6b01452..b34379b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java
@@ -224,9 +224,7 @@ public class ConfigFileForm extends ScrubbingDynaActionForm {
if (cc.isGlobalChannel()) {
return (user.hasRole(RoleFactory.CONFIG_ADMIN));
}
- else {
- return (mgr.accessToChannel(user.getId(), cc.getId()));
- }
+ return (mgr.accessToChannel(user.getId(), cc.getId()));
}
private boolean isUpload() {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
index 1f320c7..caabbbc 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
@@ -77,9 +77,7 @@ public abstract class BaseCopyToAction extends RhnAction {
return doCopy(mapping, req, user);
}
- else { // not dispatched
- return doDisplay(mapping, req, user);
- }
+ return doDisplay(mapping, req, user);
}
protected ActionForward doDisplay(ActionMapping mapping,
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java
index 6fab41b..aa5790c 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java
@@ -69,13 +69,9 @@ public class ChannelDeployConfirmAction extends RhnAction {
ConfigActionHelper.clearRhnSets(user);
return prepareToLeave(mapping, request, cc, dForm, "success");
}
- else {
- return prepareToLeave(mapping, request, cc, dForm, "failure");
- }
+ return prepareToLeave(mapping, request, cc, dForm, "failure");
}
- else {
- return prepareToLeave(mapping, request, cc, dForm, "default");
- }
+ return prepareToLeave(mapping, request, cc, dForm, "default");
}
private ActionForward prepareToLeave(ActionMapping mapping, HttpServletRequest req,
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java
index ca1cf8f..9ee42e5 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java
@@ -119,10 +119,8 @@ public class ChannelFilesListSubmit extends
BaseSetOperateOnSelectedItemsAction
return getStrutsDelegate().forwardParams(mapping.findForward(
RhnHelper.DEFAULT_FORWARD), makeParamMap(formIn, request));
}
- else {
- return getStrutsDelegate().forwardParams(mapping.findForward(forward),
- makeParamMap(formIn, request));
- }
+ return getStrutsDelegate().forwardParams(mapping.findForward(forward),
+ makeParamMap(formIn, request));
}
/**
* Copy selected files to systems - forward to a system-selection-page
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java
index 90500b6..1178065 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java
@@ -60,9 +60,7 @@ public class DeleteChannelAction extends RhnAction {
return
getStrutsDelegate().forwardParams(mapping.findForward("submit"),
params);
}
- else {
- rctx.getRequest().setAttribute("currChannel", cc);
- }
+ rctx.getRequest().setAttribute("currChannel", cc);
ConfigActionHelper.setupRequestAttributes(rctx, cc);
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java
index 65936ab..191f3c7 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java
@@ -67,19 +67,17 @@ public class DeleteFileAction extends RhnAction {
return getStrutsDelegate().forwardParams(
map.findForward("success"), params);
}
- else {
- int storage = ConfigurationManager.getInstance().
- getFileStorage(usr, cf);
- ConfigActionHelper.processParamMap(req, params);
- params.put("storage", new Integer(storage));
- ConfigActionHelper.setupRequestAttributes(ctx, cf,
- cf.getLatestConfigRevision());
- req.setAttribute("storage",
StringUtil.displayFileSize(storage));
- req.setAttribute("deleting", Boolean.TRUE);
+ int storage = ConfigurationManager.getInstance().
+ getFileStorage(usr, cf);
+ ConfigActionHelper.processParamMap(req, params);
+ params.put("storage", new Integer(storage));
+ ConfigActionHelper.setupRequestAttributes(ctx, cf,
+ cf.getLatestConfigRevision());
+ req.setAttribute("storage", StringUtil.displayFileSize(storage));
+ req.setAttribute("deleting", Boolean.TRUE);
- return getStrutsDelegate().forwardParams(
- map.findForward("default"), params);
- }
+ return getStrutsDelegate().forwardParams(
+ map.findForward("default"), params);
}
catch (IllegalArgumentException e) {
//Log the error and go on with life.
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java
index 974382e..c2472b8 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java
@@ -82,28 +82,22 @@ public class DeleteRevisionAction extends RhnAction {
return getStrutsDelegate().forwardParams(
mapping.findForward("success"), params);
}
- else {
- ActionMessage am = new
ActionMessage("deleterev.jsp.deletedfile",
- cr.getConfigFile().getConfigFileName().getPath());
- msgs.add(ActionMessages.GLOBAL_MESSAGE, am);
- ConfigActionHelper.processParamMap(cf.getConfigChannel(),
params);
- return getStrutsDelegate().forwardParams(
- mapping.findForward("deletedfile"), params);
- }
- }
- else {
- cff.updateFromRevision(request, cr);
- request.setAttribute("deleting", Boolean.TRUE);
+ ActionMessage am = new
ActionMessage("deleterev.jsp.deletedfile",
+ cr.getConfigFile().getConfigFileName().getPath());
+ msgs.add(ActionMessages.GLOBAL_MESSAGE, am);
+ ConfigActionHelper.processParamMap(cf.getConfigChannel(), params);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward("deletedfile"), params);
}
- }
- else { // Can't find the revision?!?
- ActionMessage am = new ActionMessage("deleterev.jsp.unknown");
- msgs.add(ActionMessages.GLOBAL_MESSAGE, am);
+ cff.updateFromRevision(request, cr);
+ request.setAttribute("deleting", Boolean.TRUE);
return getStrutsDelegate().forwardParams(
mapping.findForward("default"), params);
}
+ ActionMessage am = new ActionMessage("deleterev.jsp.unknown");
+ msgs.add(ActionMessages.GLOBAL_MESSAGE, am);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("default"), params);
}
finally {
if (!msgs.isEmpty()) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java
index b960339..7443239 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java
@@ -78,9 +78,7 @@ public class FileDownloadAction extends RhnAction {
if (cr.getConfigContent().isBinary()) {
return "application/octet-stream";
}
- else {
- return "text/plain";
- }
+ return "text/plain";
}
protected String getDownloadFilename(ConfigRevision cr) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java
index 3ec0dea..c8ae79d 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java
@@ -121,12 +121,10 @@ public class GlobalRevisionDeployConfirmSubmit extends
RhnListDispatchAction {
return getStrutsDelegate().forwardParams(
mapping.findForward("success"), params);
}
- else {
- createFailureMessage(request, "deployconfirm.jsp");
- Map params = makeParamMap(form, request);
- return getStrutsDelegate().forwardParams(
- mapping.findForward("failure"), params);
- }
+ createFailureMessage(request, "deployconfirm.jsp");
+ Map params = makeParamMap(form, request);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("failure"), params);
}
private Date getEarliestAction(ActionForm formIn) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java
index faac773..9a3b230 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java
@@ -230,17 +230,15 @@ public class ManageRevisionSubmit extends RhnSetAction {
return
getStrutsDelegate().forwardParam(mapping.findForward("deletedfile"),
"ccid", file.getConfigChannel().getId().toString());
}
- else {
- //create messages
- ActionMessages msg = new ActionMessages();
- addIntMessage(successCount, "config_revisions.success", msg);
- addIntMessage(failureCount, "config_revisions.failure", msg);
- //save messages
- strutsDelegate.saveMessages(request, msg);
- //go to the next page
- return strutsDelegate.forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
- }
+ //create messages
+ ActionMessages msg = new ActionMessages();
+ addIntMessage(successCount, "config_revisions.success", msg);
+ addIntMessage(failureCount, "config_revisions.failure", msg);
+ //save messages
+ strutsDelegate.saveMessages(request, msg);
+ //go to the next page
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
private void addIntMessage(int number, String key, ActionMessages msgs) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java
index 8f4eb67..dbdc587 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java
@@ -115,14 +115,12 @@ public class ImportFileSubmitAction extends RhnSetAction {
return getStrutsDelegate().forwardParams(
mapping.findForward("success"), params);
}
- else {
- ActionErrors errors = new ActionErrors();
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("sdcimportfile.jsp.noSelected"));
- addErrors(request, errors);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
- }
+ ActionErrors errors = new ActionErrors();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("sdcimportfile.jsp.noSelected"));
+ addErrors(request, errors);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
index b1f3e4d..1847d79 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
@@ -80,9 +80,7 @@ public class SubscribeConfirm extends RhnAction {
.getInstance().getMessage("ssm.config.subscribeconfirm.jsp.confirm"))) {
return confirm(mapping, request, user);
}
- else {
- return setup(mapping, request, user);
- }
+ return setup(mapping, request, user);
}
commit e4fb5ee74a224df2d9572edec8c391c0d3acf34a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 18:50:59 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/domain/
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index 1827e96..6ec4033 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -128,9 +128,7 @@ public class Channel extends BaseDomainHelper implements Comparable {
return cfam.getLabel().startsWith(
ChannelFamilyFactory.PROXY_CHANNEL_FAMILY_LABEL);
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -557,9 +555,7 @@ public class Channel extends BaseDomainHelper implements Comparable {
if (trustedOrgs != null) {
return trustedOrgs.size();
}
- else {
- return 0;
- }
+ return 0;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 7c338ca..eeae152 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -638,9 +638,7 @@ public class ChannelFactory extends HibernateFactory {
if (retval.size() > 0) {
return (Package)retval.get(0);
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -1025,9 +1023,7 @@ public class ChannelFactory extends HibernateFactory {
if (pkgs.isEmpty()) {
return null;
}
- else {
- return pkgs.get(0);
- }
+ return pkgs.get(0);
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java
b/java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java
index 3d16638..f114a54 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigRevision.java
@@ -136,9 +136,7 @@ public class ConfigRevision extends BaseDomainHelper {
if (getChangedById() != null && getChangedById().longValue() > 0) {
return UserFactory.lookupById(getChangedById());
}
- else {
- return null;
- }
+ return null;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/ServerProbe.java
b/java/code/src/com/redhat/rhn/domain/monitoring/ServerProbe.java
index 1076e3f..0c9d176 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/ServerProbe.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/ServerProbe.java
@@ -183,10 +183,8 @@ public class ServerProbe extends Probe {
getTemplateProbes().size() == 0) {
return null;
}
- else {
- return (TemplateProbe)
- getTemplateProbes().iterator().next();
- }
+ return (TemplateProbe)
+ getTemplateProbes().iterator().next();
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java
b/java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java
index 0a050d4..aff24b5 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java
@@ -276,9 +276,7 @@ public class TemplateProbe extends Probe {
if (getProbeSuites() == null) {
return null;
}
- else {
- return (ProbeSuite) getProbeSuites().iterator().next();
- }
+ return (ProbeSuite) getProbeSuites().iterator().next();
}
/**
diff --git
a/java/code/src/com/redhat/rhn/domain/monitoring/notification/NotificationFactory.java
b/java/code/src/com/redhat/rhn/domain/monitoring/notification/NotificationFactory.java
index 7481cf6..6fe3120 100644
---
a/java/code/src/com/redhat/rhn/domain/monitoring/notification/NotificationFactory.java
+++
b/java/code/src/com/redhat/rhn/domain/monitoring/notification/NotificationFactory.java
@@ -218,9 +218,7 @@ public class NotificationFactory extends HibernateFactory {
if (retval != null &&
retval.getUser().getOrg().equals(currentUser.getOrg())) {
return retval;
}
- else {
- return null;
- }
+ return null;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/suite/ProbeSuite.java
b/java/code/src/com/redhat/rhn/domain/monitoring/suite/ProbeSuite.java
index e1cdc11..2c3d61a 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/suite/ProbeSuite.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/suite/ProbeSuite.java
@@ -142,9 +142,7 @@ public class ProbeSuite {
if (this.probes == null) {
return Collections.EMPTY_SET;
}
- else {
- return probes;
- }
+ return probes;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
index 01ef259..426cdd3 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
@@ -476,9 +476,7 @@ public class Package extends BaseDomainHelper {
otherPack.getPackageArch()).append(this.getPackageEvr(),
this.getPackageEvr()).isEquals();
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageArch.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageArch.java
index 8ccff7d..5a394cf 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageArch.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageArch.java
@@ -122,9 +122,7 @@ public class PackageArch extends BaseDomainHelper implements
Comparable<PackageA
arch.getLabel()).append(getId(), arch.getId()).append(getArchType(),
arch.getArchType()).isEquals();
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
index 1b4779c..31b9dc6 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
@@ -199,9 +199,7 @@ public class PackageFactory extends HibernateFactory {
singleton.saveObject(newName);
return newName;
}
- else {
- return returned;
- }
+ return returned;
}
/**
@@ -250,13 +248,10 @@ public class PackageFactory extends HibernateFactory {
if (epoch == null || packages.size() < 2) {
return packages;
}
- else {
- for (Package pack : packages) {
- if (!epoch.equals(pack.getPackageEvr().getEpoch())) {
- packages.remove(pack);
- }
+ for (Package pack : packages) {
+ if (!epoch.equals(pack.getPackageEvr().getEpoch())) {
+ packages.remove(pack);
}
-
}
return packages;
}
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKey.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKey.java
index 13a4d7e..db4dc5a 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKey.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKey.java
@@ -91,9 +91,7 @@ public class PackageKey extends BaseDomainHelper implements
Comparable<PackageKe
return new EqualsBuilder().append(this.key, arch.getKey()).append(getId(),
arch.getId()).isEquals();
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKeyType.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKeyType.java
index 9818a21..67c969b 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKeyType.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageKeyType.java
@@ -75,9 +75,7 @@ public class PackageKeyType extends BaseDomainHelper implements
Comparable<Packa
return new EqualsBuilder().append(this.label,
type.getLabel()).append(getId(),
type.getId()).isEquals();
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageName.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageName.java
index 4f11980..522f959 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageName.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageName.java
@@ -73,9 +73,7 @@ public class PackageName implements Comparable<PackageName> {
return new EqualsBuilder().append(this.getName(),
otherPack.getName()).append(
this.getId(), otherPack.getId()).isEquals();
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProvider.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProvider.java
index 6b28bd8..426f5fd 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProvider.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageProvider.java
@@ -102,9 +102,7 @@ public class PackageProvider extends BaseDomainHelper implements
return new EqualsBuilder().append(this.name, arch.getName()).append(getId(),
arch.getId()).isEquals();
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/profile/ProfileEntry.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/profile/ProfileEntry.java
index a678193..a69b821 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/profile/ProfileEntry.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/profile/ProfileEntry.java
@@ -118,9 +118,7 @@ public class ProfileEntry implements Serializable {
}
return builder.isEquals();
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
index 762fbbe..80f0a0d 100644
--- a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
+++ b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
@@ -220,14 +220,12 @@ public class NetworkInterface extends BaseDomainHelper implements
if (ad6 == null) {
return null;
}
- else {
- ArrayList<String> addresses = new ArrayList<String>();
+ ArrayList<String> addresses = new ArrayList<String>();
- for (ServerNetAddress6 a : ad6) {
- addresses.add(a.getAddress());
- }
- return addresses;
+ for (ServerNetAddress6 a : ad6) {
+ addresses.add(a.getAddress());
}
+ return addresses;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java
b/java/code/src/com/redhat/rhn/domain/server/Server.java
index 3a3eefa..9ed25df 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -1693,9 +1693,7 @@ public class Server extends BaseDomainHelper implements Identifiable
{
if (retval.size() == 0) {
return Collections.EMPTY_SET;
}
- else {
- return retval;
- }
+ return retval;
}
return Collections.EMPTY_SET;
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
index 2650f66..39b78c5 100644
--- a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
+++ b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
@@ -368,10 +368,8 @@ public class VirtualInstance extends BaseDomainHelper {
return new GuestAndNonVirtHostView(guest.getId(), guest.getOrg().getId(),
guest.getName());
}
- else {
- return new GuestAndNonVirtHostView(guest.getId(), guest.getOrg().getId(),
- guest.getName(), host.getOrg().getId(), host.getId(),
host.getName());
- }
+ return new GuestAndNonVirtHostView(guest.getId(), guest.getOrg().getId(),
+ guest.getName(), host.getOrg().getId(), host.getId(), host.getName());
}
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java
b/java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java
index 6838e96..e401025 100644
--- a/java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java
+++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java
@@ -79,19 +79,17 @@ public class ServerGroupTest extends RhnBaseTestCase {
if (existingGroup != null) {
return existingGroup;
}
- else {
- assertNull(new UpdateOrgSystemEntitlementsCommand(
- typeIn.getAssociatedEntitlement(), org,
- DEFAULT_MAX_MEMBERS).store());
- EntitlementServerGroup group = ServerGroupFactory.lookupEntitled(
- typeIn.getAssociatedEntitlement(), org);
- assertNotNull(group);
- assertNotNull(group.getMaxMembers());
- assertTrue(group.getMaxMembers() > 0);
- assertTrue(group.getMaxMembers() - group.getCurrentMembers() > 0);
- assertNotNull(group.getGroupType().getAssociatedEntitlement());
- return group;
- }
+ assertNull(new UpdateOrgSystemEntitlementsCommand(
+ typeIn.getAssociatedEntitlement(), org,
+ DEFAULT_MAX_MEMBERS).store());
+ EntitlementServerGroup group = ServerGroupFactory.lookupEntitled(
+ typeIn.getAssociatedEntitlement(), org);
+ assertNotNull(group);
+ assertNotNull(group.getMaxMembers());
+ assertTrue(group.getMaxMembers() > 0);
+ assertTrue(group.getMaxMembers() - group.getCurrentMembers() > 0);
+ assertNotNull(group.getGroupType().getAssociatedEntitlement());
+ return group;
}
ManagedServerGroup sg = ServerGroupFactory.create("NewGroup" +
diff --git a/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java
b/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java
index 2ecb2f4..7e161c0 100644
--- a/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java
+++ b/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java
@@ -67,9 +67,7 @@ public class WebSessionImpl implements WebSession {
if (webUserId != null) {
return UserFactory.lookupById(webUserId);
}
- else {
- return null;
- }
+ return null;
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
index 37f71f8..cc20d7e 100644
--- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
@@ -304,9 +304,7 @@ public class UserFactory extends HibernateFactory {
if (dr != null && dr.size() != 0) {
return getLongValue(dr, USER_ID);
}
- else {
- return -1;
- }
+ return -1;
}
/**
commit 5e43290edfa7f7e707f2b9a7f457eef899046401
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 18:45:48 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/domain/kickstart/
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 0f29f64..b214b11 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -773,9 +773,7 @@ public class KickstartData {
if (getInstallType() != null) {
return getInstallType().isRhel5();
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -797,9 +795,7 @@ public class KickstartData {
return (getInstallType().isRhel5OrGreater() ||
getInstallType().isFedora());
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -811,9 +807,7 @@ public class KickstartData {
return (getInstallType().isRhel5() ||
!this.isRhel5OrGreater());
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -824,9 +818,7 @@ public class KickstartData {
if (getInstallType() != null) {
return getInstallType().isFedora();
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -838,9 +830,7 @@ public class KickstartData {
if (getInstallType() != null) {
return getInstallType().isGeneric();
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -850,9 +840,7 @@ public class KickstartData {
if (getInstallType() != null) {
return getInstallType().isRhel4();
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -862,9 +850,7 @@ public class KickstartData {
if (getInstallType() != null) {
return getInstallType().isRhel3();
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -875,9 +861,7 @@ public class KickstartData {
if (getInstallType() != null) {
return getInstallType().isRhel2();
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -997,9 +981,7 @@ public class KickstartData {
if (matcher.matches()) {
return "lilo";
}
- else {
- return "grub";
- }
+ return "grub";
}
/**
@@ -1213,9 +1195,7 @@ public class KickstartData {
return (installType.equals(KickstartInstallType.RHEL_21) ||
installType.equals(KickstartInstallType.RHEL_3));
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -1468,9 +1448,7 @@ public class KickstartData {
.equals(KickstartVirtualizationType.KVM_FULLYVIRT)) {
return ConfigDefaults.get().getDefaultKVMVirtBridge();
}
- else {
- return ConfigDefaults.get().getDefaultXenVirtBridge();
- }
+ return ConfigDefaults.get().getDefaultXenVirtBridge();
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index bb90c77..1419fd6 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -668,9 +668,7 @@ public class KickstartFactory extends HibernateFactory {
if (ksessions.size() > 0) {
return (KickstartSession) ksessions.iterator().next();
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -692,9 +690,7 @@ public class KickstartFactory extends HibernateFactory {
if (ksessions.size() > 0) {
return (KickstartSession) ksessions.iterator().next();
}
- else {
- return null;
- }
+ return null;
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
index 17524c4..458a4c5 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
@@ -253,9 +253,7 @@ public class KickstartScript implements
Comparable<KickstartScript> {
if (scriptIn.getPosition() < this.getPosition()) {
return after;
}
- else {
- return before;
- }
+ return before;
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartSession.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartSession.java
index 41e7b5a..d36141e 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartSession.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartSession.java
@@ -533,9 +533,7 @@ public class KickstartSession {
(KickstartSessionHistory) sorted.get(sorted.lastKey());
return hist.getMessage();
}
- else {
- return null;
- }
+ return null;
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
index 657a96c..a4a229a 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
@@ -207,18 +207,14 @@ public class KickstartableTree extends BaseDomainHelper {
if (basePathIsUrl()) {
return this.getBasePath();
}
- else {
- StringBuilder buf = new StringBuilder();
- if (!defaultLocation.startsWith("/")) {
- buf.append("/");
- }
- buf.append(defaultLocation);
- return buf.toString();
+ StringBuilder buf = new StringBuilder();
+ if (!defaultLocation.startsWith("/")) {
+ buf.append("/");
}
+ buf.append(defaultLocation);
+ return buf.toString();
}
- else {
- return "";
- }
+ return "";
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
index fbb44b6..8bd843b 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
@@ -144,9 +144,7 @@ public class CobblerSnippet implements Comparable {
if (f.exists()) {
return loadEditable(nameIn, orgIn);
}
- else {
- return null;
- }
+ return null;
}
/**
commit 038e47d3956ff943e8f5fd2b99fad2d0913418ab
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 18:38:42 2012 +0100
remove unnecessary else statements in rest of java/code/src/com/redhat/rhn/common/
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index 1913a3c..b48ee94 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -741,16 +741,14 @@ public class CachedStatement {
MethodUtil.callMethod(obj, setName, c);
continue;
}
- else {
- /*
- * Just call the set method. This will call the same
- * set method multiple times. If the result set should
- * be a list, but has a non-Collection set method, the
- * attribute corresponding to this column will ultimately
- * contain the last item found for this column.
- */
- MethodUtil.callMethod(obj, setName, getObject(rs, columnName));
- }
+ /*
+ * Just call the set method. This will call the same
+ * set method multiple times. If the result set should
+ * be a list, but has a non-Collection set method, the
+ * attribute corresponding to this column will ultimately
+ * contain the last item found for this column.
+ */
+ MethodUtil.callMethod(obj, setName, getObject(rs, columnName));
} //while
}
diff --git a/java/code/src/com/redhat/rhn/common/filediff/Trace.java
b/java/code/src/com/redhat/rhn/common/filediff/Trace.java
index 4711748..d95b2d6 100644
--- a/java/code/src/com/redhat/rhn/common/filediff/Trace.java
+++ b/java/code/src/com/redhat/rhn/common/filediff/Trace.java
@@ -156,21 +156,17 @@ public class Trace {
//likely the correct trace
return step(oldFile, newFile);
}
- else {
- //in order to avoid two equal traces (and therefore explode the
- //possible traces and thus memory used), once we start deleting,
- //we keep deleting. Since all traces that delete and then add
- //can be represented by ones that add and then delete, this is
- //computationally sound.
- if (edit != null && edit.getType() == Edit.DELETE) {
- makeDelete();
- return false;
- }
- else {
- fork();
- return true;
- }
+ //in order to avoid two equal traces (and therefore explode the
+ //possible traces and thus memory used), once we start deleting,
+ //we keep deleting. Since all traces that delete and then add
+ //can be represented by ones that add and then delete, this is
+ //computationally sound.
+ if (edit != null && edit.getType() == Edit.DELETE) {
+ makeDelete();
+ return false;
}
+ fork();
+ return true;
}
private void makeAdd() {
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ForceRecreationListType.java
b/java/code/src/com/redhat/rhn/common/hibernate/ForceRecreationListType.java
index ecf29e7..f903b57 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/ForceRecreationListType.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/ForceRecreationListType.java
@@ -109,9 +109,7 @@ public class ForceRecreationListType implements UserCollectionType {
if (l < 0) {
return null;
}
- else {
- return new Integer(l);
- }
+ return new Integer(l);
}
/**
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
index 3b163bd..1921f5d 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
@@ -518,14 +518,10 @@ public abstract class HibernateFactory {
if (data == null) {
return null;
}
- else {
- if (data.length == 0) {
- return null;
- }
- else {
- return Hibernate.createBlob(data);
- }
+ if (data.length == 0) {
+ return null;
}
+ return Hibernate.createBlob(data);
}
diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
index 6d21190..9a31fae 100644
--- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
+++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
@@ -174,10 +174,8 @@ public class LocalizationService {
initService();
return true;
}
- else {
- log.error("Tried to reload XML StringResource files but " +
- "we aren't in web.development_environment mode");
- }
+ log.error("Tried to reload XML StringResource files but " +
+ "we aren't in web.development_environment mode");
return false;
}
@@ -673,8 +671,6 @@ public class LocalizationService {
if (context != null && context.getLocale() != null) {
return Collator.getInstance(context.getLocale());
}
- else {
- return Collator.getInstance();
- }
+ return Collator.getInstance();
}
}
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java
b/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java
index 34cb10d..354a41c 100644
--- a/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java
+++ b/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java
@@ -66,9 +66,7 @@ public class ChannelAclHandler extends BaseHandler {
Channel chan = ChannelManager.lookupByIdAndUser(cid, usr);
return chan;
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -84,9 +82,7 @@ public class ChannelAclHandler extends BaseHandler {
if (chan != null) {
return UserManager.verifyChannelAdmin(usr, chan);
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -106,13 +102,9 @@ public class ChannelAclHandler extends BaseHandler {
if (NOT_GLOBAL_SUBSCRIBE.equals(p0)) {
return !subscribable;
}
- else {
- return subscribable;
- }
- }
- else {
- return false;
+ return subscribable;
}
+ return false;
}
/**
@@ -178,9 +170,7 @@ public class ChannelAclHandler extends BaseHandler {
!chan.isProxy() &&
ChannelManager.verifyChannelSubscribe(usr, chan.getId());
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -198,9 +188,7 @@ public class ChannelAclHandler extends BaseHandler {
listDownloadImages(usr, chan.getLabel(), "iso", null,
chan.isSatellite());
return (dr == null ? false : (dr.size() > 0));
}
- else {
- return false;
- }
+ return false;
}
/**
@@ -217,9 +205,7 @@ public class ChannelAclHandler extends BaseHandler {
Set vers = ChannelManager.getChannelVersions(chan);
return (vers != null && vers.contains(ChannelVersion.RHEL5));
}
- else {
- return false;
- }
+ return false;
}
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/ConfigAclHandler.java
b/java/code/src/com/redhat/rhn/common/security/acl/ConfigAclHandler.java
index 479e51e..27f3d18 100644
--- a/java/code/src/com/redhat/rhn/common/security/acl/ConfigAclHandler.java
+++ b/java/code/src/com/redhat/rhn/common/security/acl/ConfigAclHandler.java
@@ -161,22 +161,17 @@ public class ConfigAclHandler extends BaseHandler {
}
return cm.lookupConfigRevision(user, crid);
}
- else {
- crid = getAsLong(map.get("crid"));
- //Case 2:
- if (crid != null) {
+ crid = getAsLong(map.get("crid"));
+ //Case 2:
+ if (crid != null) {
- return cm.lookupConfigRevision(user, crid);
- }
- //Case 3:
- else {
- Long cfid = getAsLong(map.get("cfid"));
- if (cfid == null) {
- throw new BadParameterException("Missing crid and cfid!");
- }
- return cm.lookupConfigFile(user, cfid).getLatestConfigRevision();
- }
+ return cm.lookupConfigRevision(user, crid);
+ }
+ Long cfid = getAsLong(map.get("cfid"));
+ if (cfid == null) {
+ throw new BadParameterException("Missing crid and cfid!");
}
+ return cm.lookupConfigFile(user, cfid).getLatestConfigRevision();
}
private ConfigChannel getChannel(Map map, String[] params) {
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java
b/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java
index 4f621e8..cd1eacd 100644
--- a/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java
+++ b/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java
@@ -46,9 +46,7 @@ public class KickstartAclHandler extends BaseHandler {
usr.getOrg(), id);
return ks;
}
- else {
- return null;
- }
+ return null;
}
/**
@@ -64,9 +62,7 @@ public class KickstartAclHandler extends BaseHandler {
if (ks != null) {
return ks.isRawData();
}
- else {
- return false;
- }
+ return false;
}
/**
diff --git a/java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java
b/java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java
index 1bbb93c..4841cd3 100644
--- a/java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java
+++ b/java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java
@@ -41,9 +41,7 @@ public class SqlExceptionTranslator extends Translations {
if (ConfigDefaults.get().isOracle()) {
return oracleSQLException(e);
}
- else {
- return postgreSqlException(e);
- }
+ return postgreSqlException(e);
}
/**
commit fa0cff095089bfbe205a7363fff1ca84610c6be5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 18:42:41 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/common/validator/
diff --git a/java/code/src/com/redhat/rhn/common/validator/SchemaParser.java
b/java/code/src/com/redhat/rhn/common/validator/SchemaParser.java
index 0970846..5003c26 100644
--- a/java/code/src/com/redhat/rhn/common/validator/SchemaParser.java
+++ b/java/code/src/com/redhat/rhn/common/validator/SchemaParser.java
@@ -98,9 +98,7 @@ public class SchemaParser {
if (o != null) {
return (Constraint)o;
}
- else {
- return null;
- }
+ return null;
}
/**
diff --git a/java/code/src/com/redhat/rhn/common/validator/ValidatorException.java
b/java/code/src/com/redhat/rhn/common/validator/ValidatorException.java
index 5b6bdc1..eeab67a 100644
--- a/java/code/src/com/redhat/rhn/common/validator/ValidatorException.java
+++ b/java/code/src/com/redhat/rhn/common/validator/ValidatorException.java
@@ -97,9 +97,7 @@ public class ValidatorException extends RhnRuntimeException {
if (result == null) {
return super.getMessage();
}
- else {
- return result.getMessage();
- }
+ return result.getMessage();
}
/**
commit eabe16c6ce6943811d4c005f7c0d2eda6f354c89
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 18:41:47 2012 +0100
remove unnecessary else statements in java/code/src/com/redhat/rhn/common/util/
diff --git a/java/code/src/com/redhat/rhn/common/util/DatePicker.java
b/java/code/src/com/redhat/rhn/common/util/DatePicker.java
index eda8da7..c7d240e 100644
--- a/java/code/src/com/redhat/rhn/common/util/DatePicker.java
+++ b/java/code/src/com/redhat/rhn/common/util/DatePicker.java
@@ -462,9 +462,7 @@ public class DatePicker {
if (isLatin() && field.equals(HOUR) && result == 0) {
return new Integer(12);
}
- else {
- return new Integer(result);
- }
+ return new Integer(result);
}
catch (IllegalArgumentException e) {
// Ignore and return null to indicate invalid date
diff --git a/java/code/src/com/redhat/rhn/common/util/OvalFileAggregator.java
b/java/code/src/com/redhat/rhn/common/util/OvalFileAggregator.java
index 469b100..6ad1d4a 100644
--- a/java/code/src/com/redhat/rhn/common/util/OvalFileAggregator.java
+++ b/java/code/src/com/redhat/rhn/common/util/OvalFileAggregator.java
@@ -180,14 +180,10 @@ public class OvalFileAggregator {
if (key == null) {
continue;
}
- else {
- if (container.containsKey(key)) {
- continue;
- }
- else {
- container.put(key, child.clone());
- }
+ if (container.containsKey(key)) {
+ continue;
}
+ container.put(key, child.clone());
}
}
diff --git a/java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java
b/java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java
index 9e9bc9c..dea9e77 100644
--- a/java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java
+++ b/java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java
@@ -297,9 +297,7 @@ public class RecurringEventPicker {
if (StringUtils.isNumeric(st)) {
return Long.parseLong(st);
}
- else {
- return -1L;
- }
+ return -1L;
}
@@ -313,9 +311,7 @@ public class RecurringEventPicker {
Integer.parseInt(num) < 1) {
return null;
}
- else {
- return getDayNames()[Integer.parseInt(num) - 1];
- }
+ return getDayNames()[Integer.parseInt(num) - 1];
}
@@ -336,9 +332,7 @@ public class RecurringEventPicker {
if (StringUtils.isNumeric(st)) {
return Long.parseLong(st);
}
- else {
- return -1L;
- }
+ return -1L;
}
@@ -359,9 +353,7 @@ public class RecurringEventPicker {
if (StringUtils.isNumeric(st)) {
return Long.parseLong(st);
}
- else {
- return -1L;
- }
+ return -1L;
}
@@ -373,9 +365,7 @@ public class RecurringEventPicker {
if (slot >= array.length) {
return null;
}
- else {
- return array[slot];
- }
+ return array[slot];
}
/**
diff --git a/java/code/src/com/redhat/rhn/common/util/RpmVersionComparator.java
b/java/code/src/com/redhat/rhn/common/util/RpmVersionComparator.java
index a51e9ee..253d630 100644
--- a/java/code/src/com/redhat/rhn/common/util/RpmVersionComparator.java
+++ b/java/code/src/com/redhat/rhn/common/util/RpmVersionComparator.java
@@ -112,9 +112,7 @@ public class RpmVersionComparator implements Comparator {
if (b1 == str1.length()) {
return -1;
}
- else {
- return 1;
- }
+ return 1;
}
private int skipZeros(String s, int b, int e) {
diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java
b/java/code/src/com/redhat/rhn/common/util/StringUtil.java
index ba19a62..52eecc6 100644
--- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java
+++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java
@@ -579,51 +579,37 @@ public class StringUtil {
if (val == 1) {
return ls.getMessage("timetag.second");
}
- else {
- return ls.getMessage("timetag.seconds");
- }
+ return ls.getMessage("timetag.seconds");
case MINUTES_UNITS:
if (val == 1) {
return ls.getMessage("timetag.minute");
}
- else {
- return ls.getMessage("timetag.minutes");
- }
+ return ls.getMessage("timetag.minutes");
case HOURS_UNITS:
if (val == 1) {
return ls.getMessage("timetag.hour");
}
- else {
- return ls.getMessage("timetag.hours");
- }
+ return ls.getMessage("timetag.hours");
case DAYS_UNITS:
if (val == 1) {
return ls.getMessage("timetag.day");
}
- else {
- return ls.getMessage("timetag.days");
- }
+ return ls.getMessage("timetag.days");
case WEEKS_UNITS:
if (val == 1) {
return ls.getMessage("timetag.week");
}
- else {
- return ls.getMessage("timetag.weeks");
- }
+ return ls.getMessage("timetag.weeks");
case MONTHS_UNITS:
if (val == 1) {
return ls.getMessage("timetag.month");
}
- else {
- return ls.getMessage("timetag.months");
- }
+ return ls.getMessage("timetag.months");
case YEARS_UNITS:
if (val == 1) {
return ls.getMessage("timetag.year");
}
- else {
- return ls.getMessage("timetag.years");
- }
+ return ls.getMessage("timetag.years");
default:
return ls.getMessage("timetag.unknown");
@@ -636,9 +622,7 @@ public class StringUtil {
if (now < target) {
return ls.getMessage("timetag.futuretense");
}
- else {
- return ls.getMessage("timetag.pasttense");
- }
+ return ls.getMessage("timetag.pasttense");
}
/**
diff --git a/java/code/src/com/redhat/rhn/common/util/XPathLite.java
b/java/code/src/com/redhat/rhn/common/util/XPathLite.java
index 0ceb873..214e640 100644
--- a/java/code/src/com/redhat/rhn/common/util/XPathLite.java
+++ b/java/code/src/com/redhat/rhn/common/util/XPathLite.java
@@ -72,9 +72,7 @@ public class XPathLite {
if (current != null) {
return current.getChildren();
}
- else {
- return Collections.EMPTY_LIST;
- }
+ return Collections.EMPTY_LIST;
}
private Element findChild(Element current, String name) {
@@ -85,9 +83,7 @@ public class XPathLite {
current = child;
break;
}
- else {
- current = null;
- }
+ current = null;
}
return current;
}
commit 653bb3c61d7a5d9be8c7a94b4a2a17274c04e3f5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 18:33:29 2012 +0100
remove unnecessary else statements in
java/code/internal/src/com/redhat/rhn/internal/doclet
diff --git a/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java
b/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java
index f5126a8..cae7a4b 100644
--- a/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java
+++ b/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java
@@ -210,8 +210,6 @@ public class ApiDoclet {
if (tags.length > 0) {
return tags[0];
}
- else {
- return null;
- }
+ return null;
}
}
diff --git a/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java
b/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java
index 76da811..47c099c 100644
--- a/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java
+++ b/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java
@@ -103,9 +103,7 @@ public class EnforcementDoclet {
if (exceptions.get(clazz) == null) {
return false;
}
- else {
- return exceptions.get(clazz).contains(field);
- }
+ return exceptions.get(clazz).contains(field);
}
private static void setException(String clazz, String field) {