[Libreoffice-commits] core.git: javaunohelper/com javaunohelper/source javaunohelper/test
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 08:13:05 PST 2014
javaunohelper/com/sun/star/comp/helper/ComponentContext.java | 16 +++----
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java | 4 -
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java | 2
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java | 2
javaunohelper/com/sun/star/lib/uno/helper/Factory.java | 14 +++---
javaunohelper/source/bootstrap.cxx | 2
javaunohelper/source/preload.cxx | 6 +-
javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java | 22 +++++-----
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 4 -
9 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 92c2a468a79dd1a4025d44c208dcfeed98a6eb68
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 19:09:34 2014 +0100
Remove visual noise from javaunohelper
Change-Id: Ib359d536070456c1ef403642eba7913a834d365d
Reviewed-on: https://gerrit.libreoffice.org/8275
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 0b3b194..30ff8ea 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -33,17 +33,17 @@ import java.util.Iterator;
import java.util.ArrayList;
-//==================================================================================================
+
class Disposer implements XEventListener
{
private XComponent m_xComp;
- //----------------------------------------------------------------------------------------------
+
Disposer( XComponent xComp )
{
m_xComp = xComp;
}
- //______________________________________________________________________________________________
+
public void disposing( EventObject Source )
{
m_xComp.dispose();
@@ -117,7 +117,7 @@ public class ComponentContext implements XComponentContext, XComponent
}
// XComponentContext impl
- //______________________________________________________________________________________________
+
public Object getValueByName( String rName )
{
Object o = m_table.get( rName );
@@ -210,7 +210,7 @@ public class ComponentContext implements XComponentContext, XComponent
return Any.VOID;
}
}
- //______________________________________________________________________________________________
+
public XMultiComponentFactory getServiceManager()
{
if (m_xSMgr == null)
@@ -222,7 +222,7 @@ public class ComponentContext implements XComponentContext, XComponent
}
// XComponent impl
- //______________________________________________________________________________________________
+
public void dispose()
{
if (DEBUG)
@@ -289,7 +289,7 @@ public class ComponentContext implements XComponentContext, XComponent
if (DEBUG)
System.err.println( "... finished" );
}
- //______________________________________________________________________________________________
+
public void addEventListener( XEventListener xListener )
{
if (xListener == null)
@@ -299,7 +299,7 @@ public class ComponentContext implements XComponentContext, XComponent
m_eventListener.add( xListener );
}
- //______________________________________________________________________________________________
+
public void removeEventListener( XEventListener xListener )
{
if (xListener == null)
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index 7c7a3f4..c598896 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -85,7 +85,7 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must <= len.
- //
+
if (bytesRead <= 0) {
return(0);
}
@@ -112,7 +112,7 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must <= len.
- //
+
if (bytesRead <= 0) {
return(0);
}
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
index 37df094..a556bb0 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
@@ -122,7 +122,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream {
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must <= len.
- //
+
if (bytesRead <= 0) {
return(-1);
} else if (bytesRead < len) {
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
index e5467cb..c9b9701 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
@@ -76,7 +76,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream {
byte[] tmp = new byte[len];
// Copy the input array into a temp array, and write it out.
- //
+
System.arraycopy(b, off, tmp, 0, len);
try {
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
index 586498c..a8b50a2 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
@@ -115,7 +115,7 @@ public class Factory
return false;
}
- //==============================================================================================
+
private String m_impl_name;
private String [] m_supported_services;
private Class<?> m_impl_class;
@@ -163,7 +163,7 @@ public class Factory
}
}
- //______________________________________________________________________________________________
+
private final Object instantiate( XComponentContext xContext )
throws com.sun.star.uno.Exception
{
@@ -209,14 +209,14 @@ public class Factory
}
}
// XSingleComponentFactory impl
- //______________________________________________________________________________________________
+
public final Object createInstanceWithContext(
XComponentContext xContext )
throws com.sun.star.uno.Exception
{
return instantiate( xContext );
}
- //______________________________________________________________________________________________
+
public final Object createInstanceWithArgumentsAndContext(
Object arguments [], XComponentContext xContext )
throws com.sun.star.uno.Exception
@@ -235,12 +235,12 @@ public class Factory
}
// XServiceInfo impl
- //______________________________________________________________________________________________
+
public final String getImplementationName()
{
return m_impl_name;
}
- //______________________________________________________________________________________________
+
public final boolean supportsService( String service_name )
{
for ( int nPos = 0; nPos < m_supported_services.length; ++nPos )
@@ -250,7 +250,7 @@ public class Factory
}
return false;
}
- //______________________________________________________________________________________________
+
public final String [] getSupportedServiceNames()
{
return m_supported_services;
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index 645d6cd..1628cb6 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -63,7 +63,7 @@ inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
}
-//==================================================================================================
+
jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
JNIEnv * jni_env, SAL_UNUSED_PARAMETER jclass, jstring juno_rc, jobjectArray jpairs,
jobject loader )
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index 5278443..57c980a 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -89,7 +89,7 @@ static bool inited_juhx( JNIEnv * jni_env )
return true;
}
-//==================================================================================================
+
SAL_DLLPUBLIC_EXPORT jboolean JNICALL
Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
JNIEnv * pJEnv, jclass jClass, jstring jLibName, jobject jSMgr,
@@ -100,7 +100,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
pJEnv, jClass, jLibName, jSMgr, jRegKey, loader );
return JNI_FALSE;
}
-//==================================================================================================
+
SAL_DLLPUBLIC_EXPORT jobject JNICALL
Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
JNIEnv * pJEnv, jclass jClass, jstring jLibName, jstring jImplName,
@@ -111,7 +111,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
pJEnv, jClass, jLibName, jImplName, jSMgr, jRegKey, loader );
return 0;
}
-//==================================================================================================
+
SAL_DLLPUBLIC_EXPORT jobject JNICALL
Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
JNIEnv * jni_env, jclass jClass, jstring juno_rc, jobjectArray jpairs,
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
index 561871a..ad24adb 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
@@ -35,7 +35,7 @@ import com.sun.star.comp.helper.RegistryServiceFactory;
import com.sun.star.uno.UnoRuntime;
-//==================================================================================================
+
public class Factory_Test
extends WeakBase
implements XServiceInfo
@@ -44,11 +44,11 @@ public class Factory_Test
static final String m_supported_services [] = {
"Factory_Test.Service0", "Factory_Test.Service1" };
- //______________________________________________________________________________________________
+
public Factory_Test()
{
}
- //______________________________________________________________________________________________
+
public Factory_Test( XComponentContext xContext )
throws com.sun.star.uno.Exception
{
@@ -58,7 +58,7 @@ public class Factory_Test
"bad component context given!", this );
}
}
- //______________________________________________________________________________________________
+
public static Object __create( XComponentContext xContext )
throws com.sun.star.uno.Exception
{
@@ -66,12 +66,12 @@ public class Factory_Test
}
// XServiceInfo impl
- //______________________________________________________________________________________________
+
public final String getImplementationName()
{
return m_impl_name;
}
- //______________________________________________________________________________________________
+
public final boolean supportsService( String service_name )
{
for ( int nPos = 0; nPos < m_supported_services.length; ++nPos )
@@ -81,13 +81,13 @@ public class Factory_Test
}
return false;
}
- //______________________________________________________________________________________________
+
public final String [] getSupportedServiceNames()
{
return m_supported_services;
}
- //==============================================================================================
+
public static XSingleComponentFactory __getComponentFactory( String implName )
{
if (implName.equals( m_impl_name ))
@@ -97,14 +97,14 @@ public class Factory_Test
}
return null;
}
- //==============================================================================================
+
public static boolean __writeRegistryServiceInfo( XRegistryKey xKey )
{
return Factory.writeRegistryServiceInfo(
m_impl_name, Factory_Test.m_supported_services, xKey );
}
- //==============================================================================================
+
static void service_info_test( Object inst )
{
XServiceInfo xInfo = UnoRuntime.queryInterface( XServiceInfo.class, inst );
@@ -134,7 +134,7 @@ public class Factory_Test
}
}
}
- //==============================================================================================
+
public static void main( String args [] )
{
try
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index c6d4b8b..7b02e62 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -392,7 +392,7 @@ public class PropertySet_Test
r[i++]= ret instanceof Any && util.anyEquals(value, ret);
- // ------------------------------------------------------------------------------
+
cl.resetPropertyMembers();
value= new Boolean(true);
cl.setPropertyValue("PropBoolClass", value);
@@ -573,7 +573,7 @@ public class PropertySet_Test
r[i++]= cl.propObjectA == null;
- //
+
}catch(java.lang.Exception e){
i++;
More information about the Libreoffice-commits
mailing list