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

[rbuj]

 scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java |    7 --
 scripting/java/com/sun/star/script/framework/container/Parcel.java             |    6 -
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java    |    6 -
 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java        |   12 +--
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java     |   32 +---------
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java    |   10 ---
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java      |   10 ---
 7 files changed, 17 insertions(+), 66 deletions(-)

New commits:
commit a795c3660b543239431f3c6f7df383140da18fe5
Author: rbuj <robert.buj at gmail.com>
Date:   Fri Sep 5 00:07:55 2014 +0200

    scripting: the if statement is redundant
    
    Change-Id: I7e61d740d6f58afbcdad630deb0de0ef548efcfb
    Reviewed-on: https://gerrit.libreoffice.org/11288
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index 900a4b3..ca5d94d 100644
--- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
@@ -37,12 +37,7 @@ public class PkgProviderBrowseNode extends ProviderBrowseNode
 
     @Override
     public String getName() {
-        String name = "Unknown";
-        if ( container != null )
-        {
-            name =  container.getName();
-        }
-        return name;
+        return (container != null) ? container.getName() : "Unknown";
     }
 
 }
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index 0a5b75a..6b4fd8d 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -140,11 +140,7 @@ public class Parcel implements XNameContainer
 
     public boolean hasElements()
     {
-        if ( m_descriptor != null && m_descriptor.getScriptEntries().length > 0 )
-        {
-            return true;
-        }
-        return false;
+        return m_descriptor != null && m_descriptor.getScriptEntries().length > 0;
     }
 
     public void replaceByName( String aName, java.lang.Object aElement ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 866059f..92e7a5b 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -362,11 +362,7 @@ public class ParcelContainer implements XNameAccess
     }
     public boolean hasElements()
     {
-        if ( parcels == null || parcels.isEmpty() )
-        {
-            return false;
-        }
-        return true;
+        return !(parcels == null || parcels.isEmpty());
     }
 
     private void loadParcels() throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index ddd3fa7..b4d6a70 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -76,13 +76,11 @@ public class ScriptEntry implements Cloneable {
     }
 
     public boolean equals(ScriptEntry other) {
-        if (language.equals(other.getLanguage()) &&
-            languagename.equals(other.getLanguageName()) &&
-            logicalname.equals(other.getLogicalName()) &&
-            languagedepprops.equals(other.getLanguageProperties()) &&
-            location.equals(other.getLocation()))
-            return true;
-        return false;
+        return language.equals(other.getLanguage()) &&
+                languagename.equals(other.getLanguageName()) &&
+                logicalname.equals(other.getLogicalName()) &&
+                languagedepprops.equals(other.getLanguageProperties()) &&
+                location.equals(other.getLocation());
     }
 
     public Map<String,String> getLanguageProperties()
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 89abbfd..1d92abc 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -65,39 +65,17 @@ public class ScriptMetaData extends ScriptEntry {
     {
         return hasSource;
     }
-    public String getSource()
-    {
 
-        if ( source !=null && hasSource )
-        {
-            return source;
-        }
-        else
-        {
-            return null;
-        }
+    public String getSource() {
+        return ( source !=null && hasSource ) ? source : null;
     }
 
-    public byte[] getSourceBytes()
-    {
-        if ( source !=null && hasSource )
-        {
-            return source.getBytes();
-        }
-        else
-        {
-            return null;
-        }
-
+    public byte[] getSourceBytes() {
+        return ( source !=null && hasSource ) ? source.getBytes() : null;
     }
 
     public boolean equals(ScriptMetaData other) {
-        if (super.equals(other) &&
-            hasSource == other.hasSource() )
-        {
-            return true;
-        }
-        return false;
+        return super.equals(other) && hasSource == other.hasSource();
     }
 
     public String getScriptFullURL()
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 eed3664..2680772 100644
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -68,14 +68,8 @@ public class UnoPkgContainer extends ParcelContainer
         return result;
     }
 
-    public boolean hasRegisteredUnoPkgContainer( String url )
-    {
-        boolean result = false;
-        if ( getRegisteredUnoPkgContainer( url ) != null )
-        {
-            result = true;
-        }
-        return result;
+    public boolean hasRegisteredUnoPkgContainer( String url ) {
+        return getRegisteredUnoPkgContainer( url ) != null;
     }
 
     private void registerPackageContainer( String url, ParcelContainer c )
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 09535b4..963178d 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -557,14 +557,8 @@ public abstract class ScriptProvider
 
 
     // Performs the getRegStatus functionality for the PkgMgr
-    public boolean hasByName( String aName )
-    {
-        boolean result = false;
-        if ( ((UnoPkgContainer)m_container).hasRegisteredUnoPkgContainer( aName ) )
-        {
-            result = true;
-        }
-        return result;
+    public boolean hasByName( String aName ) {
+        return ((UnoPkgContainer)m_container).hasRegisteredUnoPkgContainer( aName );
     }
 
     public com.sun.star.uno.Type getElementType()