Move getName from BaseVDir and BaseVFile to a superclass

BaseVDir and BaseVFile have the same getName implementation based
on |name| field inherited from a common superclass. Unify the implementation
by moving it to the common superclass.

Change-Id: Ia36a41e8fc403a2b18fc47dc00f67e3da48c90ab

3 files changed, 6 insertions, 12 deletions

diff --git a/sched/src/com/android/sched/vfs/BaseVDir.java b/sched/src/com/android/sched/vfs/BaseVDir.java
index 8ee6a96f..a04166bb 100644
--- a/sched/src/com/android/sched/vfs/BaseVDir.java
+++ b/sched/src/com/android/sched/vfs/BaseVDir.java
@@ -140,12 +140,6 @@ abstract class BaseVDir extends BaseVElement implements VDir {
 
   @Override
   @Nonnull
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  @Nonnull
   public BaseVDir createVDir(@Nonnull String name) throws CannotCreateFileException {
     return vfs.createVDir(this, name);
   }
diff --git a/sched/src/com/android/sched/vfs/BaseVElement.java b/sched/src/com/android/sched/vfs/BaseVElement.java
index db8f555f..3e923f4b 100644
--- a/sched/src/com/android/sched/vfs/BaseVElement.java
+++ b/sched/src/com/android/sched/vfs/BaseVElement.java
@@ -39,4 +39,10 @@ public abstract class BaseVElement implements VElement {
   void changeVFS(@Nonnull BaseVFS<? extends BaseVDir, ? extends BaseVFile> vfs) {
     this.vfs = (BaseVFS<BaseVDir, BaseVFile>) vfs;
   }
+
+  @Override
+  @Nonnull
+  public String getName() {
+    return name;
+  }
 }
diff --git a/sched/src/com/android/sched/vfs/BaseVFile.java b/sched/src/com/android/sched/vfs/BaseVFile.java
index 11e1a5cf..387471c5 100644
--- a/sched/src/com/android/sched/vfs/BaseVFile.java
+++ b/sched/src/com/android/sched/vfs/BaseVFile.java
@@ -54,12 +54,6 @@ abstract class BaseVFile extends BaseVElement implements VFile {
 
   @Override
   @Nonnull
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  @Nonnull
   public Location getLocation() {
     return vfs.getVFileLocation(this);
   }