summaryrefslogtreecommitdiff
path: root/connectivity/qa/connectivity
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 17:59:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-27 06:54:35 -0600
commitac9212feedb828064c5cf5cbb0bde8f02cc93d65 (patch)
treee429c2bbcdfe7a98c2d55433e752bfecac3d5d00 /connectivity/qa/connectivity
parent2a33953f6eb5da62042ea3731ef9d61666d5556f (diff)
Remove visual noise from connectivity
Conflicts: connectivity/source/inc/odbc/OConnection.hxx Change-Id: I5ca98359e18cf1b27bf53037dde211774d798626 Reviewed-on: https://gerrit.libreoffice.org/8245 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity/qa/connectivity')
-rw-r--r--connectivity/qa/connectivity/tools/AbstractDatabase.java4
-rw-r--r--connectivity/qa/connectivity/tools/CRMDatabase.java16
-rw-r--r--connectivity/qa/connectivity/tools/CsvDatabase.java4
-rw-r--r--connectivity/qa/connectivity/tools/DbaseDatabase.java4
-rw-r--r--connectivity/qa/connectivity/tools/FlatFileDatabase.java4
-rw-r--r--connectivity/qa/connectivity/tools/HsqlDatabase.java4
6 files changed, 18 insertions, 18 deletions
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 28d05dd7c73d..4e048e08ca61 100644
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -39,7 +39,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
m_orb = orb;
}
- // --------------------------------------------------------------------------------------------------------
+
public AbstractDatabase(final XMultiServiceFactory orb, final String _existingDocumentURL ) throws Exception
{
m_orb = orb;
@@ -153,7 +153,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
return m_orb;
}
- // --------------------------------------------------------------------------------------------------------
+
final protected void createDBDocument(final String _docURL) throws Exception
{
m_databaseDocumentFile = _docURL;
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index ea807ae7faec..57b9e857b2e4 100644
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
@@ -88,7 +88,7 @@ public class CRMDatabase
m_connection = m_database.defaultConnection();
}
- // --------------------------------------------------------------------------------------------------------
+
/** returns the database document underlying the CRM database
*/
public final HsqlDatabase getDatabase()
@@ -96,7 +96,7 @@ public class CRMDatabase
return m_database;
}
- // --------------------------------------------------------------------------------------------------------
+
/** returns the default connection to the database
*/
public final Connection getConnection()
@@ -104,7 +104,7 @@ public class CRMDatabase
return m_connection;
}
- // --------------------------------------------------------------------------------------------------------
+
public void saveAndClose() throws SQLException, IOException
{
XDatabaseDocumentUI ui = getDocumentUI();
@@ -114,14 +114,14 @@ public class CRMDatabase
m_database.closeAndDelete();
}
- // --------------------------------------------------------------------------------------------------------
+
public XDatabaseDocumentUI getDocumentUI()
{
XModel docModel = UnoRuntime.queryInterface( XModel.class, m_database.getDatabaseDocument() );
return UnoRuntime.queryInterface( XDatabaseDocumentUI.class, docModel.getCurrentController() );
}
- // --------------------------------------------------------------------------------------------------------
+
public XController loadSubComponent( final int _objectType, final String _name ) throws IllegalArgumentException, SQLException, NoSuchElementException
{
XDatabaseDocumentUI docUI = getDocumentUI();
@@ -136,7 +136,7 @@ public class CRMDatabase
return document.getCurrentController();
}
- // --------------------------------------------------------------------------------------------------------
+
private void createTables() throws SQLException
{
HsqlTableDescriptor table = new HsqlTableDescriptor( "categories",
@@ -206,7 +206,7 @@ public class CRMDatabase
m_connection.refreshTables();
}
- // --------------------------------------------------------------------------------------------------------
+
private void validateUnparseable()
{
/*
@@ -242,7 +242,7 @@ public class CRMDatabase
*/
}
- // --------------------------------------------------------------------------------------------------------
+
private void createQueries() throws ElementExistException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException
{
m_database.getDataSource().createQuery(
diff --git a/connectivity/qa/connectivity/tools/CsvDatabase.java b/connectivity/qa/connectivity/tools/CsvDatabase.java
index 36e66f8db6ff..b2c3a179325e 100644
--- a/connectivity/qa/connectivity/tools/CsvDatabase.java
+++ b/connectivity/qa/connectivity/tools/CsvDatabase.java
@@ -22,13 +22,13 @@ import com.sun.star.lang.XMultiServiceFactory;
public class CsvDatabase extends FlatFileDatabase
{
- // --------------------------------------------------------------------------------------------------------
+
public CsvDatabase( final XMultiServiceFactory i_orb ) throws Exception
{
super( i_orb, "flat" );
}
- // --------------------------------------------------------------------------------------------------------
+
protected CsvDatabase( final XMultiServiceFactory i_orb, final String i_existingDocumentURL ) throws Exception
{
super( i_orb, i_existingDocumentURL, "flat" );
diff --git a/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index 6e71df800a1b..f3f883144e89 100644
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java
@@ -22,13 +22,13 @@ import com.sun.star.lang.XMultiServiceFactory;
public class DbaseDatabase extends FlatFileDatabase
{
- // --------------------------------------------------------------------------------------------------------
+
public DbaseDatabase( final XMultiServiceFactory i_orb ) throws Exception
{
super( i_orb, "dbase" );
}
- // --------------------------------------------------------------------------------------------------------
+
protected DbaseDatabase( final XMultiServiceFactory i_orb, final String i_existingDocumentURL ) throws Exception
{
super( i_orb, i_existingDocumentURL, "dbase" );
diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
index 03112d5c3c17..f3fddff77849 100644
--- a/connectivity/qa/connectivity/tools/FlatFileDatabase.java
+++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
@@ -29,7 +29,7 @@ import java.io.File;
class FlatFileDatabase extends AbstractDatabase
{
- // --------------------------------------------------------------------------------------------------------
+
protected FlatFileDatabase( final XMultiServiceFactory i_orb, final String i_urlSubScheme ) throws Exception
{
super(i_orb);
@@ -37,7 +37,7 @@ class FlatFileDatabase extends AbstractDatabase
createDBDocument();
}
- // --------------------------------------------------------------------------------------------------------
+
protected FlatFileDatabase(final XMultiServiceFactory i_orb, final String i_existingDocumentURL,
final String i_urlSubScheme ) throws Exception
{
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 0ea5e0d23725..dd6831d7828e 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -38,14 +38,14 @@ import java.io.File;
public class HsqlDatabase extends AbstractDatabase
{
- // --------------------------------------------------------------------------------------------------------
+
public HsqlDatabase(final XMultiServiceFactory orb) throws Exception
{
super(orb);
createDBDocument();
}
- // --------------------------------------------------------------------------------------------------------
+
public HsqlDatabase(final XMultiServiceFactory orb, final String _existingDocumentURL) throws Exception
{
super(orb, _existingDocumentURL);