From 1102185abfec9f3b4a870abb1f8e2d60f2ad4caa Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Tue, 8 Dec 2020 13:36:28 +0200 Subject: [PATCH] More branding fixes for docs & Java bindings --- doc/Java-Examples.rst | 8 ++++---- doc/NodeJS-API.rst | 2 +- doc/doxygen-java.conf | 2 +- .../{mozilla => }/deepspeech/ExampleInstrumentedTest.java | 0 .../org/{mozilla => }/deepspeech/DeepSpeechActivity.java | 0 .../org/{mozilla => }/deepspeech/ExampleUnitTest.java | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename native_client/java/app/src/androidTest/java/org/{mozilla => }/deepspeech/ExampleInstrumentedTest.java (100%) rename native_client/java/app/src/main/java/org/{mozilla => }/deepspeech/DeepSpeechActivity.java (100%) rename native_client/java/app/src/test/java/org/{mozilla => }/deepspeech/ExampleUnitTest.java (100%) diff --git a/doc/Java-Examples.rst b/doc/Java-Examples.rst index 46ffa175..04836ed5 100644 --- a/doc/Java-Examples.rst +++ b/doc/Java-Examples.rst @@ -1,12 +1,12 @@ Java API Usage example ====================== -Examples are from `native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java`. +Examples are from `native_client/java/app/src/main/java/org/deepspeech/DeepSpeechActivity.java`. Creating a model instance and loading model ------------------------------------------- -.. literalinclude:: ../native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java +.. literalinclude:: ../native_client/java/app/src/main/java/org/deepspeech/DeepSpeechActivity.java :language: java :linenos: :lineno-match: @@ -16,7 +16,7 @@ Creating a model instance and loading model Performing inference -------------------- -.. literalinclude:: ../native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java +.. literalinclude:: ../native_client/java/app/src/main/java/org/deepspeech/DeepSpeechActivity.java :language: java :linenos: :lineno-match: @@ -26,4 +26,4 @@ Performing inference Full source code ---------------- -See :download:`Full source code<../native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java>`. +See :download:`Full source code<../native_client/java/app/src/main/java/org/deepspeech/DeepSpeechActivity.java>`. diff --git a/doc/NodeJS-API.rst b/doc/NodeJS-API.rst index b6170b5b..1901e513 100644 --- a/doc/NodeJS-API.rst +++ b/doc/NodeJS-API.rst @@ -10,7 +10,7 @@ Model Stream ------ -.. js:autoclass:: Stream +.. js:autoclass:: StreamImpl :members: Module exported methods diff --git a/doc/doxygen-java.conf b/doc/doxygen-java.conf index a8d65c69..9516d6ec 100644 --- a/doc/doxygen-java.conf +++ b/doc/doxygen-java.conf @@ -790,7 +790,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/ native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/ +INPUT = native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/ native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/native_client/java/app/src/androidTest/java/org/mozilla/deepspeech/ExampleInstrumentedTest.java b/native_client/java/app/src/androidTest/java/org/deepspeech/ExampleInstrumentedTest.java similarity index 100% rename from native_client/java/app/src/androidTest/java/org/mozilla/deepspeech/ExampleInstrumentedTest.java rename to native_client/java/app/src/androidTest/java/org/deepspeech/ExampleInstrumentedTest.java diff --git a/native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java b/native_client/java/app/src/main/java/org/deepspeech/DeepSpeechActivity.java similarity index 100% rename from native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java rename to native_client/java/app/src/main/java/org/deepspeech/DeepSpeechActivity.java diff --git a/native_client/java/app/src/test/java/org/mozilla/deepspeech/ExampleUnitTest.java b/native_client/java/app/src/test/java/org/deepspeech/ExampleUnitTest.java similarity index 100% rename from native_client/java/app/src/test/java/org/mozilla/deepspeech/ExampleUnitTest.java rename to native_client/java/app/src/test/java/org/deepspeech/ExampleUnitTest.java