diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-12 09:55:57 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-12 11:03:29 +0000 |
commit | bb437029c1e5331bcc3f8fb2fc87837142a52f33 (patch) | |
tree | 56bde4059792a5284e90ae3b10ee4388cc913a54 /qadevOOo/tests/java/mod | |
parent | 84f7f412bfc9e18b1ff8b133ceda7757eae28c36 (diff) |
java: convert fields to local variables where possible
found by PMD
Change-Id: I05b45382b8fb1b734657ce9421a20e6ef6fbe542
Reviewed-on: https://gerrit.libreoffice.org/12376
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'qadevOOo/tests/java/mod')
-rw-r--r-- | qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java | 6 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_dbaccess/ORowSet.java | 9 | ||||
-rw-r--r-- | qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 9 |
3 files changed, 10 insertions, 14 deletions
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java index d27ad7b96001..bff1ecdf22c7 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java @@ -78,8 +78,6 @@ public class ODatabaseSource extends TestCase { private static int uniqueSuffixStat = 0 ; private int uniqueSuffix = 0 ; - private XNamingService xDBContextNameServ = null ; - private String databaseName = null ; private XOfficeDatabaseDocument xDBDoc = null; /** @@ -136,7 +134,7 @@ public class ODatabaseSource extends TestCase { throw new StatusException("Service not available", e) ; } - xDBContextNameServ = UnoRuntime.queryInterface(XNamingService.class, oInterface) ; + XNamingService xDBContextNameServ = UnoRuntime.queryInterface(XNamingService.class, oInterface) ; // retrieving temp directory for database String tmpDatabaseUrl = utils.getOfficeTempDir(Param.getMSF()); @@ -179,7 +177,7 @@ public class ODatabaseSource extends TestCase { throw new StatusException("Could not set property 'URL' ", e) ; } - databaseName = "NewDatabaseSource" + uniqueSuffix ; + String databaseName = "NewDatabaseSource" + uniqueSuffix ; // make sure that the DatabaseContext isn't already registered try { diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index dbb72469ea0a..5a6d42c972b5 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -134,7 +134,6 @@ public class ORowSet extends TestCase { private Object m_rowSet = null; private DataSource m_dataSource; private String m_tableFile; - private XMultiServiceFactory m_orb = null; /** * Initializes some class fields. Then creates DataSource, which serves @@ -160,13 +159,13 @@ public class ORowSet extends TestCase { protected void initialize ( TestParameters Param, PrintWriter _log) throws StatusException { - m_orb = Param.getMSF(); + XMultiServiceFactory orb = Param.getMSF(); - String tmpDir = utils.getOfficeTemp( m_orb ); + String tmpDir = utils.getOfficeTemp( orb ); origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf"); - dbTools = new DBTools( m_orb ); + dbTools = new DBTools( orb ); // creating DataSource and registering it in DatabaseContext String dbURL = (String) Param.get("test.db.url"); @@ -174,7 +173,7 @@ public class ORowSet extends TestCase { String dbPassword = (String) Param.get("test.db.password"); log.println("Creating and registering DataSource ..."); - srcInf = new DataSourceDescriptor( m_orb ); + srcInf = new DataSourceDescriptor( orb ); if (dbURL != null && dbUser != null && dbPassword != null) { isMySQLDB = true; diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index 26d38a8a6719..ed7ba409d2ed 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -126,7 +126,6 @@ import util.utils; public class GenericModelTest extends TestCase { private XTextDocument m_xTextDoc; private Object m_dbSrc = null; - private DBTools.DataSourceInfo m_srcInf = null; /** * This is the name of the Data Base which the test uses: "APITestDatabase" */ @@ -403,11 +402,11 @@ public class GenericModelTest extends TestCase { m_dbTools = new DBTools( xMSF ); String tmpDir = utils.getOfficeTemp((xMSF)); - m_srcInf = m_dbTools.newDataSourceInfo(); - m_srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); - log.println("data source: " + m_srcInf.URL); + DBTools.DataSourceInfo srcInf = m_dbTools.newDataSourceInfo(); + srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); + log.println("data source: " + srcInf.URL); - m_dbSrc = m_srcInf.getDataSourceService(); + m_dbSrc = srcInf.getDataSourceService(); m_dbTools.reRegisterDB(m_dbSourceName, m_dbSrc); m_XFormLoader = FormTools.bindForm(m_xTextDoc, m_dbSourceName, |