From 92301a92b7ff8e53a2ca8962c7f3fe9f59a3f48c Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Wed, 13 Sep 2017 23:44:58 +0200
Subject: [PATCH] Refactoring

---
 .../java/de/trac/spherical/MainActivity.java     | 16 ++++++----------
 ...{SphereParser.java => PhotoSphereParser.java} |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)
 rename app/src/main/java/de/trac/spherical/parser/{SphereParser.java => PhotoSphereParser.java} (99%)

diff --git a/app/src/main/java/de/trac/spherical/MainActivity.java b/app/src/main/java/de/trac/spherical/MainActivity.java
index a41c177..df73db3 100644
--- a/app/src/main/java/de/trac/spherical/MainActivity.java
+++ b/app/src/main/java/de/trac/spherical/MainActivity.java
@@ -1,15 +1,11 @@
 package de.trac.spherical;
 
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.opengl.GLSurfaceView;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import java.io.FileNotFoundException;
@@ -17,7 +13,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import de.trac.spherical.parser.PhotoSphereMetadata;
-import de.trac.spherical.parser.SphereParser;
+import de.trac.spherical.parser.PhotoSphereParser;
 
 import de.trac.spherical.rendering.Renderer;
 import de.trac.spherical.rendering.SphereSurfaceView;
@@ -57,7 +53,7 @@ public class MainActivity extends AppCompatActivity {
 
     /**
      * Distinguish type of sent image. Images with the MIME type of a photosphere will be directly
-     * displayed, while images with MIME type image/* are being manually tested using {@link SphereParser}.
+     * displayed, while images with MIME type image/* are being manually tested using {@link PhotoSphereParser}.
      * @param intent incoming intent.
      */
     private void handleSentImageIntent(Intent intent) {
@@ -92,8 +88,8 @@ public class MainActivity extends AppCompatActivity {
     private void displayMaybePhotoSphere(Uri uri) {
         try {
             InputStream inputStream = getContentResolver().openInputStream(uri);
-            String xml = SphereParser.getXMLContent(inputStream);
-            PhotoSphereMetadata metadata = SphereParser.parse(xml);
+            String xml = PhotoSphereParser.getXMLContent(inputStream);
+            PhotoSphereMetadata metadata = PhotoSphereParser.parse(xml);
 
             if (metadata == null || !metadata.isUsePanoramaViewer()) {
                 displayFlatImage(getContentResolver().openInputStream(uri));
@@ -115,8 +111,8 @@ public class MainActivity extends AppCompatActivity {
     private void displayPhotoSphere(Uri uri) {
         try {
             InputStream inputStream = getContentResolver().openInputStream(uri);
-            String xml = SphereParser.getXMLContent(inputStream);
-            PhotoSphereMetadata metadata = SphereParser.parse(xml);
+            String xml = PhotoSphereParser.getXMLContent(inputStream);
+            PhotoSphereMetadata metadata = PhotoSphereParser.parse(xml);
 
             if (metadata == null) {
                 Log.e(TAG, "Metadata is null. Fall back to flat image.");
diff --git a/app/src/main/java/de/trac/spherical/parser/SphereParser.java b/app/src/main/java/de/trac/spherical/parser/PhotoSphereParser.java
similarity index 99%
rename from app/src/main/java/de/trac/spherical/parser/SphereParser.java
rename to app/src/main/java/de/trac/spherical/parser/PhotoSphereParser.java
index 0f2a420..79c529a 100644
--- a/app/src/main/java/de/trac/spherical/parser/SphereParser.java
+++ b/app/src/main/java/de/trac/spherical/parser/PhotoSphereParser.java
@@ -39,7 +39,7 @@ import static de.trac.spherical.parser.PhotoSphereMetadata.USE_PANORAMA_VIEWER;
 /**
  * ParserUtil that does stuff.
  */
-public class SphereParser {
+public class PhotoSphereParser {
 
     private static final String TAG = "PhoSphePars";