[Gzz-commits] gzz gzz/errors/InconsistentChangeException.java...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/03 06:14:11

Modified files:
        gzz/errors     : InconsistentChangeException.java 
        gzz/impl       : NormalDim.java 
        gzz/impl/mirror: MasterImpl.java Mirror.java 
Added files:
        test/gzz/impl/mirror: mirror.test 

Log message:
        Mirror tests - failing!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/errors/InconsistentChangeException.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/impl/NormalDim.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/impl/mirror/MasterImpl.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/impl/mirror/Mirror.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/impl/mirror/mirror.test?rev=1.1

Patches:
Index: gzz/gzz/errors/InconsistentChangeException.java
diff -c gzz/gzz/errors/InconsistentChangeException.java:1.1 
gzz/gzz/errors/InconsistentChangeException.java:1.2
*** gzz/gzz/errors/InconsistentChangeException.java:1.1 Wed Aug 28 08:24:02 2002
--- gzz/gzz/errors/InconsistentChangeException.java     Tue Sep  3 06:14:11 2002
***************
*** 25,36 ****
  import gzz.*;
  
  /** A changelist was not consistent with the dimension it was applied to.
!  * @see Leo1
!  * @see Leo1.ChangeSet
   */
  
  public class InconsistentChangeException extends RuntimeException {
! public static final String rcsid = "$Id: InconsistentChangeException.java,v 
1.1 2002/08/28 12:24:02 tjl Exp $";
      public InconsistentChangeException(String s) { super(s); }
  }
  
--- 25,35 ----
  import gzz.*;
  
  /** A changelist was not consistent with the dimension it was applied to.
!  * @see gzz.diff.DeltaSpace
   */
  
  public class InconsistentChangeException extends RuntimeException {
! public static final String rcsid = "$Id: InconsistentChangeException.java,v 
1.2 2002/09/03 10:14:11 tjl Exp $";
      public InconsistentChangeException(String s) { super(s); }
  }
  
Index: gzz/gzz/impl/NormalDim.java
diff -c gzz/gzz/impl/NormalDim.java:1.6 gzz/gzz/impl/NormalDim.java:1.7
*** gzz/gzz/impl/NormalDim.java:1.6     Wed Jul 17 08:47:46 2002
--- gzz/gzz/impl/NormalDim.java Tue Sep  3 06:14:11 2002
***************
*** 34,40 ****
  
  
  public class NormalDim extends SimpleDim implements DeltaDim {
! public static final String rcsid = "$Id: NormalDim.java,v 1.6 2002/07/17 
12:47:46 tjl Exp $";
      public static boolean dbg = true;
      private static void pa(String s) { ZZLogger.log(s); }
  
--- 34,40 ----
  
  
  public class NormalDim extends SimpleDim implements DeltaDim {
! public static final String rcsid = "$Id: NormalDim.java,v 1.7 2002/09/03 
10:14:11 tjl Exp $";
      public static boolean dbg = true;
      private static void pa(String s) { ZZLogger.log(s); }
  
***************
*** 88,94 ****
                Cell c2 = getCell(set.p2[i]);
                if(cp.get(c1) != null ||
                    cm.get(c2) != null) {
!                   throw new InconsistentChangeException("Invalid connect in 
changeset");
                }
                cp.put(c1, c2);
                cm.put(c2, c1);
--- 88,97 ----
                Cell c2 = getCell(set.p2[i]);
                if(cp.get(c1) != null ||
                    cm.get(c2) != null) {
!                   throw new InconsistentChangeException(
!                           "Invalid connect in changeset: " +
!                           set.p1[i]+" "+set.p2[i]+" : "+
!                           cp.get(c1)+" "+cm.get(c2));
                }
                cp.put(c1, c2);
                cm.put(c2, c1);
Index: gzz/gzz/impl/mirror/MasterImpl.java
diff -c gzz/gzz/impl/mirror/MasterImpl.java:1.1 
gzz/gzz/impl/mirror/MasterImpl.java:1.2
*** gzz/gzz/impl/mirror/MasterImpl.java:1.1     Mon Aug 19 08:45:08 2002
--- gzz/gzz/impl/mirror/MasterImpl.java Tue Sep  3 06:14:11 2002
***************
*** 30,38 ****
  import java.util.List;
  
  public class MasterImpl extends UnicastRemoteObject implements Master {
! public static final String rcsid = "$Id: MasterImpl.java,v 1.1 2002/08/19 
12:45:08 tjl Exp $";
      public static boolean dbg = true;
-     private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
  
      DeltaSpace space;
--- 30,37 ----
  import java.util.List;
  
  public class MasterImpl extends UnicastRemoteObject implements Master {
! public static final String rcsid = "$Id: MasterImpl.java,v 1.2 2002/09/03 
10:14:11 tjl Exp $";
      public static boolean dbg = true;
      private static void pa(String s) { System.err.println(s); }
  
      DeltaSpace space;
Index: gzz/gzz/impl/mirror/Mirror.java
diff -c gzz/gzz/impl/mirror/Mirror.java:1.1 gzz/gzz/impl/mirror/Mirror.java:1.2
*** gzz/gzz/impl/mirror/Mirror.java:1.1 Mon Aug 19 08:45:08 2002
--- gzz/gzz/impl/mirror/Mirror.java     Tue Sep  3 06:14:11 2002
***************
*** 35,41 ****
  
      DeltaSpace deltaSpace;
  
!     /** Create a new mirror.
       * @param rmiName The name to give to java.rmi.Naming for
       *                the Master object.
       * @param deltaSpace The empty deltaSpace object
--- 35,41 ----
  
      DeltaSpace deltaSpace;
  
!     /** Create a new mirror through RMI.
       * @param rmiName The name to give to java.rmi.Naming for
       *                the Master object.
       * @param deltaSpace The empty deltaSpace object
***************
*** 43,48 ****
--- 43,56 ----
      public Mirror(String rmiName, DeltaSpace deltaSpace) throws Exception {
        this.deltaSpace = deltaSpace;
        Master master = (Master)Naming.lookup(rmiName);
+       tap = master.getTap();
+       update();
+     }
+ 
+     /** Create a new mirror, to a given Master interface.
+      */
+     public Mirror(Master master, DeltaSpace deltaSpace) throws Exception {
+       this.deltaSpace = deltaSpace;
        tap = master.getTap();
        update();
      }