Skip to content

Commit

Permalink
Remove override annotations to support JDK 1.6
Browse files Browse the repository at this point in the history
* Since Designer should be available for both JDK 1.6 and 1.7, avoid
  Override annotations on methods specifically added in 1.7 since these
  generate compilers errors when using JDK 1.6
  • Loading branch information
Paul Richardson committed Apr 5, 2014
1 parent bd1adde commit c220ed0
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ protected void checkSupportedVersion(Version teiidVersion) {
}
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public void abort(Executor executor) throws SQLException {
if (closed) {
return;
Expand All @@ -1098,26 +1098,26 @@ public void abort(Executor executor) throws SQLException {
close();
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public int getNetworkTimeout() throws SQLException {
throw new UnsupportedOperationException();
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public String getSchema() throws SQLException {
return null;
}

/**
* @see query timeouts and the synchronousTtl setting if using socket connections
*/
@Override
/* Do not override to allow compatibility with jdk 1.6 */
public void setNetworkTimeout(Executor executor, int milliseconds)
throws SQLException {
throw new UnsupportedOperationException();
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public void setSchema(String schema) throws SQLException {

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2487,12 +2487,12 @@ public ResultSet getSchemas(String catalog, String schemaPattern)
}
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public boolean generatedKeyAlwaysReturned() throws SQLException {
return false;
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public ResultSet getPseudoColumns(String catalog, String schemaPattern,
String tableNamePattern, String columnNamePattern)
throws SQLException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1982,12 +1982,12 @@ public void updateTimestamp(String columnLabel, Timestamp x)
throw new UnsupportedOperationException();
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
return DataTypeTransformer.transform(getTeiidVersion(), getObject(columnIndex), type);
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public <T> T getObject(String columnLabel, Class<T> type)
throws SQLException {
return DataTypeTransformer.transform(getTeiidVersion(), getObject(columnLabel), type);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1264,12 +1264,12 @@ static Map<Integer, Object> getColumnMetadata(String tableName, String columnNam
return getColumnMetadata(tableName, columnName, dataType.getId(), nullable, searchable, writable, signed, caseSensitive, driverConnection);
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public void closeOnCompletion() throws SQLException {
throw new UnsupportedOperationException();
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public boolean isCloseOnCompletion() throws SQLException {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public boolean jdbcCompliant() {
return false;
}

@Override
/* Do not override to allow compatibility with jdk 1.6 */
public Logger getParentLogger() {
return logger;
}
Expand Down

0 comments on commit c220ed0

Please sign in to comment.