[jspwiki] 23/36: use Page insead of WikiPage

[juanpablo]

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 01b2adf008f959f7920c4434142a17a15f121451
Author: juanpablo <juanpa...@apache.org>
AuthorDate: Sat Mar 21 14:15:45 2020 +0100

    use Page insead of WikiPage
---
 .../java/org/apache/wiki/providers/AbstractFileProvider.java   |  4 ++--
 .../java/org/apache/wiki/providers/FileSystemProvider.java     |  4 ++--
 .../java/org/apache/wiki/providers/VersioningFileProvider.java | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
 
b/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
index cbad778..4304ef8 100644
--- 
a/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
+++ 
b/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
@@ -367,13 +367,13 @@ public abstract class AbstractFileProvider implements 
PageProvider {
      *  {@inheritDoc}
      */
     @Override
-    public WikiPage getPageInfo( final String page, final int version ) throws 
ProviderException {
+    public Page getPageInfo( final String page, final int version ) throws 
ProviderException {
         final File file = findPage( page );
         if( !file.exists() ) {
             return null;
         }
 
-        final WikiPage p = new WikiPage( m_engine, page );
+        final Page p = new WikiPage( m_engine, page );
         p.setLastModified( new Date( file.lastModified() ) );
 
         return p;
diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java 
b/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
index 8368f10..f2b7f08 100644
--- 
a/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
+++ 
b/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
@@ -120,8 +120,8 @@ public class FileSystemProvider extends 
AbstractFileProvider {
      *  {@inheritDoc}
      */
     @Override
-    public WikiPage getPageInfo( final String page, final int version ) throws 
ProviderException {
-        final WikiPage p = super.getPageInfo( page, version );
+    public Page getPageInfo( final String page, final int version ) throws 
ProviderException {
+        final Page p = super.getPageInfo( page, version );
         if( p != null ) {
             try {
                 getPageProperties( p );
diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
 
b/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
index cfa6af2..bf8364c 100644
--- 
a/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
+++ 
b/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
@@ -384,7 +384,7 @@ public class VersioningFileProvider extends 
AbstractFileProvider {
             page.setAuthor(newAuthor);
             props.setProperty( versionNumber + ".author", newAuthor );
 
-            final String changeNote = page.getAttribute(WikiPage.CHANGENOTE);
+            final String changeNote = page.getAttribute( Page.CHANGENOTE );
             if( changeNote != null ) {
                 props.setProperty( versionNumber + ".changenote", changeNote );
             }
@@ -402,11 +402,11 @@ public class VersioningFileProvider extends 
AbstractFileProvider {
      *  {@inheritDoc}
      */
     @Override
-    public WikiPage getPageInfo( final String page, final int version ) throws 
ProviderException {
+    public Page getPageInfo( final String page, final int version ) throws 
ProviderException {
         final int latest = findLatestVersion( page );
         final int realVersion;
 
-        WikiPage p = null;
+        Page p = null;
 
         if( version == PageProvider.LATEST_VERSION || version == latest || 
(version == 1 && latest == -1) ) {
             //
@@ -494,7 +494,7 @@ public class VersioningFileProvider extends 
AbstractFileProvider {
         final ArrayList< Page > list = new ArrayList<>();
         final int latest = findLatestVersion( page );
         for( int i = latest; i > 0; i-- ) {
-            final WikiPage info = getPageInfo( page, i );
+            final Page info = getPageInfo( page, i );
             if( info != null ) {
                 list.add( info );
             }
@@ -521,7 +521,7 @@ public class VersioningFileProvider extends 
AbstractFileProvider {
                 final Properties props = new Properties();
                 props.load( in );
 
-                final String originalAuthor = props.getProperty( 
WikiPage.AUTHOR );
+                final String originalAuthor = props.getProperty( Page.AUTHOR );
                 if ( originalAuthor.length() > 0 ) {
                     // simulate original author as if already versioned but 
put non-versioned property in special cache too
                     props.setProperty( "1.author", originalAuthor );