[jboss-svn-commits] JBL Code SVN: r10366 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src: java/org/jboss/wiki/attributesextractor/impl and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Mar 20 17:13:42 EDT 2007
Author: szimano
Date: 2007-03-20 17:13:41 -0400 (Tue, 20 Mar 2007)
New Revision: 10366
Added:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
Removed:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
Log:
jbwiki editing prev pages and theme
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java 2007-03-20 20:32:47 UTC (rev 10365)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java 2007-03-20 21:13:41 UTC (rev 10366)
@@ -1,263 +0,0 @@
-/*
- * 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.wiki.attributesextractor;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import javax.faces.context.FacesContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.ReadOnlyException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.myfaces.portlet.MyFacesGenericPortlet;
-import org.jboss.logging.Logger;
-import org.jboss.wiki.Credentials;
-import org.jboss.wiki.WikiSession;
-import org.jboss.wiki.configuration.ConfigurationParser;
-import org.jboss.wiki.exception.WikiUserPreferenceException;
-import org.jboss.wiki.helper.WikiHelper;
-import org.jboss.wiki.portlet.PortletWikiSession;
-
-/**
- * PortletAttributesExctractor.java
- *
- * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
- */
-
-public class PortletAttributesExctractor implements AttributesExtractor {
-
- private final static Logger log = Logger
- .getLogger(PortletAttributesExctractor.class);
-
- private static final String USER_LANG = "JBWiki:Default:Language";
-
- private static final String USER_PAGE = "JBWiki:Default:Page";
-
- private String appContext;
-
- private String hostURL;
-
- private WikiSession wikiSession;
-
- private Credentials credentials;
-
- private String page;
-
- private boolean secure;
-
- private String language;
-
- private Integer pageVersion;
-
- private String type;
-
- private String userDefaultLang;
-
- private String userDefaultPage;
-
- public PortletAttributesExctractor(Object request) {
- if (request instanceof PortletRequest) {
- PortletRequest rReq = (PortletRequest) request;
-
- // get all needed attributes
- hostURL = ((rReq.isSecure()) ? "https" : "http")
- + "://"
- + rReq.getServerName()
- + ((rReq.getServerPort() == 80) ? "" : ":"
- + rReq.getServerPort());
-
- appContext = ConfigurationParser.getWikiContext();
-
- if (appContext == null) {
- appContext = rReq.getContextPath();
- }
-
- wikiSession = new PortletWikiSession(rReq.getPortletSession());
-
- credentials = WikiHelper.getWikiEngine().getCredentialsInstance(
- request);
-
- secure = rReq.isSecure();
-
- page = rReq.getParameter("page");
-
- language = rReq.getParameter("language");
-
- pageVersion = (rReq.getParameter("version") != null) ? Integer
- .valueOf(rReq.getParameter("version")) : null;
-
- type = rReq.getParameter("type");
-
- userDefaultLang = rReq.getPreferences().getValue(USER_LANG,
- ConfigurationParser.getDefaultLangugeCode());
-
- userDefaultPage = rReq.getPreferences().getValue(USER_PAGE,
- ConfigurationParser.getDefaultPage());
-
- } else {
- throw new IllegalArgumentException("Unknow type request: "
- + request);
- }
- }
-
- public String getHostURL() {
- return hostURL;
- }
-
- public String getAppContext() {
- return appContext;
- }
-
- public Credentials getCredentials() {
- return credentials;
- }
-
- public WikiSession getWikiSession() {
- return wikiSession;
- }
-
- public boolean isSecure() {
- return secure;
- }
-
- public String getOutputLink(Object request, Object response,
- boolean isAction) {
- if (response instanceof RenderResponse
- && request instanceof RenderRequest) {
- RenderResponse portletResponse = (RenderResponse) response;
-
- PortletURL portletURL;
- if (isAction) {
- portletURL = portletResponse.createActionURL();
- } else {
- portletURL = portletResponse.createRenderURL();
- }
-
- String jsfUrl = portletURL.toString();
-
- log.debug("ViewID: "
- + FacesContext.getCurrentInstance().getViewRoot()
- .getViewId());
- try {
- jsfUrl += "&"
- + MyFacesGenericPortlet.VIEW_ID
- + "="
- + URLEncoder.encode(FacesContext.getCurrentInstance()
- .getViewRoot().getViewId(), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- log.error(e);
- }
-
- return jsfUrl;
-
- } else {
- throw new IllegalArgumentException(
- "response and request should be instance of class "
- + RenderResponse.class + " and "
- + RenderRequest.class + " but are "
- + request.getClass() + " and "
- + response.getClass());
- }
- }
-
- public String getParameter(Object request, String key) {
- if (request instanceof PortletRequest) {
- PortletRequest rReq = (PortletRequest) request;
-
- return rReq.getParameter(key);
- } else {
- throw new IllegalArgumentException("Unknow type request: "
- + request);
- }
- }
-
- public String getRequestedPageName() {
- return page;
- }
-
- public String getRequestedLanguage() {
- return language;
- }
-
- public Integer getPageVersion() {
- return pageVersion;
- }
-
- public String getType() {
- return type;
- }
-
- public String getUserDefaultLang() {
- return userDefaultLang;
- }
-
- public String getUserDefaultPage() {
- return userDefaultPage;
- }
-
- public void setUserDefaultLang(String lang, Object request)
- throws WikiUserPreferenceException {
-
- if (request instanceof PortletRequest) {
- PortletRequest rReq = (PortletRequest) request;
-
- try {
- rReq.getPreferences().setValue(USER_LANG, lang);
-
- rReq.getPreferences().store();
-
- this.userDefaultLang = lang;
- } catch (Exception e) {
- throw new WikiUserPreferenceException(e);
- }
- } else {
- throw new IllegalArgumentException("Unknow type request: "
- + request);
- }
- }
-
- public void setUserDefaultPage(String page, Object request)
- throws WikiUserPreferenceException {
-
- if (request instanceof PortletRequest) {
- PortletRequest rReq = (PortletRequest) request;
-
- try {
- rReq.getPreferences().setValue(USER_PAGE, page);
-
- rReq.getPreferences().store();
-
- this.userDefaultPage = page;
- } catch (Exception e) {
- throw new WikiUserPreferenceException(e);
- }
- } else {
- throw new IllegalArgumentException("Unknow type request: "
- + request);
- }
- }
-
-}
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-03-20 21:13:41 UTC (rev 10366)
@@ -0,0 +1,266 @@
+/*
+ * 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.wiki.attributesextractor.impl;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import javax.faces.context.FacesContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletURL;
+import javax.portlet.ReadOnlyException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.myfaces.portlet.MyFacesGenericPortlet;
+import org.jboss.logging.Logger;
+import org.jboss.wiki.Credentials;
+import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.attributesextractor.AttributesExtractor;
+import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.exception.WikiUserPreferenceException;
+import org.jboss.wiki.helper.WikiHelper;
+import org.jboss.wiki.portlet.PortletWikiSession;
+
+/**
+ * PortletAttributesExctractor.java
+ *
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
+ */
+
+public class PortletAttributesExctractor implements AttributesExtractor {
+
+ private final static Logger log = Logger
+ .getLogger(PortletAttributesExctractor.class);
+
+ private static final String USER_LANG = "JBWiki:Default:Language";
+
+ private static final String USER_PAGE = "JBWiki:Default:Page";
+
+ private String appContext;
+
+ private String hostURL;
+
+ private WikiSession wikiSession;
+
+ private Credentials credentials;
+
+ private String page;
+
+ private boolean secure;
+
+ private String language;
+
+ private Integer pageVersion;
+
+ private String type;
+
+ private String userDefaultLang;
+
+ private String userDefaultPage;
+
+ public PortletAttributesExctractor(Object request) {
+ if (request instanceof PortletRequest) {
+ PortletRequest rReq = (PortletRequest) request;
+
+ // get all needed attributes
+ hostURL = ((rReq.isSecure()) ? "https" : "http")
+ + "://"
+ + rReq.getServerName()
+ + ((rReq.getServerPort() == 80) ? "" : ":"
+ + rReq.getServerPort());
+
+ appContext = ConfigurationParser.getWikiContext();
+
+ if (appContext == null) {
+ appContext = rReq.getContextPath();
+ }
+
+ wikiSession = new PortletWikiSession(rReq.getPortletSession());
+
+ credentials = WikiHelper.getWikiEngine().getCredentialsInstance(
+ request);
+
+ secure = rReq.isSecure();
+
+ page = rReq.getParameter("page");
+
+ language = rReq.getParameter("language");
+
+ log.info("Version = "+rReq.getParameter("version"));
+
+ pageVersion = (rReq.getParameter("version") != null) ? Integer
+ .valueOf(rReq.getParameter("version")) : null;
+
+ type = rReq.getParameter("type");
+
+ userDefaultLang = rReq.getPreferences().getValue(USER_LANG,
+ ConfigurationParser.getDefaultLangugeCode());
+
+ userDefaultPage = rReq.getPreferences().getValue(USER_PAGE,
+ ConfigurationParser.getDefaultPage());
+
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
+ public String getHostURL() {
+ return hostURL;
+ }
+
+ public String getAppContext() {
+ return appContext;
+ }
+
+ public Credentials getCredentials() {
+ return credentials;
+ }
+
+ public WikiSession getWikiSession() {
+ return wikiSession;
+ }
+
+ public boolean isSecure() {
+ return secure;
+ }
+
+ public String getOutputLink(Object request, Object response,
+ boolean isAction) {
+ if (response instanceof RenderResponse
+ && request instanceof RenderRequest) {
+ RenderResponse portletResponse = (RenderResponse) response;
+
+ PortletURL portletURL;
+ if (isAction) {
+ portletURL = portletResponse.createActionURL();
+ } else {
+ portletURL = portletResponse.createRenderURL();
+ }
+
+ String jsfUrl = portletURL.toString();
+
+ log.debug("ViewID: "
+ + FacesContext.getCurrentInstance().getViewRoot()
+ .getViewId());
+ try {
+ jsfUrl += "&"
+ + MyFacesGenericPortlet.VIEW_ID
+ + "="
+ + URLEncoder.encode(FacesContext.getCurrentInstance()
+ .getViewRoot().getViewId(), "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ log.error(e);
+ }
+
+ return jsfUrl;
+
+ } else {
+ throw new IllegalArgumentException(
+ "response and request should be instance of class "
+ + RenderResponse.class + " and "
+ + RenderRequest.class + " but are "
+ + request.getClass() + " and "
+ + response.getClass());
+ }
+ }
+
+ public String getParameter(Object request, String key) {
+ if (request instanceof PortletRequest) {
+ PortletRequest rReq = (PortletRequest) request;
+
+ return rReq.getParameter(key);
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
+ public String getRequestedPageName() {
+ return page;
+ }
+
+ public String getRequestedLanguage() {
+ return language;
+ }
+
+ public Integer getPageVersion() {
+ return pageVersion;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public String getUserDefaultLang() {
+ return userDefaultLang;
+ }
+
+ public String getUserDefaultPage() {
+ return userDefaultPage;
+ }
+
+ public void setUserDefaultLang(String lang, Object request)
+ throws WikiUserPreferenceException {
+
+ if (request instanceof PortletRequest) {
+ PortletRequest rReq = (PortletRequest) request;
+
+ try {
+ rReq.getPreferences().setValue(USER_LANG, lang);
+
+ rReq.getPreferences().store();
+
+ this.userDefaultLang = lang;
+ } catch (Exception e) {
+ throw new WikiUserPreferenceException(e);
+ }
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
+ public void setUserDefaultPage(String page, Object request)
+ throws WikiUserPreferenceException {
+
+ if (request instanceof PortletRequest) {
+ PortletRequest rReq = (PortletRequest) request;
+
+ try {
+ rReq.getPreferences().setValue(USER_PAGE, page);
+
+ rReq.getPreferences().store();
+
+ this.userDefaultPage = page;
+ } catch (Exception e) {
+ throw new WikiUserPreferenceException(e);
+ }
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
+}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-03-20 20:32:47 UTC (rev 10365)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-03-20 21:13:41 UTC (rev 10366)
@@ -40,7 +40,7 @@
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
-import org.jboss.wiki.attributesextractor.PortletAttributesExctractor;
+import org.jboss.wiki.attributesextractor.impl.PortletAttributesExctractor;
import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
import org.jboss.wiki.management.WikiServiceManagement;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-03-20 20:32:47 UTC (rev 10365)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-03-20 21:13:41 UTC (rev 10366)
@@ -266,7 +266,8 @@
.equals(VIEW_ID))
|| (paramName.equals("type"))
|| (paramName.equals("page"))
- || (paramName.equals("language"));
+ || (paramName.equals("language"))
+ || (paramName.equals("version"));
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-03-20 20:32:47 UTC (rev 10365)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-03-20 21:13:41 UTC (rev 10366)
@@ -44,8 +44,6 @@
private String langCode;
- private Integer pageVersion = null;
-
private int pageToDiff;
private AttributesExtractor attrExtractor;
@@ -78,7 +76,6 @@
}
}
- pageVersion = attrExtractor.getPageVersion();
}
public String getLangCode() {
@@ -93,10 +90,6 @@
return attrExtractor.getCredentials().getName();
}
- public Integer getPageVersion() {
- return pageVersion;
- }
-
public int getPageToDiff() {
return pageToDiff;
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-03-20 20:32:47 UTC (rev 10365)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-03-20 21:13:41 UTC (rev 10366)
@@ -71,7 +71,7 @@
public WikiEdit() {
attributesExtractor = WikiHelper.getAttributesExtractor(WikiHelper
.getRequest(), WikiHelper.getResponse());
-
+
WikiHelper.getWikiCommonSession().update(attributesExtractor);
editSessionId = WikiHelper.getWikiEngine().getEditSessionId();
@@ -123,13 +123,14 @@
.getCredentials(), wikiEngine.getWikiType(wikiType),
attributesExtractor.getWikiSession());
- log.info("Page version: "+WikiHelper.getWikiCommonSession().getPageVersion());
- if (WikiHelper.getWikiCommonSession().getPageVersion() != null) {
- log.info("getting page at version: "+WikiHelper.getWikiCommonSession().getPageVersion());
+ log.info("Page version: " + attributesExtractor.getPageVersion());
+ if (attributesExtractor.getPageVersion() != null) {
+ log.info("getting page at version: "
+ + attributesExtractor.getPageVersion());
return wikiEngine.getByName(WikiHelper.getWikiCommonSession()
- .getPageName(), getDirect ? null : wikiContext, WikiHelper
- .getWikiCommonSession().getPageVersion(), WikiHelper
- .getWikiCommonSession().getLangCode());
+ .getPageName(), getDirect ? null : wikiContext,
+ attributesExtractor.getPageVersion(), WikiHelper.getWikiCommonSession()
+ .getLangCode());
} else {
return wikiEngine.getByName(WikiHelper.getWikiCommonSession()
.getPageName(), getDirect ? null : wikiContext, WikiHelper
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-03-20 20:32:47 UTC (rev 10365)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-03-20 21:13:41 UTC (rev 10366)
@@ -136,11 +136,10 @@
WikiContext wikiContext = new WikiContext(attrExtractor
.getCredentials(), wikiType, attrExtractor.getWikiSession());
- if (WikiHelper.getWikiCommonSession().getPageVersion() != null) {
+ if (attrExtractor.getPageVersion() != null) {
currentPage = WikiHelper.getWikiEngine().getByName(
WikiHelper.getWikiCommonSession().getPageName(),
- wikiContext,
- WikiHelper.getWikiCommonSession().getPageVersion(),
+ wikiContext, attrExtractor.getPageVersion(),
WikiHelper.getWikiCommonSession().getLangCode());
} else {
currentPage = WikiHelper.getWikiEngine().getByName(
@@ -194,20 +193,20 @@
return hisList;
}
-
+
public String getHistoryClasses() {
String classes = "oddRow";
for (int i = 1; i < getHistoryTable().size(); i++) {
- classes += (i % 2 == 0) ? ",oddRow" : ",evenRow";
+ classes += (i % 2 == 0) ? ",oddRow" : ",evenRow";
}
-
+
return classes;
}
public boolean isOtherVersion() {
- if (WikiHelper.getWikiCommonSession().getPageVersion() != null) {
- if (getCurrentPage().getLastVersion() != WikiHelper
- .getWikiCommonSession().getPageVersion()) {
+ if (attrExtractor.getPageVersion() != null) {
+ if (getCurrentPage().getLastVersion() != attrExtractor
+ .getPageVersion()) {
return true;
}
}
@@ -253,4 +252,8 @@
public String getDate() {
return getCurrentPage().getEditDate().toString();
}
+
+ public Integer getPageVersion() {
+ return attrExtractor.getPageVersion();
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-03-20 20:32:47 UTC (rev 10365)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-03-20 21:13:41 UTC (rev 10366)
@@ -6,7 +6,10 @@
<ui:composition template="wiki_template.xhtml">
<ui:define name="content">
- <h:outputText value="#{wikiEdit.lockMsg}" styleClass="wikiGreybkgSection" rendered="#{wikiEdit.lockMsg ne ''}" />
+ <h:panelGrid styleClass="wikiGreybkgSection" rendered="#{wikiEdit.lockMsg ne ''}">
+ <h:outputText value="#{wikiEdit.lockMsg}" />
+ </h:panelGrid>
+
<h:outputText value="#{wikiEdit.showEditHTML}" escape="false" />
<h:form>
<h:panelGrid styleClass="editPageArea">
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-03-20 20:32:47 UTC (rev 10365)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-03-20 21:13:41 UTC (rev 10366)
@@ -23,9 +23,8 @@
<h:form rendered="#{wikiCommon.userLoggedIn}">
<h:outputText value="["/><h:commandLink action="edit">
- <c:if test="#{wikiCommon.pageVersion ne null}">
- <f:param name="version" value="#{wikiCommon.pageVersion}" />
- </c:if>
+ <f:param name="version" value="#{wikiView.pageVersion}" rendered="#{wikiView.pageVersion ne null}"/>
+ <f:param name="page" value="#{wikiView.pageName}" />
<h:outputText value="#{msg.edit}" />
</h:commandLink>
<h:outputText value="] [" />
@@ -60,13 +59,15 @@
</h:panelGroup>
</h:panelGrid>
- <h:panelGroup styleClass="wikiGreybkgSection" rendered="#{wikiView.otherVersion}" >
- <h:outputText value="#{msg.thisIsVer} #{wikiCommon.pageVersion} #{msg.ofPage} " />
- <h:outputLink value="#{wikiView.wikiFriendlyURL}">
- <h:outputText value="#{wikiCommon.pageName}" />
- </h:outputLink>
- <h:outputText value=". #{msg.toRollback}" />
- </h:panelGroup>
+ <h:panelGrid styleClass="wikiGreybkgSection" rendered="#{wikiView.otherVersion}" >
+ <h:panelGroup>
+ <h:outputText value="#{msg.thisIsVer} #{wikiView.pageVersion} #{msg.ofPage} " />
+ <h:outputLink value="#{wikiView.wikiFriendlyURL}">
+ <h:outputText value="#{wikiCommon.pageName}" />
+ </h:outputLink>
+ <h:outputText value=". #{msg.toRollback}" />
+ </h:panelGroup>
+ </h:panelGrid>
<ui:insert name="attachment" />
More information about the jboss-svn-commits
mailing list