/*
 * See the NOTICE file distributed with this work for additional
 * information regarding copyright ownership.
 *
 * 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.xwiki.rendering.internal.parser.wikimodel.xhtml;

import org.apache.commons.lang.StringUtils;
import org.wikimodel.wem.WikiParameter;
import org.wikimodel.wem.WikiParameters;
import org.xwiki.component.annotation.Component;
import org.xwiki.rendering.listener.reference.ResourceReference;
import org.xwiki.rendering.listener.reference.ResourceType;
import org.xwiki.rendering.parser.ResourceReferenceParser;

/**
 * Parse a resource reference specified using the syntax used by the XHTML Renderer to represent resources as XHTML
 * comments, using the syntax {@code (isTyped)|-|(type)|-|(reference)|-|(parameters: key="value")}.
 *
 * @version $Id$
 * @since 2.5RC1
 */
@Component("xhtmlmarker")
public class XHTMLMarkerResourceReferenceParser implements ResourceReferenceParser
{
    /**
     * Character to separate data in XHTML comments.
     */
    private static final String COMMENT_SEPARATOR = "|-|";

    /**
     * {@inheritDoc}
     * @see org.xwiki.rendering.parser.ResourceReferenceParser#parse(String)
     */
    public ResourceReference parse(String rawReference)
    {
        String[] tokens = StringUtils.splitByWholeSeparatorPreserveAllTokens(rawReference, COMMENT_SEPARATOR);
        boolean isTyped = tokens[0].equalsIgnoreCase("true") ? true : false;
        ResourceType type = new ResourceType(tokens[1]);
        String reference = tokens[2];

        ResourceReference resourceReference = new ResourceReference(reference, type);
        resourceReference.setTyped(isTyped);

        if (tokens.length == 4) {
            for (WikiParameter parameter : WikiParameters.newWikiParameters(tokens[3])) {
                resourceReference.setParameter(parameter.getKey(), parameter.getValue());
            }
        }

        return resourceReference;
    }
}

@@ -1387,16 +1387,26 @@
 e XHTML 
+Annotated 
 Renderer
@@ -1428,16 +1428,19 @@
 esources
+%0A *
  as XHTM
@@ -1440,19 +1440,16 @@
 as XHTML
-%0A *
  comment

Generalize Image support and add relative paths support XWiki Syntax 2.1 * Improved javadoc