summaryrefslogtreecommitdiffstats
path: root/ridljar/com/sun/star/uno
diff options
context:
space:
mode:
Diffstat (limited to 'ridljar/com/sun/star/uno')
-rw-r--r--ridljar/com/sun/star/uno/IFieldDescription.java46
-rw-r--r--ridljar/com/sun/star/uno/IMemberDescription.java61
-rw-r--r--ridljar/com/sun/star/uno/IMethodDescription.java73
-rw-r--r--ridljar/com/sun/star/uno/ITypeDescription.java174
-rw-r--r--ridljar/com/sun/star/uno/Type.java21
-rw-r--r--ridljar/com/sun/star/uno/UnoRuntime.java4
6 files changed, 16 insertions, 363 deletions
diff --git a/ridljar/com/sun/star/uno/IFieldDescription.java b/ridljar/com/sun/star/uno/IFieldDescription.java
deleted file mode 100644
index d41c2e500789..000000000000
--- a/ridljar/com/sun/star/uno/IFieldDescription.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package com.sun.star.uno;
-
-
-import java.lang.reflect.Field;
-
-/**
- * The <code>IFieldDescription</code> describes non
- * method members.
- *
- * @deprecated This interface does not cover all the features supported by the
- * corresponding (unpublished) implementation. But no client code should need
- * to access this functionality, anyway.
- */
-public interface IFieldDescription extends IMemberDescription {
- /**
- * Gives the name of this member.
- * <p>
- * @return the name
- */
- ITypeDescription getTypeDescription();
-
- /**
- * Gives native java field of this member.
- * <p>
- * @return the java field
- */
- Field getField();
-}
diff --git a/ridljar/com/sun/star/uno/IMemberDescription.java b/ridljar/com/sun/star/uno/IMemberDescription.java
deleted file mode 100644
index 041f1e021313..000000000000
--- a/ridljar/com/sun/star/uno/IMemberDescription.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package com.sun.star.uno;
-
-/**
- * The <code>IMemberDescription</code> is the base interface
- * for the special subset of typedescriptions, which describe
- * members of IDL structs or interfeces.
- *
- * @deprecated This interface does not cover all the features supported by the
- * corresponding (unpublished) implementation. But no client code should need
- * to access this functionality, anyway.
- */
-public interface IMemberDescription {
- /**
- * Gives the name of this member.
- * @return the name
- */
- String getName();
-
- /**
- * Indicates if this member is unsigned. (Not useful for IMethodDescription).
- * @return the unsigned state
- */
- boolean isUnsigned();
-
- /**
- * Indicates if this member is an any.
- * @return the any state
- */
- boolean isAny();
-
- /**
- * Indicates if this member is an interface.
- * @return the interface state
- */
- boolean isInterface();
-
- /**
- * Gives the relative index of this member in the declaring
- * interface or struct (including superclasses).
- * @return the relative index of this member
- */
- int getIndex();
-}
diff --git a/ridljar/com/sun/star/uno/IMethodDescription.java b/ridljar/com/sun/star/uno/IMethodDescription.java
deleted file mode 100644
index f58e194f2efd..000000000000
--- a/ridljar/com/sun/star/uno/IMethodDescription.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package com.sun.star.uno;
-
-
-import java.lang.reflect.Method;
-
-
-/**
- * The <code>IMethodDescription</code> allows to examine a method
- * in detail. It gives a view to java methods from a UNO point.
- *
- * @deprecated This interface does not cover all the features supported by the
- * corresponding (unpublished) implementation. But no client code should need
- * to access this functionality, anyway.
- */
-public interface IMethodDescription extends IMemberDescription {
- /**
- * Indicates if this method is <code>oneWay</code>,
- * respectively if this method may become executed asynchronously.
- * @return true means may execute asynchronously .
- */
- boolean isOneway();
-
- /**
- * Indicates if this method is const.
- * @return true means it is const.
- */
- boolean isConst();
-
- /**
- * Gives any array of <code>ITypeDescription</code> of
- * the [in] parameters.
- * @return the in parameters
- */
- ITypeDescription[] getInSignature();
-
- /**
- * Gives any array of <code>ITypeDescription</code> of
- * the [out] parameters.
- * @return the out parameters
- */
- ITypeDescription[] getOutSignature();
-
- /**
- * Gives the <code>ITypeDescription</code> of
- * the return type.
- * @return the return type <code>ITypeDescription</code>
- */
- ITypeDescription getReturnSignature();
-
- /**
- * Gives native java method of this method.
- * @return the java methodd
- */
- Method getMethod();
-}
diff --git a/ridljar/com/sun/star/uno/ITypeDescription.java b/ridljar/com/sun/star/uno/ITypeDescription.java
deleted file mode 100644
index 1495c54f5a8c..000000000000
--- a/ridljar/com/sun/star/uno/ITypeDescription.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package com.sun.star.uno;
-
-/**
- * The <code>ITypeDescription</code> allows to examine a type
- * in detail (e.g. it is used for marshaling/unmarshaling).
- * @deprecated This interface does not cover all the features supported by the
- * corresponding (unpublished) implementation. But no client code should need
- * to access this functionality, anyway.
- */
-public interface ITypeDescription {
- /**
- * Gets the <code>ITypeDescription</code> of the
- * super, if it exists.
- * @return the <code>ITypeDescription</code>.
- */
- ITypeDescription getSuperType();
-
- /**
- * Gets the <code>IMethodDescription</code> for every
- * method, if this type is an interface. Otherwise
- * returns <code>null</code>.
- * @return the <code>IMethodDescription[]</code>.
- */
- IMethodDescription []getMethodDescriptions();
-
- /**
- * Gets the <code>IMethodDescription</code> for the
- * method with index methodId, if it exists, otherwise
- * returns <code>null</code>.
- *
- * @param methodId the index.
- *
- * @return the <code>IMethodDescription</code>.
- */
- IMethodDescription getMethodDescription(int methodId);
-
- /**
- * Gets the <code>IMethodDescription</code> for the
- * method with the name <code>name</code>, if it exists,
- * otherwise returns <code>null</code>.
- *
- * @param name the name of the method.
- *
- * @return the <code>IMethodDescription</code>.
- */
- IMethodDescription getMethodDescription(String name);
-
- /**
- * Gets the <code>IFieldDescription</code> for every
- * field, if this type is an interface. Otherwise
- * returns <code>null</code>.
- * @return the <code>IFieldDescription[]</code>.
- */
- IFieldDescription []getFieldDescriptions();
-
- /**
- * Gets the <code>IFieldDescription</code> for the
- * field with the name <code>name</code>, if it exists,
- * otherwise returns <code>null</code>.
- *
- * @param name the name of the field.
- *
- * @return the <code>IFieldDescription</code>.
- */
- IFieldDescription getFieldDescription(String name);
-
- /**
- * Gets the IDL <code>TypeClass</code> of the type.
- * @return the <code>TypeClass</code>.
- */
- TypeClass getTypeClass();
-
- /**
- * Gets the component <code>ITypeDescription</code> if
- * this is an array type, otherwise returns <code>null</code>.
- * @return the <code>ITypeDescription</code>
- */
- ITypeDescription getComponentType();
-
- /**
- * Gets the (UNO) type name.
- * <table>
- * <caption>Mapping from UNO types to type names</caption>
- * <thead>
- * <tr><th>UNO type</th><th>type name</th></tr>
- * </thead>
- * <tbody>
- * <tr><td>VOID</td><td><code>"void"</code></td></tr>
- * <tr><td>BOOLEAN</td><td><code>"boolean"</code></td></tr>
- * <tr><td>CHAR</td><td><code>"char"</code></td></tr>
- * <tr><td>BYTE</td><td><code>"byte"</code></td></tr>
- * <tr><td>SHORT</td><td><code>"short"</code></td></tr>
- * <tr>
- * <td>UNSIGNED SHORT</td><td><code>"unsigned short"</code></td>
- * </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><code>"hyper"</code></td></tr>
- * <tr>
- * <td>UNSIGNED HYPER</td><td><code>"unsigned hyper"</code></td>
- * </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>
- * </tr>
- * <tr>
- * <td>enum type named <var>N</var></td>
- * <td><var>N</var> (see below)</td>
- * </tr>
- * <tr>
- * <td>struct type named <var>N</var></td>
- * <td><var>N</var> (see below)</td>
- * </tr>
- * <tr>
- * <td>exception type named <var>N</var></td>
- * <td><var>N</var> (see below)</td>
- * </tr>
- * <tr>
- * <td>interface type named <var>N</var></td>
- * <td><var>N</var> (see below)</td>
- * </tr>
- * </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
- * a simple name <var>S</var>, the corresponding type name consists of the
- * same sequence of module names and simple name, with <code>"."</code>
- * separating the individual elements.</p>
- * @return the type name.
- */
- String getTypeName();
-
- /**
- * Gets the (Java) array type name.
- * <p>The array type name is defined to be the Java class name (as returned
- * by <code>Class.forName</code>) of the Java array class that corresponds
- * to the UNO sequence type with this type (the UNO type represented by this
- * <code>ITypeDescription</code> instance) as base type. For an
- * <code>ITypeDescription</code> instance representing the UNO type VOID,
- * the array type name is defined to be
- * <code>"[Ljava.lang.Void;"</code>.</p>
- * @return the array type name.
- */
- String getArrayTypeName();
-
- /**
- * Gets the corresponding java class for the type.
- * @return the corresponding java class.
- */
- Class<?> getZClass();
-}
diff --git a/ridljar/com/sun/star/uno/Type.java b/ridljar/com/sun/star/uno/Type.java
index 018a6069d56d..355d3f8bd659 100644
--- a/ridljar/com/sun/star/uno/Type.java
+++ b/ridljar/com/sun/star/uno/Type.java
@@ -20,6 +20,8 @@ package com.sun.star.uno;
import java.util.HashMap;
+import com.sun.star.lib.uno.typedesc.TypeDescription;
+
/**
* Represents the UNO built-in type <code>TYPE</code>.
*
@@ -35,7 +37,7 @@ import java.util.HashMap;
* will never be <code>null</code>. A <code>Type</code> may have an additional
* "z class" (a <code>java.lang.Class</code>), giving a Java class type that
* corresponds to the UNO type. Also, a <code>Type</code> can cache a type
- * description (a <code>com.sun.star.uno.ITypeDescription</code>), which can be
+ * description (a <code>com.sun.star.uno.typedesc.TypeDescription</code>), which can be
* computed and set by <code>TypeDescription.getTypeDescription</code>.
*/
public class Type {
@@ -272,10 +274,11 @@ public class Type {
/**
* Constructs a new <code>Type</code> from the given type description.
*
+ * @internal
* @param typeDescription a type description. Must not be
* <code>null</code>.
*/
- public Type(ITypeDescription typeDescription) {
+ public Type(TypeDescription typeDescription) {
_typeName = typeDescription.getTypeName();
_typeClass = typeDescription.getTypeClass();
_iTypeDescription = typeDescription;
@@ -367,18 +370,20 @@ public class Type {
/**
* Gives the type description of this type.
*
+ * @internal
* @return the type description; may be <code>null</code>
*/
- public ITypeDescription getTypeDescription() {
+ public TypeDescription getTypeDescription() {
return _iTypeDescription;
}
/**
* Sets the type description for this type.
*
+ * @internal
* @param typeDescription the type description
*/
- public void setTypeDescription(ITypeDescription typeDescription) {
+ public void setTypeDescription(TypeDescription typeDescription) {
_iTypeDescription = typeDescription;
}
@@ -683,9 +688,9 @@ public class Type {
return typeClass.getValue() < __typeClassToTypeName.length;
}
- protected TypeClass _typeClass; // TODO should be final
- protected String _typeName; // TODO should be final
+ private TypeClass _typeClass; // TODO should be final
+ private String _typeName; // TODO should be final
- protected Class<?> _class;
- protected ITypeDescription _iTypeDescription;
+ private Class<?> _class;
+ private TypeDescription _iTypeDescription;
}
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java
index 114753d71d49..4bedc275c451 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -23,6 +23,8 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Iterator;
+
+import com.sun.star.lib.uno.typedesc.FieldDescription;
import com.sun.star.lib.uno.typedesc.TypeDescription;
import com.sun.star.lib.util.WeakMap;
@@ -243,7 +245,7 @@ public class UnoRuntime {
return v1 == v2;
case TypeClass.STRUCT_value:
case TypeClass.EXCEPTION_value:
- IFieldDescription[] fs;
+ FieldDescription[] fs;
try {
fs = TypeDescription.getTypeDescription(t).
getFieldDescriptions();
generated by cgit (git 2.34.1) at 2024-06-24 22:54:23 +0000