jrman-commit

[Gerardo H. <ma...@us...>]

Update of /cvsroot/jrman/drafts/src/org/jrman/maps
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1255/src/org/jrman/maps

Modified Files:
	MipMap.java ShadowMap.java 
Log Message:
Compiles for Java 1.5 with -Xlint without any warning.


Index: ShadowMap.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/maps/ShadowMap.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ShadowMap.java	26 Feb 2007 19:35:47 -0000	1.8
--- ShadowMap.java	1 Mar 2007 00:50:24 -0000	1.9
***************
*** 42,46 ****
  public class ShadowMap {
  
!     private static Map map = new HashMap();
      
      private static String currentDirectory;
--- 42,47 ----
  public class ShadowMap {
  
!     private static Map<String, ShadowMap> map =
!         new HashMap<String, ShadowMap>();
      
      private static String currentDirectory;
***************
*** 66,70 ****
          private String name;
  
!         private static Map map = new HashMap();
  
          static {
--- 67,72 ----
          private String name;
  
!         private static Map<String, Projection> map =
!             new HashMap<String, Projection>();
  
          static {
***************
*** 74,78 ****
  
          public static Projection getNamed(String name) {
!             Projection result = (Projection) map.get(name);
              if (result == null)
               throw new IllegalArgumentException("No such ShadowMap projection: "
--- 76,80 ----
  
          public static Projection getNamed(String name) {
!             Projection result = map.get(name);
              if (result == null)
               throw new IllegalArgumentException("No such ShadowMap projection: "
***************
*** 139,143 ****
  
      public static ShadowMap getShadowMap(String filename) {
!         ShadowMap result = (ShadowMap) map.get(filename);
          if (result == null)
              try {
--- 141,145 ----
  
      public static ShadowMap getShadowMap(String filename) {
!         ShadowMap result = map.get(filename);
          if (result == null)
              try {

Index: MipMap.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/maps/MipMap.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MipMap.java	26 Feb 2007 19:35:47 -0000	1.8
--- MipMap.java	1 Mar 2007 00:50:24 -0000	1.9
***************
*** 54,58 ****
      private static float[] lh = new float[4];
  
!     private static Map map = new HashMap();
      
      private static String currentDirectory;
--- 54,58 ----
      private static float[] lh = new float[4];
  
!     private static Map<String, MipMap> map = new HashMap<String, MipMap>();
      
      private static String currentDirectory;
***************
*** 84,88 ****
          private String name;
  
!         private static Map map = new HashMap();
  
          static {
--- 84,88 ----
          private String name;
  
!         private static Map<String, Mode> map = new HashMap<String, Mode>();
  
          static {
***************
*** 93,97 ****
  
          public static Mode getNamed(String name) {
!             Mode result = (Mode) map.get(name);
              if (result == null)
                  throw new IllegalArgumentException("No such MipMap mode: " +
--- 93,97 ----
  
          public static Mode getNamed(String name) {
!             Mode result = map.get(name);
              if (result == null)
                  throw new IllegalArgumentException("No such MipMap mode: " +
***************
*** 226,230 ****
  
      public static MipMap getMipMap(String filename) {
!         MipMap result = (MipMap) map.get(filename);
          if (result == null)
              try {
--- 226,230 ----
  
      public static MipMap getMipMap(String filename) {
!         MipMap result = map.get(filename);
          if (result == null)
              try {