[jboss-svn-commits] JBL Code SVN: r10889 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets/src/java/org/jboss/forge/projects/admin and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 11 09:18:57 EDT 2007
Author: wrzep
Date: 2007-04-11 09:18:57 -0400 (Wed, 11 Apr 2007)
New Revision: 10889
Added:
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminConstants.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FacesTools.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminBean.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/info/InfoAdminConstants.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml
Log:
JBLAB-849
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FacesTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FacesTools.java 2007-04-11 12:06:38 UTC (rev 10888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/FacesTools.java 2007-04-11 13:18:57 UTC (rev 10889)
@@ -220,4 +220,10 @@
Map map = context.getExternalContext().getRequestParameterMap();
return (String) map.get(param);
}
+
+ public static void resetSessionBean(String beanName) {
+
+ FacesContext fc = FacesContext.getCurrentInstance();
+ fc.getApplication().createValueBinding( "#{" + beanName + "}").setValue(fc, null );
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminBean.java 2007-04-11 12:06:38 UTC (rev 10888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminBean.java 2007-04-11 13:18:57 UTC (rev 10889)
@@ -21,7 +21,6 @@
*/
package org.jboss.forge.projects.admin;
-import java.io.IOException;
import java.io.Serializable;
import javax.faces.component.UIViewRoot;
@@ -30,7 +29,6 @@
import org.jboss.forge.common.FacesTools;
import org.jboss.forge.common.ejb3.LabsServices;
-import org.jboss.forge.common.projects.project.Pages;
import org.jboss.forge.common.projects.project.Project;
import org.jboss.forge.projects.admin.info.InfoAdminBean;
import org.jboss.forge.projects.admin.pages.PagesAdminBean;
@@ -51,14 +49,14 @@
public ProjectAdminBean() {
defaultRoot = FacesContext.getCurrentInstance().getViewRoot();
- System.out.println("DEFAULT ROOT: " + defaultRoot);
+ System.out.println("DEFAULT ROOT: " + defaultRoot + " " + defaultRoot.getId() + " " + defaultRoot.getViewId());
}
public String save() {
/* DEBUG
if (!FacesTools.isProjectAdminLogged()) {
- return "projectHome";
+ return ProjectAdminConstants.MESSAGE_ACTION;
}*/
Project project = info.getProjectToSave();
@@ -70,12 +68,12 @@
log.warn("Save project unsuccessful " + e);
FacesTools.addMessage("Save failed");
- return "projectHome";
+ return ProjectAdminConstants.MESSAGE_ACTION;
}
FacesTools.addMessage("Your changes have been saved.");
- return "projectHome";
+ return ProjectAdminConstants.MESSAGE_ACTION;
}
public String apply() {
@@ -87,9 +85,12 @@
public String cancel() {
- // reset saved beans?
+ FacesTools.resetSessionBean(ProjectAdminConstants.INFO_EDIT_BEAN);
+ FacesTools.resetSessionBean(ProjectAdminConstants.PAGES_EDIT_BEAN);
- return "";
+ // clear messages
+
+ return ProjectAdminConstants.PROJECT_HOME_ACTION;
}
public String getNav() {
Added: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminConstants.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/ProjectAdminConstants.java 2007-04-11 13:18:57 UTC (rev 10889)
@@ -0,0 +1,43 @@
+/*
+ * 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.admin;
+
+/**
+ * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
+ */
+
+public class ProjectAdminConstants {
+
+ 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 String PROJECT_HOME_ACTION = "projectHome";
+ public static final String MESSAGE_ACTION = "message";
+
+ public static final String INFO_EDIT_BEAN = "pedit";
+ public static final String PAGES_EDIT_BEAN = "pages";
+ public static final String ADMIN_BEAN = "admin";
+
+ private ProjectAdminConstants() {};
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/info/InfoAdminConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/info/InfoAdminConstants.java 2007-04-11 12:06:38 UTC (rev 10888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/info/InfoAdminConstants.java 2007-04-11 13:18:57 UTC (rev 10889)
@@ -38,12 +38,6 @@
public class InfoAdminConstants {
- 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 = RepoTypeRW.SVN;
public static final MonitorType DEFAULT_REPO_MONITOR_TYPE
= MonitorTypeRW.FISHEYE;
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-04-11 12:06:38 UTC (rev 10888)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/faces-config.xml 2007-04-11 13:18:57 UTC (rev 10889)
@@ -45,6 +45,13 @@
<to-view-id>/repo-access/default/prj-admin/projectHome.jsp</to-view-id>
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>message</from-outcome>
+ <to-view-id>/repo-access/default/prj-admin/message.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
<navigation-rule>
<from-view-id>*</from-view-id>
<navigation-case>
More information about the jboss-svn-commits
mailing list