openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1808736 - /openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java
Date Mon, 18 Sep 2017 15:46:40 GMT
Author: damjan
Date: Mon Sep 18 15:46:40 2017
New Revision: 1808736

URL: http://svn.apache.org/viewvc?rev=1808736&view=rev
Log:
In buildName(), schema should be the empty string, instead of null.

Add some JavaDoc for it, and use getClass().getName() for
getImplementationName(), which is most accurate for Java.

Patch by: me


Modified:
    openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java

Modified: openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java?rev=1808736&r1=1808735&r2=1808736&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java
(original)
+++ openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java
Mon Sep 18 15:46:40 2017
@@ -72,7 +72,7 @@ public abstract class OCatalog extends C
     
     @Override
     public String getImplementationName() {
-        return "com.sun.star.comp.connectivity.OCatalog";
+        return getClass().getName();
     }
     
     @Override
@@ -128,6 +128,11 @@ public abstract class OCatalog extends C
         return users;
     }
     
+    /**
+     * Builds the name which should be used to access the object later on in the collection.
+     * Will only be called in fillNames.
+     * @param  row The current row from the resultset
+     */
     protected String buildName(XRow row) throws SQLException {
         String catalog = row.getString(1);
         if (row.wasNull()) {
@@ -135,7 +140,7 @@ public abstract class OCatalog extends C
         }
         String schema = row.getString(2);
         if (row.wasNull()) {
-            schema = null;
+            schema = "";
         }
         String table = row.getString(3);
         if (row.wasNull()) {



Mime
View raw message