diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-26 16:00:41 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-26 16:20:50 +0200 |
| commit | 3cb10e9220da27ca7db2f68007be9e310bdefc4d (patch) | |
| tree | 485da09801dad613e86a2607b250769900d91fd0 /unodevtools/source/skeletonmaker/skeletoncommon.cxx | |
| parent | 975e230f08a664c5afc596d07ea9165e667c28f0 (diff) | |
unodevtools: drop support for skeletonmaker --java4 parameter
Minimum requirement has been Java 1.5 for years now.
Change-Id: Id512507db1fc12c92d8f7662505eda6866da2fc6
Diffstat (limited to 'unodevtools/source/skeletonmaker/skeletoncommon.cxx')
| -rw-r--r-- | unodevtools/source/skeletonmaker/skeletoncommon.cxx | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index e66b39acb981..37af9d5c57a0 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -610,12 +610,8 @@ void generateFunctionParameterMap(std::ostream& o, o << " ParamMap fpm;\n"; } else { - if ( options.java5 ) - o << " java.util.Hashtable< Integer, String > fpm = " - "new java.util.Hashtable< Integer, String >();\n"; - else - o << " java.util.Hashtable fpm = " - "new java.util.Hashtable();\n"; + o << " java.util.Hashtable< Integer, String > fpm = " + "new java.util.Hashtable< Integer, String >();\n"; } bFirst = false; } else @@ -623,11 +619,8 @@ void generateFunctionParameterMap(std::ostream& o, o << " fpm = ParamMap();\n"; } else { - if ( options.java5 ) - o << " fpm = new java.util.Hashtable< " - "Integer, String >();\n"; - else - o << " fpm = new java.util.Hashtable();\n"; + o << " fpm = new java.util.Hashtable< " + "Integer, String >();\n"; } std::vector< unoidl::InterfaceTypeEntity::Method::Parameter >::size_type @@ -643,14 +636,9 @@ void generateFunctionParameterMap(std::ostream& o, << "\");\n"; } else { - if ( options.java5 ) - o << " fpm.put(" << n << ", \"" - << j->name - << "\");\n"; - else - o << " fpm.put(new Integer(" << n << "), \"" - << j->name - << "\");\n"; + o << " fpm.put(" << n << ", \"" + << j->name + << "\");\n"; } ++n; } |