This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit e45e5fe04a2879d9a41b0e188cc6a0d4cbf7003f Author: juanpablo <[email protected]> AuthorDate: Wed Dec 27 23:20:12 2017 +0100 AttributeProviderState classes now work with JSPWikiLinks instead of Links, using the Wiki link where needed, and they do not set the URL link anymore (this is going to be done on the PostProcessorState classes) --- .../ExternalLinkAttributeProviderState.java | 10 ++++----- .../ImageLinkAttributeProviderState.java | 11 ++++------ .../InterWikiLinkAttributeProviderState.java | 17 +++++++-------- .../LocalEditLinkAttributeProviderState.java | 10 ++++----- .../LocalFootnoteLinkAttributeProviderState.java | 12 +++++------ ...LocalFootnoteRefLinkAttributeProviderState.java | 12 +++++------ .../LocalLinkAttributeProviderState.java | 25 ++++++++++------------ .../LocalReadLinkAttributeProviderState.java | 16 ++++++-------- .../WysiwygEditingAttributeProviderState.java | 8 +++---- 9 files changed, 51 insertions(+), 70 deletions(-) diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java index f76a8e8..d3bcfcf 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java @@ -19,18 +19,17 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import org.apache.wiki.WikiContext; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; -import com.vladsch.flexmark.util.sequence.CharSubSequence; /** * {@link NodeAttributeProviderState} which sets the attributes for external links. */ -public class ExternalLinkAttributeProviderState implements NodeAttributeProviderState< Link > { +public class ExternalLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { private final boolean hasRef; private final boolean m_useRelNofollow; @@ -47,15 +46,14 @@ public class ExternalLinkAttributeProviderState implements NodeAttributeProvider /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { if( linkOperations.isImageLink( link.getUrl().toString() ) ) { new ImageLinkAttributeProviderState( wikiContext, link.getText().toString(), hasRef ).setAttributes( attributes, link ); } else { attributes.replaceValue( "class", MarkupParser.CLASS_EXTERNAL ); - link.setUrl( CharSubSequence.of( link.getUrl().toString() ) ); attributes.replaceValue( "href", link.getUrl().toString() ); } if( m_useRelNofollow ) { diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java index 2ef6aa7..0801262 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java @@ -19,18 +19,17 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import org.apache.wiki.WikiContext; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; -import com.vladsch.flexmark.util.sequence.CharSubSequence; /** * {@link NodeAttributeProviderState} which sets the attributes for image links. */ -public class ImageLinkAttributeProviderState implements NodeAttributeProviderState< Link > { +public class ImageLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { private final boolean isLinkFromText; private final LinkParsingOperations linkOperations; @@ -47,18 +46,16 @@ public class ImageLinkAttributeProviderState implements NodeAttributeProviderSta /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { if( isLinkFromText && linkOperations.isExternalLink( link.getText().toString() ) ) { attributes.replaceValue( "class", MarkupParser.CLASS_EXTERNAL ); - link.setUrl( CharSubSequence.of( urlRef ) ); attributes.replaceValue( "href", urlRef ); } else if ( isLinkFromText && linkOperations.linkExists( link.getText().toString() ) ) { final String pagelink = wikiContext.getURL( WikiContext.VIEW, link.getText().toString() ); attributes.replaceValue( "class", MarkupParser.CLASS_WIKIPAGE ); - link.setUrl( CharSubSequence.of( pagelink ) ); attributes.replaceValue( "href", pagelink ); } } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java index 28e1ffa..1ee8e5b 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java @@ -19,6 +19,7 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import org.apache.wiki.WikiContext; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.render.RenderingManager; @@ -26,13 +27,12 @@ import org.apache.wiki.util.TextUtil; import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; -import com.vladsch.flexmark.util.sequence.CharSubSequence; /** * {@link NodeAttributeProviderState} which sets the attributes for interwiki links. */ -public class InterWikiLinkAttributeProviderState implements NodeAttributeProviderState< Link > { +public class InterWikiLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { private final boolean hasRef; private final boolean m_wysiwygEditorMode; @@ -50,14 +50,12 @@ public class InterWikiLinkAttributeProviderState implements NodeAttributeProvide /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { - final String[] refAndPage = link.getUrl().toString().split( ":" ); - if( m_wysiwygEditorMode ) { - setInterWikiLinkAttrs( attributes, link, refAndPage[0] + ":" + refAndPage[1] ); - } else { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { + final String[] refAndPage = link.getWikiLink().split( ":" ); + if( !m_wysiwygEditorMode ) { String urlReference = wikiContext.getEngine().getInterWikiURL( refAndPage[ 0 ] ); if( urlReference != null ) { urlReference = TextUtil.replaceString( urlReference, "%s", refAndPage[ 1 ] ); @@ -67,12 +65,13 @@ public class InterWikiLinkAttributeProviderState implements NodeAttributeProvide setInterWikiLinkAttrs( attributes, link, urlReference ); } } + } else { + setInterWikiLinkAttrs( attributes, link, refAndPage[0] + ":" + refAndPage[1] ); } } void setInterWikiLinkAttrs( final Attributes attributes, final Link link, final String url ) { attributes.replaceValue( "class", MarkupParser.CLASS_INTERWIKI ); - link.setUrl( CharSubSequence.of( url ) ); attributes.replaceValue( "href", url ); } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java index d7b1157..6b3223a 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java @@ -23,18 +23,17 @@ import java.util.ResourceBundle; import org.apache.wiki.WikiContext; import org.apache.wiki.i18n.InternationalizationManager; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.preferences.Preferences; -import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; -import com.vladsch.flexmark.util.sequence.CharSubSequence; /** * {@link NodeAttributeProviderState} which sets the attributes for local edit links. */ -public class LocalEditLinkAttributeProviderState implements NodeAttributeProviderState< Link > { +public class LocalEditLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { private final WikiContext wikiContext; private final String url; @@ -47,14 +46,13 @@ public class LocalEditLinkAttributeProviderState implements NodeAttributeProvide /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { final ResourceBundle rb = Preferences.getBundle( wikiContext, InternationalizationManager.CORE_BUNDLE ); attributes.replaceValue( "title", MessageFormat.format( rb.getString( "markupparser.link.create" ), url ) ); attributes.replaceValue( "class", MarkupParser.CLASS_EDITPAGE ); - link.setUrl( CharSubSequence.of( wikiContext.getURL( WikiContext.EDIT, url ) ) ); attributes.replaceValue( "href", link.getUrl().toString() ); } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java index 63dbebb..1c099d9 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java @@ -19,19 +19,18 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import org.apache.wiki.WikiContext; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; -import com.vladsch.flexmark.util.sequence.CharSubSequence; /** * {@link NodeAttributeProviderState} which sets the attributes for local footnote links. */ -public class LocalFootnoteLinkAttributeProviderState implements NodeAttributeProviderState< Link > { +public class LocalFootnoteLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { - private final WikiContext wikiContext; + final WikiContext wikiContext; public LocalFootnoteLinkAttributeProviderState( final WikiContext wikiContext ) { this.wikiContext = wikiContext; @@ -40,12 +39,11 @@ public class LocalFootnoteLinkAttributeProviderState implements NodeAttributePro /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { attributes.replaceValue( "class", MarkupParser.CLASS_FOOTNOTE ); - link.setUrl( CharSubSequence.of( wikiContext.getURL( WikiContext.VIEW, link.getUrl().toString() ) ) ); attributes.replaceValue( "href", link.getUrl().toString() ); } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java index 7389e02..a3605ae 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java @@ -19,19 +19,18 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import org.apache.wiki.WikiContext; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; -import com.vladsch.flexmark.util.sequence.CharSubSequence; /** * {@link NodeAttributeProviderState} which sets the attributes for local footnote reference links. */ -public class LocalFootnoteRefLinkAttributeProviderState implements NodeAttributeProviderState< Link > { +public class LocalFootnoteRefLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { - private final WikiContext wikiContext; + final WikiContext wikiContext; public LocalFootnoteRefLinkAttributeProviderState( final WikiContext wikiContext ) { this.wikiContext = wikiContext; @@ -40,12 +39,11 @@ public class LocalFootnoteRefLinkAttributeProviderState implements NodeAttribute /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { attributes.replaceValue( "class", MarkupParser.CLASS_FOOTNOTE_REF ); - link.setUrl( CharSubSequence.of( wikiContext.getURL( WikiContext.VIEW, link.getUrl().toString() ) ) ); attributes.replaceValue( "href", "#ref-" + wikiContext.getName() + "-" + link.getText().toString() ); } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java index 5c21d07..682b3d4 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java @@ -19,18 +19,17 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import org.apache.wiki.WikiContext; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; -import com.vladsch.flexmark.util.sequence.CharSubSequence; /** * {@link NodeAttributeProviderState} which sets the attributes for local links. */ -public class LocalLinkAttributeProviderState implements NodeAttributeProviderState< Link > { +public class LocalLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { private final boolean hasRef; private final WikiContext wikiContext; @@ -45,37 +44,35 @@ public class LocalLinkAttributeProviderState implements NodeAttributeProviderSta /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { final int hashMark = link.getUrl().toString().indexOf( '#' ); - final String attachment = wikiContext.getEngine().getAttachmentManager().getAttachmentInfoName( wikiContext, link.getUrl().toString() ); + final String attachment = wikiContext.getEngine().getAttachmentManager().getAttachmentInfoName( wikiContext, link.getWikiLink() ); if( attachment != null ) { if( !linkOperations.isImageLink( link.getUrl().toString() ) ) { attributes.replaceValue( "class", MarkupParser.CLASS_ATTACHMENT ); - final String attlink = wikiContext.getURL( WikiContext.ATTACH, link.getUrl().toString() ); - link.setUrl( CharSubSequence.of( attlink ) ); + final String attlink = wikiContext.getURL( WikiContext.ATTACH, link.getWikiLink() ); attributes.replaceValue( "href", attlink ); } else { new ImageLinkAttributeProviderState( wikiContext, attachment, hasRef ).setAttributes( attributes, link ); } } else if( hashMark != -1 ) { // It's an internal Wiki link, but to a named section final String namedSection = link.getUrl().toString().substring( hashMark + 1 ); - link.setUrl( CharSubSequence.of( link.getUrl().toString().substring( 0, hashMark ) ) ); final String matchedLink = linkOperations.linkIfExists( link.getUrl().toString() ); if( matchedLink != null ) { String sectref = "#section-" + wikiContext.getEngine().encodeName( matchedLink + "-" + MarkupParser.wikifyLink( namedSection ) ); sectref = sectref.replace('%', '_'); - new LocalReadLinkAttributeProviderState( wikiContext, link.getUrl().toString() + sectref ).setAttributes( attributes, link ); + new LocalReadLinkAttributeProviderState( wikiContext ).setAttributes( attributes, link ); } else { - new LocalEditLinkAttributeProviderState( wikiContext, link.getUrl().toString() ).setAttributes( attributes, link ); + new LocalEditLinkAttributeProviderState( wikiContext, link.getWikiLink() ).setAttributes( attributes, link ); } } else { - if( linkOperations.linkExists( link.getUrl().toString() ) ) { - new LocalReadLinkAttributeProviderState( wikiContext, link.getUrl().toString() ).setAttributes( attributes, link ); + if( linkOperations.linkExists( link.getWikiLink() ) ) { + new LocalReadLinkAttributeProviderState( wikiContext ).setAttributes( attributes, link ); } else { - new LocalEditLinkAttributeProviderState( wikiContext, link.getUrl().toString() ).setAttributes( attributes, link ); + new LocalEditLinkAttributeProviderState( wikiContext, link.getWikiLink() ).setAttributes( attributes, link ); } } } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java index aa81379..0c26726 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java @@ -19,35 +19,31 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import org.apache.wiki.WikiContext; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; -import com.vladsch.flexmark.util.sequence.CharSubSequence; /** * {@link NodeAttributeProviderState} which sets the attributes for local read links. */ -public class LocalReadLinkAttributeProviderState implements NodeAttributeProviderState< Link > { +public class LocalReadLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { - private final WikiContext wikiContext; - private final String url; + final WikiContext wikiContext; - public LocalReadLinkAttributeProviderState( final WikiContext wikiContext, final String url ) { + public LocalReadLinkAttributeProviderState( final WikiContext wikiContext ) { this.wikiContext = wikiContext; - this.url = url; } /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { attributes.replaceValue( "class", MarkupParser.CLASS_WIKIPAGE ); - link.setUrl( CharSubSequence.of( wikiContext.getURL( WikiContext.VIEW, url ) ) ); attributes.replaceValue( "href", link.getUrl().toString() ); } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java index eeb8034..06d2eb6 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java @@ -20,10 +20,10 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import org.apache.wiki.WikiContext; import org.apache.wiki.htmltowiki.XHtmlToWikiConfig; +import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.render.RenderingManager; import org.apache.wiki.render.WikiRenderer; -import com.vladsch.flexmark.ast.Link; import com.vladsch.flexmark.util.html.Attributes; @@ -31,7 +31,7 @@ import com.vladsch.flexmark.util.html.Attributes; * {@link NodeAttributeProviderState} to finish up polishing WYSIWYG editing mode. More or less equivalent to WysiwygEditingRenderer, the main difference * being that in here there isn't any node removal, those nodes are simply not inserted elsewhere if WYSIWYG editing is detected. */ -public class WysiwygEditingAttributeProviderState implements NodeAttributeProviderState< Link > { +public class WysiwygEditingAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { private final WikiContext wikiContext; private final boolean m_wysiwygEditorMode; @@ -45,10 +45,10 @@ public class WysiwygEditingAttributeProviderState implements NodeAttributeProvid /** * {@inheritDoc} * - * @see NodeAttributeProviderState#setAttributes(Attributes, Link) + * @see NodeAttributeProviderState#setAttributes(Attributes, JSPWikiLink) */ @Override - public void setAttributes( final Attributes attributes, final Link link ) { + public void setAttributes( final Attributes attributes, final JSPWikiLink link ) { if( m_wysiwygEditorMode ) { if( attributes.getValue( "class" ) != null ) { String href = attributes.getValue( "href" ); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
