[Jmri-commits] SF.net SVN: jmri:[20904] trunk/jmri/java/src/apps

[<rh...@us...>]

Revision: 20904
          http://jmri.svn.sourceforge.net/jmri/?rev=20904&view=rev
Author:   rhwood
Date:     2012-07-29 17:27:38 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Move non-GUI abstract Apps3 methods to AppsBase.

Modified Paths:
--------------
    trunk/jmri/java/src/apps/AppsBase.java
    trunk/jmri/java/src/apps/JmriFaceless.java
    trunk/jmri/java/src/apps/gui3/Apps3.java

Modified: trunk/jmri/java/src/apps/AppsBase.java
===================================================================
--- trunk/jmri/java/src/apps/AppsBase.java	2012-07-29 16:37:56 UTC (rev 20903)
+++ trunk/jmri/java/src/apps/AppsBase.java	2012-07-29 17:27:38 UTC (rev 20904)
@@ -371,4 +371,7 @@
             }
         }
     }
+
+    abstract public String getAppName();
+
 }

Modified: trunk/jmri/java/src/apps/JmriFaceless.java
===================================================================
--- trunk/jmri/java/src/apps/JmriFaceless.java	2012-07-29 16:37:56 UTC (rev 20903)
+++ trunk/jmri/java/src/apps/JmriFaceless.java	2012-07-29 17:27:38 UTC (rev 20904)
@@ -52,6 +52,11 @@
         app.postInit();
         
     }
+
+    @Override
+    public String getAppName() {
+        return "JmriFaceless";
+    }
     
     static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(JmriFaceless.class.getName());
 }

Modified: trunk/jmri/java/src/apps/gui3/Apps3.java
===================================================================
--- trunk/jmri/java/src/apps/gui3/Apps3.java	2012-07-29 16:37:56 UTC (rev 20903)
+++ trunk/jmri/java/src/apps/gui3/Apps3.java	2012-07-29 17:27:38 UTC (rev 20904)
@@ -139,8 +139,6 @@
 
     abstract protected void createMainFrame();
     
-    abstract public String getAppName();
-    
     public void createAndDisplayFrame(){
         createMainFrame();
         

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.