You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2009/04/13 17:13:26 UTC
svn commit: r764501 - in /incubator/jspwiki/trunk/src/java/org/apache/wiki:
./ action/ api/ attachment/ content/ plugin/
Author: jalkanen
Date: Mon Apr 13 15:13:25 2009
New Revision: 764501
URL: http://svn.apache.org/viewvc?rev=764501&view=rev
Log:
Renamed WikiPage.getWikiPath() to just getPath().
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java Mon Apr 13 15:13:25 2009
@@ -106,7 +106,7 @@
/* (non-Javadoc)
* @see org.apache.wiki.WikiPage#getQualifiedName()
*/
- public WikiPath getWikiPath()
+ public WikiPath getPath()
{
return m_name;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java Mon Apr 13 15:13:25 2009
@@ -179,13 +179,13 @@
WikiPage p;
try
{
- p = m_engine.getContentManager().getPage( page.getWikiPath() );
+ p = m_engine.getContentManager().getPage( page.getPath() );
}
catch( PageNotFoundException e )
{
try
{
- p = m_engine.getContentManager().addPage( page.getWikiPath(), ContentManager.JSPWIKI_CONTENT_TYPE );
+ p = m_engine.getContentManager().addPage( page.getPath(), ContentManager.JSPWIKI_CONTENT_TYPE );
}
catch( PageAlreadyExistsException e1 )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java Mon Apr 13 15:13:25 2009
@@ -254,10 +254,10 @@
for( WikiPath referred : refTo )
{
- log.debug( "Removing references to page %s from page %s", page.getWikiPath(), referred );
+ log.debug( "Removing references to page %s from page %s", page.getPath(), referred );
Set<WikiPath> referredBy = findReferrers(referred);
- referredBy.remove( page.getWikiPath() );
+ referredBy.remove( page.getPath() );
try
{
@@ -435,7 +435,7 @@
// A page is no longer referenced, so this page is removed from its
// referencedBy list.
Set<WikiPath> refs = findReferrers( name );
- refs.remove( page.getWikiPath() );
+ refs.remove( page.getPath() );
setReferredBy( name, refs );
}
}
@@ -447,7 +447,7 @@
// There is a new reference which is not in the old references list,
// so we will need to add it to the new page's referencedBy list.
Set<WikiPath> refs = findReferrers( name );
- refs.add( page.getWikiPath() );
+ refs.add( page.getPath() );
setReferredBy( name, refs );
}
}
@@ -574,7 +574,7 @@
Collection<WikiPage> c = m_engine.getContentManager().getAllPages( null );
for( WikiPage p : c )
- result.add( p.getWikiPath().toString() );
+ result.add( p.getPath().toString() );
return result;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Mon Apr 13 15:13:25 2009
@@ -914,7 +914,7 @@
{
try
{
- return getFrontPage(null).getWikiPath().toString();
+ return getFrontPage(null).getPath().toString();
}
catch( ProviderException e )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java Mon Apr 13 15:13:25 2009
@@ -193,7 +193,7 @@
if( att == null )
{
String contentType = "application/octet-stream"; // FIXME: This is not a good guess
- WikiPath path = context.getPage().getWikiPath().resolve(filename);
+ WikiPath path = context.getPage().getPath().resolve(filename);
att = engine.getContentManager().addPage( path, contentType );
created = true;
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java Mon Apr 13 15:13:25 2009
@@ -67,7 +67,7 @@
*
* @return the qualified page name, for example <code>mywiki:Main</code>
*/
- public WikiPath getWikiPath();
+ public WikiPath getPath();
/**
* A WikiPage may have a number of attributes, which might or might not be
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java Mon Apr 13 15:13:25 2009
@@ -201,7 +201,7 @@
return null;
}
- WikiPath name = currentPage.getWikiPath().resolve( attachmentname );
+ WikiPath name = currentPage.getPath().resolve( attachmentname );
Attachment att;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java Mon Apr 13 15:13:25 2009
@@ -731,7 +731,7 @@
catch( PageNotFoundException e )
{
String contentType = "application/octet-stream"; // FIXME: This is not a good guess
- WikiPath path = context.getPage().getWikiPath().resolve(filename);
+ WikiPath path = context.getPage().getPath().resolve(filename);
try
{
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=764501&r1=764500&r2=764501&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 Mon Apr 13 15:13:25 2009
@@ -1002,7 +1002,7 @@
workflow.setAttribute( PRESAVE_PAGE_AUTHOR, author );
workflow.setAttribute( PRESAVE_PAGE_ATTRIBUTES, (Serializable)page.getAttributes() );
workflow.setAttribute( PRESAVE_PAGE_LASTMODIFIED, new Date() );
- workflow.setAttribute( PRESAVE_PAGE_NAME, page.getWikiPath() );
+ workflow.setAttribute( PRESAVE_PAGE_NAME, page.getPath() );
workflow.setAttribute( PRESAVE_PAGE_TEXT, saveText );
return Outcome.STEP_COMPLETE;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java Mon Apr 13 15:13:25 2009
@@ -168,7 +168,7 @@
try
{
- engine.getReferenceManager().pageRemoved( fromPage.getWikiPath() );
+ engine.getReferenceManager().pageRemoved( fromPage.getPath() );
}
catch( PageNotFoundException e )
{
@@ -214,9 +214,9 @@
{
// In case the page was just changed from under us, let's do this
// small kludge.
- if( pageName.equals( fromPage.getWikiPath() ) )
+ if( pageName.equals( fromPage.getPath() ) )
{
- pageName = toPage.getWikiPath();
+ pageName = toPage.getPath();
}
try
@@ -261,7 +261,7 @@
try
{
- Collection<WikiPath> r = engine.getReferenceManager().findReferrers( fromPage.getWikiPath() );
+ Collection<WikiPath> r = engine.getReferenceManager().findReferrers( fromPage.getPath() );
if( r != null ) referrers.addAll( r );
/*
Collection<Attachment> attachments = engine.getAttachmentManager().listAttachments( fromPage );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java Mon Apr 13 15:13:25 2009
@@ -102,7 +102,7 @@
WikiPage page = null;
try
{
- WikiPath pageName = engine.getFinalPageName( context.getPage().getWikiPath().resolve( includedPage ) );
+ WikiPath pageName = engine.getFinalPageName( context.getPage().getPath().resolve( includedPage ) );
if( pageName != null )
{
page = engine.getPage( pageName );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java Mon Apr 13 15:13:25 2009
@@ -94,7 +94,7 @@
{
WikiPage page = context.getEngine().getPage( pageName );
- Collection<WikiPath> links = refmgr.findReferrers( page.getWikiPath() );
+ Collection<WikiPath> links = refmgr.findReferrers( page.getPath() );
String wikitext = "";
super.initialize( context, params );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java?rev=764501&r1=764500&r2=764501&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java Mon Apr 13 15:13:25 2009
@@ -474,7 +474,7 @@
//
if( pageDay != null && pageDay.after(start) && pageDay.before(end) )
{
- WikiPage firstVersion = mgr.getPage( p.getWikiPath(), 1 );
+ WikiPage firstVersion = mgr.getPage( p.getPath(), 1 );
result.add( firstVersion );
}
}