Skip to content

Commit 2b4043c

Browse files
fix Xtend 2.15 based compiler warnings
1 parent e1498e2 commit 2b4043c

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

sqldev/src/main/java/org/utplsql/sqldev/UtplsqlWorksheet.xtend

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import org.utplsql.sqldev.model.preference.PreferenceModel
3030
import org.utplsql.sqldev.resources.UtplsqlResources
3131

3232
class UtplsqlWorksheet {
33-
private static val Logger logger = Logger.getLogger(UtplsqlWorksheet.name);
33+
static val Logger logger = Logger.getLogger(UtplsqlWorksheet.name);
3434

35-
private var PreferenceModel preferences
36-
private var String connectionName
37-
private var List<String> pathList
35+
var PreferenceModel preferences
36+
var String connectionName
37+
var List<String> pathList
3838

3939
new(List<String> pathList, String connectionName) {
4040
this.pathList = pathList

sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ import org.utplsql.sqldev.model.ut.Annotation
2626

2727
class UtplsqlDao {
2828
public static val UTPLSQL_PACKAGE_NAME = "UT"
29-
private var Connection conn
30-
private var JdbcTemplate jdbcTemplate
29+
var Connection conn
30+
var JdbcTemplate jdbcTemplate
3131
// cache fields
32-
private Boolean cachedDbaViewAccessible
33-
private String cachedUtplsqlSchema
34-
private Boolean cachedUtAnnotationManagerInstalled
32+
Boolean cachedDbaViewAccessible
33+
String cachedUtplsqlSchema
34+
Boolean cachedUtAnnotationManagerInstalled
3535

36-
new(Connection conn) {
37-
this.conn = conn
38-
this.jdbcTemplate = new JdbcTemplate(new SingleConnectionDataSource(conn, true))
36+
new(Connection connection) {
37+
conn = connection
38+
jdbcTemplate = new JdbcTemplate(new SingleConnectionDataSource(conn, true))
3939
}
4040

4141
def boolean isDbaViewAccessible() {

sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import org.utplsql.sqldev.model.preference.PreferenceModel
4040
import org.utplsql.sqldev.parser.UtplsqlParser
4141

4242
class UtplsqlController implements Controller {
43-
private static final Logger logger = Logger.getLogger(UtplsqlController.name);
44-
private val extension URLTools urlTools = new URLTools
43+
static final Logger logger = Logger.getLogger(UtplsqlController.name);
44+
val extension URLTools urlTools = new URLTools
4545

4646
public static int UTLPLSQL_TEST_CMD_ID = Ide.findCmdID("utplsql.test")
4747
public static final IdeAction UTLPLSQL_TEST_ACTION = IdeAction.get(UtplsqlController.UTLPLSQL_TEST_CMD_ID)

sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import org.utplsql.sqldev.model.parser.PlsqlObject
2424
import org.utplsql.sqldev.model.parser.Unit
2525

2626
class UtplsqlParser {
27-
private String owner
28-
private String plsql
29-
private String plsqlReduced
30-
private ArrayList<PlsqlObject> objects = new ArrayList<PlsqlObject>
31-
private ArrayList<Unit> units = new ArrayList<Unit>
27+
String owner
28+
String plsql
29+
String plsqlReduced
30+
ArrayList<PlsqlObject> objects = new ArrayList<PlsqlObject>
31+
ArrayList<Unit> units = new ArrayList<Unit>
3232

3333
new(String plsql, Connection conn, String owner) {
3434
setPlsql(plsql)

sqldev/src/main/java/org/utplsql/sqldev/resources/UtplsqlResources.xtend

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package org.utplsql.sqldev.resources
1818
import oracle.dbtools.raptor.utils.MessagesBase
1919

2020
class UtplsqlResources extends MessagesBase {
21-
private static final ClassLoader CLASS_LOADER = UtplsqlResources.classLoader
22-
private static final String CLASS_NAME = UtplsqlResources.canonicalName
23-
private static final UtplsqlResources INSTANCE = new UtplsqlResources()
21+
static final ClassLoader CLASS_LOADER = UtplsqlResources.classLoader
22+
static final String CLASS_NAME = UtplsqlResources.canonicalName
23+
static final UtplsqlResources INSTANCE = new UtplsqlResources()
2424

2525
private new() {
2626
super(CLASS_NAME, CLASS_LOADER)

sqldev/src/test/java/org/utplsql/sqldev/tests/UrlToolsTest.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.junit.Test
55
import org.utplsql.sqldev.model.URLTools
66

77
class UrlToolsTest {
8-
private val extension URLTools urlTools = new URLTools
8+
val extension URLTools urlTools = new URLTools
99

1010
@Test
1111
def void testReplacePlusSign() {

sqldev/src/test/java/org/utplsql/sqldev/tests/UtplsqlParserTest.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.utplsql.sqldev.parser.UtplsqlParser
2424

2525
class UtplsqlParserTest extends AbstractJdbcTest {
2626

27-
private static val sqlScript = '''
27+
static val sqlScript = '''
2828
PROMPT
2929
PROMPT Install utPLSQL test package
3030
PROMPT

0 commit comments

Comments
 (0)