Author: metskem
Date: Sun Dec 12 12:33:23 2010
New Revision: 1044804
URL: http://svn.apache.org/viewvc?rev=1044804&view=rev
Log:
3.0.0-svn-223 * JSPWIKI-671: WikiPageRenameEvent not fired during page
rename.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1044804&r1=1044803&r2=1044804&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Dec 12 12:33:23 2010
@@ -1,3 +1,9 @@
+2010-12-12 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-223
+
+ * JSPWIKI-671: WikiPageRenameEvent not fired during page rename.
+
2010-12-05 Dirk Frederickx <[email protected]>
* v3.0.0-svn-222
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=1044804&r1=1044803&r2=1044804&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Dec 12
12:33:23 2010
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "222";
+ public static final String BUILD = "223";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=1044804&r1=1044803&r2=1044804&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
Sun Dec 12 12:33:23 2010
@@ -1467,9 +1467,9 @@ public class ContentManager implements W
* @return The final new name (in case it had to be modified)
* @throws WikiException If the page cannot be renamed.
*/
- public String renamePage( WikiContext context,
- String renameFrom,
- String renameTo )
+ public String renamePage( final WikiContext context,
+ final String renameFrom,
+ final String renameTo )
throws WikiException
{
//
@@ -1487,8 +1487,8 @@ public class ContentManager implements W
//
// Clean up the "to" -name so that it does not contain anything
illegal
//
- renameTo = MarkupParser.cleanLink( renameTo.trim() );
- if( renameTo.equals(renameFrom) )
+ String renameToClean = MarkupParser.cleanLink( renameTo.trim() );
+ if( renameToClean.equals(renameFrom) )
{
throw new WikiException( "You cannot rename the page to itself" );
}
@@ -1498,7 +1498,7 @@ public class ContentManager implements W
//
WikiEngine engine = context.getEngine();
WikiPath fromPath = WikiPath.valueOf( renameFrom );
- WikiPath toPath = WikiPath.valueOf( renameTo );
+ WikiPath toPath = WikiPath.valueOf( renameToClean );
//
// Do the actual rename by changing from the frompage to the topage,
including
@@ -1532,16 +1532,20 @@ public class ContentManager implements W
}
page.setAttribute( WikiPage.CHANGENOTE, fromPath.toString() + " ==> "
+ toPath.toString() );
page.setAuthor( context.getCurrentUser().getName() );
- page.setAttribute( JCRWikiPage.ATTR_TITLE, renameTo );
+ page.setAttribute( JCRWikiPage.ATTR_TITLE, renameToClean );
// Tell everyone we moved the page
fireEvent( ContentEvent.NODE_RENAMED, toPath, fromPath );
page.save();
-
+
+
+ // Currently not used internally by JSPWiki itself, but you can use it
for something else.
+ WikiEventManager.fireEvent( this, new WikiPageRenameEvent( this,
fromPath, toPath ) );
+
//
// Done, return the new name.
//
- return renameTo;
+ return renameToClean;
}
// events processing
.......................................................
