INTEGRATION: CWS sb18 (1.3.4); FILE MERGED

2004/05/07 08:25:48 sb 1.3.4.3: #i21150# Complete rewrite of javamaker to generate .class files instead of .java files.
2004/04/28 08:59:43 sb 1.3.4.2: #i21150# Simplified TypeDependency to Dependencies.
2004/04/22 08:23:26 sb 1.3.4.1: #i21150# Refactord GeneratedTypeSet out of TypeDependency; expanded unotypesort.hxx to unotype.hxx.

1 files changed, 11 insertions, 295 deletions

diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx
index 1743f2940192..1af8c0eaf03e 100644
--- a/codemaker/source/javamaker/javatype.hxx
+++ b/codemaker/source/javamaker/javatype.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: javatype.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-03-30 16:53:39 $
+ *  last change: $Author: obo $ $Date: 2004-06-04 03:14:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,300 +59,16 @@
  *
  ************************************************************************/
 
-#ifndef _CPPUMAKER_CPPUTYPE_HXX_
-#define _CPPUMAKER_CPPUTYPE_HXX_
-
-#ifndef _CODEMAKER_TYPEMANAGER_HXX_
-#include    <codemaker/typemanager.hxx>
-#endif
-
-#ifndef _CODEMAKER_DEPENDENCY_HXX_
-#include    <codemaker/dependency.hxx>
-#endif
-
-#include "codemaker/options.hxx"
-
-#include "registry/reader.hxx"
-#include "registry/types.h"
-
-namespace codemaker { struct ExceptionTreeNode; }
-
-enum JavaTypeDecl
-{
-    CPPUTYPEDECL_ALLTYPES,
-    CPPUTYPEDECL_NOINTERFACES,
-    CPPUTYPEDECL_ONLYINTERFACES
-};
-
-static const sal_Int32 UIT_IN        = 0x00000001;
-static const sal_Int32 UIT_OUT       = 0x00000002;
-static const sal_Int32 UIT_UNSIGNED  = 0x00000004;
-static const sal_Int32 UIT_READONLY  = 0x00000008;
-static const sal_Int32 UIT_ONEWAY    = 0x00000010;
-static const sal_Int32 UIT_CONST     = 0x00000020;
-static const sal_Int32 UIT_ANY       = 0x00000040;
-static const sal_Int32 UIT_INTERFACE = 0x00000080;
-static const sal_Int32 UIT_BOUND     = 0x00000100;
-
-enum UnoTypeInfo
-{
-  UNOTYPEINFO_INVALID,
-  UNOTYPEINFO_METHOD,
-  UNOTYPEINFO_PARAMETER,
-  UNOTYPEINFO_ATTIRBUTE,
-  UNOTYPEINFO_MEMBER
-};
-
-struct UnoInfo
-{
-    UnoInfo()
-        : m_unoTypeInfo(UNOTYPEINFO_INVALID)
-        , m_index(-1)
-        , m_flags(0)
-        {}
-
-    UnoInfo(const ::rtl::OString& name, const ::rtl::OString& methodName,
-            UnoTypeInfo unoTypeInfo, sal_Int32 index, sal_Int32 flags)
-        : m_name(name)
-        , m_methodName(methodName)
-        , m_unoTypeInfo(unoTypeInfo)
-        , m_index(index)
-        , m_flags(flags)
-        {}
-
-    ::rtl::OString  m_name;
-    ::rtl::OString  m_methodName;
-    UnoTypeInfo     m_unoTypeInfo;
-    sal_Int32       m_index;
-    sal_Int32       m_flags;
-};
-
-inline int operator == (const UnoInfo& u1, const UnoInfo& u2)
-{
-    return ((u1.m_name == u2.m_name) && (u1.m_methodName == u2.m_methodName));
-}
-
-inline int operator < (const UnoInfo& u1, const UnoInfo& u2)
-{
-    if (u1.m_name == u2.m_name)
-        return (u1.m_methodName < u2.m_methodName);
-    else
-        return (u1.m_name < u2.m_name);
-}
-
-typedef ::std::list< UnoInfo > UnoInfoList;
+#ifndef INCLUDED_codemaker_source_javamaker_javatype_hxx
+#define INCLUDED_codemaker_source_javamaker_javatype_hxx
 
+namespace codemaker { class GeneratedTypeSet; }
+namespace rtl { class OString; }
 class JavaOptions;
-class FileStream;
-
-class JavaType
-{
-public:
-    JavaType(typereg::Reader& typeReader,
-             const ::rtl::OString& typeName,
-             const TypeManager& typeMgr,
-             const TypeDependency& typeDependencies);
-
-    virtual ~JavaType();
-
-    virtual sal_Bool dump(JavaOptions* pOptions) throw( CannotDumpException );
-    void dumpDependedTypes(JavaOptions * options);
-    virtual sal_Bool dumpFile(FileStream& o) throw( CannotDumpException ) { return sal_True; }
-
-    void dumpPackage(FileStream& o, sal_Bool bFullScope = sal_False);
-
-    virtual void dumpType(FileStream& o, const ::rtl::OString& type) throw( CannotDumpException );
-    void dumpTypeInit(FileStream& o, const ::rtl::OString& name, const ::rtl::OString& type);
-    sal_Bool isUnsigned(const ::rtl::OString& type);
-    sal_Bool isAny(const ::rtl::OString& type);
-    sal_Bool isInterface(const ::rtl::OString& type);
-
-    void    dumpConstantValue(FileStream& o, sal_uInt16 index);
-
-    // only used for structs and exceptions
-    sal_Bool    dumpMemberConstructor(FileStream& o);
-    sal_Bool    dumpInheritedMembers( FileStream& o, const ::rtl::OString& type,
-                                      sal_Bool first, sal_Bool withType= sal_True );
-    void        dumpSeqStaticMember(FileStream& o, const ::rtl::OString& type,
-                                    const ::rtl::OString& name);
-
-    void            inc(sal_uInt32 num=4);
-    void            dec(sal_uInt32 num=4);
-    ::rtl::OString  indent();
-    ::rtl::OString  indent(sal_uInt32 num);
-protected:
-    rtl::OString resolveTypedefs(rtl::OString const & unoType);
-
-    rtl::OString unfoldType(rtl::OString const & unoType, sal_Int32 * rank = 0);
-
-    ::rtl::OString  checkRealBaseType(const ::rtl::OString& type);
-
-    virtual rtl::OString translateTypeName() { return m_typeName; }
-
-protected:
-    sal_uInt32          m_indentLength;
-    ::rtl::OString      m_typeName;
-    ::rtl::OString      m_name;
-    typereg::Reader     m_reader;
-    TypeManager&        m_typeMgr;
-    TypeDependency      m_dependencies;
-};
-
-class InterfaceType : public JavaType
-{
-public:
-    InterfaceType(typereg::Reader& typeReader,
-                 const ::rtl::OString& typeName,
-                 const TypeManager& typeMgr,
-                 const TypeDependency& typeDependencies);
-
-    virtual ~InterfaceType();
-
-    sal_Bool    dumpFile(FileStream& o) throw( CannotDumpException );
-
-    void        dumpAttributes(FileStream& o, UnoInfoList* pUnoInfos);
-    void        dumpMethods(FileStream& o, UnoInfoList* pUnoInfos);
-
-    void        dumpUnoInfo(FileStream& o, const UnoInfo& unoInfo, sal_Int32 * index);
-
-private:
-    void dumpExceptionSpecification(FileStream & out, sal_uInt16 methodIndex);
+class TypeManager;
 
-    void dumpAttributeExceptionSpecification(
-        FileStream & out, rtl::OUString const & name, RTMethodMode sort);
-};
-
-class ModuleType : public JavaType
-{
-public:
-    ModuleType(typereg::Reader& typeReader,
-                  const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
-               const TypeDependency& typeDependencies);
-
-    virtual ~ModuleType();
-
-    sal_Bool    dump(JavaOptions* pOptions) throw( CannotDumpException );
-    sal_Bool    hasConstants();
-};
-
-class ConstantsType : public JavaType
-{
-public:
-    ConstantsType(typereg::Reader& typeReader,
-                  const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
-               const TypeDependency& typeDependencies);
-
-    virtual ~ConstantsType();
-
-    sal_Bool    dumpFile(FileStream& o) throw( CannotDumpException );
-};
-
-class StructureType : public JavaType
-{
-public:
-    StructureType(typereg::Reader& typeReader,
-                  const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
-                  const TypeDependency& typeDependencies);
-
-    virtual ~StructureType();
-
-    sal_Bool    dumpFile(FileStream& o) throw( CannotDumpException );
-};
-
-class ExceptionType : public JavaType
-{
-public:
-    ExceptionType(typereg::Reader& typeReader,
-                  const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
-                  const TypeDependency& typeDependencies);
-
-    virtual ~ExceptionType();
-
-    sal_Bool    dumpFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpSimpleMemberConstructor(FileStream& o);
-};
-
-class EnumType : public JavaType
-{
-public:
-    EnumType(typereg::Reader& typeReader,
-              const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
-              const TypeDependency& typeDependencies);
-
-    virtual ~EnumType();
-
-    sal_Bool    dumpFile(FileStream& o) throw( CannotDumpException );
-};
-
-class TypeDefType : public JavaType
-{
-public:
-    TypeDefType(typereg::Reader& typeReader,
-              const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
-              const TypeDependency& typeDependencies);
-
-    virtual ~TypeDefType();
-
-    sal_Bool    dump(JavaOptions* pOptions) throw( CannotDumpException );
-};
-
-class ServiceType: public JavaType {
-public:
-    ServiceType(
-        typereg::Reader & reader, rtl::OString const & name,
-        TypeManager const & manager, TypeDependency const & dependencies):
-        JavaType(reader, name, manager, dependencies) {}
-
-    bool isSingleInterfaceBased();
-
-    virtual sal_Bool dumpFile(FileStream & out) throw (CannotDumpException);
-
-private:
-    virtual rtl::OString translateTypeName();
-
-    void dumpCatchClauses(
-        FileStream & out, codemaker::ExceptionTreeNode const * node);
-
-    void dumpAny(
-        FileStream & out, rtl::OString const & javaExpression,
-        rtl::OString const & unoType);
-};
-
-class SingletonType: public JavaType {
-public:
-    SingletonType(
-        typereg::Reader & reader, rtl::OString const & name,
-        TypeManager const & manager, TypeDependency const & dependencies):
-        JavaType(reader, name, manager, dependencies) {}
-
-    bool isInterfaceBased();
-
-    virtual sal_Bool dumpFile(FileStream & out) throw (CannotDumpException);
-
-private:
-    virtual rtl::OString translateTypeName();
-};
-
-sal_Bool produceType(const ::rtl::OString& typeName,
-                     TypeManager& typeMgr,
-                     TypeDependency& typeDependencies,
-                     JavaOptions* pOptions)
-                 throw( CannotDumpException );
-
-/**
- * This function returns a Java scoped name, represents the package
- * scoping of this type, e.g. com.sun.star.uno.XInterface. If the scope of
- * the type is equal scope, the relativ name will be used.
- */
-::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type,
-                   sal_Bool bNoNameSpace=sal_False);
-
-
-#endif // _CPPUMAKER_CPPUTYPE_HXX_
+bool produceType(
+    rtl::OString const & type, TypeManager & manager,
+    codemaker::GeneratedTypeSet & generated, JavaOptions * options);
 
+#endif