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

[Christian Bauer]

  User: cbauer  
  Date: 07/12/20 13:35:54

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui  
                        WikiFormattedTextHandler.java
                        UIWikiFormattedText.java
  Log:
  Simplifed and fixed help popup
  
  Revision  Changes    Path
  1.17      +0 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiFormattedTextHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- WikiFormattedTextHandler.java	19 Dec 2007 04:29:22 -0000	1.16
  +++ WikiFormattedTextHandler.java	20 Dec 2007 18:35:54 -0000	1.17
  @@ -94,7 +94,6 @@
           setAttribute(ctx, cmp, UIWikiFormattedText.ATTR_BROKEN_LINK_STYLE_CLASS);
           setAttribute(ctx, cmp, UIWikiFormattedText.ATTR_ATTACHMENT_LINK_STYLE_CLASS);
           setAttribute(ctx, cmp, UIWikiFormattedText.ATTR_THUMBNAIL_LINK_STYLE_CLASS);
  -        setAttribute(ctx, cmp, UIWikiFormattedText.ATTR_PLAIN_VIEW);
           setAttribute(ctx, cmp, UIWikiFormattedText.ATTR_INTERNAL_TARGET_FRAME);
           setAttribute(ctx, cmp, UIWikiFormattedText.ATTR_EXTERNAL_TARGET_FRAME);
           setAttribute(ctx, cmp, UIWikiFormattedText.ATTR_LINK_BASE_FILE);
  
  
  
  1.33      +2 -11     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIWikiFormattedText.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -b -r1.32 -r1.33
  --- UIWikiFormattedText.java	19 Dec 2007 04:29:22 -0000	1.32
  +++ UIWikiFormattedText.java	20 Dec 2007 18:35:54 -0000	1.33
  @@ -9,7 +9,6 @@
   import antlr.ANTLRException;
   import antlr.RecognitionException;
   import org.jboss.seam.Component;
  -import org.jboss.seam.core.Conversation;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.log.Log;
   import org.jboss.seam.log.Logging;
  @@ -20,7 +19,6 @@
   import org.jboss.seam.wiki.core.engine.WikiLinkResolver;
   import org.jboss.seam.wiki.core.engine.WikiTextParser;
   import org.jboss.seam.wiki.core.model.WikiFile;
  -import org.jboss.seam.wiki.core.model.WikiUpload;
   import org.jboss.seam.wiki.core.model.WikiUploadImage;
   import org.jboss.seam.wiki.util.WikiUtil;
   
  @@ -32,8 +30,6 @@
   import java.io.StringWriter;
   import java.util.ArrayList;
   import java.util.List;
  -import java.util.Map;
  -import java.util.HashMap;
   
   /**
    * Uses WikiTextParser and WikiLinkResolver to render Seam Text markup with wiki links.
  @@ -51,7 +47,6 @@
       public static final String ATTR_BROKEN_LINK_STYLE_CLASS         = "brokenLinkStyleClass";
       public static final String ATTR_ATTACHMENT_LINK_STYLE_CLASS     = "attachmentLinkStyleClass";
       public static final String ATTR_THUMBNAIL_LINK_STYLE_CLASS      = "thumbnailLinkStyleClass";
  -    public static final String ATTR_PLAIN_VIEW                      = "plainView";
       public static final String ATTR_INTERNAL_TARGET_FRAME           = "internalTargetFrame";
       public static final String ATTR_EXTERNAL_TARGET_FRAME           = "externalTargetFrame";
       public static final String ATTR_LINK_BASE_FILE                  = "linkBaseFile";
  @@ -106,8 +101,6 @@
                           + (
                               inlineLink.isBroken()
                                   ? inlineLink.getUrl()
  -                                : "true".equals(getAttributes().get(ATTR_PLAIN_VIEW))
  -                                  ? WikiUtil.renderPlainURL(inlineLink.getFile())
                                     : WikiUtil.renderURL(inlineLink.getFile())
                              )
                           + "\" target=\""
  @@ -131,9 +124,7 @@
   
               public String renderFileAttachmentLink(int attachmentNumber, WikiLink attachmentLink) {
                   return "<a href=\""
  -                        + ("true".equals(getAttributes().get(ATTR_PLAIN_VIEW))
  -                          ? WikiUtil.renderPlainURL(baseFile)
  -                          : WikiUtil.renderURL(baseFile))
  +                        + WikiUtil.renderURL(baseFile)
                           + "#attachment" + attachmentNumber
                           + "\" target=\""
                           + (getAttributes().get(ATTR_INTERNAL_TARGET_FRAME) != null ? getAttributes().get(ATTR_INTERNAL_TARGET_FRAME) : "")