Java5 update - usage generics where possible

Change-Id: I12f8c448961919e153047e28fee2a0acf3af1002
This commit is contained in:
Noel Grandin
2012-06-27 15:40:17 +02:00
committed by Michael Stahl
parent 33ec740d14
commit b65017a2a7
655 changed files with 2414 additions and 3349 deletions

View File

@@ -152,7 +152,7 @@ public class GenericModelTest extends TestCase {
* myProp.Value = "My special Value";
* m_propertiesToSet.add(myProp);
*/
public static ArrayList m_propertiesToSet = new ArrayList();
public static ArrayList<NamedValue> m_propertiesToSet = new ArrayList<NamedValue>();
/**
* This variable contains the name of the property which should be changed while
@@ -278,14 +278,14 @@ public class GenericModelTest extends TestCase {
log.println("closing data source...");
try {
XCloseable closer = (XCloseable) UnoRuntime.queryInterface(
XCloseable closer = UnoRuntime.queryInterface(
XCloseable.class, m_dbSrc);
if ( closer == null )
{
XDocumentDataSource dataSource = (XDocumentDataSource)UnoRuntime.queryInterface(
XDocumentDataSource dataSource = UnoRuntime.queryInterface(
XDocumentDataSource.class, m_dbSrc);
if ( dataSource != null )
closer = (XCloseable) UnoRuntime.queryInterface(
closer = UnoRuntime.queryInterface(
XCloseable.class, dataSource.getDatabaseDocument() );
}
if (debug && closer==null){
@@ -302,7 +302,7 @@ public class GenericModelTest extends TestCase {
log.println("disposing data source...");
try {
XComponent dataSourceComp = (XComponent)UnoRuntime.queryInterface(
XComponent dataSourceComp = UnoRuntime.queryInterface(
XComponent.class, m_dbSrc);
dataSourceComp.dispose();
}
@@ -313,7 +313,7 @@ public class GenericModelTest extends TestCase {
log.println("closing document...");
try {
XCloseable closer = (XCloseable) UnoRuntime.queryInterface(
XCloseable closer = UnoRuntime.queryInterface(
XCloseable.class, m_xTextDoc);
closer.close(true);
} catch (com.sun.star.util.CloseVetoException e) {
@@ -537,9 +537,9 @@ public class GenericModelTest extends TestCase {
}
public void commit() throws com.sun.star.sdbc.SQLException {
XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface(
XBoundComponent bound = UnoRuntime.queryInterface(
XBoundComponent.class, ctrl);
XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface(
XResultSetUpdate update = UnoRuntime.queryInterface(
XResultSetUpdate.class,
formLoaderF);