From 5734224b1e7ff2b2a72ea1d0c3acf70429559fd2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 31 Aug 2018 10:12:21 +0300
Subject: [PATCH] Re-namespace Android tutorials for consistency

---
 examples/tutorials/android/android-tutorial-4/AndroidManifest.xml     | 2 +-
 examples/tutorials/android/android-tutorial-4/jni/tutorial-4.c        | 2 +-
 examples/tutorials/android/android-tutorial-4/res/layout/main.xml     | 4 ++--
 .../gstreamer/tutorials}/tutorial_4/GStreamerSurfaceView.java         | 2 +-
 .../freedesktop/gstreamer/tutorials}/tutorial_4/Tutorial4.java        | 2 +-
 examples/tutorials/android/android-tutorial-5/AndroidManifest.xml     | 2 +-
 examples/tutorials/android/android-tutorial-5/jni/tutorial-5.c        | 2 +-
 examples/tutorials/android/android-tutorial-5/res/layout/main.xml     | 2 +-
 .../android/android-tutorial-5/src/com/lamerman/FileDialog.java       | 2 +-
 .../gstreamer/tutorials}/tutorial_5/GStreamerSurfaceView.java         | 2 +-
 .../freedesktop/gstreamer/tutorials}/tutorial_5/Tutorial5.java        | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename examples/tutorials/android/android-tutorial-4/src/{com/gst_sdk_tutorials => org/freedesktop/gstreamer/tutorials}/tutorial_4/GStreamerSurfaceView.java (98%)
 rename examples/tutorials/android/android-tutorial-4/src/{com/gst_sdk_tutorials => org/freedesktop/gstreamer/tutorials}/tutorial_4/Tutorial4.java (99%)
 rename examples/tutorials/android/android-tutorial-5/src/{com/gst_sdk_tutorials => org/freedesktop/gstreamer/tutorials}/tutorial_5/GStreamerSurfaceView.java (98%)
 rename examples/tutorials/android/android-tutorial-5/src/{com/gst_sdk_tutorials => org/freedesktop/gstreamer/tutorials}/tutorial_5/Tutorial5.java (99%)

diff --git a/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml b/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
index 9885cc1..aa06aab 100644
--- a/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
+++ b/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.gst_sdk_tutorials.tutorial_4"
+      package="org.freedesktop.gstreamer.tutorials.tutorial_4"
       android:versionCode="1"
       android:versionName="1.0">
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
diff --git a/examples/tutorials/android/android-tutorial-4/jni/tutorial-4.c b/examples/tutorials/android/android-tutorial-4/jni/tutorial-4.c
index e792161..a05aa0d 100644
--- a/examples/tutorials/android/android-tutorial-4/jni/tutorial-4.c
+++ b/examples/tutorials/android/android-tutorial-4/jni/tutorial-4.c
@@ -553,7 +553,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     __android_log_print (ANDROID_LOG_ERROR, "tutorial-4", "Could not retrieve JNIEnv");
     return 0;
   }
-  jclass klass = (*env)->FindClass (env, "com/gst_sdk_tutorials/tutorial_4/Tutorial4");
+  jclass klass = (*env)->FindClass (env, "org/freedesktop/gstreamer/tutorials/tutorial_4/Tutorial4");
   (*env)->RegisterNatives (env, klass, native_methods, G_N_ELEMENTS(native_methods));
 
   pthread_key_create (&current_jni_env, detach_current_thread);
diff --git a/examples/tutorials/android/android-tutorial-4/res/layout/main.xml b/examples/tutorials/android/android-tutorial-4/res/layout/main.xml
index a4215ef..20df7a3 100644
--- a/examples/tutorials/android/android-tutorial-4/res/layout/main.xml
+++ b/examples/tutorials/android/android-tutorial-4/res/layout/main.xml
@@ -60,10 +60,10 @@
             android:indeterminate="false" />
     </LinearLayout>
 
-    <com.gst_sdk_tutorials.tutorial_4.GStreamerSurfaceView
+    <org.freedesktop.gstreamer.tutorials.tutorial_4.GStreamerSurfaceView
         android:id="@+id/surface_video"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|center_horizontal" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/GStreamerSurfaceView.java b/examples/tutorials/android/android-tutorial-4/src/org/freedesktop/gstreamer/tutorials/tutorial_4/GStreamerSurfaceView.java
similarity index 98%
rename from examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/GStreamerSurfaceView.java
rename to examples/tutorials/android/android-tutorial-4/src/org/freedesktop/gstreamer/tutorials/tutorial_4/GStreamerSurfaceView.java
index c2cd2b2..75e7196 100644
--- a/examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/GStreamerSurfaceView.java
+++ b/examples/tutorials/android/android-tutorial-4/src/org/freedesktop/gstreamer/tutorials/tutorial_4/GStreamerSurfaceView.java
@@ -1,4 +1,4 @@
-package com.gst_sdk_tutorials.tutorial_4;
+package org.freedesktop.gstreamer.tutorials.tutorial_4;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java b/examples/tutorials/android/android-tutorial-4/src/org/freedesktop/gstreamer/tutorials/tutorial_4/Tutorial4.java
similarity index 99%
rename from examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java
rename to examples/tutorials/android/android-tutorial-4/src/org/freedesktop/gstreamer/tutorials/tutorial_4/Tutorial4.java
index 8516cb2..083448a 100644
--- a/examples/tutorials/android/android-tutorial-4/src/com/gst_sdk_tutorials/tutorial_4/Tutorial4.java
+++ b/examples/tutorials/android/android-tutorial-4/src/org/freedesktop/gstreamer/tutorials/tutorial_4/Tutorial4.java
@@ -1,4 +1,4 @@
-package com.gst_sdk_tutorials.tutorial_4;
+package org.freedesktop.gstreamer.tutorials.tutorial_4;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml b/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
index 6a33328..a43b75f 100755
--- a/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
+++ b/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gst_sdk_tutorials.tutorial_5"
+    package="org.freedesktop.gstreamer.tutorials.tutorial_5"
     android:versionCode="1"
     android:versionName="1.0" >
 
diff --git a/examples/tutorials/android/android-tutorial-5/jni/tutorial-5.c b/examples/tutorials/android/android-tutorial-5/jni/tutorial-5.c
index 81e9524..ab492df 100755
--- a/examples/tutorials/android/android-tutorial-5/jni/tutorial-5.c
+++ b/examples/tutorials/android/android-tutorial-5/jni/tutorial-5.c
@@ -561,7 +561,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     __android_log_print (ANDROID_LOG_ERROR, "tutorial-5", "Could not retrieve JNIEnv");
     return 0;
   }
-  jclass klass = (*env)->FindClass (env, "com/gst_sdk_tutorials/tutorial_5/Tutorial5");
+  jclass klass = (*env)->FindClass (env, "org/freedesktop/gstreamer/tutorials/tutorial_5/Tutorial5");
   (*env)->RegisterNatives (env, klass, native_methods, G_N_ELEMENTS(native_methods));
 
   pthread_key_create (&current_jni_env, detach_current_thread);
diff --git a/examples/tutorials/android/android-tutorial-5/res/layout/main.xml b/examples/tutorials/android/android-tutorial-5/res/layout/main.xml
index 70ee015..10c0169 100755
--- a/examples/tutorials/android/android-tutorial-5/res/layout/main.xml
+++ b/examples/tutorials/android/android-tutorial-5/res/layout/main.xml
@@ -68,7 +68,7 @@
             android:indeterminate="false" />
     </LinearLayout>
 
-    <com.gst_sdk_tutorials.tutorial_5.GStreamerSurfaceView
+    <org.freedesktop.gstreamer.tutorials.tutorial_5.GStreamerSurfaceView
         android:id="@+id/surface_video"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/examples/tutorials/android/android-tutorial-5/src/com/lamerman/FileDialog.java b/examples/tutorials/android/android-tutorial-5/src/com/lamerman/FileDialog.java
index e162522..b3c2269 100644
--- a/examples/tutorials/android/android-tutorial-5/src/com/lamerman/FileDialog.java
+++ b/examples/tutorials/android/android-tutorial-5/src/com/lamerman/FileDialog.java
@@ -45,7 +45,7 @@ import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
-import com.gst_sdk_tutorials.tutorial_5.R;
+import org.freedesktop.gstreamer.tutorials.tutorial_5.R;
 
 /**
  * Activity para escolha de arquivos/diretorios.
diff --git a/examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/GStreamerSurfaceView.java b/examples/tutorials/android/android-tutorial-5/src/org/freedesktop/gstreamer/tutorials/tutorial_5/GStreamerSurfaceView.java
similarity index 98%
rename from examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/GStreamerSurfaceView.java
rename to examples/tutorials/android/android-tutorial-5/src/org/freedesktop/gstreamer/tutorials/tutorial_5/GStreamerSurfaceView.java
index 72b17b9..2aac3ef 100644
--- a/examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/GStreamerSurfaceView.java
+++ b/examples/tutorials/android/android-tutorial-5/src/org/freedesktop/gstreamer/tutorials/tutorial_5/GStreamerSurfaceView.java
@@ -1,4 +1,4 @@
-package com.gst_sdk_tutorials.tutorial_5;
+package org.freedesktop.gstreamer.tutorials.tutorial_5;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java b/examples/tutorials/android/android-tutorial-5/src/org/freedesktop/gstreamer/tutorials/tutorial_5/Tutorial5.java
similarity index 99%
rename from examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
rename to examples/tutorials/android/android-tutorial-5/src/org/freedesktop/gstreamer/tutorials/tutorial_5/Tutorial5.java
index 11c79f1..87c3aea 100644
--- a/examples/tutorials/android/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
+++ b/examples/tutorials/android/android-tutorial-5/src/org/freedesktop/gstreamer/tutorials/tutorial_5/Tutorial5.java
@@ -1,4 +1,4 @@
-package com.gst_sdk_tutorials.tutorial_5;
+package org.freedesktop.gstreamer.tutorials.tutorial_5;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
-- 
2.7.4