[jboss-svn-commits] JBL Code SVN: r9423 - labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Feb 10 07:59:17 EST 2007


Author: wrzep
Date: 2007-02-10 07:59:17 -0500 (Sat, 10 Feb 2007)
New Revision: 9423

Added:
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java
Log:
JBLAB-780
refactoring
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java	2007-02-10 08:14:26 UTC (rev 9422)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java	2007-02-10 12:59:17 UTC (rev 9423)
@@ -23,7 +23,6 @@
 
 import javax.faces.context.FacesContext;
 
-import org.jboss.forge.common.FacesTools;
 import org.jboss.forge.common.ForgeHelper;
 import org.jboss.forge.common.projects.ProjectsHelper;
 import org.jboss.forge.common.projects.project.Project;
@@ -127,27 +126,11 @@
 		return description;
 	}
 
-	public void setDescription(String description) {	}
-
 	public String getProjectURL() {		
 		return projectURL;
 	}
 
-	public void setProjectURL(String projectURL) {}
-
 	public String getUsername() {		
 		return username;
 	}
-
-	public void setUsername(String username) {}
-	
-	public String applyChanges() {
-		
-		System.out.println("NEW Project name: " + project.getName());
-		System.out.println("NEW Project logo: " + project.getLogo());
-		
-		FacesTools.addMessage("Your changes has been saved");
-		
-		return "back";
-	}
 }

Added: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoConstants.java	2007-02-10 12:59:17 UTC (rev 9423)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.forge.projects.info;
+
+import org.jboss.forge.common.projects.project.RepoType;
+
+/**
+ * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
+ */
+
+public class ProjectInfoConstants  {
+
+	public static final String EDIT_ACTION			= "edit";
+	public static final String APPLY_ACTION			= "back";
+	public static final String BACK_ACTION			= "back";
+	public static final String ERR_ACTION 			= "";
+	public static final String ADD_REMOVE_ACTION 	= "";
+	
+	public static final RepoType DEFAULT_REPO_TYPE  = RepoType.SVN;
+
+	private ProjectInfoConstants() {};
+}

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-10 08:14:26 UTC (rev 9422)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoEditBean.java	2007-02-10 12:59:17 UTC (rev 9423)
@@ -41,7 +41,7 @@
 	private ProjectsService projectsService;
 	
 	private String newRepoURL;
-	private RepoType newRepoType;
+	private RepoType newRepoType = ProjectInfoConstants.DEFAULT_REPO_TYPE;
 	
 	public ProjectInfoEditBean() {
 		
@@ -53,22 +53,18 @@
 	
 	public String applyChanges() {
 		
-		System.out.println("[apply] project name: " + project.getName()); //debug
-		
 		projectsService.persistProject(project);
 		
 		FacesTools.addMessage("Your changes have been saved");
 		
-		return "back";
+		return ProjectInfoConstants.APPLY_ACTION;
 	}
 	
 	public String addRepo() {
 		
-		System.out.println("AddRepo "); //debug
-		
 		if ((newRepoURL == null) || (newRepoURL == "")) {
 			FacesTools.addMessage("Please provide repository URL.");
-			return "";
+			return ProjectInfoConstants.ERR_ACTION;
 		}
 		
 		List<Repository> repoList = project.getRepositories();
@@ -78,28 +74,27 @@
 		repo.setValue(newRepoURL);
 		
 		repoList.add(repo);
+		newRepoURL = "";
+		newRepoType = ProjectInfoConstants.DEFAULT_REPO_TYPE;
 		
-		return "";
+		return ProjectInfoConstants.ADD_REMOVE_ACTION;
 	}
 	
 	public String delRepo() {
 		
 		String delRepoId = FacesTools.getRequestParameter("delRepoId");
 		
-		System.out.println(" delRepoId = " + delRepoId); //debug
-		
 		List<Repository> repositories = project.getRepositories();
 		for (Repository repo : repositories) {
-			if (repo.getValue() == delRepoId) {
+			
+			if (delRepoId.equals(repo.getValue())) {
 				repositories.remove(repo);
-				System.out.println("removed"); //debug
-				return "";
+				return ProjectInfoConstants.ADD_REMOVE_ACTION;
 			}
 		}
 		
 		FacesTools.addMessage("Unknown error");
-		
-		return "";
+		return ProjectInfoConstants.ERR_ACTION;
 	}
 	
 	/* Getters and setters */




More information about the jboss-svn-commits mailing list