Replace abstract class AbstractMarkerManager by an interface.

Change-Id: I0520b0704c7b00fe6836d95e33270d879652405c

6 files changed, 10 insertions, 10 deletions

diff --git a/sched/tests/com/android/sched/item/ItemsTest.java b/sched/tests/com/android/sched/item/ItemsTest.java
index 9f5893e..9f306ed 100644
--- a/sched/tests/com/android/sched/item/ItemsTest.java
+++ b/sched/tests/com/android/sched/item/ItemsTest.java
@@ -24,7 +24,7 @@ import com.android.sched.marker.Marker3;
 import com.android.sched.marker.Marker4;
 import com.android.sched.marker.Marker5;
 import com.android.sched.marker.Marker6;
-import com.android.sched.marker.MarkerManager;
+import com.android.sched.marker.StaticMarkerManager;
 
 import org.junit.After;
 import org.junit.Before;
@@ -34,7 +34,7 @@ public class ItemsTest {
 
   @Before
   public void setUp() throws Exception {
-    MarkerManager.class.getClassLoader().setDefaultAssertionStatus(true);
+    StaticMarkerManager.class.getClassLoader().setDefaultAssertionStatus(true);
   }
 
   @After
diff --git a/sched/tests/com/android/sched/marker/ManagedMarkerTest.java b/sched/tests/com/android/sched/marker/ManagedMarkerTest.java
index 66c7e58..0519e14 100644
--- a/sched/tests/com/android/sched/marker/ManagedMarkerTest.java
+++ b/sched/tests/com/android/sched/marker/ManagedMarkerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 public class ManagedMarkerTest {
   @Before
   public void setUp() {
-    MarkerManager.class.getClassLoader().setDefaultAssertionStatus(true);
+    StaticMarkerManager.class.getClassLoader().setDefaultAssertionStatus(true);
   }
 
   @Test
diff --git a/sched/tests/com/android/sched/marker/MarkedA.java b/sched/tests/com/android/sched/marker/MarkedA.java
index 8444f63..f5dc013 100644
--- a/sched/tests/com/android/sched/marker/MarkedA.java
+++ b/sched/tests/com/android/sched/marker/MarkedA.java
@@ -16,5 +16,5 @@
 
 package com.android.sched.marker;
 
-public class MarkedA extends MarkerManager {
+public class MarkedA extends StaticMarkerManager {
 }
diff --git a/sched/tests/com/android/sched/marker/MarkedB.java b/sched/tests/com/android/sched/marker/MarkedB.java
index 2731876..bffc12c 100644
--- a/sched/tests/com/android/sched/marker/MarkedB.java
+++ b/sched/tests/com/android/sched/marker/MarkedB.java
@@ -16,5 +16,5 @@
 
 package com.android.sched.marker;
 
-public class MarkedB extends MarkerManager {
+public class MarkedB extends StaticMarkerManager {
 }
diff --git a/sched/tests/com/android/sched/marker/MarkedC.java b/sched/tests/com/android/sched/marker/MarkedC.java
index 5b38cfb..94d53bf 100644
--- a/sched/tests/com/android/sched/marker/MarkedC.java
+++ b/sched/tests/com/android/sched/marker/MarkedC.java
@@ -16,5 +16,5 @@
 
 package com.android.sched.marker;
 
-public class MarkedC extends MarkerManager {
+public class MarkedC extends StaticMarkerManager {
 }
diff --git a/sched/tests/com/android/sched/marker/MarkerManagerTest.java b/sched/tests/com/android/sched/marker/MarkerManagerTest.java
index b972eaa..561a53d 100644
--- a/sched/tests/com/android/sched/marker/MarkerManagerTest.java
+++ b/sched/tests/com/android/sched/marker/MarkerManagerTest.java
@@ -31,18 +31,18 @@ import java.util.List;
 
 public class MarkerManagerTest {
 
-  MarkerManager[] markeds;
+  StaticMarkerManager[] markeds;
   Class<? extends Marker>[] markers;
   boolean[][] compatible;
 
   @SuppressWarnings("unchecked")
   @Before
   public void setUp() throws Exception {
-    MarkerManager.class.getClassLoader().setDefaultAssertionStatus(true);
+    StaticMarkerManager.class.getClassLoader().setDefaultAssertionStatus(true);
 
-    new MarkerManager();
+    new StaticMarkerManager();
 
-    markeds = new MarkerManager[] {new MarkedA(), new MarkedB(), new MarkedC(), new MarkedB1()};
+    markeds = new StaticMarkerManager[] {new MarkedA(), new MarkedB(), new MarkedC(), new MarkedB1()};
     markers = (Class<? extends Marker>[]) new Class<?>[] {
         Marker1.class, Marker2.class, Marker3.class};
     compatible = new boolean[markeds.length][markers.length];