jrman-commit

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

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

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


Index: SurfaceShader.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/shaders/SurfaceShader.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** SurfaceShader.java	28 Feb 2007 00:02:41 -0000	1.23
--- SurfaceShader.java	1 Mar 2007 00:50:29 -0000	1.24
***************
*** 60,64 ****
      static Color3fGrid _cg1 = new Color3fGrid();
  
!     static Map shaderClassCache = new HashMap();
  
      protected static abstract class Statement {
--- 60,64 ----
      static Color3fGrid _cg1 = new Color3fGrid();
  
!     static Map<String, Class> shaderClassCache = new HashMap<String, Class>();
  
      protected static abstract class Statement {
***************
*** 149,153 ****
      public static SurfaceShader createShader(String name,
              ParameterList parameters, Attributes attributes) {
!         Class clazz = (Class) shaderClassCache.get(name);
          if (clazz == null) {
              String className = "Surface" + name.substring(0, 1).toUpperCase()
--- 149,153 ----
      public static SurfaceShader createShader(String name,
              ParameterList parameters, Attributes attributes) {
!         Class clazz = shaderClassCache.get(name);
          if (clazz == null) {
              String className = "Surface" + name.substring(0, 1).toUpperCase()
***************
*** 215,219 ****
  
      protected void specular(ShaderVariables sv, Vector3fGrid Nn,
!             Vector3fGrid V, float roughness, Color3fGrid out) {
          out.set(BLACK);
          specularStatement.setNn(Nn);
--- 215,219 ----
  
      protected void specular(ShaderVariables sv, Vector3fGrid Nn,
!                             Vector3fGrid V, float roughness, Color3fGrid out) {
          out.set(BLACK);
          specularStatement.setNn(Nn);
***************
*** 225,229 ****
  
      protected void doIlluminance(ShaderVariables sv, LightShader[] lights,
!             Point3fGrid P, Vector3fGrid N, float angle, Statement statement) {
          for (int i = 0; i < lights.length; i++) {
              LightShader ls = lights[i];
--- 225,230 ----
  
      protected void doIlluminance(ShaderVariables sv, LightShader[] lights,
!                                  Point3fGrid P, Vector3fGrid N, float angle,
!                                  Statement statement) {
          for (int i = 0; i < lights.length; i++) {
              LightShader ls = lights[i];
***************
*** 236,240 ****
  
      protected void illuminance(ShaderVariables sv, String categoryList,
!             Point3fGrid P, Vector3fGrid N, float angle, Statement statement) {
          LightShader[] selectedLights;
          if (categoryList == null)
--- 237,242 ----
  
      protected void illuminance(ShaderVariables sv, String categoryList,
!                                Point3fGrid P, Vector3fGrid N, float angle,
!                                Statement statement) {
          LightShader[] selectedLights;
          if (categoryList == null)
***************
*** 246,250 ****
  
      protected LightShader[] getLightsByCategory(ShaderVariables sv,
!             String categoryList) {
          boolean inverse = false;
          if (categoryList.startsWith("-")) {
--- 248,252 ----
  
      protected LightShader[] getLightsByCategory(ShaderVariables sv,
!                                                 String categoryList) {
          boolean inverse = false;
          if (categoryList.startsWith("-")) {
***************
*** 252,258 ****
              inverse = true;
          }
!         Set categories = new TreeSet();
          categories.addAll(Arrays.asList(SEPARATOR.split(categoryList)));
!         List result = new ArrayList();
          LightShader[] lights = sv.attributes.getLightSourcesArray();
          for (int i = 0; i < lights.length; i++) {
--- 254,260 ----
              inverse = true;
          }
!         Set<String> categories = new TreeSet<String>();
          categories.addAll(Arrays.asList(SEPARATOR.split(categoryList)));
!         List<LightShader> result = new ArrayList<LightShader>();
          LightShader[] lights = sv.attributes.getLightSourcesArray();
          for (int i = 0; i < lights.length; i++) {
***************
*** 268,272 ****
                 */
          }
!         return (LightShader[]) result.toArray(new LightShader[result.size()]);
      }
  
--- 270,274 ----
                 */
          }
!         return result.toArray(new LightShader[result.size()]);
      }