February 2010 - xwiki-devs@xwiki.org

[xwiki-devs] [VOTE] Don't include the JavaScript extensions when rendering a document in WYSIWYG edit mode
by Marius Dumitru Florea 03 Feb '10

03 Feb '10

Hi devs, Right now JavaScript extensions are included when a document is rendered in WYSIWYG edit mode. This has both advantages and disadvantages. Pro: If the output of a macro depends on a JavaScript extension, then the result of rendering that macro will be the same in view mode and (WYSIWYG) edit mode. Con: If the JavaScript extension is not aware of the edit mode then it can modify the DOM document outside of the read-only macro markers which leads to unwanted changes in the content of the edited document (i.e. the modifications done by the JavaScript extension are saved). Such an example is http://jira.xwiki.org/jira/browse/XWIKI-4665 . WDYT? Should we limit the WYSIWYG in order to make the editing safer? I'm +0. Thanks, Marius

5 15

[xwiki-devs] [VOTE] Add get/setSyntax and deprecate get/setSyntaxId() in Document/XWikiDocument
by Vincent Massol 03 Feb '10

03 Feb '10

Hi, I'd like to make this change for 2.2RC1 (since I don't see any danger about it, although that's subjective and if we don't agree I could wait for 2.3M1). <explanation> The story behind this is because we need to get access to the Syntax object from templates in a few places order to check the syntax used. Right now for example we do the following in macros.vm for the livetable macro: #if($doc.syntaxId == "xwiki/2.0") The pb is that this is going to fail in the future when we introduce the XWiki 2.1 syntax (which we're preparing with Thomas). To fix this we'll need to check that syntax.getType == "xwiki" && syntax.getVersion > 1.0 instead. I also wanted to convert some panels to 2.0 syntax for 2.2 final but that requires to convert macros.vm's #panelheader to work fine with all syntaxes rather than adding ugly checks in panel code itself... (or wrapping them all with unnecessary html macros). </explanation> Here's my +1 for doing it now (although I'm also +1 for doing it but in 2.3M1). Note that doing now has one advantage: In order to implement it cleanly we need to break an API, namely: CoreConfiguration.getDefaultDocumentSyntax would return Syntax instead of returning String now. Since this API isn't used from Velocity and is pretty new there's little risk to break lots of people but better modify it ASAP than wait. Thanks -Vincent

6 11

[xwiki-devs] Which skins do we want to support?
by Vincent Massol 03 Feb '10

03 Feb '10

Hi, We need to decide which skins we want to support/maintain. By support/maintain I mean fixing bugs and improving them. Right now we have 3 skins in the platform: - Albatross - Toucan - Colibri We still need to keep it in platform for now since others depend on it but the question of knowing if we support it or not is independent IMO. Several questions: * Are we still supporting the Albatross skin? * Same question for Toucan? * We could decide not to support it but to apply contributor patches for it. * We could also decide that we don't support it and close jira issues related to it with won't fix. My feeling: - Keep it in platform for now, keep jira issues, apply patches, don't break what exists (when we change template files or CSS files for ex). WDYT? Thanks -Vincent

3 3

Re: [xwiki-devs] [xwiki-notifications] r26554 - platform/web/trunk/standard/src/main/webapp/templates
by Sergiu Dumitriu 03 Feb '10

03 Feb '10

On 01/29/2010 10:04 PM, vmassol (SVN) wrote: > Author: vmassol > Date: 2010-01-29 22:04:01 +0100 (Fri, 29 Jan 2010) > New Revision: 26554 > > Modified: > platform/web/trunk/standard/src/main/webapp/templates/copy.vm > Log: > XWIKI-4817: Allow to copy a document's default language + all translations in the copy menu action > > * Template part > > Modified: platform/web/trunk/standard/src/main/webapp/templates/copy.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/copy.vm 2010-01-29 19:58:17 UTC (rev 26553) > +++ platform/web/trunk/standard/src/main/webapp/templates/copy.vm 2010-01-29 21:04:01 UTC (rev 26554) > @@ -19,7 +19,7 @@ > <div id="document-title"><h1>$msg.get('core.copy.copydoc')</h1></div> > #set($sourcedoc = "$!{request.sourcedoc}") > #set($targetdoc = "$!{request.targetdoc}") > - #if("$!request.language" != "") That's wrong, fragile. Localized messages should not be used as select values. <option value="ALL">$msg.get('core.copy.allTranslations')</option> + "$!{request.language}" != 'ALL' > + #if("$!request.language" != ""&& "$!request.language" != $msg.get("core.copy.allTranslations")) > #set($language = $request.language) > #end > #set($sourcewiki = $context.database) > @@ -48,8 +48,11 @@ > <td>$msg.get("language"):</td> > <td> > <select name="language"> > + ## Add a special "All Translations" combo box entry to copy all translations. > +<option selected="selected">$msg.get("core.copy.allTranslations")</option> > + ## Add all the existing translations > #foreach ($docTranslation in $docTranslations) > -<option #if($docTranslation == "$!{context.language}")selected="selected"#end>$docTranslation</option> > +<option>$docTranslation</option> > #end > </select> -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1

Re: [xwiki-devs] [xwiki-notifications] r26284 - platform/skins/trunk/colibri/src/main/resources/colibri
by Vincent Massol 02 Feb '10

02 Feb '10

First commit! Yeah :) Champagne! Some questions below (hey I couldn't left the first commit go without questions ;)) On Jan 21, 2010, at 4:24 PM, evalica (SVN) wrote: > Author: evalica > Date: 2010-01-21 16:24:22 +0100 (Thu, 21 Jan 2010) > New Revision: 26284 > > Modified: > platform/skins/trunk/colibri/src/main/resources/colibri/colibri.css > Log: > XSCOLIBRI-180: Scroll and width problems on Stats space > > Modified: platform/skins/trunk/colibri/src/main/resources/colibri/colibri.css > =================================================================== > --- platform/skins/trunk/colibri/src/main/resources/colibri/colibri.css 2010-01-21 14:52:45 UTC (rev 26283) > +++ platform/skins/trunk/colibri/src/main/resources/colibri/colibri.css 2010-01-21 15:24:22 UTC (rev 26284) > @@ -1316,7 +1316,7 @@ > } > > div.panellayoutcontainer-2col .panellayoutcol { > - width: 50%; > + width: 49%; Where does this magic number come from? Is the 1% important? If so maybe this warrants some comment? > } > > div.panellayoutcontainer-3col .panellayoutcol { > @@ -1324,11 +1324,11 @@ > } > > div.panellayoutcontainer-4col .panellayoutcol { > - width: 25%; > + width: 24%; same > } > > div.panellayoutcontainer-5col .panellayoutcol { > - width: 20%; > + width: 19%; same > } > > div.panellayoutcontainer-1col, div.panellayoutcontainer-2col, div.panellayoutcontainer-3col, div.panellayoutcontainer-4col, div.panellayoutcontainer-5col { > @@ -1339,15 +1339,13 @@ > .panellayoutcol { > float: left; > height: 1%; > - overflow: auto; > - > } > > .panellayoutcol .panel { > - border: 1px solid #ddd; > - margin: 0 0 20px 5%; > + border: 1px solid $theme.borderColor; > + margin: 0 0 5% 5%; > + overflow-x: auto; > width: 90%; > - > } > > #xwikicontent .panel ul { Thanks -Vincent

3 14

Re: [xwiki-devs] [xwiki-notifications] r26619 - platform/web/trunk/standard/src/main/webapp/templates
by Vincent Massol 02 Feb '10

02 Feb '10

On Feb 2, 2010, at 8:13 PM, vmassol (SVN) wrote: > Author: vmassol > Date: 2010-02-02 20:13:03 +0100 (Tue, 02 Feb 2010) > New Revision: 26619 > > Modified: > platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > Log: > XWIKI-4841: Section editing links should not appear on pages for which users don't have edit rights > > * More improvement (this time from Marius Florea!) oops that was from Sergiu Dumitriu... sorry :) -Vincent > > Modified: platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/javascript.vm 2010-02-02 18:58:01 UTC (rev 26618) > +++ platform/web/trunk/standard/src/main/webapp/templates/javascript.vm 2010-02-02 19:13:03 UTC (rev 26619) > @@ -36,7 +36,7 @@ > XWiki.docisnew = $!doc.isNew(); > XWiki.docsyntax = "$!doc.getSyntaxId()"; > XWiki.blacklistedSpaces = [ #foreach($space in $blacklistedSpaces)#if($velocityCount > 1),#end"$space"#end ]; > -XWiki.hasEdit = #if($hasEdit) true #else false #end; > +XWiki.hasEdit = $hasEdit; > window.docviewurl = "${doc.getURL('view')}"; > window.docediturl = "${doc.getURL('edit')}"; > window.docsaveurl = "${doc.getURL('save')}";

1 0

Re: [xwiki-devs] [xwiki-notifications] r26602 - in platform/core/trunk/xwiki-rendering: xwiki-rendering-api xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml xwiki
by Sergiu Dumitriu 02 Feb '10

02 Feb '10

On 02/02/2010 04:46 PM, Thomas Mortagne wrote: > On Tue, Feb 2, 2010 at 16:25, Sergiu Dumitriu<sergiu(a)xwiki.com> wrote: >> On 02/02/2010 03:51 PM, vmassol (SVN) wrote: >>> Author: vmassol >>> Date: 2010-02-02 15:51:13 +0100 (Tue, 02 Feb 2010) >>> New Revision: 26602 >>> >>> Added: >>> platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/AttachURILabelGenerator.java >>> platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java >>> platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/URILabelGenerator.java >>> Modified: >>> platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml >>> platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/DefaultLinkLabelGenerator.java >>> platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/DefaultXHTMLLinkRenderer.java >>> platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/resources/META-INF/components.txt >>> platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/SimpleRenderingTests.java >>> Log: >>> XWIKI-4839: Improve labels for mailto and attach links >>> >>> * Refactored to make the implementation more generic... >>> >>> Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml >>> =================================================================== >>> --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml 2010-02-02 14:38:44 UTC (rev 26601) >>> +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml 2010-02-02 14:51:13 UTC (rev 26602) >>> @@ -132,6 +132,9 @@ >>> **/rendering/internal/macro/*.java, >>> **/rendering/internal/parser/*.java, >>> **/rendering/internal/renderer/BasicLinkRenderer.java, >> >> It's a pity that we must manually list all the checked files... > > Actually we don't need to list checked files, we list here because we > don't want to check all files. I know, it's not "we need because we can't", but "we need because we do". In this project we're using both includes and excludes, when we could be using only excludes. >> >>> + **/rendering/internal/renderer/DefaultLinkLabelGenerator.java, >>> + **/rendering/internal/renderer/AttachURILabelGenerator.java, >>> + **/rendering/internal/renderer/MailtoURILabelGenerator.java, >>> **/rendering/listener/*.java, >>> **/rendering/listener/chaining/AbstractChainingListener.java, >>> **/rendering/listener/chaining/ChainingListener.java, >> >>> Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java >>> =================================================================== >>> --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java (rev 0) >>> +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java 2010-02-02 14:51:13 UTC (rev 26602) >>> +@Component("mailto") >>> +public class MailtoURILabelGenerator implements URILabelGenerator >>> +{ >>> + /** >>> + * The MAILTO URI prefix (the scheme followed by ":"). >>> + */ >>> + private static final String MAILTO = "mailto:"; >>> + >>> + /** >>> + * {@inheritDoc} >>> + * @see org.xwiki.rendering.renderer.URILabelGenerator#generateLabel(org.xwiki.rendering.listener.Link) >>> + */ >>> + public String generateLabel(Link link) >>> + { >>> + String label = link.getReference().substring(MAILTO.length()); >> >> StringUtils.removeStart(label, MAILTO) is safer. >> >>> + // Also remove the query string part from the label (we only want the email address). >> >> return StringUtils.substringBefore("?") is shorter. >> >>> + int queryStringPosition = label.indexOf("?"); >>> + if (queryStringPosition> -1) { >>> + label = label.substring(0, queryStringPosition); >>> + } >>> + return label; >>> + } >>> +} -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

Re: [xwiki-devs] [xwiki-notifications] r26615 - in platform/web/trunk/standard/src/main/webapp: resources/js/xwiki templates
by Sergiu Dumitriu 02 Feb '10

02 Feb '10

On 02/02/2010 07:13 PM, vmassol (SVN) wrote: > Author: vmassol > Date: 2010-02-02 19:13:59 +0100 (Tue, 02 Feb 2010) > New Revision: 26615 > > Modified: > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js > platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > Log: > XWIKI-4841: Section editing links should not appear on pages for which users don't have edit rights > > * Use boolean (good suggestion from Jerome Velociter) > > Modified: platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/javascript.vm 2010-02-02 18:02:33 UTC (rev 26614) > +++ platform/web/trunk/standard/src/main/webapp/templates/javascript.vm 2010-02-02 18:13:59 UTC (rev 26615) > @@ -36,7 +36,7 @@ > XWiki.docisnew = $!doc.isNew(); > XWiki.docsyntax = "$!doc.getSyntaxId()"; > XWiki.blacklistedSpaces = [ #foreach($space in $blacklistedSpaces)#if($velocityCount> 1),#end"$space"#end ]; > -XWiki.hasEdit = "$hasEdit"; > +XWiki.hasEdit = #if($hasEdit) true #else false #end; Why not simply XWiki.hasEdit = ${hasEdit}; since it is a boolean and will be printed as a boolean. -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

Re: [xwiki-devs] [xwiki-notifications] r26614 - in platform/web/trunk/standard/src/main/webapp: resources/js/xwiki templates
by Vincent Massol 02 Feb '10

02 Feb '10

On Feb 2, 2010, at 7:06 PM, Jerome Velociter wrote: > On 2/2/10 7:02 PM, vmassol (SVN) wrote: >> Author: vmassol >> Date: 2010-02-02 19:02:33 +0100 (Tue, 02 Feb 2010) >> New Revision: 26614 >> >> Modified: >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js >> platform/web/trunk/standard/src/main/webapp/templates/javascript.vm >> Log: >> XWIKI-4841: Section editing links should not appear on pages for which users don't have edit rights >> >> Modified: platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js >> =================================================================== >> --- platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js 2010-02-02 17:19:46 UTC (rev 26613) >> +++ platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js 2010-02-02 18:02:33 UTC (rev 26614) >> @@ -337,7 +337,7 @@ >> */ >> insertSectionEditLinks: function() { >> // Insert links only in view mode and for xwiki/2.0 documents. >> - if (XWiki.docsyntax == "xwiki/2.0"&& XWiki.contextaction == "view") { >> + if (XWiki.docsyntax == "xwiki/2.0"&& XWiki.contextaction == "view"&& XWiki.hasEdit == "true") { >> >> // Section count starts at one, not zero. >> var sectioncount = 1; >> >> Modified: platform/web/trunk/standard/src/main/webapp/templates/javascript.vm >> =================================================================== >> --- platform/web/trunk/standard/src/main/webapp/templates/javascript.vm 2010-02-02 17:19:46 UTC (rev 26613) >> +++ platform/web/trunk/standard/src/main/webapp/templates/javascript.vm 2010-02-02 18:02:33 UTC (rev 26614) >> @@ -36,6 +36,7 @@ >> XWiki.docisnew = $!doc.isNew(); >> XWiki.docsyntax = "$!doc.getSyntaxId()"; >> XWiki.blacklistedSpaces = [ #foreach($space in $blacklistedSpaces)#if($velocityCount> 1),#end"$space"#end ]; >> +XWiki.hasEdit = "$hasEdit"; > > why not using a boolean ? > > XWiki.hasEdit = #if($hasEdit) true #else false #end; Done Thanks -Vincent > Jerome. > >> window.docviewurl = "${doc.getURL('view')}"; >> window.docediturl = "${doc.getURL('edit')}"; >> window.docsaveurl = "${doc.getURL('save')}";

1 0

Re: [xwiki-devs] [xwiki-notifications] r26602 - in platform/core/trunk/xwiki-rendering: xwiki-rendering-api xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml xwiki
by Thomas Mortagne 02 Feb '10

02 Feb '10

On Tue, Feb 2, 2010 at 15:51, vmassol <platform-notifications(a)xwiki.org> wrote: > Author: vmassol > Date: 2010-02-02 15:51:13 +0100 (Tue, 02 Feb 2010) > New Revision: 26602 > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/AttachURILabelGenerator.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/URILabelGenerator.java > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/DefaultLinkLabelGenerator.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/DefaultXHTMLLinkRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/resources/META-INF/components.txt > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/SimpleRenderingTests.java > Log: > XWIKI-4839: Improve labels for mailto and attach links > > * Refactored to make the implementation more generic... > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml 2010-02-02 14:38:44 UTC (rev 26601) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml 2010-02-02 14:51:13 UTC (rev 26602) > @@ -132,6 +132,9 @@ > **/rendering/internal/macro/*.java, > **/rendering/internal/parser/*.java, > **/rendering/internal/renderer/BasicLinkRenderer.java, > + **/rendering/internal/renderer/DefaultLinkLabelGenerator.java, > + **/rendering/internal/renderer/AttachURILabelGenerator.java, > + **/rendering/internal/renderer/MailtoURILabelGenerator.java, > **/rendering/listener/*.java, > **/rendering/listener/chaining/AbstractChainingListener.java, > **/rendering/listener/chaining/ChainingListener.java, > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/AttachURILabelGenerator.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/AttachURILabelGenerator.java (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/AttachURILabelGenerator.java 2010-02-02 14:51:13 UTC (rev 26602) > @@ -0,0 +1,58 @@ > +/* > + * 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.renderer; > + > +import org.xwiki.component.annotation.Component; > +import org.xwiki.component.annotation.Requirement; > +import org.xwiki.rendering.listener.Attachment; > +import org.xwiki.rendering.listener.Link; > +import org.xwiki.rendering.parser.AttachmentParser; > +import org.xwiki.rendering.renderer.URILabelGenerator; > + > +/** > + * Generate link labels for ATTACH URIs. > + * > + * @version $Id$ > + * @since 2.2RC1 > + */ > +@Component("attach") > +public class AttachURILabelGenerator implements URILabelGenerator > +{ > + /** > + * The ATTACH URI prefix (the scheme followed by ":"). > + */ > + private static final String ATTACH = "attach:"; > + > + /** > + * Used to extract the attachment name from the reference. > + */ > + @Requirement > + private AttachmentParser attachmentParser; > + > + /** > + * {@inheritDoc} > + * @see org.xwiki.rendering.renderer.URILabelGenerator#generateLabel(org.xwiki.rendering.listener.Link) > + */ > + public String generateLabel(Link link) > + { > + Attachment attachment = this.attachmentParser.parse(link.getReference().substring(ATTACH.length())); > + return attachment.getAttachmentName(); > + } > +} > > > Property changes on: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/AttachURILabelGenerator.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/DefaultLinkLabelGenerator.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/DefaultLinkLabelGenerator.java 2010-02-02 14:38:44 UTC (rev 26601) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/DefaultLinkLabelGenerator.java 2010-02-02 14:51:13 UTC (rev 26602) > @@ -32,6 +32,10 @@ > @Component > public class DefaultLinkLabelGenerator implements LinkLabelGenerator > { > + /** > + * {@inheritDoc} > + * @see org.xwiki.rendering.renderer.LinkLabelGenerator#generate(org.xwiki.rendering.listener.Link) > + */ > public String generate(Link link) > { > return link.getReference(); > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java 2010-02-02 14:51:13 UTC (rev 26602) > @@ -0,0 +1,54 @@ > +/* > + * 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.renderer; > + > +import org.xwiki.component.annotation.Component; > +import org.xwiki.rendering.listener.Link; > +import org.xwiki.rendering.renderer.URILabelGenerator; > + > +/** > + * Generate link labels for MAILTO URIs. > + * > + * @version $Id$ > + * @since 2.2RC1 > + */ > +@Component("mailto") > +public class MailtoURILabelGenerator implements URILabelGenerator > +{ > + /** > + * The MAILTO URI prefix (the scheme followed by ":"). > + */ > + private static final String MAILTO = "mailto:"; > + > + /** > + * {@inheritDoc} > + * @see org.xwiki.rendering.renderer.URILabelGenerator#generateLabel(org.xwiki.rendering.listener.Link) > + */ > + public String generateLabel(Link link) > + { > + String label = link.getReference().substring(MAILTO.length()); > + // Also remove the query string part from the label (we only want the email address). > + int queryStringPosition = label.indexOf("?"); > + if (queryStringPosition > -1) { > + label = label.substring(0, queryStringPosition); > + } Since it's an URI why don't you use new URI(link.getReference()) to parse it ? > + return label; > + } > +} > > > Property changes on: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/MailtoURILabelGenerator.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/DefaultXHTMLLinkRenderer.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/DefaultXHTMLLinkRenderer.java 2010-02-02 14:38:44 UTC (rev 26601) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/DefaultXHTMLLinkRenderer.java 2010-02-02 14:51:13 UTC (rev 26602) > @@ -36,6 +36,7 @@ > import org.xwiki.rendering.listener.LinkType; > import org.xwiki.rendering.parser.AttachmentParser; > import org.xwiki.rendering.renderer.LinkLabelGenerator; > +import org.xwiki.rendering.renderer.URILabelGenerator; > import org.xwiki.rendering.renderer.printer.XHTMLWikiPrinter; > import org.xwiki.rendering.renderer.xhtml.XHTMLLinkRenderer; > import org.xwiki.rendering.wiki.WikiModel; > @@ -70,11 +71,6 @@ > private static final String ATTACH = "attach:"; > > /** > - * The link reference prefix indicating that the link is targeting a mail address. > - */ > - private static final String MAILTO = "mailto:"; > - > - /** > * The class attribute 'wikilink'. > */ > private static final String WIKILINK = "wikilink"; > @@ -276,23 +272,26 @@ > if (link.getType() == LinkType.DOCUMENT) { > getXHTMLWikiPrinter().printXML(this.linkLabelGenerator.generate(link)); > } else if (link.getType() == LinkType.URI) { > + > + // Look for a component implementing URILabelGenerator with a role hint matching the URI scheme. > + // If not found then use the full reference as the label. > + int schemeSeparator = link.getReference().indexOf(":"); > + > + // If there's no scheme separator then use the full reference as the label. Note that this can happen > + // when we're not in wiki mode (since all links are considered URIs when not in wiki mode). > String label; > - // Special handling for MAILTO and ATTACH URIs for which we don't want to print the scheme in the label > - // (so that they appear displayed a nicer way for users). > - if (link.getReference().startsWith(ATTACH)) { > - // Only display the attachment name. > - Attachment attachment = this.attachmentParser.parse(link.getReference().substring(ATTACH.length())); > - label = attachment.getAttachmentName(); > - } else if (link.getReference().startsWith(MAILTO)) { > - label = link.getReference().substring(MAILTO.length()); > - // For MAILTO also remove the query string part from the label (we only want the email address). > - int queryStringPosition = label.indexOf("?"); > - if (queryStringPosition > -1) { > - label = label.substring(0, queryStringPosition); > + if (schemeSeparator > -1) { > + String scheme = link.getReference().substring(0, schemeSeparator); > + try { > + URILabelGenerator uriLabelGenerator = this.componentManager.lookup(URILabelGenerator.class, scheme); > + label = uriLabelGenerator.generateLabel(link); > + } catch (ComponentLookupException e) { > + label = link.getReference(); > } > } else { > label = link.getReference(); > } > + > getXHTMLWikiPrinter().printXML(label); > } else { > getXHTMLWikiPrinter().printXML(link.getReference()); > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/URILabelGenerator.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/URILabelGenerator.java (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/URILabelGenerator.java 2010-02-02 14:51:13 UTC (rev 26602) > @@ -0,0 +1,40 @@ > +/* > + * 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.renderer; > + > +import org.xwiki.component.annotation.ComponentRole; > +import org.xwiki.rendering.listener.Link; > + > +/** > + * Generate link labels for URIs. For example an implementation for MAILTO URIs would remove the scheme part and the > + * query string part. > + * > + * @version $Id$ > + * @since 2.2RC1 > + */ > +@ComponentRole > +public interface URILabelGenerator > +{ > + /** > + * @param link the link pointing to a URI for which we want to generate a label > + * @return the URI label to display when rendering links > + */ > + String generateLabel(Link link); > +} > > > Property changes on: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/URILabelGenerator.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/resources/META-INF/components.txt > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/resources/META-INF/components.txt 2010-02-02 14:38:44 UTC (rev 26601) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/resources/META-INF/components.txt 2010-02-02 14:51:13 UTC (rev 26602) > @@ -9,6 +9,8 @@ > org.xwiki.rendering.internal.configuration.DefaultRenderingConfiguration > org.xwiki.rendering.internal.parser.DefaultSyntaxFactory > org.xwiki.rendering.internal.renderer.DefaultLinkLabelGenerator > +org.xwiki.rendering.internal.renderer.AttachURILabelGenerator > +org.xwiki.rendering.internal.renderer.MailtoURILabelGenerator > org.xwiki.rendering.internal.macro.DefaultMacroManager > org.xwiki.rendering.internal.transformation.DefaultTransformationManager > org.xwiki.rendering.internal.renderer.xwiki.XWikiSyntaxRenderer > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/SimpleRenderingTests.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/SimpleRenderingTests.java 2010-02-02 14:38:44 UTC (rev 26601) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/SimpleRenderingTests.java 2010-02-02 14:51:13 UTC (rev 26602) > @@ -37,6 +37,7 @@ > public static junit.framework.Test suite() throws Exception > { > RenderingTestSuite suite = new RenderingTestSuite("Rendering tests not requiring the wiki notion"); > + suite.addTestsFromResource("link/links24", false); > > // Embedded documents > suite.addTestsFromResource("group/group1", false); > @@ -210,7 +211,7 @@ > suite.addTestsFromResource("encoding/encoding1", false); > > // Links without WikiModel > - suite.addTestsFromResource("link/links24", false); > +// suite.addTestsFromResource("link/links24", false); > > return new ComponentManagerTestSetup(suite); > } > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications > -- Thomas Mortagne

2 1