INTEGRATION: CWS scriptingf4 (1.6.4); FILE MERGED

2004/05/06 12:59:07 npower 1.6.4.1: #i28812# Added changes to use the BrowseNodeFactory service.

1 files changed, 9 insertions, 16 deletions

diff --git a/scripting/examples/java/selector/ScriptSelector.java b/scripting/examples/java/selector/ScriptSelector.java
index 2c54196f69df..fbcf8216d22d 100644
--- a/scripting/examples/java/selector/ScriptSelector.java
+++ b/scripting/examples/java/selector/ScriptSelector.java
@@ -30,6 +30,8 @@ import com.sun.star.lib.uno.helper.PropertySet;
 
 import drafts.com.sun.star.script.browse.XBrowseNode;
 import drafts.com.sun.star.script.browse.BrowseNodeTypes;
+import drafts.com.sun.star.script.browse.XBrowseNodeFactory;
+import drafts.com.sun.star.script.browse.BrowseNodeFactoryViewType;
 import drafts.com.sun.star.script.provider.XScriptContext;
 import drafts.com.sun.star.script.provider.XScript;
 import drafts.com.sun.star.script.provider.XScriptProvider;
@@ -301,25 +303,16 @@ public class ScriptSelector {
 
         XBrowseNode result = null;
 
-        try {
-            String serviceName = "drafts.com.sun.star.script." +
-                "provider.MasterScriptProvider";
-
-            XComponentContext xcc = ctxt.getComponentContext();
-            XMultiComponentFactory xmcf = xcc.getServiceManager();
 
-            Any[] args = new Any[1];
-            args[0] = new Any(new Type(XModel.class), ctxt.getDocument());
+        XComponentContext xcc = ctxt.getComponentContext();
+        XMultiComponentFactory xmcf = xcc.getServiceManager();
+        XBrowseNodeFactory xBrowseFac = (XBrowseNodeFactory)
+            UnoRuntime.queryInterface( XBrowseNodeFactory.class, xcc.getValueByName(
+                "/singletons/drafts.com.sun.star.script.browse.theBrowseNodeFactory") );
 
-            Object serviceObj = xmcf.createInstanceWithArgumentsAndContext(
-                serviceName, args, xcc);
 
-            result = (XBrowseNode)UnoRuntime.queryInterface(
-                XBrowseNode.class, serviceObj);
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
+        result = (XBrowseNode)UnoRuntime.queryInterface(
+           XBrowseNode.class, xBrowseFac.getView( BrowseNodeFactoryViewType.SCRIPTORGANIZER ) );
         return result;
     }
 }