java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java |
8 ++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java |
4 +-
java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java |
14 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit faeb8408f224b73c3bc2ca463dac4364b02eb717
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Sep 2 13:04:45 2011 +0200
Checkstyle fixes
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
index 6c536a7..d6d929f 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
@@ -411,14 +411,14 @@ public class ConfigurationFactory extends HibernateFactory {
/**
* Finds a ConfigRevision for a given ConfigFile and given revision id
- * @param ConfigFile The ConfigFile to look for.
- * @param rev_id The ConfigFile revision to look for.
+ * @param cf The ConfigFile to look for.
+ * @param revId The ConfigFile revision to look for.
* @return ConfigRevision The sought for ConfigRevision.
*/
- public static ConfigRevision lookupConfigRevisionByRevId(ConfigFile cf, Long rev_id)
{
+ public static ConfigRevision lookupConfigRevisionByRevId(ConfigFile cf, Long revId)
{
Session session = HibernateFactory.getSession();
Query q =
session.getNamedQuery("ConfigRevision.findByRevisionAndConfigFile");
- q.setLong("rev", rev_id.longValue());
+ q.setLong("rev", revId.longValue());
q.setEntity("cf", cf);
return (ConfigRevision) q.uniqueResult();
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index 695fcfb..d4ddae9 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -114,9 +114,9 @@ public class ConfigChannelHandler extends BaseHandler {
ConfigurationManager cm = ConfigurationManager.getInstance();
ConfigFile cf = cm.lookupConfigFile(loggedInUser, cc.getId(), filePath);
- for (Integer rev_id : revisions) {
+ for (Integer revId : revisions) {
ConfigRevision cr = cm.lookupConfigRevisionByRevId(loggedInUser, cf,
- rev_id.longValue());
+ revId.longValue());
cm.deleteConfigRevision(loggedInUser, cr);
}
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 8fcf22a..ad5e1e4 100644
--- a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
@@ -1887,23 +1887,23 @@ public class ConfigurationManager extends BaseManager {
* For a given configuration file, looks up a config revision id
* @param user The user requesting to lookup a config revision.
* @param cf The ConfigFile that the revision applies to
- * @param rev_id The ConfigFile revision id.
+ * @param revId The ConfigFile revision id.
* @return The sought for config revision.
*/
public ConfigRevision lookupConfigRevisionByRevId(User user, ConfigFile cf,
- Long rev_id) {
- ConfigRevision cr = ConfigurationFactory.lookupConfigRevisionByRevId(cf,
rev_id);
+ Long revId) {
+ ConfigRevision cr = ConfigurationFactory.lookupConfigRevisionByRevId(cf, revId);
if (cr == null) {
- throw new LookupException("Could not find config revision with revision
id="
- + rev_id);
+ throw new LookupException("Could not find config revision with revision
id=" +
+ revId);
}
if (!accessToRevision(user.getId(), cr.getId())) {
LocalizationService ls = LocalizationService.getInstance();
LookupException e =
- new LookupException("Could not find config revision with revision
id="
- + rev_id);
+ new LookupException("Could not find config revision with revision
id=" +
+ revId);
e.setLocalizedTitle(ls.getMessage("lookup.configrev.title"));
e.setLocalizedReason1(ls.getMessage("lookup.configrev.reason1"));
e.setLocalizedReason2(ls.getMessage("lookup.configrev.reason2"));
Show replies by date