[Libreoffice-commits] core.git: 7 commits - bean/com jurt/com odk/examples
Christian Lohmaier
lohmaier+LibreOffice at googlemail.com
Fri Mar 11 12:48:58 UTC 2016
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 8 ++---
bean/com/sun/star/comp/beans/OOoBean.java | 16 +++++-----
jurt/com/sun/star/comp/loader/JavaLoader.java | 5 ---
jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java | 2 -
jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java | 3 -
jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java | 2 -
jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java | 2 -
odk/examples/DevelopersGuide/Forms/DocumentHelper.java | 2 -
odk/examples/DevelopersGuide/Forms/KeyGenerator.java | 2 -
9 files changed, 18 insertions(+), 24 deletions(-)
New commits:
commit 053103915717e41436b7a397d9cfa3ea0e3519cc
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Fri Mar 11 03:07:49 2016 +0100
neither doxygen nor javadoc make use of <type scope="…"> annotations
even more so when they are invalid xml.
Thus obsolete since the switch from autodoc to doxygen, see also
https://lists.freedesktop.org/archives/libreoffice/2013-June/053077.html
Change-Id: Ifc2ef7754eca70bf923a2f7e4a652a8d394c370b
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 7623ad8..5d79c21 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -923,12 +923,12 @@ public class OOoBean
// @requirement FUNC.BEAN.PROG/0.5
// @requirement API.SIM.SEAP/0.2
- /** returns the <type scope="com::sun::star::frame">Frame</a>
+ /** returns the com::sun::star::frame::Frame
of the bean.
@return
a Java class which implements all interfaces which the service
- <type scope="com::sun::star::frame">Frame</a> implements.
+ com::sun::star::frame::Frame implements.
Thus, methods can be called directly without queryInterface.
This feature might be implemented by UNO or explicitly coded.
@@ -947,11 +947,11 @@ public class OOoBean
// @requirement FUNC.BEAN.PROG/0.5
// @requirement API.SIM.SEAP/0.2
- /** returns the <type scope="com::sun::star::frame::Controller"> of the bean.
+ /** returns the com::sun::star::frame::Controller of the bean.
@return
a Java class which implements all interfaces which the service
- <type scope="com::sun::star::frame">Controller</a> implements.
+ com::sun::star::frame::Controller implements.
Thus, methods can be called directly without queryInterface.
This feature might be implemented by UNO or explicitly coded.
@@ -974,12 +974,12 @@ public class OOoBean
// @requirement FUNC.BEAN.STOR/0.4
// @requirement FUNC.BEAN.PRNT/0.4
// @requirement API.SIM.SEAP/0.2
- /** returns the <type scope="com::sun::star::document::OfficeDocument">
+ /** returns the com::sun::star::document::OfficeDocument
of the bean.
@return
a Java class which implements all interfaces which the service
- <type scope="com::sun::star::document">OfficeDocument</a>
+ com::sun::star::document::OfficeDocument
implements.
Thus, methods can be called directly without queryInterface.
This feature might be implemented by UNO or explicitly coded.
commit 69db01422057771d462287e84352b48fc773a845
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Fri Mar 11 01:33:14 2016 +0100
ThreadPool doesn't exist - etiher point to IThreadPool or implementation
Change-Id: I96e1607945802d06dcc01b64267117d98f9a9994
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
index c43bcfa..3373c92 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
@@ -22,7 +22,7 @@ package com.sun.star.lib.uno.environments.remote;
* This class implements a java thread pool.
*
* @see com.sun.star.uno.UnoRuntime
- * @see com.sun.star.lib.uno.environments.remote.ThreadPool
+ * @see com.sun.star.lib.uno.environments.remote.NativeThreadPool
* @see com.sun.star.lib.uno.environments.remote.IThreadPool
* @see com.sun.star.lib.uno.environments.remote.Job
* @see com.sun.star.lib.uno.environments.remote.JobQueue
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index 592bc32..57dc5fa 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -31,7 +31,7 @@ import com.sun.star.lang.DisposedException;
* (put by <code>putjob</code>) into the async queue, which is only
* known by the sync queue.</p>
*
- * @see com.sun.star.lib.uno.environments.remote.ThreadPool
+ * @see com.sun.star.lib.uno.environments.remote.IThreadPool
* @see com.sun.star.lib.uno.environments.remote.Job
* @see com.sun.star.lib.uno.environments.remote.ThreadId
* @since UDK1.0
commit a86734ef31b18eb07747a6b12a8fc55d3992c2ef
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Fri Mar 11 01:26:14 2016 +0100
interface is called "DisposeNotifier", not "NotifyDispose"
Change-Id: Ib60120bedb360b178a09a649de635ae3459f3af4
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 05dd9c7..f7f487a 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -667,7 +667,7 @@ public class java_remote_bridge
/**
*
- * @see NotifyDispose#addDisposeListener
+ * @see DisposeNotifier#addDisposeListener
*/
public void addDisposeListener(DisposeListener listener) {
synchronized (this) {
commit 37e1495307731e6ab099c12b1d40307de31c1a09
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Fri Mar 11 01:09:39 2016 +0100
ComponentFactoryWrapper was removed in 2002
with commit 9e50970ccf5b12d634a8a786579220c0728f1076
Change-Id: Icb1077f9aa47874ec601a93adc3561d0d99c4261
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java
index 663713a..8caa196 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -232,9 +232,6 @@ public class JavaLoader implements XImplementationLoader,
* <p>To get the factory the inspects the class for the optional static member
* functions __getServiceFactory resp. getServiceFactory (DEPRECATED).</p>
*
- * <p>If the function can not be found a default factory @see ComponentFactoryWrapper
- * will be created.</p>
- *
* @param implementationName the implementation (class) name of the component.
* @param implementationLoaderUrl the URL of the implementation loader. Not used.
* @param locationUrl points to an archive (JAR file) which contains a component.
@@ -362,8 +359,6 @@ public class JavaLoader implements XImplementationLoader,
* @param implementationLoaderUrl specifies the loader, the component is loaded by.
* @param locationUrl points to an archive (JAR file) which contains a component.
* @return true if registration is successfully - otherwise false.
- *
- * @see ComponentFactoryWrapper
*/
public boolean writeRegistryInfo( XRegistryKey regKey,
String implementationLoaderUrl,
commit ee39cab29128588eebb02629888b1def8d898758
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Fri Mar 11 00:43:00 2016 +0100
[I]ThreadPoolFactory is dead since 2003
f195124f6d58624f31469259a4dd6333e1f5c9cd killed it off for good
Change-Id: Ibf217096d2f14caa5a7b1572895c81ab295f0c46
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
index f862655..597313e 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
@@ -21,8 +21,7 @@ package com.sun.star.lib.uno.environments.remote;
/**
* This interface is an abstraction of the various threadpool implementations.
*
- * @see com.sun.star.lib.uno.environments.remote.ThreadPoolFactory
- * @see com.sun.star.lib.uno.environments.remote.IThreadPoolFactory
+ * @see com.sun.star.lib.uno.environments.remote.ThreadPoolManager
* @since UDK1.0
*/
public interface IThreadPool {
commit 82bf21f4d047d72abbed46b5be1703b8eeb9b7f0
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Fri Mar 11 00:39:59 2016 +0100
NoConnectionException is com.sun.star.comp.beans.NoConnectionException
and not com.sun.star.lang.NoConnectionException
Change-Id: Ie7b5a2aaa365fefeca1de470c18edc68c29e4a74
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 15a10bc..7623ad8 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -520,7 +520,7 @@ public class OOoBean
@throws java.io.IOException
if an IO error occurs reading the resource specified by the URL.
- @throws com.sun.star.lang.NoConnectionException
+ @throws com.sun.star.comp.beans.NoConnectionException
if no connection can be established.
@throws com.sun.star.util.CloseVetoException
@@ -797,7 +797,7 @@ public class OOoBean
@throws java.io.IOException
if an IO error occurs reading the resource specified by the URL.
- @throws com.sun.star.lang.NoConnectionException
+ @throws com.sun.star.comp.beans.NoConnectionException
if no connection is established.
@throws NoDocumentException
commit ee69514c847a61955e2d236199385403abe54e05
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Thu Mar 10 23:37:18 2016 +0100
javadoc is HTML 4, not xhtml or html5, so <br/> is not allowed
Change-Id: I0da91e0f6cb7fca09cb5ae08f6d3ef13829653d9
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 12f1458..5c67e90 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -122,8 +122,8 @@ public class LocalOfficeConnection
* Constructor.
* Sets up paths to the office application and native libraries if
* values are available in <code>OFFICE_PROP_FILE</code> in the user
- * home directory.<br />
- * "com.sun.star.beans.path" - the office application directory;<br/>
+ * home directory.<br>
+ * "com.sun.star.beans.path" - the office application directory;<br>
* "com.sun.star.beans.libpath" - native libraries directory.
*/
public LocalOfficeConnection()
@@ -156,7 +156,7 @@ public class LocalOfficeConnection
/**
* Sets a connection URL.
- * This implementation accepts a UNO URL with following format:<br />
+ * This implementation accepts a UNO URL with following format:<br>
* <pre>
* url := uno:localoffice[,<params>];urp;StarOffice.ServiceManager
* params := <path>[,<pipe>]
@@ -457,7 +457,7 @@ public class LocalOfficeConnection
/**
* Parses a connection URL.
- * This method accepts a UNO URL with following format:<br />
+ * This method accepts a UNO URL with following format:<br>
* <pre>
* url := uno:localoffice[,<params>];urp;StarOffice.NamingService
* params := <path>[,<pipe>]
diff --git a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
index 1734334..7e4bfef 100644
--- a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
+++ b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
@@ -223,7 +223,7 @@ public class DocumentHelper
/* ------------------------------------------------------------------ */
/** retrieves a com.sun.star.drawing.DrawPage of the document, denoted by index
* @param index
- * the index of the draw page<br/>
+ * the index of the draw page<br>
* @throws
* com.sun.star.lang.IndexOutOfBoundsException
* com.sun.star.lang.WrappedTargetException
diff --git a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
index 8b4c451..0042b1c 100644
--- a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
+++ b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
@@ -51,7 +51,7 @@ class UniqueColumnValue
/** extracts the name of the table a form is based on.
<p>This method works for forms based directly on tables, and for forms based on statements, which
- themself are based on one table.<br/>
+ themself are based on one table.<br>
Everything else (especially forms based on queries) is not yet implemented.</p>
*/
private String extractTableName( XPropertySet xForm ) throws com.sun.star.uno.Exception
More information about the Libreoffice-commits
mailing list