diff options
Diffstat (limited to 'wizards/com/sun/star/wizards/db/DBMetaData.java')
| -rw-r--r-- | wizards/com/sun/star/wizards/db/DBMetaData.java | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 2fceae708..0905db3b9 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -83,6 +83,7 @@ import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.common.SystemDialog; import com.sun.star.uno.Any; +import com.sun.star.wizards.common.PropertyNames; import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; @@ -102,7 +103,7 @@ public class DBMetaData public int[] CommandTypes; public String DataSourceName; public com.sun.star.sdbc.XConnection DBConnection; - public com.sun.star.sdb.tools.XConnectionTools ConnectionTools; + private com.sun.star.sdb.tools.XConnectionTools m_connectionTools; public com.sun.star.lang.XMultiServiceFactory xMSF; public XComponent xConnectionComponent; @@ -611,7 +612,7 @@ public class DBMetaData XPropertySet xPSet = UnoRuntime.queryInterface( XPropertySet.class, m_dataSource ); if (xPSet != null) { - DataSourceName = AnyConverter.toString(xPSet.getPropertyValue("Name")); + DataSourceName = AnyConverter.toString(xPSet.getPropertyValue(PropertyNames.PROPERTY_NAME)); } return getConnection(xConnection); } @@ -677,7 +678,7 @@ public class DBMetaData try { this.DBConnection = _DBConnection; - this.ConnectionTools = UnoRuntime.queryInterface( XConnectionTools.class, this.DBConnection ); + this.m_connectionTools = UnoRuntime.queryInterface( XConnectionTools.class, this.DBConnection ); getDataSourceObjects(); return true; } @@ -740,7 +741,7 @@ public class DBMetaData else { xConnectionComponent = UnoRuntime.queryInterface( XComponent.class, DBConnection ); - ConnectionTools = UnoRuntime.queryInterface( XConnectionTools.class, DBConnection ); + m_connectionTools = UnoRuntime.queryInterface( XConnectionTools.class, DBConnection ); getDataSourceObjects(); } return bgetConnection; @@ -825,6 +826,16 @@ public class DBMetaData return false; } + public boolean supportsQueriesInFrom() + { + return m_connectionTools.getDataSourceMetaData().supportsQueriesInFrom(); + } + + public String suggestName( final int i_objectType, final String i_baseName ) throws IllegalArgumentException + { + return m_connectionTools.getObjectNames().suggestName( i_objectType, i_baseName ); + } + /** * inserts a Query to a datasource; There is no validation if the queryname is already existing in the datasource * @param oQuery @@ -844,7 +855,7 @@ public class DBMetaData xPSet.setPropertyValue("Command", s); XNameContainer xNameCont = UnoRuntime.queryInterface( XNameContainer.class, xQueryDefs ); - ConnectionTools.getObjectNames().checkNameForCreate(com.sun.star.sdb.CommandType.QUERY, _QueryName); + m_connectionTools.getObjectNames().checkNameForCreate(com.sun.star.sdb.CommandType.QUERY, _QueryName); xNameCont.insertByName(_QueryName, oQuery); return true; } @@ -937,7 +948,7 @@ public class DBMetaData xCloseable.close(false); NamedValueCollection creationArgs = new NamedValueCollection(); - creationArgs.put( "Name", basename ); + creationArgs.put( PropertyNames.PROPERTY_NAME, basename ); creationArgs.put( "URL", documentURL ); creationArgs.put( "AsTemplate", i_createTemplate ); XMultiServiceFactory xDocMSF = UnoRuntime.queryInterface( XMultiServiceFactory.class, _xDocNameAccess ); @@ -1080,7 +1091,7 @@ public class DBMetaData } catch (com.sun.star.uno.Exception ex) { - ex.printStackTrace(); + Logger.getLogger( getClass().getName() ).log( Level.SEVERE, "error calling the error dialog", ex ); } } @@ -1095,7 +1106,7 @@ public class DBMetaData xDataSourcePropertySet = null; xWindowPeer = null; DBConnection = null; - ConnectionTools = null; + m_connectionTools = null; xMSF = null; xConnectionComponent = null; CommandObjects = null; |