wizards/com/sun/star/wizards/db/CommandMetaData.java | 3 +--
wizards/com/sun/star/wizards/db/CommandName.java | 14 +++++++-------
wizards/com/sun/star/wizards/db/DBMetaData.java | 7 ++++++-
wizards/com/sun/star/wizards/db/RelationController.java | 8 ++++----
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 2 +-
wizards/com/sun/star/wizards/query/QuerySummary.java | 2 +-
wizards/com/sun/star/wizards/query/QueryWizard.java | 16 ++++++++--------
wizards/com/sun/star/wizards/table/Finalizer.java | 4 ++--
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 2 +-
9 files changed, 31 insertions(+), 27 deletions(-)
New commits:
commit 8c78ce59f87f809c3a26b7b92284030d8d5b3438
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 08:58:07 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 20:32:32 2024 +0200
remove call to getCatalogSeparator where return is ignored
since:
commit 43cc8ad33e815522e2b23ac87a4a9c4526cd85c9
CommitDate: Mon Jan 5 08:23:29 2015 +0200
java: remove dead code
Change-Id: Ib2b3e7a45ef1c9f1a7edf06ed6d474375bfe1c5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173943
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java
b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index 3f01cc152f96..5cc7d4ac851e 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -539,7 +539,6 @@ public class CommandMetaData extends DBMetaData
{
try
{
- getDBMetaData().getCatalogSeparator();
sIdentifierQuote = getDBMetaData().getIdentifierQuoteString();
bCommandComposerAttributesalreadyRetrieved = true;
}
commit 1cb1e96979593ce51ff8a09a13a250552a2ce5bb
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 08:56:57 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 20:32:26 2024 +0200
cid#1606775 PA: Public Attribute
Change-Id: Ie5034470b02310f329c041224ebf035769374e50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173942
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java
b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index 66b507ca69c9..3f01cc152f96 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -539,8 +539,8 @@ public class CommandMetaData extends DBMetaData
{
try
{
- xDBMetaData.getCatalogSeparator();
- sIdentifierQuote = xDBMetaData.getIdentifierQuoteString();
+ getDBMetaData().getCatalogSeparator();
+ sIdentifierQuote = getDBMetaData().getIdentifierQuoteString();
bCommandComposerAttributesalreadyRetrieved = true;
}
catch (SQLException e)
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java
b/wizards/com/sun/star/wizards/db/CommandName.java
index 4768018ef3b5..aab9d7f4595a 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -48,14 +48,14 @@ public class CommandName
{
baddQuotation = _baddQuotation;
oCommandMetaData = _CommandMetaData;
- if ((_CatalogName != null) &&
(oCommandMetaData.xDBMetaData.supportsCatalogsInTableDefinitions()))
+ if ((_CatalogName != null) &&
(oCommandMetaData.getDBMetaData().supportsCatalogsInTableDefinitions()))
{
if (!_CatalogName.equals(PropertyNames.EMPTY_STRING))
{
CatalogName = _CatalogName;
}
}
- if ((_SchemaName != null) &&
(oCommandMetaData.xDBMetaData.supportsSchemasInTableDefinitions()))
+ if ((_SchemaName != null) &&
(oCommandMetaData.getDBMetaData().supportsSchemasInTableDefinitions()))
{
if (!_SchemaName.equals(PropertyNames.EMPTY_STRING))
{
@@ -86,7 +86,7 @@ public class CommandName
this.DisplayName = _DisplayName;
int iIndex;
- if
(oCommandMetaData.xDBMetaData.supportsCatalogsInDataManipulation())
+ if
(oCommandMetaData.getDBMetaData().supportsCatalogsInDataManipulation())
{ // ...then Catalog also in TableName
iIndex = _DisplayName.indexOf(sCatalogSep);
if (iIndex >= 0)
@@ -103,7 +103,7 @@ public class CommandName
}
}
}
- if
(oCommandMetaData.xDBMetaData.supportsSchemasInDataManipulation())
+ if
(oCommandMetaData.getDBMetaData().supportsSchemasInDataManipulation())
{
String[] NameList = JavaTools.ArrayoutofString(_DisplayName,
".");
if (NameList.length > 1)
@@ -171,9 +171,9 @@ public class CommandName
{
try
{
- bCatalogAtStart = oCommandMetaData.xDBMetaData.isCatalogAtStart();
- sCatalogSep = oCommandMetaData.xDBMetaData.getCatalogSeparator();
- oCommandMetaData.xDBMetaData.getIdentifierQuoteString();
+ bCatalogAtStart =
oCommandMetaData.getDBMetaData().isCatalogAtStart();
+ sCatalogSep =
oCommandMetaData.getDBMetaData().getCatalogSeparator();
+ oCommandMetaData.getDBMetaData().getIdentifierQuoteString();
return true;
}
catch (SQLException e)
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java
b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 287d92cd4863..b5fb5d369b01 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -80,7 +80,7 @@ import com.sun.star.wizards.common.SystemDialog;
public class DBMetaData
{
private XNameAccess xQueryNames;
- public XDatabaseMetaData xDBMetaData;
+ private XDatabaseMetaData xDBMetaData;
private XDataSource m_dataSource;
private XPropertySet m_dataSourceSettings;
private XOfficeDatabaseDocument xModel;
@@ -137,6 +137,11 @@ public class DBMetaData
private long lDateCorrection = INVALID;
private boolean bdisposeConnection = false;
+ public XDatabaseMetaData getDBMetaData()
+ {
+ return xDBMetaData;
+ }
+
public com.sun.star.sdbc.XConnection getDBConnection()
{
return DBConnection;
diff --git a/wizards/com/sun/star/wizards/db/RelationController.java
b/wizards/com/sun/star/wizards/db/RelationController.java
index 0c77d92bb146..76a18bd65c2a 100644
--- a/wizards/com/sun/star/wizards/db/RelationController.java
+++ b/wizards/com/sun/star/wizards/db/RelationController.java
@@ -55,7 +55,7 @@ public class RelationController extends CommandName
try
{
ArrayList<String> aReferencedTableVector = new ArrayList<String>();
- XResultSet xResultSet =
super.getCommandMetaData().xDBMetaData.getExportedKeys(getCatalogName(this),
getSchemaName(), getTableName());
+ XResultSet xResultSet =
super.getCommandMetaData().getDBMetaData().getExportedKeys(getCatalogName(this),
getSchemaName(), getTableName());
XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
while (xResultSet.next())
{
@@ -96,7 +96,7 @@ public class RelationController extends CommandName
try
{
CommandName oLocCommandName = new
CommandName(super.getCommandMetaData(), _sreferencedtablename);
- XResultSet xResultSet =
super.getCommandMetaData().xDBMetaData.getImportedKeys(getCatalogName(oLocCommandName),
oLocCommandName.getSchemaName(), oLocCommandName.getTableName());
+ XResultSet xResultSet =
super.getCommandMetaData().getDBMetaData().getImportedKeys(getCatalogName(oLocCommandName),
oLocCommandName.getSchemaName(), oLocCommandName.getTableName());
XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
boolean bleaveLoop = false;
ArrayList<String> aMasterFieldNamesVector = new
ArrayList<String>();
@@ -105,11 +105,11 @@ public class RelationController extends CommandName
{
String sPrimaryCatalog = null;
String sPrimarySchema = null;
- if
(super.getCommandMetaData().xDBMetaData.supportsCatalogsInDataManipulation())
+ if
(super.getCommandMetaData().getDBMetaData().supportsCatalogsInDataManipulation())
{
sPrimaryCatalog = xRow.getString(PKTABLE_CAT);
}
- if
(super.getCommandMetaData().xDBMetaData.supportsSchemasInDataManipulation())
+ if
(super.getCommandMetaData().getDBMetaData().supportsSchemasInDataManipulation())
{
sPrimarySchema = xRow.getString(PKTABLE_SCHEM);
}
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 55719dfb51f7..b8979b31ee8b 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -63,7 +63,7 @@ public class SQLQueryComposer
private boolean addtoSelectClause(String DisplayFieldName) throws
SQLException
{
- return !(bincludeGrouping &&
CurDBMetaData.xDBMetaData.supportsGroupByUnrelated() &&
CurDBMetaData.getGroupFieldNames() != null &&
JavaTools.FieldInList(CurDBMetaData.getGroupFieldNames(), DisplayFieldName) >
-1);
+ return !(bincludeGrouping &&
CurDBMetaData.getDBMetaData().supportsGroupByUnrelated() &&
CurDBMetaData.getGroupFieldNames() != null &&
JavaTools.FieldInList(CurDBMetaData.getGroupFieldNames(), DisplayFieldName) >
-1);
}
public String getSelectClause(boolean _baddAliasFieldNames) throws
SQLException
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java
b/wizards/com/sun/star/wizards/query/QuerySummary.java
index 369e269698cf..6fedab278c11 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.java
@@ -62,7 +62,7 @@ public class QuerySummary extends QueryMetaData
"<FIELDNAME>", "<SORTMODE>"
}) + sReturnChar;
sFilterFraction =
combineFilterNameFraction(this.getFilterConditions(), "RID_QUERY_53",
"RID_QUERY_54") + sReturnChar;
- if (xDBMetaData.supportsGroupBy())
+ if (getDBMetaData().supportsGroupBy())
{
sGroupByFraction = combinePartString("RID_QUERY_57",
getGroupFieldNames(), "RID_QUERY_58") + sReturnChar;
sHavingFraction =
combineFilterNameFraction(getGroupByFilterConditions(), "RID_QUERY_59",
"RID_QUERY_60");
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java
b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 442d9e9474df..03f033d0b451 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -154,7 +154,7 @@ public class QueryWizard extends DatabaseObjectWizard
case SOAGGREGATE_PAGE:
if (_bEnabled)
{
- bEnabled = ((m_DBMetaData.hasNumericalFields()) &&
(m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar()));
+ bEnabled = ((m_DBMetaData.hasNumericalFields()) &&
(m_DBMetaData.getDBMetaData().supportsCoreSQLGrammar()));
}
break;
case SOGROUPSELECTION_PAGE:
@@ -198,11 +198,11 @@ public class QueryWizard extends DatabaseObjectWizard
i = insertRoadmapItem(0, true, SOFIELDSELECTION_PAGE - 1,
SOFIELDSELECTION_PAGE);
i = insertRoadmapItem(i, false, SOSORTING_PAGE - 1,
SOSORTING_PAGE); // Orderby is always supported
i = insertRoadmapItem(i, false, SOFILTER_PAGE - 1, SOFILTER_PAGE);
- if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())
+ if (m_DBMetaData.getDBMetaData().supportsCoreSQLGrammar())
{
i = insertRoadmapItem(i, m_DBMetaData.hasNumericalFields(),
SOAGGREGATE_PAGE - 1, SOAGGREGATE_PAGE);
}
- if (m_DBMetaData.xDBMetaData.supportsGroupBy())
+ if (m_DBMetaData.getDBMetaData().supportsGroupBy())
{
i = insertRoadmapItem(i, false, SOGROUPSELECTION_PAGE - 1,
SOGROUPSELECTION_PAGE);
i = insertRoadmapItem(i, false, SOGROUPFILTER_PAGE - 1,
SOGROUPFILTER_PAGE);
@@ -232,11 +232,11 @@ public class QueryWizard extends DatabaseObjectWizard
m_filterComponent = new FilterComponent(this, SOFILTER_PAGE, 97,
27, 3, m_DBMetaData, 40878);
m_filterComponent.addNumberFormats();
- if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())
+ if (m_DBMetaData.getDBMetaData().supportsCoreSQLGrammar())
{
m_aggregateComponent = new AggregateComponent(this,
m_DBMetaData, SOAGGREGATE_PAGE, 97, 69, 209, 5, 40895);
}
- if (m_DBMetaData.xDBMetaData.supportsGroupBy())
+ if (m_DBMetaData.getDBMetaData().supportsGroupBy())
{
m_groupFieldSelection = new FieldSelection(this,
SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy,
40915, false);
m_groupFieldSelection.addFieldSelectionListener(new
FieldSelectionListener());
@@ -277,7 +277,7 @@ public class QueryWizard extends DatabaseObjectWizard
{
if (nOldStep <= SOGROUPSELECTION_PAGE && nNewStep >
SOGROUPSELECTION_PAGE)
{
- if (m_DBMetaData.xDBMetaData.supportsGroupBy())
+ if (m_DBMetaData.getDBMetaData().supportsGroupBy())
{
m_DBMetaData.setGroupFieldNames(m_groupFieldSelection.getSelectedFieldNames());
m_DBMetaData.setGroupFieldNames(JavaTools.removeOutdatedFields(m_DBMetaData.getGroupFieldNames(),
m_DBMetaData.getNonAggregateFieldNames()));
@@ -357,10 +357,10 @@ public class QueryWizard extends DatabaseObjectWizard
{
if (m_DBMetaData.Type ==
QueryMetaData.QueryType.SOSUMMARYQUERY)
{
- if (m_DBMetaData.xDBMetaData.supportsGroupBy())
+ if (m_DBMetaData.getDBMetaData().supportsGroupBy())
{
m_DBMetaData.setNonAggregateFieldNames();
-
m_groupFieldSelection.initialize(m_DBMetaData.getUniqueAggregateFieldNames(),
false, m_DBMetaData.xDBMetaData.getMaxColumnsInGroupBy());
+
m_groupFieldSelection.initialize(m_DBMetaData.getUniqueAggregateFieldNames(),
false, m_DBMetaData.getDBMetaData().getMaxColumnsInGroupBy());
m_groupFieldSelection.initializeSelectedFields(m_DBMetaData.getNonAggregateFieldNames());
m_groupFieldSelection.setMultipleMode(false);
setStepEnabled(SOGROUPFILTER_PAGE,
m_aggregateComponent.isGroupingpossible() &&
m_DBMetaData.getNonAggregateFieldNames().length > 0);
diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java
b/wizards/com/sun/star/wizards/table/Finalizer.java
index f7a25d2fc7e3..a7a719fe0b1c 100644
--- a/wizards/com/sun/star/wizards/table/Finalizer.java
+++ b/wizards/com/sun/star/wizards/table/Finalizer.java
@@ -91,7 +91,7 @@ public class Finalizer
});
txtTableName.addTextListener(CurUnoDialog);
txtTableName.setMaxTextLen((short)
this.curtabledescriptor.getMaxTableNameLength());
- if
(this.curtabledescriptor.xDBMetaData.supportsCatalogsInTableDefinitions())
+ if
(this.curtabledescriptor.getDBMetaData().supportsCatalogsInTableDefinitions())
{
if (sCatalogNames != null && sCatalogNames.length > 0)
{
@@ -143,7 +143,7 @@ public class Finalizer
nListBoxPosX = 200;
}
}
- if
(this.curtabledescriptor.xDBMetaData.supportsSchemasInTableDefinitions())
+ if
(this.curtabledescriptor.getDBMetaData().supportsSchemasInTableDefinitions())
{
if (sSchemaNames != null && sSchemaNames.length > 0)
{
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index deed09843d13..480ee0312bbe 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -292,7 +292,7 @@ public class AggregateComponent extends ControlScroller
{
try
{
- boolean benableGroupPage = isAggregateComponentEnabled() &&
CurDBMetaData.xDBMetaData.supportsGroupBy() && hasonlycompletefunctions();
+ boolean benableGroupPage = isAggregateComponentEnabled() &&
CurDBMetaData.getDBMetaData().supportsGroupBy() && hasonlycompletefunctions();
String[][] sAggregateFieldNames = this.getAggregateFieldNames();
if (benableGroupPage)
{
