Changeset: 23f84ff380c2 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/23f84ff380c2
Modified Files:
src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
src/main/java/org/monetdb/jdbc/MonetDriver.java
Branch: default
Log Message:
Now we have a MonetVersion class use it from MonetDatabaseMetaData also.
The 2 static utility methods in MonetDriver (which were only called by
MonetDatabaseMetaData)only are not needed anymore.
diffs (80 lines):
diff --git a/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
b/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -181,7 +181,7 @@ public final class MonetDatabaseMetaData
*/
@Override
public String getDriverVersion() {
- return MonetDriver.getDriverVersion();
+ return MonetVersion.driverVersion;
}
/**
@@ -191,7 +191,7 @@ public final class MonetDatabaseMetaData
*/
@Override
public int getDriverMajorVersion() {
- return MonetDriver.getDriverMajorVersion();
+ return MonetVersion.majorVersion;
}
/**
@@ -201,7 +201,7 @@ public final class MonetDatabaseMetaData
*/
@Override
public int getDriverMinorVersion() {
- return MonetDriver.getDriverMinorVersion();
+ return MonetVersion.minorVersion;
}
/**
diff --git a/src/main/java/org/monetdb/jdbc/MonetDriver.java
b/src/main/java/org/monetdb/jdbc/MonetDriver.java
--- a/src/main/java/org/monetdb/jdbc/MonetDriver.java
+++ b/src/main/java/org/monetdb/jdbc/MonetDriver.java
@@ -158,8 +158,7 @@ public final class MonetDriver implement
*/
@Override
public int getMajorVersion() {
- // defer to the static version of this method
- return getDriverMajorVersion();
+ return MonetVersion.majorVersion;
}
/**
@@ -169,8 +168,7 @@ public final class MonetDriver implement
*/
@Override
public int getMinorVersion() {
- // defer to the static version of this method
- return getDriverMinorVersion();
+ return MonetVersion.minorVersion;
}
/**
@@ -303,26 +301,6 @@ public final class MonetDriver implement
/**
- * Get MonetDB JDBC Driver major version number
- * method called by MonetDatabaseMetaData methods
- * @return MonetDB JDBC Driver major version number
- */
- static final int getDriverMajorVersion() {
- // defer to the generated MonetVersion class
- return MonetVersion.majorVersion;
- }
-
- /**
- * Get MonetDB JDBC Driver minor version number
- * method called by MonetDatabaseMetaData methods
- * @return MonetDB JDBC Driver minor version number
- */
- static final int getDriverMinorVersion() {
- // defer to the generated MonetVersion class
- return MonetVersion.minorVersion;
- }
-
- /**
* Returns a touched up identifying version string of this driver.
* It is made public as it is called from
org/monetdb/client/JdbcClient.java
* @return the version string
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
