Close #614

Author: HosseinYousefi

pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart

@@ -53,7 +53,7 @@ import 'dart:core' as _$core;
 import 'package:jni/_internal.dart' as _$jni;
 import 'package:jni/jni.dart' as _$jni;
 
-import 'PDDocumentInformation.dart' as pddocumentinformation_;
+import 'PDDocumentInformation.dart' as _$pddocumentinformation;
 
 /// from: `org.apache.pdfbox.pdmodel.PDDocument`
 ///
@@ -677,11 +677,12 @@ class PDDocument extends _$jni.JObject {
   /// document level metadata, a metadata stream should be used instead, see
   /// PDDocumentCatalog\#getMetadata().
   ///@return The documents /Info dictionary, never null.
-  pddocumentinformation_.PDDocumentInformation? getDocumentInformation() {
+  _$pddocumentinformation.PDDocumentInformation? getDocumentInformation() {
     return _getDocumentInformation(
             reference.pointer, _id_getDocumentInformation as _$jni.JMethodIDPtr)
-        .object<pddocumentinformation_.PDDocumentInformation?>(
-            const pddocumentinformation_.$PDDocumentInformation$NullableType());
+        .object<_$pddocumentinformation.PDDocumentInformation?>(
+            const _$pddocumentinformation
+                .$PDDocumentInformation$NullableType());
   }
 
   static final _id_setDocumentInformation = _class.instanceMethodId(
@@ -709,7 +710,7 @@ class PDDocument extends _$jni.JObject {
   /// PDDocumentCatalog\#setMetadata(org.apache.pdfbox.pdmodel.common.PDMetadata) PDDocumentCatalog\#setMetadata(PDMetadata).
   ///@param info The updated document information.
   void setDocumentInformation(
-    pddocumentinformation_.PDDocumentInformation? info,
+    _$pddocumentinformation.PDDocumentInformation? info,
   ) {
     final _$info = info?.reference ?? _$jni.jNullReference;
     _setDocumentInformation(reference.pointer,

pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart

@@ -53,7 +53,7 @@ import 'dart:core' as _$core;
 import 'package:jni/_internal.dart' as _$jni;
 import 'package:jni/jni.dart' as _$jni;
 
-import '../pdmodel/PDDocument.dart' as pddocument_;
+import '../pdmodel/PDDocument.dart' as _$pddocument;
 
 /// from: `org.apache.pdfbox.text.PDFTextStripper`
 ///
@@ -138,7 +138,7 @@ class PDFTextStripper extends _$jni.JObject {
   ///@return The text of the PDF document.
   ///@throws IOException if the doc state is invalid or it is encrypted.
   _$jni.JString? getText(
-    pddocument_.PDDocument? doc,
+    _$pddocument.PDDocument? doc,
   ) {
     final _$doc = doc?.reference ?? _$jni.jNullReference;
     return _getText(
@@ -175,7 +175,7 @@ class PDFTextStripper extends _$jni.JObject {
   ///@param outputStream The location to put the text.
   ///@throws IOException If the doc is in an invalid state.
   void writeText(
-    pddocument_.PDDocument? doc,
+    _$pddocument.PDDocument? doc,
     _$jni.JObject? outputStream,
   ) {
     final _$doc = doc?.reference ?? _$jni.jNullReference;

pkgs/jnigen/lib/src/bindings/resolver.dart

@@ -22,7 +22,10 @@ class Resolver {
   final List<String> _importStrings = [];
 
   final Set<String> _relativeImportedClasses = {};
-  final Map<String, String> _importedNameToClass = {};
+  final Map<String, String> _importedNameToClass = {
+    r'_$core': '',
+    r'_$jni': '',
+  };
   final Map<String, String> _classToImportedName = {};
 
   Resolver({
@@ -83,18 +86,14 @@ class Resolver {
     }
 
     final pkgName = cutFromLast(target, '.')[1].toLowerCase();
-    if (pkgName.isEmpty) {
-      throw UnsupportedError('No package could be deduced from '
-          'qualified binaryName');
-    }
 
     // We always name imports with an underscore suffix, so that they can be
     // never shadowed by a parameter or local variable.
-    var importedName = '${pkgName}_';
+    var importedName = '_\$$pkgName';
     var suffix = 0;
     while (_importedNameToClass.containsKey(importedName)) {
-      suffix++;
-      importedName = '$pkgName${suffix}_';
+      ++suffix;
+      importedName = '_\$$pkgName$suffix';
     }
 
     _importedNameToClass[importedName] = target;