java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 6 java/code/src/com/redhat/rhn/domain/channel/ContentSource.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java | 115 +++++----- java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java | 83 ++++--- java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java | 13 - java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 3 java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 6 java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 1 java/code/src/com/redhat/rhn/manager/channel/RepoLister.java | 11 java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java | 16 - java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java | 6 java/code/src/com/redhat/rhn/manager/channel/repo/EditRepoCommand.java | 5 java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 2 16 files changed, 162 insertions(+), 115 deletions(-)
New commits: commit c60570a6f1306260399c3efacffa420f9e8bb514 Author: Shannon Hughes shughes@redhat.com Date: Thu Jun 17 15:14:03 2010 -0400
lots of checkstyle fixes
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 b0022da..f1dee2b 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -161,9 +161,9 @@ public class ChannelFactory extends HibernateFactory {
/** * lookup content source by id and org - * @param id - * @param orgIn - * @return + * @param id id of content source + * @param orgIn org to check + * @return content source */ public static ContentSource lookupContentSource(Long id, Org orgIn) { Map params = new HashMap(); diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java index 0cc9f95..3d482d8 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java @@ -111,7 +111,7 @@ public class ContentSource extends BaseDomainHelper {
/** * - * @param set of channels this repo is pushed to + * @param channelsIn of channels this repo is pushed to */ public void setChannels(Set<Channel> channelsIn) { this.channels = channelsIn; diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java index e503aea..08e231d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java @@ -609,7 +609,7 @@ public class EditChannelAction extends RhnAction implements Listable { c.getLastSynced()); } request.setAttribute("last_sync", lastSync); - if (ChannelManager.getLatestSyncLogFile(cs,c) != null) { + if (ChannelManager.getLatestSyncLogFile(cs, c) != null) { request.setAttribute("log_url", DownloadManager.getChannelSyncLogDownloadPath(cs, ctx.getLoggedInUser())); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java index 4469760..75566ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java @@ -37,64 +37,77 @@ import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
- +/** + * + * RepositoriesAction + * @version $Rev$ + */ public class RepositoriesAction extends RhnAction implements Listable {
- - public ActionForward execute(ActionMapping mapping, - ActionForm formIn, - HttpServletRequest request, - HttpServletResponse response) { + /** + * + * {@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) {
- RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); - - long cid = context.getRequiredParam("cid"); - Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); - request.setAttribute("channel_name", chan.getName()); - - Map params = new HashMap(); - params.put(RequestContext.CID, chan.getId().toString()); + RequestContext context = new RequestContext(request); + User user = context.getLoggedInUser();
- ListSessionSetHelper helper = new ListSessionSetHelper(this, request,params); - - if (!context.isSubmitted()) { - List<ContentSource> result = getResult(context); - Set<String> preSelect = new HashSet<String>(); - for (int i = 0; i < result.size(); i++) { - ContentSource src = result.get(i); - if(src.getChannels().contains(chan)) { - preSelect.add(src.getId().toString()); - } - } - helper.preSelect(preSelect); - } - - helper.ignoreEmptySelection(); - helper.execute(); - - if(helper.isDispatched()) { - Set<ContentSource> foo = chan.getSources(); - foo.clear(); - Set <String> set = helper.getSet(); - for (String id : set) { - Long sgid = Long.valueOf(id); - ContentSource tmp = ChannelFactory.lookupContentSource(sgid); - foo.add(tmp); + long cid = context.getRequiredParam("cid"); + Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); + request.setAttribute("channel_name", chan.getName()); + + Map params = new HashMap(); + params.put(RequestContext.CID, chan.getId().toString()); + + ListSessionSetHelper helper = + new ListSessionSetHelper(this, request, params); + + if (!context.isSubmitted()) { + List<ContentSource> result = getResult(context); + Set<String> preSelect = new HashSet<String>(); + for (int i = 0; i < result.size(); i++) { + ContentSource src = result.get(i); + if (src.getChannels().contains(chan)) { + preSelect.add(src.getId().toString()); } - - ChannelFactory.save(chan); - - StrutsDelegate strutsDelegate = getStrutsDelegate(); - strutsDelegate.saveMessage("channel.edit.repo.updated", new String[] {chan.getName()}, request ); - - return strutsDelegate.forwardParams - (mapping.findForward("success"), params); - } - - return mapping.findForward("default"); + } + helper.preSelect(preSelect); } + + helper.ignoreEmptySelection(); + helper.execute(); + + if (helper.isDispatched()) { + Set<ContentSource> foo = chan.getSources(); + foo.clear(); + Set <String> set = helper.getSet(); + for (String id : set) { + Long sgid = Long.valueOf(id); + ContentSource tmp = ChannelFactory.lookupContentSource(sgid); + foo.add(tmp); + } + + ChannelFactory.save(chan); + + StrutsDelegate strutsDelegate = getStrutsDelegate(); + strutsDelegate.saveMessage("channel.edit.repo.updated", + new String[] {chan.getName()}, request); + + return strutsDelegate.forwardParams + (mapping.findForward("success"), params); + } + + return mapping.findForward("default"); + }
+ /** + * + * {@inheritDoc} + */ public List<ContentSource> getResult(RequestContext context) { User user = context.getLoggedInUser(); return ChannelFactory.lookupContentSources(user.getOrg()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java index 675d393..752919e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java @@ -36,47 +36,58 @@ import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
- +/** + * + * SyncRepositoriesAction + * @version $Rev$ + */ public class SyncRepositoriesAction extends RhnAction implements Listable {
- - public ActionForward execute(ActionMapping mapping, - ActionForm formIn, - HttpServletRequest request, - HttpServletResponse response) { + /** + * + * {@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) {
- RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); - - long cid = context.getRequiredParam("cid"); - Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); - request.setAttribute("channel_name", chan.getName()); - - Map params = new HashMap(); - params.put(RequestContext.CID, chan.getId().toString()); + RequestContext context = new RequestContext(request); + User user = context.getLoggedInUser(); + + long cid = context.getRequiredParam("cid"); + Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); + request.setAttribute("channel_name", chan.getName()); + + Map params = new HashMap(); + params.put(RequestContext.CID, chan.getId().toString()); + ListSessionSetHelper helper = new ListSessionSetHelper(this, request, params); + + helper.execute(); + + if (helper.isDispatched()) { + Set <String> set = helper.getSet(); + for (String id : set) { + Long sgid = Long.valueOf(id); + ContentSource tmp = ChannelFactory.lookupContentSource(sgid); + System.out.println("SYNCING:" + tmp.getSourceUrl()); + } + + StrutsDelegate strutsDelegate = getStrutsDelegate(); + strutsDelegate.saveMessage("channel.edit.repo.updated", + new String[] {chan.getName()}, request); + + return strutsDelegate.forwardParams + (mapping.findForward("success"), params); + }
- ListSessionSetHelper helper = new ListSessionSetHelper(this, request,params); - - helper.execute(); - - if(helper.isDispatched()) { - Set <String> set = helper.getSet(); - for (String id : set) { - Long sgid = Long.valueOf(id); - ContentSource tmp = ChannelFactory.lookupContentSource(sgid); - System.out.println("SYNCING:" + tmp.getSourceUrl()); - } - - StrutsDelegate strutsDelegate = getStrutsDelegate(); - strutsDelegate.saveMessage("channel.edit.repo.updated", new String[] {chan.getName()}, request ); - - return strutsDelegate.forwardParams - (mapping.findForward("success"), params); - } - - return mapping.findForward("default"); - } + return mapping.findForward("default"); + }
+ /** + * + * {@inheritDoc} + */ public List<ContentSource> getResult(RequestContext context) { User user = context.getLoggedInUser(); long cid = context.getRequiredParam("cid"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java index 9ce5da8..5640001 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java @@ -46,8 +46,8 @@ public class RepoDeleteAction extends RhnAction {
ContentSource src = cmd.getNewRepo();
- request.setAttribute(RepoDetailsAction.LABEL, src.getLabel() ); - request.setAttribute(RepoDetailsAction.URL, src.getSourceUrl() ); + request.setAttribute(RepoDetailsAction.LABEL, src.getLabel()); + request.setAttribute(RepoDetailsAction.URL, src.getSourceUrl()); request.setAttribute("id", src.getId());
if (context.isSubmitted()) { 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 5a580a2..620b34b 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 @@ -96,15 +96,15 @@ public class RepoDetailsAction extends RhnAction { } } } - else if(!isCreateMode(request)) { + else if (!isCreateMode(request)) { setup(request, form); }
return mapping.findForward(RhnHelper.DEFAULT_FORWARD); }
- private Map<String,String> makeValidationMap(DynaActionForm form) { - Map<String,String> map = new HashMap<String,String>(); + private Map<String, String> makeValidationMap(DynaActionForm form) { + Map<String, String> map = new HashMap<String, String>(); map.put(LABEL, form.getString(LABEL)); map.put(URL, form.getString(URL)); return map; @@ -133,7 +133,7 @@ public class RepoDetailsAction extends RhnAction { /** * Method to bind the repo to a request * @param request the servlet request - * @param snip the snippet to bind + * @param repo content source */ public static void bindRepo(HttpServletRequest request, ContentSource repo) { request.setAttribute(REPO, repo); @@ -145,11 +145,12 @@ public class RepoDetailsAction extends RhnAction { String label = form.getString(LABEL); Org org = context.getLoggedInUser().getOrg(); BaseRepoCommand repoCmd = null; - if(isCreateMode(request)) { + if (isCreateMode(request)) { repoCmd = new CreateRepoCommand(org); } else { - repoCmd = new EditRepoCommand(context.getLoggedInUser(), context.getParamAsLong(SOURCEID)); + repoCmd = new EditRepoCommand(context.getLoggedInUser(), + context.getParamAsLong(SOURCEID)); }
repoCmd.setLabel(label); 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 8efcddb..bd47599 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 @@ -374,7 +374,8 @@ public class DownloadFile extends DownloadAction { } else if (type.equals(DownloadManager.DOWNLOAD_TYPE_REPO_LOG)) { Channel c = ChannelFactory.lookupById((Long)params.get(CHANNEL)); - ContentSource cs = ChannelFactory.lookupContentSource(fileId, user.getOrg()); + ContentSource cs = + ChannelFactory.lookupContentSource(fileId, user.getOrg()); ChannelManager.verifyChannelAdmin(user, fileId); File file = new File(ChannelManager.getLatestSyncLogFile(cs, c));
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java index 293df08..f259470 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java @@ -62,7 +62,7 @@ public class ContentSourceDto extends BaseDto { }
/** - * @param idIn The id to set. + * @param cIn The channel id to set. */ public void setChannels(Long cIn) { this.channels = cIn; 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 6421bef..ad79803 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 @@ -529,9 +529,11 @@ public class SystemHandler extends BaseHandler { Channel baseChannel = server.getBaseChannel(); List returnList = new ArrayList();
- List<EssentialChannelDto> list = ChannelManager.listBaseChannelsForSystem(loggedInUser, server); + List<EssentialChannelDto> list = + ChannelManager.listBaseChannelsForSystem(loggedInUser, server); for (EssentialChannelDto ch : list) { - Boolean currentBase = (baseChannel != null) && baseChannel.getId().equals(ch.getId()); + Boolean currentBase = (baseChannel != null) && + baseChannel.getId().equals(ch.getId()); returnList.add(createChannelMap(ch, currentBase)); }
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 7e0d2c1..77ac74e 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -2812,6 +2812,7 @@ public class ChannelManager extends BaseManager { /** * get the latest log file for spacewalk-repo-sync * @param cs the channel content source you want the latest log file for + * @param c channel * @return the string of the filename (fully qualified) */ public static String getLatestSyncLogFile(ContentSource cs, Channel c) { diff --git a/java/code/src/com/redhat/rhn/manager/channel/RepoLister.java b/java/code/src/com/redhat/rhn/manager/channel/RepoLister.java index 8cc5ed2..efa8a49 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/RepoLister.java +++ b/java/code/src/com/redhat/rhn/manager/channel/RepoLister.java @@ -49,6 +49,11 @@ public class RepoLister extends BaseManager { return INSTANCE; }
+ /** + * + * @param orgIn org to check + * @return list of contet source dto's + */ public DataResult<ContentSourceDto> sourcesInOrg(Org orgIn) {
SelectMode m = ModeFactory.getMode("Channel_queries", "contentsrc_for_org"); @@ -60,7 +65,11 @@ public class RepoLister extends BaseManager { return returnDataResult; }
- + /** + * + * @param user that is logged in + * @return list of content source dto's for users org + */ public List<ContentSourceDto> list(User user) { List <ContentSourceDto> repos = new LinkedList<ContentSourceDto>(); repos.addAll(sourcesInOrg(user.getOrg())); diff --git a/java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java b/java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java index 6ce2d92..a1345d3 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java @@ -51,10 +51,10 @@ public class BaseRepoCommand {
/** * - * @param org to set for repo + * @param orgIn to set for repo */ - public void setOrg(Org org) { - this.org = org; + public void setOrg(Org orgIn) { + this.org = orgIn; }
/** @@ -69,8 +69,8 @@ public class BaseRepoCommand { * * @param labelIn to set for repo */ - public void setLabel(String LabelIn) { - this.label = LabelIn; + public void setLabel(String labelIn) { + this.label = labelIn; }
/** @@ -94,9 +94,9 @@ public class BaseRepoCommand { * @return ValidatorError[] array if there are errors */ public ValidatorError[] store() { - ValidatorError[] errors = validate(); - if (errors != null && errors.length > 0) { - return errors; + ValidatorError[] errorst = validate(); + if (errorst != null && errorst.length > 0) { + return errorst; } else { // Create repo diff --git a/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java b/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java index e769d32..9ecbf2f 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java @@ -23,7 +23,11 @@ import com.redhat.rhn.domain.org.Org; */ public class CreateRepoCommand extends BaseRepoCommand {
- public CreateRepoCommand(Org orgIn) { + /** + * + * @param orgIn org for repo + */ + public CreateRepoCommand(Org orgIn) { super(); this.repo = ChannelFactory.createRepo(); this.repo.setOrg(orgIn); diff --git a/java/code/src/com/redhat/rhn/manager/channel/repo/EditRepoCommand.java b/java/code/src/com/redhat/rhn/manager/channel/repo/EditRepoCommand.java index fa65f94..5a2c803 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/repo/EditRepoCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/repo/EditRepoCommand.java @@ -23,6 +23,11 @@ import com.redhat.rhn.domain.user.User; */ public class EditRepoCommand extends BaseRepoCommand {
+ /** + * + * @param currentUser logged in user + * @param repoId id of content source object + */ public EditRepoCommand(User currentUser, Long repoId) { super(); this.repo = ChannelFactory.lookupContentSource(repoId, currentUser.getOrg()); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java index f5e621c..82ba218 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java @@ -85,7 +85,7 @@ public class RepoSyncTask implements Job {
try { Process p = Runtime.getRuntime().exec( - getSyncCommand(src,c).toArray(new String[0])); + getSyncCommand(src, c).toArray(new String[0])); c.setLastSynced(new Date()); int chr = p.getInputStream().read(); while (chr != -1) {
spacewalk-commits@lists.fedorahosted.org