Added getName() to Table

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@63 f203690c-595d-4dc9-a70b-905162fa7fd2

diff --git a/src/java/com/healthmarketscience/jackcess/Database.java b/src/java/com/healthmarketscience/jackcess/Database.java
index d5f12feb0af7917972aae55a7379b561f5f155be..93e8a835e970510b398c1a08b5ba0f21744d2c49 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/Database.java
+++ b/src/java/com/healthmarketscience/jackcess/Database.java
@@ -238,7 +238,7 @@ public class Database {
       throw new IOException("Looking for system catalog at page " +
           PAGE_SYSTEM_CATALOG + ", but page type is " + pageType);
     }
-    _systemCatalog = new Table(_buffer, _pageChannel, _format, PAGE_SYSTEM_CATALOG);
+    _systemCatalog = new Table(_buffer, _pageChannel, _format, PAGE_SYSTEM_CATALOG, "System Catalog");
     Map row;
     while ( (row = _systemCatalog.getNextRow(Arrays.asList(
         COL_NAME, COL_TYPE, COL_ID))) != null)
@@ -271,7 +271,7 @@ public class Database {
       throw new IOException("Looking for MSysACEs at page " + pageNum +
           ", but page type is " + pageType);
     }
-    _accessControlEntries = new Table(buffer, _pageChannel, _format, pageNum);
+    _accessControlEntries = new Table(buffer, _pageChannel, _format, pageNum, "Access Control Entries");
   }
   
   /**
@@ -298,7 +298,7 @@ public class Database {
       return null;
     } else {
       _pageChannel.readPage(_buffer, pageNumber.intValue());
-      return new Table(_buffer, _pageChannel, _format, pageNumber.intValue());
+      return new Table(_buffer, _pageChannel, _format, pageNumber.intValue(), name);
     }
   }
   

diff --git a/src/java/com/healthmarketscience/jackcess/Table.java b/src/java/com/healthmarketscience/jackcess/Table.java
index c09792eebe8de6dcd3d73320f92b382e51f01d3f..46bcc636e6a8de8901992f2bb4f361eaf3f90a09 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/Table.java
+++ b/src/java/com/healthmarketscience/jackcess/Table.java
@@ -82,6 +82,8 @@ public class Table {
   private List<Index> _indexes = new ArrayList<Index>();
   /** Used to read in pages */
   private PageChannel _pageChannel;
+  /** Table name as stored in Database */
+  private String _name;
   /** Usage map of pages that this table owns */
   private UsageMap _ownedPages;
   /** Usage map of pages that this table owns with free space on them */
@@ -99,8 +101,9 @@ public class Table {
    * @param pageChannel Page channel to get database pages from
    * @param format Format of the database that contains this table
    * @param pageNumber Page number of the table definition
+        * @param name Table name
    */
-  protected Table(ByteBuffer buffer, PageChannel pageChannel, JetFormat format, int pageNumber)
+  protected Table(ByteBuffer buffer, PageChannel pageChannel, JetFormat format, int pageNumber, String name)
   throws IOException, SQLException
   {
     _buffer = buffer;
@@ -123,7 +126,15 @@ public class Table {
                        newBuffer.put(nextPageBuffer.array(), 8, format.PAGE_SIZE - 8);
                        _buffer = newBuffer;
                }
-               readPage();     
+               readPage();
+               _name = name;
+  }
+
+  /**
+   * @return The name of the table
+   */
+  public String getName() {
+    return _name;
   }
   
   /**