[jboss-svn-commits] JBL Code SVN: r9731 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src: java/org/jboss/wiki/ui and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 23 19:26:18 EST 2007
Author: szimano
Date: 2007-02-23 19:26:18 -0500 (Fri, 23 Feb 2007)
New Revision: 9731
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/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/web/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
Log:
jbwiki attachments
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-02-23 22:57:31 UTC (rev 9730)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-02-24 00:26:18 UTC (rev 9731)
@@ -28,6 +28,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.faces.context.FacesContext;
import javax.portlet.ActionRequest;
@@ -70,6 +71,24 @@
super.facesRender(request, response);
}
+ @Override
+ protected void doView(RenderRequest request, RenderResponse response)
+ throws PortletException, IOException {
+ Map paramMap = request.getParameterMap();
+
+ for (String key : (Set<String>) paramMap.keySet()) {
+ if (key.matches("var[123456789]\\d*")) {
+ WikiHelper.getAttributesExtractor(request, response)
+ .getWikiSession().setAttribute(key,
+ ((String[]) paramMap.get(key))[0]);
+ log.info("Wiki Param: " + key + " = "
+ + ((String[]) paramMap.get(key))[0]);
+ }
+ }
+
+ super.doView(request, response);
+ }
+
/**
* Called by the portlet container to allow the portlet to process an action
* request.
@@ -200,29 +219,21 @@
private void prepareParams(ActionRequest request, ActionResponse response) {
log.info("pp param");
- Map<String, String> paramMap = request.getParameterMap();
+ Map paramMap = request.getParameterMap();
- for (String key : paramMap.keySet()) {
+ for (String key : (Set<String>) paramMap.keySet()) {
if (paramMatches(key)) {
response.setRenderParameter(key, request.getParameter(key));
log.info("Param: " + key + " = " + request.getParameter(key));
}
}
-
- // add plugin parameters
- int i = 1;
- while (request.getParameter("var" + i) != null) {
- request.getPortletSession().setAttribute("var" + i,
- request.getParameter("var" + i));
- i++;
- }
}
private boolean paramMatches(String paramName) {
- return (paramName.matches("var[123456789]\\d*"))
- || (paramName
- .equals("org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID"))
- || (paramName.equals("type")) || (paramName.equals("page"))
+ return (paramName.matches("var[123456789]\\d*") || paramName
+ .equals("org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID"))
+ || (paramName.equals("type"))
+ || (paramName.equals("page"))
|| (paramName.equals("language"));
}
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-02-23 22:57:31 UTC (rev 9730)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-02-24 00:26:18 UTC (rev 9731)
@@ -23,6 +23,7 @@
package org.jboss.wiki.ui;
import java.util.Map;
+import java.util.Set;
import org.jboss.logging.Logger;
import org.jboss.wiki.WikiEngine;
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-02-23 22:57:31 UTC (rev 9730)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-02-24 00:26:18 UTC (rev 9731)
@@ -25,7 +25,12 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
+import javax.faces.model.SelectItem;
+
import org.jboss.logging.Logger;
import org.jboss.wiki.WikiContext;
import org.jboss.wiki.WikiEngine;
@@ -52,6 +57,8 @@
private String pageContent;
+ private String attName;
+
private File newFile;
public WikiEdit() {
@@ -127,14 +134,15 @@
String fileName = null;
- log
- .info("\n\n\n !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ADDING FILE: "
- + newFile);
-
if (newFile == null) {
// look for file
newFile = WikiHelper.getFile();
- fileName = WikiHelper.getFileName();
+ if (attName.equals(WikiHelper.getMessage("new_att"))) {
+ fileName = WikiHelper.getFileName();
+ }
+ else {
+ fileName = attName;
+ }
}
if (newFile != null && fileName != null) {
@@ -157,4 +165,30 @@
return "goback";
}
+
+ public List<SelectItem> getFileNames() {
+ WikiEngine engine = WikiHelper.getWikiEngine();
+ WikiPage page = getWikiPage();
+
+ Set<String> attSet = engine.getAttachmentsSet(page, page.getLangCode());
+
+ List<SelectItem> attNames = new Vector<SelectItem>();
+
+ for (String att : attSet) {
+ attNames.add(new SelectItem(att, att));
+ }
+
+ attNames.add(0, new SelectItem(WikiHelper.getMessage("new_att"),
+ WikiHelper.getMessage("new_att")));
+
+ return attNames;
+ }
+
+ public String getAttName() {
+ return attName;
+ }
+
+ public void setAttName(String attName) {
+ this.attName = attName;
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-02-23 22:57:31 UTC (rev 9730)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-02-24 00:26:18 UTC (rev 9731)
@@ -27,4 +27,6 @@
addFile = Add file
upload_error = File couldn't have been uploaded
-search = Search
\ No newline at end of file
+search = Search
+
+new_att = /Add new attachment/
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2007-02-23 22:57:31 UTC (rev 9730)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2007-02-24 00:26:18 UTC (rev 9731)
@@ -12,6 +12,10 @@
</h:panelGroup>
<h:form id="uploadForm" enctype="multipart/form-data">
+ <h:selectOneMenu value="#{wikiEdit.attName}" >
+ <f:selectItems value="#{wikiEdit.fileNames}" />
+ </h:selectOneMenu>
+
<t:inputFileUpload id="file"
value="#{wikiEdit.newFile}"
required="true"/>
More information about the jboss-svn-commits
mailing list