[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model ...

[Christian Bauer]

  User: cbauer  
  Date: 08/01/14 00:10:46

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/model   
                        WikiFeed.java WikiUpload.java Feed.java
  Log:
  JBSEAM-2457 - Render "REST" feed/file download URLs, breaks all current feed/file bookmarks
  
  Revision  Changes    Path
  1.3       +4 -0      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFeed.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiFeed.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFeed.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- WikiFeed.java	9 Jan 2008 15:59:23 -0000	1.2
  +++ WikiFeed.java	14 Jan 2008 05:10:46 -0000	1.3
  @@ -37,4 +37,8 @@
       public int getReadAccessLevel() {
           return getDirectory().getReadAccessLevel();
       }
  +
  +    public String getURL() {
  +        return directory.getWikiURL().length() > 0 ?  "/"+directory.getWikiURL() : "";
  +    }
   }
  
  
  
  1.5       +2 -2      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiUpload.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiUpload.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiUpload.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- WikiUpload.java	11 Jan 2008 00:09:16 -0000	1.4
  +++ WikiUpload.java	14 Jan 2008 05:10:46 -0000	1.5
  @@ -107,11 +107,11 @@
       }
   
       public String getPermURL(String suffix) {
  -        return "servlets/files/download.seam?fileId=" + getId();
  +        return "service/File/" + getId();
       }
   
       public String getWikiURL() {
  -        return "servlets/files/download.seam?fileId=" + getId();
  +        return "service/File/" + getId();
       }
   
       public String toString() {
  
  
  
  1.11      +4 -0      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Feed.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Feed.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Feed.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Feed.java	3 Jan 2008 09:06:05 -0000	1.10
  +++ Feed.java	14 Jan 2008 05:10:46 -0000	1.11
  @@ -108,6 +108,10 @@
           return 0; // No restrictions
       }
   
  +    public String getURL() {
  +        return ""; // Depends...
  +    }
  +
       // Need this for JSF EL expressions
       public boolean isInstance(String className) {
           try {