diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-23 13:50:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-23 13:50:40 +0000 |
| commit | 9c90fa61e9ea6159e54fe79454c61e7cf1280a42 (patch) | |
| tree | b9345e815846425979825fac99445f936e83daed /bridges/test/java_uno/equals/TestEquals.java | |
| parent | 8910bd3edacc0a213076139f75b11ed174b9147e (diff) | |
INTEGRATION: CWS sb20 (1.3.110); FILE MERGED
2004/07/09 13:29:31 sb 1.3.110.1: #i29741# Retrofitted existing services as single-interface--based ones.
Diffstat (limited to 'bridges/test/java_uno/equals/TestEquals.java')
| -rw-r--r-- | bridges/test/java_uno/equals/TestEquals.java | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/bridges/test/java_uno/equals/TestEquals.java b/bridges/test/java_uno/equals/TestEquals.java index ae91a7089e7b..a87db71fd84a 100644 --- a/bridges/test/java_uno/equals/TestEquals.java +++ b/bridges/test/java_uno/equals/TestEquals.java @@ -2,9 +2,9 @@ * * $RCSfile: TestEquals.java,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2003-05-22 08:41:26 $ + * last change: $Author: rt $ $Date: 2004-07-23 14:50:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,7 @@ import com.sun.star.bridge.XBridge; import com.sun.star.bridge.XBridgeFactory; import com.sun.star.bridge.XInstanceProvider; import com.sun.star.comp.helper.Bootstrap; +import com.sun.star.connection.Acceptor; import com.sun.star.connection.XAcceptor; import com.sun.star.connection.XConnection; import com.sun.star.lang.XMultiComponentFactory; @@ -124,25 +125,19 @@ public final class TestEquals { XTestFrame.class, bridge.getInstance("TestFrame")); XComponentContext context = Bootstrap.createInitialComponentContext(null); - XMultiComponentFactory factory = context.getServiceManager(); - XBridgeFactory bridgeFactory - = (XBridgeFactory) UnoRuntime.queryInterface( - XBridgeFactory.class, - factory.createInstanceWithContext( - "com.sun.star.bridge.BridgeFactory", context)); - XAcceptor acceptor = (XAcceptor) UnoRuntime.queryInterface( - XAcceptor.class, - factory.createInstanceWithContext( - "com.sun.star.connection.Acceptor", context)); + XAcceptor acceptor = Acceptor.create(context); + XBridgeFactory factory = (XBridgeFactory) UnoRuntime.queryInterface( + XBridgeFactory.class, + context.getServiceManager().createInstanceWithContext( + "com.sun.star.bridge.BridgeFactory", context)); System.out.println("Client, 2nd connection: Accepting..."); XInstanceProvider prov = new Provider(); f.notifyAccepting(new Done(), prov.getInstance(INSTANCE1), prov.getInstance(INSTANCE2)); XConnection connection = acceptor.accept(CONNECTION_DESCRIPTION); System.out.println("Client, 2nd connection: ...connected..."); - XBridge bridge2 = bridgeFactory.createBridge("", - PROTOCOL_DESCRIPTION, - connection, prov); + XBridge bridge2 = factory.createBridge( + "", PROTOCOL_DESCRIPTION, connection, prov); System.out.println("Client, 2nd connection: ...bridged."); synchronized (lock) { while (!done) { |