[Rails-commits] 18xx/rails/common Defs.java,1.4,1.5

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/common
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16351/rails/common

Modified Files:
	Defs.java 
Log Message:
Simplified Defs.ClassName and Defs.Parm handling

Index: Defs.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/common/Defs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Defs.java	4 May 2009 20:29:15 -0000	1.4
--- Defs.java	12 Sep 2009 19:48:39 -0000	1.5
***************
*** 1,38 ****
  package rails.common;
  
- import java.util.EnumMap;
- 
  public class Defs {
  
!     /* Identifiers and default names for configurable UI classes */
      public enum ClassName {
!         GAME_UI_MANAGER,
!         OR_UI_MANAGER,
!         STATUS_WINDOW,
!         GAME_STATUS,
!         OR_WINDOW
!     }
! 
!     private static EnumMap<Defs.ClassName, String> defaultClasses =
!         new EnumMap<Defs.ClassName, String> (Defs.ClassName.class);
! 
!     static {
!         defaultClasses.put (ClassName.GAME_UI_MANAGER,
!                 "rails.ui.swing.GameUIManager");
!         defaultClasses.put (ClassName.OR_UI_MANAGER,
!                 "rails.ui.swing.ORUIManager");
!         defaultClasses.put (ClassName.STATUS_WINDOW,
!                 "rails.ui.swing.StatusWindow");
!         defaultClasses.put (ClassName.GAME_STATUS,
!                 "rails.ui.swing.GameStatus");
!         defaultClasses.put (ClassName.OR_WINDOW,
!                 "rails.ui.swing.ORWindow");
!     }
  
      public static String getDefaultClassName (ClassName key) {
!         return defaultClasses.get(key);
      }
  
!     /* Definitions for key/value pairs in the communication
       * between GameManager and GameUIManager.
       */
--- 1,31 ----
  package rails.common;
  
  public class Defs {
  
!     /** Identifiers and default names for configurable UI classes */
      public enum ClassName {
!         
!         GAME_UI_MANAGER ("rails.ui.swing.GameUIManager"),
!         OR_UI_MANAGER ("rails.ui.swing.ORUIManager"),
!         STATUS_WINDOW ("rails.ui.swing.StatusWindow"),
!         GAME_STATUS ("rails.ui.swing.GameStatus"),
!         OR_WINDOW ("rails.ui.swing.ORWindow");
!         
!         private String defaultClassName;
!         
!         ClassName (String defaultClassName) {
!             this.defaultClassName = defaultClassName;
!         }
!         
!         public String getDefaultClassName () {
!             return defaultClassName;
!         }
!    }
  
      public static String getDefaultClassName (ClassName key) {
!         return key.getDefaultClassName();
      }
  
!     /** Definitions for key/value pairs in the communication
       * between GameManager and GameUIManager.
       */