Skip to content

Commit

Permalink
Fix all remaining javadoc errors that break the build with Java 8.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1697312 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Damjan Jovanovic committed Aug 24, 2015
1 parent cf2d543 commit c86fe57
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 29 deletions.
6 changes: 3 additions & 3 deletions main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
Expand Up @@ -149,7 +149,7 @@ static public XComponentContext createInitialComponentContext( Hashtable context
* Bootstraps a servicemanager with the jurt base components registered.
* <p>
* @return a freshly boostrapped service manager
* @see com.sun.star.lang.ServiceManager
* @see "com.sun.star.lang.ServiceManager"
* @throws java.lang.Exception
*/
static public XMultiServiceFactory createSimpleServiceManager() throws Exception
Expand All @@ -163,7 +163,7 @@ static public XMultiServiceFactory createSimpleServiceManager() throws Exception
* Bootstraps the initial component context from a native UNO installation.
* <p>
* @return
* @see cppuhelper/defaultBootstrap_InitialComponentContext()
* @see defaultBootstrap_InitialComponentContext()
*/
static public final XComponentContext defaultBootstrap_InitialComponentContext()
throws Exception
Expand All @@ -177,7 +177,7 @@ static public final XComponentContext defaultBootstrap_InitialComponentContext()
@param bootstrap_parameters
bootstrap parameters (maybe null)
@see cppuhelper/defaultBootstrap_InitialComponentContext()
@see defaultBootstrap_InitialComponentContext()
*/
static public final XComponentContext defaultBootstrap_InitialComponentContext(
String ini_file, Hashtable bootstrap_parameters )
Expand Down
Expand Up @@ -29,7 +29,7 @@
The first one is commonly used for singleton objects of the component
context, that are raised on first-time retrieval of the key.
You have to pass a com.sun.star.lang.XSingleComponentFactory
or string (=> service name) object for this.
or string (=&gt; service name) object for this.
</p>
*/
public class ComponentContextEntry
Expand Down
Expand Up @@ -34,9 +34,9 @@
* The <code>SharedLibraryLoader</code> class provides the functionality of the <code>com.sun.star.loader.SharedLibrary</code>
* service.
* <p>
* @see com.sun.star.loader.SharedLibrary
* @see "com.sun.star.loader.SharedLibrary"
* @see com.sun.star.comp.servicemanager.ServiceManager
* @see com.sun.star.lang.ServiceManager
* @see "com.sun.star.lang.ServiceManager"
*/
public class SharedLibraryLoader {
/**
Expand Down Expand Up @@ -70,9 +70,9 @@ private static native Object component_getFactory(
* @return the factory for the "com.sun.star.comp.stoc.DLLComponentLoader" component.
* @param smgr the ServiceManager
* @param regKey the root registry key
* @see com.sun.star.loader.SharedLibrary
* @see com.sun.star.lang.ServiceManager
* @see com.sun.star.registry.RegistryKey
* @see "com.sun.star.loader.SharedLibrary"
* @see "com.sun.star.lang.ServiceManager"
* @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleServiceFactory getServiceFactory(
XMultiServiceFactory smgr,
Expand All @@ -93,9 +93,9 @@ public static XSingleServiceFactory getServiceFactory(
* @param impName the implementation name of the component
* @param smgr the ServiceManager
* @param regKey the root registry key
* @see com.sun.star.loader.SharedLibrary
* @see com.sun.star.lang.ServiceManager
* @see com.sun.star.registry.RegistryKey
* @see "com.sun.star.loader.SharedLibrary"
* @see "com.sun.star.lang.ServiceManager"
* @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleServiceFactory getServiceFactory(
String libName,
Expand All @@ -116,9 +116,9 @@ public static XSingleServiceFactory getServiceFactory(
* @return true if the registration was successful - otherwise false
* @param smgr the ServiceManager
* @param regKey the root key under that the component should be registered
* @see com.sun.star.loader.SharedLibrary
* @see com.sun.star.lang.ServiceManager
* @see com.sun.star.registry.RegistryKey
* @see "com.sun.star.loader.SharedLibrary"
* @see "com.sun.star.lang.ServiceManager"
* @see "com.sun.star.registry.RegistryKey"
*/
public static boolean writeRegistryServiceInfo(
com.sun.star.lang.XMultiServiceFactory smgr,
Expand All @@ -136,9 +136,9 @@ public static boolean writeRegistryServiceInfo(
* @param libName name of the shared library
* @param smgr the ServiceManager
* @param regKey the root key under that the component should be registered
* @see com.sun.star.loader.SharedLibrary
* @see com.sun.star.lang.ServiceManager
* @see com.sun.star.registry.RegistryKey
* @see "com.sun.star.loader.SharedLibrary"
* @see "com.sun.star.lang.ServiceManager"
* @see "com.sun.star.registry.RegistryKey"
*/
public static boolean writeRegistryServiceInfo(
String libName,
Expand Down
3 changes: 2 additions & 1 deletion main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
Expand Up @@ -34,7 +34,8 @@
/** Factory helper class supporting com.sun.star.lang.XServiceInfo and
com.sun.star.lang.XSingleComponentFactory.
@attention
Attention:
<br>
This factory implementation does not support lang.XSingleServiceFactory.
*/
public class Factory
Expand Down
2 changes: 1 addition & 1 deletion main/ridljar/com/sun/star/uno/IEnvironment.java
Expand Up @@ -63,7 +63,7 @@ public interface IEnvironment {
* given bridge <var>B2</var>.</li>
* <li>A proxy object, created as a remote object is mapped into this
* environment via a given bridge.</li>
* </ul></p>
* </ul>
*
* <p>The object actually registered may differ from the specified
* <code>object</code> that is passed as an argument. This enables an
Expand Down
18 changes: 9 additions & 9 deletions main/ridljar/com/sun/star/uno/ITypeDescription.java
Expand Up @@ -103,8 +103,8 @@ public interface ITypeDescription {
/**
* Gets the (UNO) type name.
*
* <p>The following table lists how UNO types map to type names:</p>
* <table>
* <caption>The following table lists how UNO types map to type names:</caption>
* <thead>
* <tr><th>UNO type</th><th>type name</th></tr>
* </thead>
Expand All @@ -119,15 +119,15 @@ public interface ITypeDescription {
* </tr>
* <tr><td>LONG</td><td><code>"long"</code></td></tr>
* <tr><td>UNSIGNED LONG</td><td><code>"unsigned long"</code></td></tr>
* <tr><td>HYPER</td><td></td><code>"hyper"</code></tr>
* <tr><td>HYPER</td><td><code>"hyper"</code></td></tr>
* <tr>
* <td>UNSIGNED HYPER</td><td></td><code>"unsigned hyper"</code>
* <td>UNSIGNED HYPER</td><td><code>"unsigned hyper"</code></td>
* </tr>
* <tr><td>FLOAT</td><td></td><code>"float"</code></tr>
* <tr><td>DOUBLE</td><td></td><code>"double"</code></tr>
* <tr><td>STRING</td><td></td><code>"string"</code></tr>
* <tr><td>TYPE</td><td></td><code>"type"</code></tr>
* <tr><td>ANY</td><td></td><code>"any"</code></tr>
* <tr><td>FLOAT</td><td><code>"float"</code></td></tr>
* <tr><td>DOUBLE</td><td><code>"double"</code></td></tr>
* <tr><td>STRING</td><td><code>"string"</code></td></tr>
* <tr><td>TYPE</td><td><code>"type"</code></td></tr>
* <tr><td>ANY</td><td><code>"any"</code></td></tr>
* <tr>
* <td>sequence type of base type <var>T</var></td>
* <td><code>"[]"</code> followed by type name for <var>T</var></td>
Expand All @@ -148,7 +148,7 @@ public interface ITypeDescription {
* <td>interface type named <var>N</var></td>
* <td><var>N</var> (see below)</td>
* </tr>
* <tbody>
* </tbody>
* </table>
* <p>For a UNO type named <var>N</var>, consisting of a sequence of module
* names <var>M<sub>1</sub></var>, ..., <var>M<sub>n</sub></var> followed by
Expand Down

0 comments on commit c86fe57

Please sign in to comment.