[Libreoffice-commits] core.git: scripting/java

[rbuj]

 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java |   14 +++++-----
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3bb05281cb980c01cde07b5412c2e4c440e4ab7d
Author: rbuj <robert.buj at gmail.com>
Date:   Sun Sep 7 12:29:27 2014 +0200

    scripting: if...else if...else Statement
    
    Change-Id: Ia60b352b4cb52d2712b2499550859ece699341d1
    Reviewed-on: https://gerrit.libreoffice.org/11322
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index b49a526..d08011b 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -214,8 +214,7 @@ public abstract class ScriptProvider
                         extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
                         extensionRepository = "bundled";
                     }
-
-                    if ( originalContextURL.startsWith( "share" ) )
+                    else if ( originalContextURL.startsWith( "share" ) )
                     {
                         contextUrl = "vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR";
                         extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
@@ -231,12 +230,13 @@ public abstract class ScriptProvider
                     if ( originalContextURL.endsWith( "uno_packages") )
                     {
                         isPkgProvider = true;
+                        if (!originalContextURL.equals(contextUrl)
+                                && !extensionRepository.equals("bundled"))
+                        {
+                            contextUrl = PathUtils.make_url(contextUrl, "uno_packages");
+                        }
                     }
-                    if ( originalContextURL.endsWith( "uno_packages") &&  !originalContextURL.equals( contextUrl  )
-                            && !extensionRepository.equals("bundled"))
-                    {
-                        contextUrl = PathUtils.make_url( contextUrl, "uno_packages"  );
-                    }
+
                     if ( isPkgProvider )
                     {
                         m_container = new UnoPkgContainer( m_xContext, contextUrl, extensionDb, extensionRepository, language  );