[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/utils ObjectStore.java,1.8,1.9 UserInfo.java,1.3,1.4 CleanUp.java,1.3,1.4

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils
In directory sc8-pr-cvs1:/tmp/cvs-serv26777/dev/src/net/sourceforge/idrs/utils

Modified Files:
	ObjectStore.java UserInfo.java CleanUp.java 
Log Message:
1.  Moved controller code into servlet
2.  Added the ability for properties to be arrays of strings
3.  Moved config file into it's own xml file
4.  Added better compile errors for rml pages
5.  removed all debug printings

Index: ObjectStore.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/ObjectStore.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ObjectStore.java	8 Jan 2003 06:01:01 -0000	1.8
--- ObjectStore.java	6 Feb 2003 20:13:45 -0000	1.9
***************
*** 200,204 ****
          Class objClass;
          Class[] propArgs = new Class[1];
!         propArgs[0] = "".getClass();
          
          this.methods=new HashMap();
--- 200,206 ----
          Class objClass;
          Class[] propArgs = new Class[1];
!        
!         
!        
          
          this.methods=new HashMap();
***************
*** 210,216 ****
          
          try {
!             init.invoke(obj,vals);
!             
             ((CleanUp) obj).setContext(this.idrs);
              
              int i;
--- 212,219 ----
          
          try {
!         	 ((CleanUp) obj).reload();
             ((CleanUp) obj).setContext(this.idrs);
+             init.invoke(obj,vals);
+            
              
              int i;
***************
*** 229,233 ****
                  this.props = new Method[propNames.length];
                  for (i=0;i<propNames.length;i++) {
!                     props[i] = objClass.getMethod(propNames[i],propArgs);
                  }
              }
--- 232,245 ----
                  this.props = new Method[propNames.length];
                  for (i=0;i<propNames.length;i++) {
! 
! 						try {
! 							 propArgs[0] = "".getClass();
! 							props[i] = objClass.getMethod(propNames[i],propArgs);
! 						} catch (NoSuchMethodException e) {
! 							 propArgs[0] = String[].class;
! 							props[i] = objClass.getMethod(propNames[i],propArgs);
! 						}
! 
! 
                  }
              }
***************
*** 236,240 ****
          }
          catch (Exception e) {
!             throw new Exception("No init method");
          }
      }
--- 248,252 ----
          }
          catch (Exception e) {
!             throw e;
          }
      }
***************
*** 351,369 ****
          StringBuffer buf = new StringBuffer();
          String[] args = new String[1];
          String[] vals;
          for (int i=0,m=this.propNames.length;i<m;i++) {
              buf.setLength(0);
              buf.append(this.id).append('-').append("prop").append('_').append(propNames[i].substring(3));
!             args[0] =  req.getParameter(buf.toString());
              
-             /*if (vals == null) {
-             	args[0] = req.getParameter(buf.toString());
-             }
-             else {
-             	args[0] = vals;
-             }*/
              
              //args[0] = vals.length==1 ? vals[0] : vals;
!             props[i].invoke(this.obj,args);
          }
          
--- 363,398 ----
          StringBuffer buf = new StringBuffer();
          String[] args = new String[1];
+        Object[] objArgs;
          String[] vals;
          for (int i=0,m=this.propNames.length;i<m;i++) {
              buf.setLength(0);
              buf.append(this.id).append('-').append("prop").append('_').append(propNames[i].substring(3));
!            //System.out.println("type : " + props[i].getParameterTypes()[0].isArray());
!            
!            	if (props[i].getParameterTypes()[0].isArray()) {
!            		vals = req.getParameterValues(buf.toString());
!            		objArgs = new Object[]{vals};
!            		props[i].invoke(this.obj,objArgs);
!            	}
!            	else {
!          		args[0] =  req.getParameter(buf.toString());
!            		props[i].invoke(this.obj,args);	
!            	}
!            
              
              
+             
+             
+             
+ //            vals = req.getParameterValues(buf.toString());
+ //            if (vals == null || vals.length == 1) {
+ //            	args[0] = req.getParameter(buf.toString());
+ //            }
+ //            else {
+ //            	args[0] = vals;
+ //            }
+ //            
              //args[0] = vals.length==1 ? vals[0] : vals;
!             
          }
          

Index: UserInfo.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/UserInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UserInfo.java	18 Sep 2001 03:18:57 -0000	1.3
--- UserInfo.java	6 Feb 2003 20:13:45 -0000	1.4
***************
*** 53,60 ****
  	public boolean inGroup(int group) throws Exception {
  		boolean found = false;
! 		System.out.println("group : " + group);
  
  		for (int i=0, m=groups.length;i<m;i++) {
! 			System.out.println(groups[i]);
  			if (groups[i] == group) {
  				found =true;
--- 53,60 ----
  	public boolean inGroup(int group) throws Exception {
  		boolean found = false;
! 		//System.out.println("group : " + group);
  
  		for (int i=0, m=groups.length;i<m;i++) {
! 			//System.out.println(groups[i]);
  			if (groups[i] == group) {
  				found =true;

Index: CleanUp.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/CleanUp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CleanUp.java	29 Dec 2002 04:01:56 -0000	1.3
--- CleanUp.java	6 Feb 2003 20:13:45 -0000	1.4
***************
*** 3,12 ****
  import java.sql.*;
  import java.util.*;
  
! public class CleanUp extends Validators {
  	protected transient LinkedList statements;
  
  	public CleanUp() {
! 		this.statements = new LinkedList();
  	}
  
--- 3,19 ----
  import java.sql.*;
  import java.util.*;
+ import java.io.*;
  
! public class CleanUp extends Validators implements Serializable {
! 	static final long serialVersionUID = -6760151742357546179L;
  	protected transient LinkedList statements;
  
  	public CleanUp() {
! 		
! 
! 	}
! 	
! 	public void reload() {
! 		this.statements = new LinkedList();	
  	}