scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |
16 +++++-----
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java |
10 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 015d65c7ea301ed1033dde71e722e32f94c49530
Author: rbuj <robert....@gmail.com>
Date: Fri Sep 5 00:46:03 2014 +0200
scripting: use contains to check if a string contains a substring
Change-Id: I7cbd32310e362f43f0a456e45b58930eb5453f0c
Reviewed-on: https://gerrit.libreoffice.org/11289
Reviewed-by: Thomas Arnhold <tho...@arnhold.org>
Tested-by: Thomas Arnhold <tho...@arnhold.org>
diff --git
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 1d92abc..c644e53 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -121,13 +121,13 @@ public class ScriptMetaData extends ScriptEntry {
{
String result = "Unknown";
- if ( url.indexOf(UNO_USER_PACKAGES1) > -1 ||
- url.indexOf(UNO_USER_PACKAGES2) > -1 )
+ if ( url.contains(UNO_USER_PACKAGES1) ||
+ url.contains(UNO_USER_PACKAGES2) )
{
result = PathUtils.make_url( "user:uno_packages", pkgname );
}
- else if ( url.indexOf(UNO_SHARED_PACKAGES1) > -1 ||
- url.indexOf(UNO_SHARED_PACKAGES2) > -1 )
+ else if ( url.contains(UNO_SHARED_PACKAGES1) ||
+ url.contains(UNO_SHARED_PACKAGES2) )
{
result = PathUtils.make_url( "share:uno_packages", pkgname );
}
@@ -151,8 +151,8 @@ public class ScriptMetaData extends ScriptEntry {
String placeHolder = "Unknown";
String pathToParcel = parent.getPathToParcel();
- if ( pathToParcel.indexOf(UNO_USER_PACKAGES1) > -1 ||
- pathToParcel.indexOf(UNO_USER_PACKAGES2) > -1 )
+ if ( pathToParcel.contains(UNO_USER_PACKAGES1) ||
+ pathToParcel.contains(UNO_USER_PACKAGES2) )
{
// it's a package
placeHolder = "user:uno_packages";
@@ -162,8 +162,8 @@ public class ScriptMetaData extends ScriptEntry {
placeHolder = PathUtils.make_url( placeHolder, unoPkg );
}
}
- else if ( pathToParcel.indexOf(UNO_SHARED_PACKAGES1) > -1 ||
- pathToParcel.indexOf(UNO_SHARED_PACKAGES2) > -1 )
+ else if ( pathToParcel.contains(UNO_SHARED_PACKAGES1) ||
+ pathToParcel.contains(UNO_SHARED_PACKAGES2) )
{
//its a package
placeHolder = "share:uno_packages";
diff --git
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 2680772..d281b92 100644
---
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -355,11 +355,11 @@ public class UnoPkgContainer extends ParcelContainer
LogUtils.DEBUG("processUnoPackage - script library package");
String parentUrl = uri;
- if ( uri.indexOf( "%2Funo_packages%2F" ) > -1 ||
- uri.indexOf( "/uno_packages/" ) > -1 ||
- uri.indexOf("$UNO_USER_PACKAGES_CACHE/") > -1 ||
- uri.indexOf("$UNO_SHARED_PACKAGES_CACHE/") > -1 ||
- uri.indexOf("$BUNDLED_EXTENSIONS/") > -1 )
+ if ( uri.contains("%2Funo_packages%2F") ||
+ uri.contains("/uno_packages/") ||
+ uri.contains("$UNO_USER_PACKAGES_CACHE/") ||
+ uri.contains("$UNO_SHARED_PACKAGES_CACHE/") ||
+ uri.contains("$BUNDLED_EXTENSIONS/") )
{
//its in a bundle need to determine the uno-package file its in
LogUtils.DEBUG("processUnoPackage - is part of a uno bundle");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
