Prepended com.google to the Java namespace.

Bug: 16507831
Change-Id: I5beee18f63f174e425dc1ab395807b578d5f9477
Tested: on Linux.

diff --git a/java/flatbuffers/Constants.java b/java/com/google/flatbuffers/Constants.java
similarity index 96%
rename from java/flatbuffers/Constants.java
rename to java/com/google/flatbuffers/Constants.java
index aeb22cc..67585d7 100644 (file)
--- a/java/flatbuffers/Constants.java
+++ b/java/com/google/flatbuffers/Constants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package flatbuffers;
+package com.google.flatbuffers;
 
 // Class that holds shared constants.
 

diff --git a/java/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from java/flatbuffers/FlatBufferBuilder.java
rename to java/com/google/flatbuffers/FlatBufferBuilder.java
index c1fa771..0689818
--- a/java/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package flatbuffers;
+package com.google.flatbuffers;
 
-import static flatbuffers.Constants.*;
+import static com.google.flatbuffers.Constants.*;
 import java.util.Arrays;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

diff --git a/java/flatbuffers/Struct.java b/java/com/google/flatbuffers/Struct.java
old mode 100755 (executable)
new mode 100644 (file)
similarity index 96%
rename from java/flatbuffers/Struct.java
rename to java/com/google/flatbuffers/Struct.java
index aac25bf..9e6fe4a
--- a/java/flatbuffers/Struct.java
+++ b/java/com/google/flatbuffers/Struct.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package flatbuffers;
+package com.google.flatbuffers;
 
 import java.nio.ByteBuffer;
 

diff --git a/java/flatbuffers/Table.java b/java/com/google/flatbuffers/Table.java
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from java/flatbuffers/Table.java
rename to java/com/google/flatbuffers/Table.java
index d48a325..8f83653
--- a/java/flatbuffers/Table.java
+++ b/java/com/google/flatbuffers/Table.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package flatbuffers;
+package com.google.flatbuffers;
 
-import static flatbuffers.Constants.*;
+import static com.google.flatbuffers.Constants.*;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 

diff --git a/src/idl_gen_java.cpp b/src/idl_gen_java.cpp
index 7c83056..ba4ca55 100755 (executable)
--- a/src/idl_gen_java.cpp
+++ b/src/idl_gen_java.cpp
@@ -388,7 +388,7 @@ static bool SaveClass(const Parser &parser, const Definition &def,
   code += "package " + namespace_java + ";\n\n";
   if (needs_imports) {
     code += "import java.nio.*;\nimport java.lang.*;\nimport java.util.*;\n";
-    code += "import flatbuffers.*;\n\n";
+    code += "import com.google.flatbuffers.*;\n\n";
   }
   code += classcode;
   auto filename = namespace_dir + kPathSeparator + def.name + ".java";

diff --git a/tests/JavaTest.java b/tests/JavaTest.java
index 43467c3..7fcc937 100755 (executable)
--- a/tests/JavaTest.java
+++ b/tests/JavaTest.java
@@ -17,7 +17,7 @@
 import java.io.*;
 import java.nio.ByteBuffer;
 import MyGame.Example.*;
-import flatbuffers.FlatBufferBuilder;
+import com.google.flatbuffers.FlatBufferBuilder;
 
 class JavaTest {
     public static void main(String[] args) {

diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java
index f814898..2ba07c9 100755 (executable)
--- a/tests/MyGame/Example/Monster.java
+++ b/tests/MyGame/Example/Monster.java
@@ -5,7 +5,7 @@ package MyGame.Example;
 import java.nio.*;
 import java.lang.*;
 import java.util.*;
-import flatbuffers.*;
+import com.google.flatbuffers.*;
 
 public class Monster extends Table {
   public static Monster getRootAsMonster(ByteBuffer _bb) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (new Monster()).__init(_bb.getInt(_bb.position()) + _bb.position(), _bb); }

diff --git a/tests/MyGame/Example/Test.java b/tests/MyGame/Example/Test.java
index fde24e6..52d09c4 100755 (executable)
--- a/tests/MyGame/Example/Test.java
+++ b/tests/MyGame/Example/Test.java
@@ -5,7 +5,7 @@ package MyGame.Example;
 import java.nio.*;
 import java.lang.*;
 import java.util.*;
-import flatbuffers.*;
+import com.google.flatbuffers.*;
 
 public class Test extends Struct {
   public Test __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }

diff --git a/tests/MyGame/Example/Vec3.java b/tests/MyGame/Example/Vec3.java
index be5c66b..76e219e 100755 (executable)
--- a/tests/MyGame/Example/Vec3.java
+++ b/tests/MyGame/Example/Vec3.java
@@ -5,7 +5,7 @@ package MyGame.Example;
 import java.nio.*;
 import java.lang.*;
 import java.util.*;
-import flatbuffers.*;
+import com.google.flatbuffers.*;
 
 public class Vec3 extends Struct {
   public Vec3 __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }