android: create events with LOEventFactory (moved out of LOEvent)

Change-Id: Ia2e6bd040160e9d09377fe1f27d94d22c46fb778

4 files changed, 38 insertions, 29 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index 80210a7e45a8..4b22d1f96133 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -52,30 +52,6 @@ public class LOEvent {
         mTypeString = "Change part";
     }
 
-    public static LOEvent draw(Rect rect) {
-        return new LOEvent(DRAW, rect);
-    }
-
-    public static LOEvent sizeChanged(int widthPixels, int heightPixels) {
-        return new LOEvent(SIZE_CHANGED, widthPixels, heightPixels);
-    }
-
-    public static LOEvent tileSize(IntSize tileSize) {
-        return new LOEvent(TILE_SIZE, tileSize);
-    }
-
-    public static LOEvent viewport(ImmutableViewportMetrics viewportMetrics) {
-        return new LOEvent(VIEWPORT, viewportMetrics);
-    }
-
-    public static LOEvent changePart(int part) {
-        return new LOEvent(CHANGE_PART, part);
-    }
-
-    public static LOEvent load(String inputFile) {
-        return new LOEvent(LOAD, inputFile);
-    }
-
     public String getTypeString() {
         return mTypeString;
     }
@@ -91,5 +67,4 @@ public class LOEvent {
     public String getFilename() {
         return mFilename;
     }
-
 }
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
new file mode 100644
index 000000000000..d0b024af9feb
--- /dev/null
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
@@ -0,0 +1,33 @@
+package org.libreoffice;
+
+import android.graphics.Rect;
+
+import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
+import org.mozilla.gecko.gfx.IntSize;
+
+
+public class LOEventFactory {
+    public static LOEvent draw(Rect rect) {
+        return new LOEvent(LOEvent.DRAW, rect);
+    }
+
+    public static LOEvent sizeChanged(int widthPixels, int heightPixels) {
+        return new LOEvent(LOEvent.SIZE_CHANGED, widthPixels, heightPixels);
+    }
+
+    public static LOEvent tileSize(IntSize tileSize) {
+        return new LOEvent(LOEvent.TILE_SIZE, tileSize);
+    }
+
+    public static LOEvent viewport(ImmutableViewportMetrics viewportMetrics) {
+        return new LOEvent(LOEvent.VIEWPORT, viewportMetrics);
+    }
+
+    public static LOEvent changePart(int part) {
+        return new LOEvent(LOEvent.CHANGE_PART, part);
+    }
+
+    public static LOEvent load(String inputFile) {
+        return new LOEvent(LOEvent.LOAD, inputFile);
+    }
+}
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index cc86e0bd308b..2f69cf32645e 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -127,7 +127,7 @@ public class LibreOfficeMainActivity extends Activity {
         mLayerController.setLayerClient(mLayerClient);
         mGeckoLayout.addView(mLayerController.getView(), 0);
 
-        LOKitShell.sendEvent(LOEvent.load(mInputFile));
+        LOKitShell.sendEvent(LOEventFactory.load(mInputFile));
     }
 
     @Override
@@ -199,7 +199,7 @@ public class LibreOfficeMainActivity extends Activity {
         @Override
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
             DocumentPartView partView = mDocumentPartViewListAdpater.getItem(position);
-            LOKitShell.sendEvent(LOEvent.changePart(partView.getPartIndex()));
+            LOKitShell.sendEvent(LOEventFactory.changePart(partView.getPartIndex()));
             mDrawerLayout.closeDrawer(mDrawerList);
         }
     }
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index 28c2bbb14eb7..f2b27931b8b5 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -46,6 +46,7 @@ import android.util.Log;
 import android.view.View;
 
 import org.libreoffice.LOEvent;
+import org.libreoffice.LOEventFactory;
 import org.libreoffice.LOKitShell;
 import org.libreoffice.LibreOfficeMainActivity;
 import org.libreoffice.TileProvider;
@@ -180,7 +181,7 @@ public class GeckoLayerClient implements LayerView.Listener {
             Log.d(LOGTAG, "Window-size changed to " + mWindowSize);
         }
 
-        LOEvent event = LOEvent.sizeChanged(metrics.widthPixels, metrics.heightPixels);
+        LOEvent event = LOEventFactory.sizeChanged(metrics.widthPixels, metrics.heightPixels);
         LOKitShell.sendEvent(event);
     }
 
@@ -206,7 +207,7 @@ public class GeckoLayerClient implements LayerView.Listener {
             mDrawTimingQueue.add(displayPort);
         }
 
-        LOKitShell.sendEvent(LOEvent.viewport(clampedMetrics));
+        LOKitShell.sendEvent(LOEventFactory.viewport(clampedMetrics));
         if (mViewportSizeChanged) {
             mViewportSizeChanged = false;
             LOKitShell.viewSizeChanged();