summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <robert.buj@gmail.com>2014-08-10 03:10:29 +0200
committerDavid Tardon <dtardon@redhat.com>2014-08-10 07:34:32 +0000
commit85ab4a14c541f3d6c30300d102b97f8564a1c7ee (patch)
tree8cf5c5ecd558a324750505df31b90e5d319d87ee
parentc77e929c4bfa6e9aee3d6103ef3629a9bcf583ae (diff)
jurt: Use <T> T[] toArray(T[] a)
http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Set.html#toArray%28T%5b%5d%29 Change-Id: I601e77db3cc978d81aebddfe6abba1c020671913 Reviewed-on: https://gerrit.libreoffice.org/10853 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--jurt/com/sun/star/comp/servicemanager/ServiceManager.java15
1 files changed, 6 insertions, 9 deletions
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index a4a5f8d865c8..38e5cb30646d 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -188,15 +188,12 @@ public class ServiceManager implements XMultiServiceFactory,
public String[] getAvailableServiceNames()
throws com.sun.star.uno.RuntimeException
{
- int i = 0;
- String[] availableServiceNames = new String[factoriesByServiceNames.size()];
-
- java.util.Iterator<String> keys = factoriesByServiceNames.keySet().iterator();
-
- while (keys.hasNext())
- availableServiceNames[i++] = keys.next();
-
- return availableServiceNames;
+ try{
+ return factoriesByServiceNames.keySet().toArray(
+ new String[ factoriesByServiceNames.size() ] );
+ } catch(Exception ex) {
+ throw new com.sun.star.uno.RuntimeException(ex.toString());
+ }
}
// XMultiComponentFactory implementation