[Javabdd-checkins] JavaBDD/net/sf/javabdd CALFactory.java,1.5,1.6 TestBDDFactory.java,1.6,1.7 BuDDyFactory.java,1.8,1.9 CUDDFactory.java,1.5,1.6 BDDFactory.java,1.9,1.10 TypedBDDFactory.java,1.6,1.7

[John W. <joe...@us...>]

Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9291/net/sf/javabdd

Modified Files:
	CALFactory.java TestBDDFactory.java BuDDyFactory.java 
	CUDDFactory.java BDDFactory.java TypedBDDFactory.java 
Log Message:
Many updates to support applet version.

Index: TestBDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/TestBDDFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestBDDFactory.java	8 Apr 2005 05:27:52 -0000	1.6
--- TestBDDFactory.java	29 Apr 2005 02:25:28 -0000	1.7
***************
*** 30,35 ****
  
      public static BDDFactory init(int nodenum, int cachesize) {
!         String bdd1 = System.getProperty("bdd1", "j");
!         String bdd2 = System.getProperty("bdd2", "micro");
          BDDFactory a = BDDFactory.init(bdd1, nodenum, cachesize);
          BDDFactory b = BDDFactory.init(bdd2, nodenum, cachesize);
--- 30,35 ----
  
      public static BDDFactory init(int nodenum, int cachesize) {
!         String bdd1 = getProperty("bdd1", "j");
!         String bdd2 = getProperty("bdd2", "micro");
          BDDFactory a = BDDFactory.init(bdd1, nodenum, cachesize);
          BDDFactory b = BDDFactory.init(bdd2, nodenum, cachesize);

Index: CALFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/CALFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CALFactory.java	8 Apr 2005 05:27:52 -0000	1.5
--- CALFactory.java	29 Apr 2005 02:25:28 -0000	1.6
***************
*** 53,58 ****
              // Cannot find library, try loading it from the current directory...
              libname = System.mapLibraryName(libname);
!             String currentdir = System.getProperty("user.dir");
!             String sep = System.getProperty("file.separator");
              System.load(currentdir+sep+libname);
          }
--- 53,58 ----
              // Cannot find library, try loading it from the current directory...
              libname = System.mapLibraryName(libname);
!             String currentdir = getProperty("user.dir", ".");
!             String sep = getProperty("file.separator", "/");
              System.load(currentdir+sep+libname);
          }

Index: TypedBDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/TypedBDDFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TypedBDDFactory.java	8 Apr 2005 05:27:52 -0000	1.6
--- TypedBDDFactory.java	29 Apr 2005 02:25:28 -0000	1.7
***************
*** 39,43 ****
      public static BDDFactory init(int nodenum, int cachesize) {
          BDDFactory a;
!         String factoryName = System.getProperty("bdd");
          if (factoryName != null && factoryName.equals("typed"))
              a = BuDDyFactory.init(nodenum, cachesize);
--- 39,43 ----
      public static BDDFactory init(int nodenum, int cachesize) {
          BDDFactory a;
!         String factoryName = getProperty("bdd", null);
          if (factoryName != null && factoryName.equals("typed"))
              a = BuDDyFactory.init(nodenum, cachesize);

Index: BuDDyFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BuDDyFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BuDDyFactory.java	8 Apr 2005 05:27:52 -0000	1.8
--- BuDDyFactory.java	29 Apr 2005 02:25:28 -0000	1.9
***************
*** 51,55 ****
      
      static {
!         String libname = System.getProperty("buddylib", "buddy");
          try {
              System.loadLibrary(libname);
--- 51,55 ----
      
      static {
!         String libname = getProperty("buddylib", "buddy");
          try {
              System.loadLibrary(libname);
***************
*** 57,62 ****
              // Cannot find library, try loading it from the current directory...
              libname = System.mapLibraryName(libname);
!             String currentdir = System.getProperty("user.dir");
!             String sep = System.getProperty("file.separator");
              String filename = currentdir+sep+libname;
              try {
--- 57,62 ----
              // Cannot find library, try loading it from the current directory...
              libname = System.mapLibraryName(libname);
!             String currentdir = getProperty("user.dir", ".");
!             String sep = getProperty("file.separator", "/");
              String filename = currentdir+sep+libname;
              try {

Index: BDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDDFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BDDFactory.java	17 Apr 2005 10:21:47 -0000	1.9
--- BDDFactory.java	29 Apr 2005 02:25:28 -0000	1.10
***************
*** 21,24 ****
--- 21,25 ----
  import java.lang.reflect.Modifier;
  import java.math.BigInteger;
+ import java.security.AccessControlException;
  
  /**
***************
*** 32,35 ****
--- 33,44 ----
  public abstract class BDDFactory {
  
+     public static final String getProperty(String key, String def) {
+         try {
+             return System.getProperty(key, def);
+         } catch (AccessControlException _) {
+             return def;
+         }
+     }
+     
      /**
       * <p>Initializes a BDD factory with the given initial node table size
***************
*** 42,46 ****
       */
      public static BDDFactory init(int nodenum, int cachesize) {
!         String bddpackage = System.getProperty("bdd", "buddy");
          return init(bddpackage, nodenum, cachesize);
      }
--- 51,55 ----
       */
      public static BDDFactory init(int nodenum, int cachesize) {
!         String bddpackage = getProperty("bdd", "buddy");
          return init(bddpackage, nodenum, cachesize);
      }
***************
*** 1157,1161 ****
          public String toString() {
              StringBuffer sb = new StringBuffer();
!             String newLine = System.getProperty("line.separator");
              sb.append(newLine);
              sb.append("Cache statistics");
--- 1166,1170 ----
          public String toString() {
              StringBuffer sb = new StringBuffer();
!             String newLine = getProperty("line.separator", "\n");
              sb.append(newLine);
              sb.append("Cache statistics");

Index: CUDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/CUDDFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CUDDFactory.java	8 Apr 2005 05:27:52 -0000	1.5
--- CUDDFactory.java	29 Apr 2005 02:25:28 -0000	1.6
***************
*** 53,58 ****
              // Cannot find library, try loading it from the current directory...
              libname = System.mapLibraryName(libname);
!             String currentdir = System.getProperty("user.dir");
!             String sep = System.getProperty("file.separator");
              System.load(currentdir+sep+libname);
          }
--- 53,58 ----
              // Cannot find library, try loading it from the current directory...
              libname = System.mapLibraryName(libname);
!             String currentdir = getProperty("user.dir", ".");
!             String sep = getProperty("file.separator", "/");
              System.load(currentdir+sep+libname);
          }