[jboss-svn-commits] JBL Code SVN: r9616 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets/src/java/org/jboss/forge/projects/info and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 19 14:23:33 EST 2007
Author: wrzep
Date: 2007-02-19 14:23:32 -0500 (Mon, 19 Feb 2007)
New Revision: 9616
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/EnumTypeConverter.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoAccessBean.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml
Log:
JBLAB-780
project info edit made simple
-Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/EnumTypeConverter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/EnumTypeConverter.java 2007-02-19 18:54:22 UTC (rev 9615)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/EnumTypeConverter.java 2007-02-19 19:23:32 UTC (rev 9616)
@@ -31,7 +31,7 @@
@SuppressWarnings("unchecked")
public Object getAsObject(FacesContext context, UIComponent comp,
String value) throws ConverterException {
-
+
Class enumType = comp.getValueBinding("value").getType(context);
return Enum.valueOf(enumType, value);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoAccessBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoAccessBean.java 2007-02-19 18:54:22 UTC (rev 9615)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoAccessBean.java 2007-02-19 19:23:32 UTC (rev 9616)
@@ -33,9 +33,8 @@
public boolean isProjectAdminLogged() {
- System.out.println("PAL");
-
- return FacesTools.isProjectAdminLogged();
+ return true; //DEBUG
+ //return FacesTools.isProjectAdminLogged();
}
public boolean isUserLogged() {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java 2007-02-19 18:54:22 UTC (rev 9615)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java 2007-02-19 19:23:32 UTC (rev 9616)
@@ -22,7 +22,6 @@
package org.jboss.forge.projects.info;
import java.util.List;
-import java.util.Map;
import org.jboss.forge.common.FacesTools;
import org.jboss.forge.common.projects.project.BuildResult;
@@ -33,32 +32,16 @@
import org.jboss.forge.common.projects.project.MonitorType;
import org.jboss.forge.common.projects.project.Project;
import org.jboss.forge.common.projects.project.RepoMonitor;
-import org.jboss.forge.common.projects.project.RepoType;
public class ProjectInfoEditBean {
private Project project;
-
+
private String issueTrackerURL;
- private IssueTrackerType issueTrackerType =
- ProjectInfoConstants.DEFAULT_ISSUE_TRACKER_TYPE;
-
- private RepoType repoType;
- private String commiterRepoURL;
- private String anonRepoURL;
-
+ private IssueTrackerType issueTrackerType;
private String repoMonitorURL;
- private MonitorType repoMonitorType =
- ProjectInfoConstants.DEFAULT_REPO_MONITOR_TYPE;
-
- private String trainingURL;
- private String supportURL;
-
- private String devForumURL;
- private String userForumURL;
-
+ private MonitorType repoMonitorType;
private List<String> jems;
-
private List<Documentation> documentation;
private String newBuildResultsURL;
@@ -66,49 +49,32 @@
ProjectInfoConstants.DEFAULT_BUILD_TYPE;
public ProjectInfoEditBean() {
- /*
+
project = ProjectInfoTools.getProjectByName(FacesTools.getSelectedProjectId());
- IssueTracker it = (IssueTracker) ProjectInfoTools.getFirst(project.getIssueTrackers());
+ documentation = ProjectInfoTools.getAllDocumentation(project);
+
+ IssueTracker it = project.getIssueTracker();
if (it != null) {
issueTrackerURL = it.getValue();
issueTrackerType = it.getType();
}
- RepoMonitor rm = (RepoMonitor) ProjectInfoTools.getFirst(project.getRepoMonitors());
- if (rm != null) {
- repoMonitorURL = rm.getValue();
- repoMonitorType = rm.getType();
+ RepoMonitor monitor = project.getRepoMonitor();
+ if (monitor != null) {
+ repoMonitorURL = monitor.getValue();
+ repoMonitorType = monitor.getType();
}
- Map<RepoType,String> repoMap = ProjectInfoTools.getRepoMap(project);
- if ((repoMap.containsKey(RepoType.CVS)) || (repoMap.containsKey(RepoType.ANONCVS))) {
- repoType = RepoType.CVS;
- commiterRepoURL = repoMap.get(RepoType.CVS);
- anonRepoURL = repoMap.get(RepoType.ANONCVS);
- } else {
- repoType = RepoType.SVN;
- commiterRepoURL = repoMap.get(RepoType.SVN);
- anonRepoURL = repoMap.get(RepoType.ANONSVN);
- }
-
- Map<SupportType,String> supportMap = ProjectInfoTools.getSupportMap(project);
- supportURL = supportMap.get(SupportType.SUPPORT);
- trainingURL = supportMap.get(SupportType.TRAINING);
-
- Map<ForumType,String> forumsMap = ProjectInfoTools.getForumsMap(project);
- devForumURL = forumsMap.get(ForumType.DEV);
- userForumURL = forumsMap.get(ForumType.USER);
-
- documentation = ProjectInfoTools.getAllDocumentation(project);
- */
+ jems = project.getJems();
}
/* Business methods */
public String applyChanges() {
- //ProjectInfoTools.applyProjectChanges(this);
+ //TODO setIssueTracker
+ //TODO setRepoMonitor
FacesTools.addMessage("Your changes have been saved");
@@ -150,7 +116,6 @@
FacesTools.addMessage("Unknown error");
return ProjectInfoConstants.ERR_ACTION;
}
-
/* Getters and setters */
@@ -177,31 +142,7 @@
public void setIssueTrackerURL(String issueTrackerURL) {
this.issueTrackerURL = issueTrackerURL;
}
-
- public RepoType getRepoType() {
- return repoType;
- }
- public void setRepoType(RepoType repoType) {
- this.repoType = repoType;
- }
-
- public String getAnonRepoURL() {
- return anonRepoURL;
- }
-
- public void setAnonRepoURL(String anonRepoURL) {
- this.anonRepoURL = anonRepoURL;
- }
-
- public String getCommiterRepoURL() {
- return commiterRepoURL;
- }
-
- public void setCommiterRepoURL(String commiterRepoURL) {
- this.commiterRepoURL = commiterRepoURL;
- }
-
public MonitorType getRepoMonitorType() {
return repoMonitorType;
}
@@ -217,39 +158,15 @@
public void setRepoMonitorURL(String repoMonitorURL) {
this.repoMonitorURL = repoMonitorURL;
}
-
- public String getSupportURL() {
- return supportURL;
- }
- public void setSupportURL(String supportURL) {
- this.supportURL = supportURL;
+ public List<String> getJems() {
+ return jems;
}
- public String getTrainingURL() {
- return trainingURL;
+ public void setJems(List<String> jems) {
+ this.jems = jems;
}
- public void setTrainingURL(String trainingURL) {
- this.trainingURL = trainingURL;
- }
-
- public String getDevForumURL() {
- return devForumURL;
- }
-
- public void setDevForumURL(String devForumURL) {
- this.devForumURL = devForumURL;
- }
-
- public String getUserForumURL() {
- return userForumURL;
- }
-
- public void setUserForumURL(String userForumURL) {
- this.userForumURL = userForumURL;
- }
-
public List<Documentation> getDocumentation() {
return documentation;
}
@@ -257,15 +174,7 @@
public void setDocumentation(List<Documentation> documentation) {
this.documentation = documentation;
}
-
- public List<String> getJems() {
- return jems;
- }
-
- public void setJems(List<String> jems) {
- this.jems = jems;
- }
-
+
public String getNewBuildResultsURL() {
return newBuildResultsURL;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java 2007-02-19 18:54:22 UTC (rev 9615)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTools.java 2007-02-19 19:23:32 UTC (rev 9616)
@@ -30,44 +30,17 @@
import org.jboss.forge.common.ejb3.ProjectsService;
import org.jboss.forge.common.projects.ProjectsHelper;
+
import org.jboss.forge.common.projects.project.Documentation;
import org.jboss.forge.common.projects.project.DocumentationType;
-import org.jboss.forge.common.projects.project.IssueTracker;
-import org.jboss.forge.common.projects.project.IssueTrackerType;
-import org.jboss.forge.common.projects.project.MonitorType;
import org.jboss.forge.common.projects.project.Project;
-import org.jboss.forge.common.projects.project.RepoMonitor;
-import org.jboss.forge.common.projects.project.RepoType;
-
public class ProjectInfoTools {
- /*
+
private static ProjectsService projectsService = null;
- public static void applyProjectChanges(ProjectInfoEditBean bean) {
-
- if (projectsService == null) {
- projectsService = ProjectsHelper.getProjectsService();
- }
-
- Project project = bean.getProject();
-
- setIssueTracker(project, bean.getIssueTrackerURL(), bean.getIssueTrackerType());
- setRepositories(project, bean.getRepoType(),
- bean.getCommiterRepoURL(), bean.getAnonRepoURL());
- setRepoMonitor(project, bean.getRepoMonitorURL(), bean.getRepoMonitorType());
- setSupport(project, bean.getTrainingURL(), bean.getSupportURL());
- setForums(project, bean.getDevForumURL(), bean.getUserForumURL());
- setDocumentation(project, bean.getDocumentation());
-
- projectsService.persistProject(project);
-
- }
- */
- /* get */
-/*
public static Project getProjectByName(String projectId) {
if (projectsService == null) {
@@ -79,49 +52,18 @@
public static List<SelectItem> getAllProjects() {
+ if (projectsService == null) {
+ projectsService = ProjectsHelper.getProjectsService();
+ }
+
List<SelectItem> projects = new ArrayList<SelectItem>();
for (String projectId : projectsService.getProjectsIds()) {
projects.add(new SelectItem(projectId,projectId));
}
return projects;
}
-
- public static Map<RepoType, String> getRepoMap(Project project) {
-
- Map<RepoType, String> map = new EnumMap<RepoType,String>(RepoType.class);
-
- List<Repository> repoList = project.getRepositories();
- for (Repository repository : repoList) {
- map.put(repository.getType(), repository.getValue());
- }
-
- return map;
- }
- public static Map<SupportType, String> getSupportMap(Project project) {
-
- Map<SupportType, String> map = new EnumMap<SupportType,String>(SupportType.class);
- List<SupportService> supportList = project.getSupportServices();
- for (SupportService s : supportList) {
- map.put(s.getType(), s.getValue());
- }
-
- return map;
- }
-
- public static Map<ForumType, String> getForumsMap(Project project) {
-
- Map<ForumType, String> map = new EnumMap<ForumType,String>(ForumType.class);
-
- List<Forum> supportList = project.getForums();
- for (Forum f : supportList) {
- map.put(f.getType(), f.getValue());
- }
-
- return map;
- }
-
public static List<Documentation> getAllDocumentation(Project prj) {
Map<DocumentationType,Documentation> docMap = getDocumentationMap(prj);
@@ -154,127 +96,7 @@
return map;
}
-
- public static Object getFirst(List list) {
- if ((list == null) || (list.size() == 0)) {
- return null;
- }
- return list.get(0);
- }
-
- */
- /* set */
-
- // TODO methods below will change
- // after Rysiek finishes threadsafe project.xml impl
-
- private static void setIssueTracker(Project project, String issueTrackerURL,
- IssueTrackerType issueTrackerType) {
-
- List<IssueTracker> list = new ArrayList<IssueTracker>();
-
- if ((issueTrackerURL != null) && (issueTrackerURL.length() > 0)) {
-
- IssueTracker it = new IssueTracker();
- it.setValue(issueTrackerURL);
- it.setType(issueTrackerType);
-
- list.add(it);
- }
-
- //TODO project.setIssueTrackers(list);
- }
- /*
- private static void setForums(Project project, String devForumURL, String userForumURL) {
-
- List<Forum> forumsList = new ArrayList<Forum>();
-
- addForum(forumsList, devForumURL, ForumType.DEV);
- addForum(forumsList, userForumURL, ForumType.USER);
-
- //TODO project.setForums(forumsList);
- }
-
- private static void addForum(List<Forum> forumsList, String forumURL, ForumType forumType) {
-
- if ((forumURL != null) && (forumURL.length() > 0)) {
-
- Forum forum = new Forum();
- forum.setValue(forumURL);
- forum.setType(forumType);
- forumsList.add(forum);
- }
- }
-
- private static void setRepositories(Project project, RepoType repoType,
- String commiterRepoURL, String anonRepoURL) {
-
- List<Repository> repoList = new ArrayList<Repository>();
-
- addRepo(repoList, commiterRepoURL, repoType);
- addRepo(repoList, anonRepoURL,
- (repoType == RepoType.SVN ? RepoType.ANONSVN : RepoType.ANONCVS));
-
- // TODO project.setRepositories(repoList)
- }
-
- private static void addRepo(List<Repository> repoList, String repoURL, RepoType repoType) {
-
- if ((repoURL != null) && (repoURL.length() > 0)) {
-
- Repository repo = new Repository();
- repo.setValue(repoURL);
- repo.setType(repoType);
- repoList.add(repo);
- }
-
- }
-
- private static void setRepoMonitor(Project project, String repoMonitorURL, MonitorType repoMonitorType) {
-
- List<RepoMonitor> list = new ArrayList<RepoMonitor>();
-
- if ((repoMonitorURL != null) && (repoMonitorURL.length() > 0)) {
-
- RepoMonitor it = new RepoMonitor();
- it.setValue(repoMonitorURL);
- it.setType(repoMonitorType);
-
- list.add(it);
- }
-
- //TODO project.setRepoMonitors(list);
- }
-
-
- private static void setSupport(Project project, String trainingURL, String supportURL) {
-
- List<SupportService> list = new ArrayList<SupportService>();
-
- addSupport(list, trainingURL, SupportType.TRAINING);
- addSupport(list, supportURL, SupportType.SUPPORT);
-
- //TODO project.setSupportServices(list);
- }
-
- private static void addSupport(List<SupportService> list, String supportURL, SupportType supportType) {
-
- if ((supportURL != null) && (supportURL.length() > 0)) {
-
- SupportService s = new SupportService();
- s.setValue(supportURL);
- s.setType(supportType);
- list.add(s);
- }
- }
-
- private static void setDocumentation(Project project, List<Documentation> documentation) {
-
- //TODO project.setDocumentation(documentation);
- }
-
private ProjectInfoTools() { }
- */
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java 2007-02-19 18:54:22 UTC (rev 9615)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoTypesBean.java 2007-02-19 19:23:32 UTC (rev 9616)
@@ -21,10 +21,8 @@
*/
package org.jboss.forge.projects.info;
-import java.util.HashMap;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-
import javax.faces.model.SelectItem;
import org.jboss.forge.common.projects.project.BuildType;
@@ -41,73 +39,46 @@
public List<SelectItem> getAllProjects() {
- // return ProjectInfoTools.getAllProjects();
- return null;
+ return ProjectInfoTools.getAllProjects();
}
+
+ public List<SelectItem> getIssueTrackerTypes() {
+
+ List<SelectItem> list = new ArrayList<SelectItem>();
+ for (IssueTrackerType itt : IssueTrackerType.values()) {
+ list.add(new SelectItem(itt, itt.value()));
+ }
+ return list;
+ }
- public Map<String,RepoType> getRepoTypes() {
+ public List<SelectItem> getRepoTypes() {
- Map<String,RepoType> map = new HashMap<String,RepoType>();
+ List<SelectItem> list = new ArrayList<SelectItem>();
for(RepoType repoType : RepoType.values()) {
- map.put(repoType.value(), repoType);
+ list.add(new SelectItem(repoType, repoType.value()));
}
- return map;
+ return list;
}
-
- public Map<String,RepoType> getGeneralRepoTypes() {
-
- Map<String,RepoType> map = new HashMap<String,RepoType>();
- map.put("svn", RepoType.SVN);
- map.put("cvs", RepoType.CVS);
-
- return map;
- }
- public Map<String,MonitorType> getRepoMonitorTypes() {
+ public List<SelectItem> getRepoMonitorTypes() {
- Map<String,MonitorType> monitorTypesMap = new HashMap<String,MonitorType>();
+ List<SelectItem> list = new ArrayList<SelectItem>();
for (MonitorType mt : MonitorType.values()) {
- monitorTypesMap.put(mt.value(), mt);
+ list.add(new SelectItem(mt, mt.value()));
}
- return monitorTypesMap;
+ return list;
}
- public Map<String,IssueTrackerType> getIssueTrackerTypes() {
+ public List<SelectItem> getBuildResultsTypes() {
- Map<String,IssueTrackerType> typesMap = new HashMap<String,IssueTrackerType>();
- for (IssueTrackerType itt : IssueTrackerType.values()) {
- typesMap.put(itt.value(), itt);
+ List<SelectItem> list = new ArrayList<SelectItem>();
+ for (BuildType brt : BuildType.values()) {
+ list.add(new SelectItem(brt, brt.value()));
}
- return typesMap;
+ return list;
}
- public Map<String,BuildType> getBuildResultsTypes() {
-
- Map<String,BuildType> typesMap = new HashMap<String,BuildType>();
- for (BuildType itt : BuildType.values()) {
- typesMap.put(itt.value(), itt);
- }
- return typesMap;
- }
/*
- public Map<String,SupportType> getSupportServiceTypes() {
-
- Map<String,SupportType> typesMap = new HashMap<String,SupportType>();
- for (SupportType st : SupportType.values()) {
- typesMap.put(st.value(), st);
- }
- return typesMap;
- }
-
- public Map<String,ForumType> getForumTypes() {
-
- Map<String,ForumType> typesMap = new HashMap<String,ForumType>();
- for (ForumType ft : ForumType.values()) {
- typesMap.put(ft.value(), ft);
- }
- return typesMap;
- }
-
public Map<String,DocumentationType> getDocumentationTypes() {
Map<String,DocumentationType> typesMap = new HashMap<String,DocumentationType>();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml 2007-02-19 18:54:22 UTC (rev 9615)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml 2007-02-19 19:23:32 UTC (rev 9616)
@@ -47,24 +47,8 @@
</managed-bean>
<converter>
- <converter-for-class>org.jboss.forge.common.projects.project.RepoType</converter-for-class>
+ <converter-id>enumConverter</converter-id>
<converter-class>org.jboss.forge.common.EnumTypeConverter</converter-class>
</converter>
- <converter>
- <converter-for-class>org.jboss.forge.common.projects.project.IssueTrackerType</converter-for-class>
- <converter-class>org.jboss.forge.common.EnumTypeConverter</converter-class>
- </converter>
- <converter>
- <converter-for-class>org.jboss.forge.common.projects.project.DocumentationType</converter-for-class>
- <converter-class>org.jboss.forge.common.EnumTypeConverter</converter-class>
- </converter>
- <converter>
- <converter-for-class>org.jboss.forge.common.projects.project.BuildType</converter-for-class>
- <converter-class>org.jboss.forge.common.EnumTypeConverter</converter-class>
- </converter>
- <converter>
- <converter-for-class>org.jboss.forge.common.projects.project.MonitorType</converter-for-class>
- <converter-class>org.jboss.forge.common.EnumTypeConverter</converter-class>
- </converter>
-
+
</faces-config>
More information about the jboss-svn-commits
mailing list