nice-commit — Changes sent to CVS

[Nice-commit] Nice/testsuite/compiler/typing arrays.testsuite,1.1,1.2

[<ar...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/typing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11278/F:/nice/testsuite/compiler/typing

Modified Files:
	arrays.testsuite 
Log Message:
Make a testcase not conflict with stdlib.

Index: arrays.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/typing/arrays.testsuite,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** arrays.testsuite	14 Jul 2002 16:07:31 -0000	1.1
--- arrays.testsuite	2 Mar 2004 17:25:33 -0000	1.2
***************
*** 17,21 ****
  /// PASS
    /// Toplevel
!   <Any R> R[] reverse(R[] x) = 
      superfill(new R[x.length], int i => x[x.length - 1 - i]);
  
--- 17,21 ----
  /// PASS
    /// Toplevel
!   <Any R> R[] myReverse(R[] x) = 
      superfill(new R[x.length], int i => x[x.length - 1 - i]);
  

[Nice-commit] Nice/src/bossa/parser Parser.jj,1.241,1.242

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25647/src/bossa/parser

Modified Files:
	Parser.jj 
Log Message:
Allow explicit method overrides.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.241
retrieving revision 1.242
diff -C2 -d -r1.241 -r1.242
*** Parser.jj	24 Feb 2004 15:20:16 -0000	1.241
--- Parser.jj	2 Mar 2004 16:02:44 -0000	1.242
***************
*** 901,906 ****
--- 901,908 ----
    Contract contract;
    List statements = new LinkedList();
+   boolean isOverride = false;
  }
  {
+   [ "override" { isOverride = true; } ]
    cst=constraint()
    returnType=monotype()
***************
*** 911,915 ****
    
    { return NiceMethod.create(c, name, cst, returnType, parameters, 
!                              body!=null?new Block(statements):null , contract); }
  }
  
--- 913,918 ----
    
    { return NiceMethod.create(c, name, cst, returnType, parameters, 
!                              body != null ? new Block(statements) : null,
!                              contract, isOverride); }
  }
  
***************
*** 1366,1370 ****
  }
  
! Definition methodDeclaration(Constraint cst):
  {
      LocatedString name;
--- 1369,1373 ----
  }
  
! Definition methodDeclaration(Constraint cst, boolean isOverride):
  {
      LocatedString name;
***************
*** 1402,1411 ****
              (name, cst, returnType, parameters, 
               body != null ? new Block(statements) : null, 
!              contract);
          }
        |
          // Nice method
          ";"
!         { res = new NiceMethod(name,cst,returnType,parameters,contract); }
        )
      )
--- 1405,1415 ----
              (name, cst, returnType, parameters, 
               body != null ? new Block(statements) : null, 
!              contract, isOverride);
          }
        |
          // Nice method
          ";"
!         { res = new NiceMethod
!             (name, cst, returnType, parameters, contract, isOverride); }
        )
      )
***************
*** 1548,1552 ****
        res=globalVariable()
      | res=enumDefinition(definitions)
!     | { Constraint cst; } cst = constraint()
        ( 
          res=customConstructor(cst)
--- 1552,1558 ----
        res=globalVariable()
      | res=enumDefinition(definitions)
!     | "override" { Constraint cst; } cst = constraint() 
!       res=methodDeclaration(cst, true)
!     | cst = constraint()
        ( 
          res=customConstructor(cst)
***************
*** 1554,1558 ****
          res=interfaceDefinition(cst)
        | res=classDefinition(cst, definitions, storeDocString)
!       | res=methodDeclaration(cst)
        )
      )
--- 1560,1564 ----
          res=interfaceDefinition(cst)
        | res=classDefinition(cst, definitions, storeDocString)
!       | res=methodDeclaration(cst, false)
        )
      )

[Nice-commit] Nice/src/bossa/syntax NiceMethod.java,1.29,1.30 DefaultMethodImplementation.java,1.6,1.7

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25647/src/bossa/syntax

Modified Files:
	NiceMethod.java DefaultMethodImplementation.java 
Log Message:
Allow explicit method overrides.


Index: NiceMethod.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NiceMethod.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NiceMethod.java	2 Mar 2004 12:18:41 -0000	1.29
--- NiceMethod.java	2 Mar 2004 16:02:44 -0000	1.30
***************
*** 48,52 ****
       FormalParameters params,
       Statement body, 
!      Contract contract)
    {
      // it is a class method, there is an implicit "this" argument
--- 48,53 ----
       FormalParameters params,
       Statement body, 
!      Contract contract,
!      boolean isOverride)
    {
      // it is a class method, there is an implicit "this" argument
***************
*** 126,133 ****
      
      if (body == null)
!       return new NiceMethod(name, constraint, returnType, params, contract);
      else
        return NiceMethod.WithDefault.create
!         (name, constraint, returnType, params, body, contract);
    }
  
--- 127,135 ----
      
      if (body == null)
!       return new NiceMethod(name, constraint, returnType, params, contract, 
!                             isOverride);
      else
        return NiceMethod.WithDefault.create
!         (name, constraint, returnType, params, body, contract, isOverride);
    }
  
***************
*** 135,145 ****
  		    Constraint constraint, Monotype returnType, 
  		    FormalParameters parameters,
! 		    Contract contract)
    {
      super(name, constraint, returnType, parameters, contract);
      this.returnTypeLocation = returnType.location();
      bossa.link.Dispatch.register(this);
    }
  
    private bossa.util.Location returnTypeLocation;
  
--- 137,149 ----
  		    Constraint constraint, Monotype returnType, 
  		    FormalParameters parameters,
! 		    Contract contract, boolean isOverride)
    {
      super(name, constraint, returnType, parameters, contract);
+     this.isOverride = isOverride;
      this.returnTypeLocation = returnType.location();
      bossa.link.Dispatch.register(this);
    }
  
+   private boolean isOverride;
    private bossa.util.Location returnTypeLocation;
  
***************
*** 296,307 ****
         FormalParameters parameters,
         Statement body,
!        Contract contract)
      {
        if (body == null)
          return new NiceMethod
!           (name, constraint, returnType, parameters, contract);
  
        return new DefaultMethodImplementation
!         (name, constraint, returnType, parameters, contract, body);
      }
  
--- 300,311 ----
         FormalParameters parameters,
         Statement body,
!        Contract contract, boolean isOverride)
      {
        if (body == null)
          return new NiceMethod
!           (name, constraint, returnType, parameters, contract, isOverride);
  
        return new DefaultMethodImplementation
!         (name, constraint, returnType, parameters, contract, isOverride, body);
      }
  
***************
*** 310,317 ****
         Constraint constraint, Monotype returnType, 
         FormalParameters parameters,
!        Contract contract,
         DefaultMethodImplementation impl)
      {
!       super(name, constraint, returnType, parameters, contract);
        this.implementation = impl;
      }
--- 314,321 ----
         Constraint constraint, Monotype returnType, 
         FormalParameters parameters,
!        Contract contract, boolean isOverride,
         DefaultMethodImplementation impl)
      {
!       super(name, constraint, returnType, parameters, contract, isOverride);
        this.implementation = impl;
      }

Index: DefaultMethodImplementation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/DefaultMethodImplementation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DefaultMethodImplementation.java	28 Feb 2004 14:23:43 -0000	1.6
--- DefaultMethodImplementation.java	2 Mar 2004 16:02:44 -0000	1.7
***************
*** 29,38 ****
       Monotype returnType,
       FormalParameters parameters,
!      Contract contract,
       Statement body)
    {
      super(name, body, getAnyPatterns(parameters, name.location()));
      this.declaration = new NiceMethod.WithDefault
!       (name, constraint, returnType, parameters, contract, this);
      addChild(declaration);
    }
--- 29,38 ----
       Monotype returnType,
       FormalParameters parameters,
!      Contract contract, boolean isOverride,
       Statement body)
    {
      super(name, body, getAnyPatterns(parameters, name.location()));
      this.declaration = new NiceMethod.WithDefault
!       (name, constraint, returnType, parameters, contract, isOverride, this);
      addChild(declaration);
    }

[Nice-commit] Nice/testsuite/compiler/methods overriding.testsuite,1.3,1.4

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25647/testsuite/compiler/methods

Modified Files:
	overriding.testsuite 
Log Message:
Allow explicit method overrides.


Index: overriding.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/overriding.testsuite,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** overriding.testsuite	2 Mar 2004 12:18:41 -0000	1.3
--- overriding.testsuite	2 Mar 2004 16:02:44 -0000	1.4
***************
*** 70,74 ****
    /// Toplevel
  class B extends A {}
! boolean foo(B); foo(B x) = true;
  
  /// PASS
--- 70,74 ----
    /// Toplevel
  class B extends A {}
! override boolean foo(B); foo(B x) = true;
  
  /// PASS

[Nice-commit] Nice/web index.xml,1.7,1.8

[<bo...@us...>]

Update of /cvsroot/nice/Nice/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16762/web

Modified Files:
	index.xml 
Log Message:
Use the more precise description of how Nice relates to object orientation,
as discussed on nice-info.


Index: index.xml
===================================================================
RCS file: /cvsroot/nice/Nice/web/index.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.xml	24 Jan 2004 21:19:56 -0000	1.7
--- index.xml	2 Mar 2004 15:18:59 -0000	1.8
***************
*** 10,17 ****
  <section>
  <para>
! Nice is a new object-oriented programming language based on Java.
! It incorporates features from functional programming,
! and puts into practice state-of-the-art results from academic research.
! This results in more expressivity, modularity and safety.
  </para>
  
--- 10,19 ----
  <section>
  <para>
! Nice is a new programming language. It extends the ideas behind
! object-orientation in order to better support modular programming and
! static type safety. It also incorporates features from functional
! programming, and puts into practice state-of-the-art results from
! academic research. This results in more expressivity, modularity and
! safety.
  </para>
  

[Nice-commit] Nice/web compilation.xml,1.6,1.7

[<bo...@us...>]

Update of /cvsroot/nice/Nice/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16147/web

Modified Files:
	compilation.xml 
Log Message:
Use quotes around the classpath argument, as this is required on windows
at the moment.


Index: compilation.xml
===================================================================
RCS file: /cvsroot/nice/Nice/web/compilation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** compilation.xml	20 Feb 2004 10:27:41 -0000	1.6
--- compilation.xml	2 Mar 2004 15:16:20 -0000	1.7
***************
*** 72,76 ****
  program, you cannot use the <literal>java -jar</literal> command,
  because it ignores the classpath. You then need to use
! <literal>java -classpath lib1.jar:lib2.jar:program.jar
  my.program.dispatch</literal> (use <literal>;</literal> instead of
  <literal>:</literal> on Windows systems).
--- 72,76 ----
  program, you cannot use the <literal>java -jar</literal> command,
  because it ignores the classpath. You then need to use
! <literal>java -classpath "lib1.jar:lib2.jar:program.jar"
  my.program.dispatch</literal> (use <literal>;</literal> instead of
  <literal>:</literal> on Windows systems).

[Nice-commit] Nice/src/nice/tools/typing Types.java,1.4,1.5

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/nice/tools/typing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10343/src/nice/tools/typing

Modified Files:
	Types.java 
Log Message:
Check that method overrides have covariant return types.


Index: Types.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/typing/Types.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Types.java	28 Feb 2004 14:23:42 -0000	1.4
--- Types.java	2 Mar 2004 12:18:41 -0000	1.5
***************
*** 214,216 ****
--- 214,275 ----
      return new Domain(t.getConstraint(), m);
    }
+ 
+   /****************************************************************
+    * Covariant specialization
+    ****************************************************************/
+ 
+   /**
+      @returns true if the spec type is a covariant specialization of origin,
+               false if the return type is not a subtype of the original subtype
+   */
+   public static boolean covariantSpecialization(Polytype spec, Polytype origin)
+   {
+     boolean entered = false;
+ 
+     if (Constraint.hasBinders(spec.getConstraint()) || 
+         Constraint.hasBinders(origin.getConstraint()))
+       {
+         entered = true;
+         Typing.enter();
+       }
+ 
+     try {
+ 
+       try {
+         if (entered) {
+           Polytype clonedSpec = spec.cloneType();
+ 
+           Constraint.enter(origin.getConstraint());
+           Constraint.enter(clonedSpec.getConstraint());
+ 
+           // For all argument types ...
+           Monotype[] args = MonotypeVar.news(parameters(origin).length);
+           Typing.introduce(args);
+ 
+           // ... that can be used for both methods ...
+           Typing.leq(args, parameters(origin));
+           Typing.leq(args, parameters(clonedSpec));
+ 
+           Typing.implies();
+ 
+           // ... apply those args to the 'specialized' method ...
+           Constraint.enter(spec.getConstraint());
+           Typing.leq(args, parameters(spec));
+         }
+ 
+         // ... and check that the result is indeed more precise.
+         Typing.leq(result(spec), result(origin));
+       }
+       finally {
+         if (entered)
+           Typing.leave();
+       }
+     }
+     catch (TypingEx ex) {
+       return false;
+     }
+ 
+     // OK, spec is a covariant specialization
+     return true;
+   }
  }

[Nice-commit] Nice/src/bossa/syntax NiceMethod.java,1.28,1.29

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10343/src/bossa/syntax

Modified Files:
	NiceMethod.java 
Log Message:
Check that method overrides have covariant return types.


Index: NiceMethod.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NiceMethod.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** NiceMethod.java	28 Feb 2004 14:23:43 -0000	1.28
--- NiceMethod.java	2 Mar 2004 12:18:41 -0000	1.29
***************
*** 138,144 ****
--- 138,147 ----
    {
      super(name, constraint, returnType, parameters, contract);
+     this.returnTypeLocation = returnType.location();
      bossa.link.Dispatch.register(this);
    }
  
+   private bossa.util.Location returnTypeLocation;
+ 
    public boolean isMain()
    {
***************
*** 208,211 ****
--- 211,224 ----
            continue;
  
+         if (! Types.covariantSpecialization(getType(), s.getType()))
+           {
+             User.error
+               (returnTypeLocation != null ? returnTypeLocation : location(), 
+ "The return type is less precise than the original return type defined in:\n" +
+                d.location());
+           }
+ 
+         // Check if we are a proper specialization, or if we actually have
+         // the same domain.
          if (Typing.smaller(itsDomain, ourDomain))
            {
***************
*** 223,226 ****
--- 236,240 ----
          if (specializedMethods == null)
            specializedMethods = new ArrayList
+             // Heuristic: the maximum number that might be needed
              (homonyms.size() - i.previousIndex());
          specializedMethods.add(d);

[Nice-commit] Nice/testsuite/compiler/methods overriding.testsuite,1.2,1.3

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10343/testsuite/compiler/methods

Modified Files:
	overriding.testsuite 
Log Message:
Check that method overrides have covariant return types.


Index: overriding.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/overriding.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** overriding.testsuite	28 Feb 2004 20:24:16 -0000	1.2
--- overriding.testsuite	2 Mar 2004 12:18:41 -0000	1.3
***************
*** 131,132 ****
--- 131,179 ----
  boolean foo(A x,int->int t) = true;
  boolean foo(A x,int->byte t) = false;
+ 
+ /// FAIL
+   /// Toplevel
+ class A{}
+ class B extends A {}
+ B foo(A x) = new B();
+ /*/// FAIL HERE*/ A foo(B x) = new A();
+ 
+ /// PASS
+   A a = new B();
+   foo(a);
+   /// Toplevel
+ abstract class A {}
+ class B extends A {}
+ <A T> T foo(T x) { throw new Error(); }
+ <B T> T foo(T x) = x;
+ 
+ /// PASS
+   /// Toplevel
+ abstract class A {}
+ abstract class B {} // B does NOT extend A
+ <A T> T foo(T x);
+ <B T> A foo(T x);
+ 
+ /// FAIL
+   /// Toplevel
+ abstract class A {}
+ abstract class B extends A {}
+ <A T> T foo(T x);
+ <B T> /*/// FAIL HERE*/ A foo(T x);
+ 
+ /// FAIL
+   /// Toplevel
+ abstract class A {}
+ abstract class B extends A {}
+ <A T1, B U1> U1 foo(A a, T1 t, U1 u);
+ <A T2, B U2> /*/// FAIL HERE*/ T2 foo(B b, T2 t, U2 u);
+ 
+ /// PASS
+   A<String> a = new B();
+   foo(a, a);
+   /// Toplevel
+ abstract class A<T> {}
+ class B<T> extends A<T> {}
+ 
+ <T, T1, T2 | T1 <: T, T2 <: T> A<T> foo(A<T1> a1, A<T2> a2);
+ <U, U1, U2 | U1 <: U, U2 <: U> B<U> foo(B<U1> a1, B<U2> a2) = new B();

[Nice-commit] Nice/stdlib/nice/lang array.nice,1.32,1.33

[<bo...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18330/stdlib/nice/lang

Modified Files:
	array.nice 
Log Message:
Renamed
  <T> ?T find(!T[] a, (!T)->boolean test)
as 'search', since it is not supposed to be a specialization of
  <T> T find (List<T> list, T->boolean test)
but of
  <T> ?T search (java.util.List<!T> list, !T->boolean test)


Index: array.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/array.nice,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** array.nice	17 Jan 2004 16:35:43 -0000	1.32
--- array.nice	1 Mar 2004 17:16:13 -0000	1.33
***************
*** 110,114 ****
  }
  */
! <T> ?T find(!T[] a, (!T)->boolean test)
  {
    for (int i = 0; i < a.length; i++)
--- 110,114 ----
  }
  */
! <T> ?T search(!T[] a, (!T)->boolean test)
  {
    for (int i = 0; i < a.length; i++)

[Nice-commit] Nice NEWS,1.25,1.26

[<bo...@us...>]

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1312

Modified Files:
	NEWS 
Log Message:
Strict imports.


Index: NEWS
===================================================================
RCS file: /cvsroot/nice/Nice/NEWS,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** NEWS	24 Feb 2004 15:20:18 -0000	1.25
--- NEWS	1 Mar 2004 16:04:18 -0000	1.26
***************
*** 1,6 ****
--- 1,12 ----
  nice (0.9.7)
  
+   * When importing a java package, it is possible to specify that its methods
+     do not accept null arguments:
+       import some.java.pkg.* (!);
+     Individual methods can be treated specially by retyping them.
    * The 'Any' keyword is now deprecated.
  
+  --
+ 
  nice (0.9.6)
  

[Nice-commit] Nice/src/bossa/link Alternative.java,1.48,1.49

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/link
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23398/src/bossa/link

Modified Files:
	Alternative.java 
Log Message:
Fix sorting of alternatives, now that alternatives can belong to several
methods.


Index: Alternative.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Alternative.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Alternative.java	28 Feb 2004 14:23:43 -0000	1.48
--- Alternative.java	28 Feb 2004 20:24:16 -0000	1.49
***************
*** 52,67 ****
  
    /****************************************************************
-    * Graph traversal
-    ****************************************************************/
- 
-   static final int 
-     UNVISITED = 1,
-     VISITING  = 2,
-     VISITED   = 3;
-   
-   /** Marks the state of this node in the graph traversal. */
-   int mark = UNVISITED;
-   
-   /****************************************************************
     * Order on alternatives
     ****************************************************************/
--- 52,55 ----
***************
*** 222,225 ****
--- 210,222 ----
  
    /****************************************************************
+    * Graph traversal
+    ****************************************************************/
+ 
+   /** Marks the state of this node in the graph traversal. */
+   private int mark = 0;
+ 
+   private static int currentVisitedMark = 0;
+ 
+   /****************************************************************
     * Sorting alternatives by generality
     ****************************************************************/
***************
*** 237,251 ****
        return sortedAlternatives;
  
!     // Test if another sort has been done before.
!     // In that case reset the marks.
!     if (((Alternative) alternatives.get(0)).mark != Alternative.UNVISITED)
!       for(Iterator i = alternatives.iterator(); i.hasNext();)
! 	((Alternative) i.next()).mark = Alternative.UNVISITED;
! 	
      for(Iterator i = alternatives.iterator(); i.hasNext();)
        {
  	Alternative a = (Alternative) i.next();
! 	if (a.mark == Alternative.UNVISITED)
! 	  visit(a, alternatives, sortedAlternatives);
        }
  
--- 234,247 ----
        return sortedAlternatives;
  
!     // We used a different mark for each sort.
!     // Useful since an alternative can belong to several methods because of
!     // overriding, and SuperExp also lists alternatives.
!     int visited = ++currentVisitedMark;
! 
      for(Iterator i = alternatives.iterator(); i.hasNext();)
        {
  	Alternative a = (Alternative) i.next();
! 	if (a.mark != visited)
! 	  visit(a, alternatives, sortedAlternatives, visited);
        }
  
***************
*** 256,272 ****
      (final Alternative a, 
       final List alternatives,
!      final Stack sortedAlternatives
       )
    {
!     // Cycles are possible
!     //   * if two alternatives are identical (same patterns)
!     //   * if there is a cyclic subclass relation
!     //   * that's all, folks ! :-)
!     switch(a.mark)
!       {
!       case Alternative.VISITING : User.error("Cycle in alternatives: "+a);
!       case Alternative.UNVISITED: a.mark = Alternative.VISITING; break;
!       case Alternative.VISITED  : return; //should not happen
!       }
      
      for(Iterator i = alternatives.iterator();
--- 252,260 ----
      (final Alternative a, 
       final List alternatives,
!      final Stack sortedAlternatives,
!      final int visited
       )
    {
!     a.mark = visited;
      
      for(Iterator i = alternatives.iterator();
***************
*** 274,283 ****
        {
  	Alternative daughter = (Alternative) i.next();
! 	if(daughter != a 
! 	   && daughter.mark == Alternative.UNVISITED 
! 	   && Alternative.leq(daughter,a))
! 	  visit(daughter,alternatives,sortedAlternatives);
        }
!     a.mark = Alternative.VISITED;
      sortedAlternatives.push(a);
    }
--- 262,270 ----
        {
  	Alternative daughter = (Alternative) i.next();
! 	if (daughter.mark != visited 
!             && Alternative.leq(daughter,a))
! 	  visit(daughter, alternatives, sortedAlternatives, visited);
        }
! 
      sortedAlternatives.push(a);
    }

[Nice-commit] Nice/testsuite/compiler/methods overriding.testsuite,1.1,1.2

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23398/testsuite/compiler/methods

Modified Files:
	overriding.testsuite 
Log Message:
Fix sorting of alternatives, now that alternatives can belong to several
methods.


Index: overriding.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/overriding.testsuite,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** overriding.testsuite	28 Feb 2004 14:23:42 -0000	1.1
--- overriding.testsuite	28 Feb 2004 20:24:16 -0000	1.2
***************
*** 73,76 ****
--- 73,89 ----
  
  /// PASS
+   A a = new C();
+   B b = new C();
+   assert a.foo();
+   assert b.foo();
+   /// Toplevel
+ interface A {}
+ interface B{}
+ class C implements A,B {}
+ boolean foo(A a) = false;
+ boolean foo(B b) = false;
+ boolean foo(C c) = true;
+ 
+ /// PASS
    /// Toplevel
  class A{}

[Nice-commit] Nice/src/bossa/link SourceAlternative.java,1.3,1.4 ImportedAlternative.java,1.7,1.8 Alternative.java,1.47,1.48

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/link
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16026/src/bossa/link

Modified Files:
	SourceAlternative.java ImportedAlternative.java 
	Alternative.java 
Log Message:
Methods now specialize other methods with a larger domain (ignoring 
subtyping on non-dispatchable types like primitive and tuple types).
Covariance of the return type is not yet checked, and there is not yet a
way to explicitely declare that a method is a specialization.


Index: SourceAlternative.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/SourceAlternative.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SourceAlternative.java	11 Sep 2003 20:50:27 -0000	1.3
--- SourceAlternative.java	28 Feb 2004 14:23:43 -0000	1.4
***************
*** 28,34 ****
    {
      super(implementation.getDeclaration().getName().toString(), 
- 	  implementation.getDeclaration().getFullName(), 
  	  implementation.getPatterns());
      this.implementation = implementation;
    }
  
--- 28,43 ----
    {
      super(implementation.getDeclaration().getName().toString(), 
  	  implementation.getPatterns());
      this.implementation = implementation;
+ 
+     add(implementation.getDeclaration().getFullName());
+ 
+     java.util.Iterator specializedMethods = 
+       implementation.getDeclaration().listSpecializedMethods();
+     if (specializedMethods != null)
+       for (; specializedMethods.hasNext();)
+         {
+           add(((MethodDeclaration) specializedMethods.next()).getFullName());
+         }
    }
  

Index: ImportedAlternative.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/ImportedAlternative.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ImportedAlternative.java	28 Feb 2004 12:26:05 -0000	1.7
--- ImportedAlternative.java	28 Feb 2004 14:23:43 -0000	1.8
***************
*** 76,83 ****
        }
      
!     new ImportedAlternative(method.getName(), fullName, (Pattern[]) 
! 			    patterns.toArray(new Pattern[patterns.size()]),
! 			    new QuoteExp(new PrimProcedure(method)),
! 			    location);
    }
  
--- 76,87 ----
        }
      
!     Alternative alt = 
!       new ImportedAlternative(method.getName(), (Pattern[]) 
!                               patterns.toArray(new Pattern[patterns.size()]),
!                               new QuoteExp(new PrimProcedure(method)),
!                               location);
! 
!     alt.add(nice.tools.util.System.split
!             (fullName, MethodDeclaration.methodListSeparator));
    }
  
***************
*** 111,118 ****
    }
  
!   private ImportedAlternative(String name, String fullName, Pattern[] patterns,
  			      gnu.expr.Expression code, Location location)
    {
!     super(name, fullName, patterns);
      this.code = code;
      this.location = location;
--- 115,122 ----
    }
  
!   private ImportedAlternative(String name, Pattern[] patterns,
  			      gnu.expr.Expression code, Location location)
    {
!     super(name, patterns);
      this.code = code;
      this.location = location;

Index: Alternative.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Alternative.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Alternative.java	2 Feb 2004 13:08:34 -0000	1.47
--- Alternative.java	28 Feb 2004 14:23:43 -0000	1.48
***************
*** 45,54 ****
       complete type.
    */
!   public Alternative(String methodName, String fullName, Pattern[] patterns)
    {
      this.methodName = methodName;
-     this.fullName = fullName;
      this.patterns = patterns;
-     add();
    }
  
--- 45,52 ----
       complete type.
    */
!   public Alternative(String methodName, Pattern[] patterns)
    {
      this.methodName = methodName;
      this.patterns = patterns;
    }
  
***************
*** 176,180 ****
  
    String methodName;
-   String fullName;
    Pattern[] patterns;
  
--- 174,177 ----
***************
*** 191,195 ****
    }
    
!   private void add()
    {
      List l = (List) alternatives.get(fullName);
--- 188,192 ----
    }
    
!   protected void add(String fullName)
    {
      List l = (List) alternatives.get(fullName);
***************
*** 205,208 ****
--- 202,211 ----
    }
    
+   protected void add(String[] fullNames)
+   {
+     for (int i = 0; i < fullNames.length; i++)
+       add(fullNames[i]);
+   }
+ 
    public static Stack sortedAlternatives(MethodDeclaration m)
    {

[Nice-commit] Nice/src/bossa/syntax Pattern.java,1.81,1.82 NiceMethod.java,1.27,1.28 MethodImplementation.java,1.4,1.5 MethodDeclaration.java,1.54,1.55 MethodBodyDefinition.java,1.148,1.149 DefaultMethodImplementation.java,1.5,1.6 CustomConstructor.java,1.13,1.14 AST.java,1.56,1.57

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16026/src/bossa/syntax

Modified Files:
	Pattern.java NiceMethod.java MethodImplementation.java 
	MethodDeclaration.java MethodBodyDefinition.java 
	DefaultMethodImplementation.java CustomConstructor.java 
	AST.java 
Log Message:
Methods now specialize other methods with a larger domain (ignoring 
subtyping on non-dispatchable types like primitive and tuple types).
Covariance of the return type is not yet checked, and there is not yet a
way to explicitely declare that a method is a specialization.


Index: Pattern.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Pattern.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** Pattern.java	28 Feb 2004 12:26:05 -0000	1.81
--- Pattern.java	28 Feb 2004 14:23:43 -0000	1.82
***************
*** 32,36 ****
  
     @version $Date$
!    @author Daniel Bonniot (d.b...@ma...)
  */
  public class Pattern implements Located
--- 32,36 ----
  
     @version $Date$
!    @author Daniel Bonniot (bo...@us...)
  */
  public class Pattern implements Located
***************
*** 396,399 ****
--- 396,408 ----
        return false;
  
+     if (that.atNonNull())
+       // The only reason it could be false is if we are atNull, but that's
+       // already handled.
+       return true;
+ 
+     // that is not atNonNull nor atAny at this point
+     if (this.atNonNull())
+       return false;
+ 
      if (that.atBool())
        return this.atBool() && (this.atTrue() == that.atTrue());
***************
*** 437,440 ****
--- 446,452 ----
        return tag == PrimitiveType.nullTC;
  
+     if (atNonNull())
+       return tag != PrimitiveType.nullTC;
+ 
      // a null tc is an unmatchable argument (e.g. function)
      if (tag == null)
***************
*** 856,859 ****
--- 868,877 ----
    }
    public boolean atNull() { return atValue instanceof NullExp; }
+   /** This pattern only specifies that the vlaue is not null.
+       This cannot be explicitely used in source programs, but it is useful
+       when a method with a non-null parameter specializes one where that 
+       parameter can be null.
+   */
+   public boolean atNonNull() { return tc == PrimitiveType.sureTC; }
    public boolean atAny()  { return atValue == null && tc == null; }
    public boolean atBool() { 

Index: NiceMethod.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NiceMethod.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** NiceMethod.java	16 Feb 2004 21:47:11 -0000	1.27
--- NiceMethod.java	28 Feb 2004 14:23:43 -0000	1.28
***************
*** 15,18 ****
--- 15,19 ----
  import bossa.util.*;
  import mlsub.typing.*;
+ import nice.tools.typing.Types;
  
  import gnu.bytecode.*;
***************
*** 148,151 ****
--- 149,233 ----
    }
  
+   void resolve()
+   {
+     homonyms = Node.getGlobalScope().lookup(getName());
+     homonyms.remove(getSymbol());
+   }
+ 
+   void typedResolve()
+   {
+     findSpecializedMethods();
+ 
+     super.typedResolve();
+   }
+ 
+   private List homonyms;
+ 
+   private List specializedMethods = null;
+ 
+   public Iterator listSpecializedMethods()
+   {
+     return specializedMethods == null ? null : specializedMethods.iterator();
+   }
+ 
+   public boolean specializesMethods()
+   {
+     //if (homonyms != null)
+     //throw new Error(this.toString());
+ 
+     return specializedMethods != null;
+   }
+ 
+   void findSpecializedMethods()
+   {
+     if (homonyms.isEmpty())
+       {
+         homonyms = null;
+         return;
+       }
+ 
+     Domain ourDomain = Types.domain(getType());
+ 
+     for (ListIterator i = homonyms.listIterator(); i.hasNext();)
+       {
+         VarSymbol s = (VarSymbol) i.next();
+         MethodDeclaration d = s.getMethodDeclaration();
+ 
+         // Ignore non-methods.
+         if (d == null || d.isIgnored())
+           continue;
+ 
+         // Check that we have the same number of arguments
+         if (d.getArity() != this.getArity())
+           continue;
+ 
+         Domain itsDomain = Types.domain(s.getType());
+ 
+         // Do we have a smaller domain?
+         if (! (Typing.smaller(ourDomain, itsDomain, true)))
+           continue;
+ 
+         if (Typing.smaller(itsDomain, ourDomain))
+           {
+             if (module == d.module)
+               User.error(this, "This method has a domain identical to " +
+                          d + ", which is defined at " + d.location());
+             else
+               // Methods with identical domains in different packages are
+               // accepted, but they do not specialize each other.
+               // They can be refered to unambiguously by using their
+               // fully qualified name.
+               continue;
+           }
+ 
+         if (specializedMethods == null)
+           specializedMethods = new ArrayList
+             (homonyms.size() - i.previousIndex());
+         specializedMethods.add(d);
+       }
+ 
+     homonyms = null;
+   }
+ 
    /****************************************************************
     * Code generation

Index: MethodImplementation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodImplementation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MethodImplementation.java	25 Feb 2004 11:23:29 -0000	1.4
--- MethodImplementation.java	28 Feb 2004 14:23:43 -0000	1.5
***************
*** 24,27 ****
--- 24,28 ----
  import mlsub.typing.Typing;
  import mlsub.typing.TypeConstructor;
+ import mlsub.typing.Monotype;
  import mlsub.typing.MonotypeVar;
  import gnu.bytecode.*;
***************
*** 96,99 ****
--- 97,119 ----
    }
    
+   /** Where no patterns are present, add those corresponding to the method
+       declaration.
+   */
+   void addPatterns()
+   {
+     Monotype[] parameters = Types.parameters(declaration.getType());
+     for (int i = 0; i < formals.length; i++)      
+       if (formals[i].tc == null)
+         {
+           formals[i].tc = Types.concreteConstructor(parameters[i]);
+ 
+           if (formals[i].tc == null && Types.isSure(parameters[i]))
+             formals[i].tc = PrimitiveType.sureTC;
+ 
+           if (Types.isPrimitive(formals[i].tc))
+             formals[i].tc = null;
+         }
+   }
+ 
    void resolveBody()
    {
***************
*** 108,113 ****
--- 128,140 ----
        Node.thisExp = null;
      }
+ 
+     // Register this alternative for the link test
+     alternative = new bossa.link.SourceAlternative(this);
    }
  
+   private bossa.link.Alternative alternative;
+ 
+   bossa.link.Alternative getAlternative() { return alternative; }
+ 
    /****************************************************************
     * Type checking
***************
*** 178,182 ****
  
      compiledMethod.addBytecodeAttribute
!       (new MiscAttr("definition", declaration.getFullName().getBytes()));
      compiledMethod.addBytecodeAttribute
        (new MiscAttr("patterns", 
--- 205,209 ----
  
      compiledMethod.addBytecodeAttribute
!       (new MiscAttr("definition", declaration.getAllFullNames().getBytes()));
      compiledMethod.addBytecodeAttribute
        (new MiscAttr("patterns", 

Index: MethodDeclaration.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodDeclaration.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** MethodDeclaration.java	25 Feb 2004 11:23:29 -0000	1.54
--- MethodDeclaration.java	28 Feb 2004 14:23:43 -0000	1.55
***************
*** 394,397 ****
--- 394,430 ----
    }
  
+   public boolean specializesMethods()
+   {
+     return false;
+   }
+ 
+   public Iterator listSpecializedMethods()
+   {
+    return null;
+   }
+ 
+   /** @return a string that uniquely represents this method 
+       and those that it specializes. 
+   */
+   String getAllFullNames()
+   {
+     Iterator i = listSpecializedMethods();
+ 
+     if (i == null)
+       return getFullName();
+ 
+     StringBuffer res = new StringBuffer();
+     res.append(getFullName());
+     while (i.hasNext())
+       {
+         res.append(methodListSeparator);
+         res.append(((MethodDeclaration) i.next()).getFullName());
+       }
+ 
+     return res.toString();
+   }
+ 
+   public static final char methodListSeparator = ';';
+ 
    private gnu.expr.Expression code;
  

Index: MethodBodyDefinition.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodBodyDefinition.java,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** MethodBodyDefinition.java	25 Feb 2004 11:23:29 -0000	1.148
--- MethodBodyDefinition.java	28 Feb 2004 14:23:43 -0000	1.149
***************
*** 112,118 ****
  		 d.location());
  
-     // Register this alternative for the link test
-     alternative = new bossa.link.SourceAlternative(this);
- 
      buildSymbols();
    }
--- 112,115 ----
***************
*** 343,347 ****
      }
  
!     removeUnnecessaryDispatch();
    }
  
--- 340,345 ----
      }
  
!     if (! declaration.specializesMethods())
!       removeUnnecessaryDispatch();
    }
  
***************
*** 482,485 ****
--- 480,489 ----
        }
      }
+ 
+     // If the method we implement specialize others, then we cannot
+     // omit the patterns, as we do handle only a special case of those
+     // more general methods.
+     if (declaration.specializesMethods())
+       addPatterns();
    }
  
***************
*** 516,524 ****
    }
  
-   private bossa.link.Alternative alternative;
- 
-   bossa.link.Alternative getAlternative() { return alternative; }
- 
- 
    /****************************************************************
     * Printing
--- 520,523 ----

Index: DefaultMethodImplementation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/DefaultMethodImplementation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultMethodImplementation.java	25 Feb 2004 11:23:29 -0000	1.5
--- DefaultMethodImplementation.java	28 Feb 2004 14:23:43 -0000	1.6
***************
*** 78,86 ****
    {
      super.resolveBody();
-     /*alternative =*/ new bossa.link.SourceAlternative(this);
    }
  
    void innerTypecheck() throws mlsub.typing.TypingEx
    {
      Node.currentFunction = this;
      if (hasThis())
--- 78,91 ----
    {
      super.resolveBody();
    }
  
    void innerTypecheck() throws mlsub.typing.TypingEx
    {
+     // If the method we implement specialize others, then we cannot
+     // omit the patterns, as we do handle only a special case of those
+     // more general methods.
+     if (declaration.specializesMethods())
+       addPatterns();
+ 
      Node.currentFunction = this;
      if (hasThis())

Index: CustomConstructor.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/CustomConstructor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CustomConstructor.java	20 Feb 2004 00:31:11 -0000	1.13
--- CustomConstructor.java	28 Feb 2004 14:23:43 -0000	1.14
***************
*** 131,134 ****
--- 131,136 ----
      void resolve()
      {
+       super.resolve();
+ 
        TypeConstructor tc = Node.getGlobalTypeScope().globalLookup(className);
        TypeConstructors.addConstructor(tc, this);
***************
*** 273,276 ****
--- 275,279 ----
      void resolve()
      {
+       super.resolve();
        addConstructorCallSymbol();
      }

Index: AST.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/AST.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** AST.java	22 Dec 2003 01:30:59 -0000	1.56
--- AST.java	28 Feb 2004 14:23:43 -0000	1.57
***************
*** 130,136 ****
      Node.setModule(module);
  
!     for (int i = 0; i < methodImplementations.length; i++)
        try{
!         methodImplementations[i].lateBuildScope();
        }
        catch(UserError ex){
--- 130,136 ----
      Node.setModule(module);
  
!     for (int i = 0; i < methods.length; i++)
        try{
!         methods[i].typedResolve();
        }
        catch(UserError ex){
***************
*** 138,144 ****
        }
  
!     for (int i = 0; i < methods.length; i++)
        try{
!         methods[i].typedResolve();
        }
        catch(UserError ex){
--- 138,144 ----
        }
  
!     for (int i = 0; i < methodImplementations.length; i++)
        try{
!         methodImplementations[i].lateBuildScope();
        }
        catch(UserError ex){

[Nice-commit] Nice/src/mlsub/typing Typing.java,1.34,1.35

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/mlsub/typing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16026/src/mlsub/typing

Modified Files:
	Typing.java 
Log Message:
Methods now specialize other methods with a larger domain (ignoring 
subtyping on non-dispatchable types like primitive and tuple types).
Covariance of the return type is not yet checked, and there is not yet a
way to explicitely declare that a method is a specialization.


Index: Typing.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/Typing.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Typing.java	26 Feb 2004 22:17:37 -0000	1.34
--- Typing.java	28 Feb 2004 14:23:43 -0000	1.35
***************
*** 335,338 ****
--- 335,358 ----
    }
  
+   /** @param dispatchable when true, we require that non dispatchable types be
+                           equal, not mere subtypes.
+   */
+   public static void leq(Monotype[] ms1, Monotype[] ms2, boolean dispatchable)
+     throws TypingEx
+   {
+     if (! dispatchable)
+       for(int i = 0; i < ms1.length; i++)
+         leq(ms1[i], ms2[i]);
+     else
+       for(int i = 0; i < ms1.length; i++)
+         {
+           Monotype m1 = ms1[i];
+           Monotype m2 = ms2[i];
+           leq(m1, m2);
+           if (! nice.tools.typing.Types.isDispatchable(m2))
+             leq(m2, m1);
+         }
+   }
+ 
    /****************************************************************
     * Type constructors
***************
*** 388,391 ****
--- 408,421 ----
      throws TypingEx
    {
+     leq(d1, d2, false);
+   }
+ 
+   /** Test if d1 is a subdomain of d2.
+       @param dispatchable when true, we require that non dispatchable types be
+                           equal, not mere subtypes.
+   */
+   public static void leq(Domain d1, Domain d2, boolean dispatchable)
+     throws TypingEx
+   {
      if(dbg) Debug.println(d1+" leq "+d2);
      
***************
*** 396,400 ****
  	  Constraint.hasBinders(d2.getConstraint())))
        {
! 	leq(d1.getMonotypes(), d2.getMonotypes());
  	return;
        }
--- 426,430 ----
  	  Constraint.hasBinders(d2.getConstraint())))
        {
! 	leq(d1.getMonotypes(), d2.getMonotypes(), dispatchable);
  	return;
        }
***************
*** 407,411 ****
  
        Constraint.enter(d2.getConstraint());
!       leq(d1.getMonotypes(), d2.getMonotypes());
      }
      finally{
--- 437,441 ----
  
        Constraint.enter(d2.getConstraint());
!       leq(d1.getMonotypes(), d2.getMonotypes(), dispatchable);
      }
      finally{
***************
*** 413,417 ****
      }
    }
!   
    /** Test if a polytype is in a domain. */
    public static void in(Polytype type, Monotype domain)
--- 443,472 ----
      }
    }
! 
!   public static boolean smaller(Domain d1, Domain d2)
!   {
!     try {
!       leq(d1, d2);
!       return true;
!     }
!     catch(TypingEx ex) {
!       return false;
!     }
!   }
! 
!   /** @param dispatchable when true, we require that non dispatchable types be
!                           equal, not mere subtypes.
!   */
!   public static boolean smaller(Domain d1, Domain d2, boolean dispatchable)
!   {
!     try {
!       leq(d1, d2, dispatchable);
!       return true;
!     }
!     catch(TypingEx ex) {
!       return false;
!     }
!   }
! 
    /** Test if a polytype is in a domain. */
    public static void in(Polytype type, Monotype domain)

[Nice-commit] Nice/src/nice/tools/typing Types.java,1.3,1.4

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/nice/tools/typing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16026/src/nice/tools/typing

Modified Files:
	Types.java 
Log Message:
Methods now specialize other methods with a larger domain (ignoring 
subtyping on non-dispatchable types like primitive and tuple types).
Covariance of the return type is not yet checked, and there is not yet a
way to explicitely declare that a method is a specialization.


Index: Types.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/typing/Types.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Types.java	27 Feb 2004 01:25:55 -0000	1.3
--- Types.java	28 Feb 2004 14:23:42 -0000	1.4
***************
*** 67,70 ****
--- 67,79 ----
    }
  
+   public static boolean isDispatchable(Monotype m)
+   {
+     // Functional types are not dispatchable
+     if (parameters(m) != null)
+       return false;
+ 
+     return ! isPrimitive(m);
+   }
+ 
    /****************************************************************
     * Handling of option types
***************
*** 155,158 ****
--- 164,184 ----
      return equivalent(type).head();
    }
+ 
+   /**
+      Return a concrete type constructor that represents as closely as
+      possible the given type. 
+ 
+      The constraint that introduces type variables occuring in the type must be
+      entered in the context before calling this method.
+   */
+   public static TypeConstructor concreteConstructor(Monotype type)
+   {
+     TypeConstructor res = constructor(type);
+ 
+     if (res == null || res.isConcrete())
+       return res;
+ 
+     return Typing.lowestInstance(res);
+   }
    
    /****************************************************************

[Nice-commit] Nice/testsuite/compiler/overloading specificity.testsuite,1.4,1.5 complex.testsuite,1.2,1.3

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/overloading
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16026/testsuite/compiler/overloading

Modified Files:
	specificity.testsuite complex.testsuite 
Log Message:
Methods now specialize other methods with a larger domain (ignoring 
subtyping on non-dispatchable types like primitive and tuple types).
Covariance of the return type is not yet checked, and there is not yet a
way to explicitely declare that a method is a specialization.


Index: specificity.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/overloading/specificity.testsuite,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** specificity.testsuite	17 Jan 2004 20:59:51 -0000	1.4
--- specificity.testsuite	28 Feb 2004 14:23:41 -0000	1.5
***************
*** 51,56 ****
    void foo(A);
    void foo(B);
!   foo(@B(A)) {}
!   foo(@B(B)) {}
  
  /// PASS
--- 51,55 ----
    void foo(A);
    void foo(B);
!   foo(@B) {}
  
  /// PASS
***************
*** 71,78 ****
    void foo(B, A);
    void foo(B, B);
!   foo(@B(A) ,@B(A)) {}
!   foo(@B(A) ,@B(B)) {}
!   foo(@B(B) ,@B(A)) {}
!   foo(@B(B) ,@B(B)) {}
  
  /// FAIL
--- 70,74 ----
    void foo(B, A);
    void foo(B, B);
!   foo(@B,@B) {}
  
  /// FAIL
***************
*** 85,89 ****
    foo(@B(B)) {}
  
! /// FAIL
    /// Toplevel
    abstract class A {}
--- 81,85 ----
    foo(@B(B)) {}
  
! /// PASS
    /// Toplevel
    abstract class A {}
***************
*** 92,97 ****
    void foo(B ,Number);
    void foo(B ,Integer);
!   foo(@B(A) ,s) {}
!   foo(@B(B) ,s) {}
    
  /// PASS
--- 88,94 ----
    void foo(B ,Number);
    void foo(B ,Integer);
!   foo(@B, s@String) {}
!   foo(@B, s@Number) {}
!   foo(@B, s@Integer) {}
    
  /// PASS

Index: complex.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/overloading/complex.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** complex.testsuite	5 May 2003 16:39:44 -0000	1.2
--- complex.testsuite	28 Feb 2004 14:23:41 -0000	1.3
***************
*** 8,15 ****
    String[] sa1 = ["xyz"];
    eq2(sa1, [null]);
    /// Toplevel
    <T,U,V | U <: T, V <: T> boolean eq2(U[] u, V[] v) = false;
!   <Any T> boolean eq2(!T,!T) = true;
!   <Any T> boolean eq2(?T, ?T) = false;
    
  /// PASS
--- 8,19 ----
    String[] sa1 = ["xyz"];
    eq2(sa1, [null]);
+ 
+   ?String s = "";
+   assert  eq2(s, s);
+   assert !eq2(null, null);
    /// Toplevel
    <T,U,V | U <: T, V <: T> boolean eq2(U[] u, V[] v) = false;
!   <T> boolean eq2(!T,!T) = true;
!   <T> boolean eq2(?T,?T) = false;
    
  /// PASS
***************
*** 19,22 ****
    /// Toplevel
    <T,U> boolean test(List<T> , List<U>) = false;
!   <Any T> boolean test(!T,!T) = true;
!   <Any T> boolean test(?T, ?T) = false;
--- 23,26 ----
    /// Toplevel
    <T,U> boolean test(List<T> , List<U>) = false;
!   <T> boolean test(!T,!T) = true;
!   <T> boolean test(?T, ?T) = false;

[Nice-commit] Nice/src/nice/tools/util System.java,1.4,1.5

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/nice/tools/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16026/src/nice/tools/util

Modified Files:
	System.java 
Log Message:
Methods now specialize other methods with a larger domain (ignoring 
subtyping on non-dispatchable types like primitive and tuple types).
Covariance of the return type is not yet checked, and there is not yet a
way to explicitely declare that a method is a specialization.


Index: System.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/util/System.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** System.java	30 Oct 2001 15:38:24 -0000	1.4
--- System.java	28 Feb 2004 14:23:42 -0000	1.5
***************
*** 22,25 ****
--- 22,28 ----
  import java.text.DateFormat;
  
+ import java.util.List;
+ import java.util.ArrayList;
+ 
  /**
     Communication with the system environment.
***************
*** 87,89 ****
--- 90,121 ----
  
    private static final DateFormat longDate = DateFormat.getDateTimeInstance();
+ 
+   /**
+      String operations.
+   */
+ 
+   public static String[] split(String str, char separator)
+   {
+     List res = new ArrayList();
+     int ntx = 0;
+     int pos = 0;
+     while(ntx > -1)
+       {
+         ntx = str.indexOf(separator, pos);
+         if (ntx > -1)
+           {
+             if (ntx > 0)
+               {
+                 res.add(str.substring(pos, ntx));
+               }
+             pos = ntx + 1;
+           }
+         else
+           {
+             res.add(pos == 0 ? str : str.substring(pos));
+           }
+       }
+ 
+     return (String[]) res.toArray(new String[res.size()]);
+   }
  }

[Nice-commit] Nice/testsuite/compiler/methods overriding.testsuite,NONE,1.1

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16026/testsuite/compiler/methods

Added Files:
	overriding.testsuite 
Log Message:
Methods now specialize other methods with a larger domain (ignoring 
subtyping on non-dispatchable types like primitive and tuple types).
Covariance of the return type is not yet checked, and there is not yet a
way to explicitely declare that a method is a specialization.


--- NEW FILE: overriding.testsuite ---
/// PASS
  B b = new B();
  assert foo(b);

  A a = b;
  assert foo(a);
  /// Toplevel
class A {}
class B extends A {}

boolean foo(A) = false;
boolean foo(B x); foo(B x) = true;

/// PASS
  B b = new B();
  assert foo(b);

  A a = b;
  assert foo(a);
  /// Toplevel
class A {}
class B extends A {}

boolean foo(A) = false;
boolean foo(B) = true;

/// PASS
  /// package a
  /// Toplevel
class A {}
class B extends A {}

boolean foo(A) = false;
boolean foo(B x); foo(B x) = true;
  /// package b import a
  B b = new B();
  assert foo(b);

  A a = b;
  assert foo(a);

/// PASS
  /// package b import a
  /// Toplevel
class B extends A {}
boolean foo(B); foo(B x) = true;
  /// package a import b
  B b = new B();
  assert foo(b);

  A a = b;
  assert foo(a);
  /// Toplevel
class A {}

boolean foo(A) = false;

/// PASS
  /// package a import b
  B b = new B();
  assert foo(b);

  A a = b;
  assert foo(a);
  /// Toplevel
class A {}

boolean foo(A) = false;
  /// package b import a
  /// Toplevel
class B extends A {}
boolean foo(B); foo(B x) = true;

/// PASS
  /// Toplevel
class A{}
<T> void foo(A,Object) {}
<A T> void foo(T,String) {}

/// PASS
  /// Toplevel
void foo(Throwable,Object) {}
<Throwable T> void foo(T,String); foo(x, String s) {}
foo(RuntimeException re, String) {}

/// PASS
  /// Toplevel
class A{}
class B extends A {}
class Z {}

void foo(A,?Z) {}
void foo(A,Z) {}
foo(B x,z) {}

/// PASS
  /// Toplevel
class A{}
class B extends A {}

void foo(A,int ?-> int) {}
void foo(A,int->int) {}
foo(B x,z) {}

/// PASS
  /// Toplevel
class A{}
class B extends A {}
void foo(A x,int t) {}
void foo(B x,int t) {}

/// PASS
  assert  foo(new A(), int x => x);
  assert !foo(new A(), int x => 0);
  /// Toplevel
class A{}
class B extends A {}
boolean foo(A x,int->int t) = true;
boolean foo(A x,int->byte t) = false;

[Nice-commit] Nice/testsuite/lib/nice/lang strings.testsuite,1.2,1.3

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/lib/nice/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12437

Modified Files:
	strings.testsuite 
Log Message:
Modified split to use a character separator. JDK 1.4 includes a 
String.split(String), where the second argument is a regexp. It's not necessary
to duplicate that functionality, but spliting based on a single character is
a useful special case.

Index: strings.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/lib/nice/lang/strings.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** strings.testsuite	3 Jun 2003 19:12:52 -0000	1.2
--- strings.testsuite	28 Feb 2004 14:00:54 -0000	1.3
***************
*** 1,4 ****
  /// PASS
!   List<String> splits = split("foo,bar,baz", ",");
    assert splits.size == 3;
    assert splits[0].equals("foo");		
--- 1,4 ----
  /// PASS
!   List<String> splits = split("foo,bar,baz", ',');
    assert splits.size == 3;
    assert splits[0].equals("foo");		
***************
*** 7,16 ****
  
  /// PASS
-   List<String> splits = split("foo,bar,foo,baz", "foo,");
-   assert splits.size == 2;
-   assert splits[0].equals("bar,");		
-   assert splits[1].equals("baz");		
- 
- /// PASS
    String joined = ["1", "2", "3"].join(",");
    assert joined.equals("1,2,3");
--- 7,10 ----

[Nice-commit] Nice/src/bossa/syntax Pattern.java,1.80,1.81

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27412/src/bossa/syntax

Modified Files:
	Pattern.java 
Log Message:
Improve the encapsulation of bossa.syntax.Pattern


Index: Pattern.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Pattern.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** Pattern.java	25 Feb 2004 11:23:28 -0000	1.80
--- Pattern.java	28 Feb 2004 12:26:05 -0000	1.81
***************
*** 112,115 ****
--- 112,120 ----
    }
  
+   public final TypeConstructor getTC()
+   {
+     return tc;
+   }
+ 
    final TypeConstructor getRuntimeTC()
    {
***************
*** 821,826 ****
    
    LocatedString name,refName;
!   TypeIdent typeConstructor, additional;
!   public TypeConstructor tc;
    TypeConstructor tc2;
    private TypeConstructor runtimeTC;
--- 826,831 ----
    
    LocatedString name,refName;
!   private TypeIdent typeConstructor, additional;
!   TypeConstructor tc;
    TypeConstructor tc2;
    private TypeConstructor runtimeTC;

[Nice-commit] Nice/src/bossa/link ImportedAlternative.java,1.6,1.7 Compilation.java,1.14,1.15

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/link
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27412/src/bossa/link

Modified Files:
	ImportedAlternative.java Compilation.java 
Log Message:
Improve the encapsulation of bossa.syntax.Pattern


Index: ImportedAlternative.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/ImportedAlternative.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ImportedAlternative.java	25 Jul 2003 16:13:10 -0000	1.6
--- ImportedAlternative.java	28 Feb 2004 12:26:05 -0000	1.7
***************
*** 62,66 ****
      while ((p = Pattern.read(rep, at, fullName)) != null)
        {
! 	if (p.tc == bossa.syntax.PrimitiveType.arrayTC)
  	  /* Special treatment for arrays:
  	     they are compiled into Object,
--- 62,66 ----
      while ((p = Pattern.read(rep, at, fullName)) != null)
        {
! 	if (p.getTC() == bossa.syntax.PrimitiveType.arrayTC)
  	  /* Special treatment for arrays:
  	     they are compiled into Object,

Index: Compilation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Compilation.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Compilation.java	23 Feb 2004 14:35:12 -0000	1.14
--- Compilation.java	28 Feb 2004 12:26:05 -0000	1.15
***************
*** 176,180 ****
    private static NiceClass declaringClass(JavaMethod m, Alternative alt)
    {
!     mlsub.typing.TypeConstructor firstArgument = alt.getPatterns()[0].tc;
      ClassDefinition def = ClassDefinition.get(firstArgument);
  
--- 176,180 ----
    private static NiceClass declaringClass(JavaMethod m, Alternative alt)
    {
!     mlsub.typing.TypeConstructor firstArgument = alt.getPatterns()[0].getTC();
      ClassDefinition def = ClassDefinition.get(firstArgument);
  

[Nice-commit] swing/src/nice/ui/common AWTListenerAccessors.nice,1.4,1.5 AWTListenerConverters.nice,1.2,1.3 AWTListenerDecorators.nice,1.3,1.4 AWTListenerRemovers.nice,1.5,1.6 BeanListenerAccessors.nice,1.3,1.4 BeanListenerConverters.nice,1.2,1.3 BeanListenerDecorators.nice,1.3,1.4 BeanListenerRemovers.nice,1.5,1.6 common.nice,1.5,1.6 SwingListenerAccessors.nice,1.4,1.5 SwingListenerConverters.nice,1.2,1.3 SwingListenerDecorators.nice,1.4,1.5 SwingListenerRemovers.nice,1.5,1.6

[<ar...@us...>]

Update of /cvsroot/nice/swing/src/nice/ui/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12429/D:/nice/nice/ui/common

Modified Files:
	AWTListenerAccessors.nice AWTListenerConverters.nice 
	AWTListenerDecorators.nice AWTListenerRemovers.nice 
	BeanListenerAccessors.nice BeanListenerConverters.nice 
	BeanListenerDecorators.nice BeanListenerRemovers.nice 
	common.nice SwingListenerAccessors.nice 
	SwingListenerConverters.nice SwingListenerDecorators.nice 
	SwingListenerRemovers.nice 
Log Message:
Syntax update for niceswing (new pattern style, removed Any keyword).

Index: AWTListenerAccessors.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/AWTListenerAccessors.nice,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AWTListenerAccessors.nice	21 Nov 2003 18:56:28 -0000	1.4
--- AWTListenerAccessors.nice	27 Feb 2004 18:32:08 -0000	1.5
***************
*** 52,56 ****
   */
  
! getNicePropertyChangeListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(PropertyChangeListener.class);
--- 52,56 ----
   */
  
! getNicePropertyChangeListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(PropertyChangeListener.class);
***************
*** 58,62 ****
  }
  
! getNiceActionListeners(th...@ja...t.Button)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 58,62 ----
  }
  
! getNiceActionListeners(java.awt.Button this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 64,68 ****
  }
  
! getNiceActionListeners(th...@ja...st)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 64,68 ----
  }
  
! getNiceActionListeners(java.awt.List this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 70,74 ****
  }
  
! getNiceActionListeners(th...@ja...nuItem)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 70,74 ----
  }
  
! getNiceActionListeners(java.awt.MenuItem this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 76,80 ****
  }
  
! getNiceActionListeners(th...@ja...t.TextField)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 76,80 ----
  }
  
! getNiceActionListeners(java.awt.TextField this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 82,86 ****
  }
  
! getNiceItemListeners(th...@ja...eckbox)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
--- 82,86 ----
  }
  
! getNiceItemListeners(java.awt.Checkbox this)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
***************
*** 88,92 ****
  }
  
! getNiceItemListeners(th...@ja...eckboxMenuItem)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
--- 88,92 ----
  }
  
! getNiceItemListeners(java.awt.CheckboxMenuItem this)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
***************
*** 94,98 ****
  }
  
! getNiceItemListeners(th...@ja...oice)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
--- 94,98 ----
  }
  
! getNiceItemListeners(java.awt.Choice this)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
***************
*** 100,104 ****
  }
  
! getNiceItemListeners(th...@ja...st)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
--- 100,104 ----
  }
  
! getNiceItemListeners(java.awt.List this)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
***************
*** 106,110 ****
  }
  
! getNiceTextListeners(th...@ja...t.TextComponent)
  {
    EventListener[?] listeners = this.getListeners(TextListener.class);
--- 106,110 ----
  }
  
! getNiceTextListeners(java.awt.TextComponent this)
  {
    EventListener[?] listeners = this.getListeners(TextListener.class);
***************
*** 112,116 ****
  }
  
! getNiceAdjustmentListeners(th...@ja...rollbar)
  {
    EventListener[?] listeners = this.getListeners(AdjustmentListener.class);
--- 112,116 ----
  }
  
! getNiceAdjustmentListeners(java.awt.Scrollbar this)
  {
    EventListener[?] listeners = this.getListeners(AdjustmentListener.class);
***************
*** 118,122 ****
  }
  
! getNiceContainerListeners(th...@ja...ntainer)
  {
    EventListener[?] listeners = this.getListeners(ContainerListener.class);
--- 118,122 ----
  }
  
! getNiceContainerListeners(java.awt.Container this)
  {
    EventListener[?] listeners = this.getListeners(ContainerListener.class);
***************
*** 124,128 ****
  }
  
! getNiceWindowListeners(th...@ja...t.Window)
  {
    EventListener[?] listeners = this.getListeners(WindowListener.class);
--- 124,128 ----
  }
  
! getNiceWindowListeners(java.awt.Window this)
  {
    EventListener[?] listeners = this.getListeners(WindowListener.class);
***************
*** 130,134 ****
  }
  
! getNiceComponentListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(ComponentListener.class);
--- 130,134 ----
  }
  
! getNiceComponentListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(ComponentListener.class);
***************
*** 136,140 ****
  }
  
! getNiceFocusListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(FocusListener.class);
--- 136,140 ----
  }
  
! getNiceFocusListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(FocusListener.class);
***************
*** 142,146 ****
  }
  
! getNiceHierarchyBoundsListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(HierarchyBoundsListener.class);
--- 142,146 ----
  }
  
! getNiceHierarchyBoundsListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(HierarchyBoundsListener.class);
***************
*** 148,152 ****
  }
  
! getNiceHierarchyListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(HierarchyListener.class);
--- 148,152 ----
  }
  
! getNiceHierarchyListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(HierarchyListener.class);
***************
*** 154,158 ****
  }
  
! getNiceInputMethodListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(InputMethodListener.class);
--- 154,158 ----
  }
  
! getNiceInputMethodListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(InputMethodListener.class);
***************
*** 160,164 ****
  }
  
! getNiceKeyListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(KeyListener.class);
--- 160,164 ----
  }
  
! getNiceKeyListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(KeyListener.class);
***************
*** 166,170 ****
  }
  
! getNiceMouseListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(MouseListener.class);
--- 166,170 ----
  }
  
! getNiceMouseListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(MouseListener.class);
***************
*** 172,176 ****
  }
  
! getNiceMouseMotionListeners(th...@ja...ponent)
  {
    EventListener[?] listeners = this.getListeners(MouseMotionListener.class);
--- 172,176 ----
  }
  
! getNiceMouseMotionListeners(java.awt.Component this)
  {
    EventListener[?] listeners = this.getListeners(MouseMotionListener.class);
***************
*** 179,183 ****
  
  
! getNiceDragSourceListeners(th...@ja...t.dnd.DragSourceContext)
  {
  	?java.util.List<NiceDragSourceListener> result = dragSourceListeners.get(this.object());
--- 179,183 ----
  
  
! getNiceDragSourceListeners(java.awt.dnd.DragSourceContext this)
  {
  	?java.util.List<NiceDragSourceListener> result = dragSourceListeners.get(this.object());
***************
*** 185,189 ****
  }
  
! getNiceDropTargetListeners(th...@ja...t.dnd.DropTarget)
  {
  	?java.util.List<NiceDropTargetListener> result = dropTargetListeners.get(this.object());
--- 185,189 ----
  }
  
! getNiceDropTargetListeners(java.awt.dnd.DropTarget this)
  {
  	?java.util.List<NiceDropTargetListener> result = dropTargetListeners.get(this.object());
***************
*** 191,195 ****
  }
  
! getNiceDragGestureListeners(th...@ja...t.dnd.DragGestureRecognizer)
  {
  	?java.util.List<NiceDragGestureListener> result = dragGestureListeners.get(this.object());
--- 191,195 ----
  }
  
! getNiceDragGestureListeners(java.awt.dnd.DragGestureRecognizer this)
  {
  	?java.util.List<NiceDragGestureListener> result = dragGestureListeners.get(this.object());
***************
*** 197,201 ****
  }
  
! //JDK1.4  getNiceAdjustmentListeners(s...@ja...rollPaneAdjustable)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getListeners(AdjustmentListener.class);
--- 197,201 ----
  }
  
! //JDK1.4  getNiceAdjustmentListeners(java.awt.ScrollPaneAdjustable s)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getListeners(AdjustmentListener.class);
***************
*** 203,207 ****
  //JDK1.4  }
  
! //JDK1.4  getNiceWindowFocusListeners(w...@ja...t.Window)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getListeners(WindowFocusListener.class);
--- 203,207 ----
  //JDK1.4  }
  
! //JDK1.4  getNiceWindowFocusListeners(java.awt.Window w)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getListeners(WindowFocusListener.class);
***************
*** 209,213 ****
  //JDK1.4  }
  
! //JDK1.4  getNiceWindowStateListeners(w...@ja...t.Window)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getListeners(WindowStateListener.class);
--- 209,213 ----
  //JDK1.4  }
  
! //JDK1.4  getNiceWindowStateListeners(java.awt.Window w)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getListeners(WindowStateListener.class);
***************
*** 215,219 ****
  //JDK1.4  }
  
! //JDK1.4  getNiceMouseWheelListeners(c...@ja...ponent)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getListeners(MouseWheelListener.class);
--- 215,219 ----
  //JDK1.4  }
  
! //JDK1.4  getNiceMouseWheelListeners(java.awt.Component c)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getListeners(MouseWheelListener.class);
***************
*** 221,225 ****
  //JDK1.4  }
  
! //JDK1.4  getNiceDragSourceListeners(d...@ja...t.dnd.DragSource)
  //JDK1.4  {
  //JDK1.4  	?java.util.List<NiceDragGestureListener> result = dragSourceListeners.get(this.object());
--- 221,225 ----
  //JDK1.4  }
  
! //JDK1.4  getNiceDragSourceListeners(java.awt.dnd.DragSource d)
  //JDK1.4  {
  //JDK1.4  	?java.util.List<NiceDragGestureListener> result = dragSourceListeners.get(this.object());
***************
*** 227,231 ****
  //JDK1.4  }
  
! //JDK1.4  getNiceDragSourceMotionListeners(d...@ja...t.dnd.DragSource)
  //JDK1.4  {
  //JDK1.4  	?java.util.List<NiceDragGestureListener> result = dragSourceMotionListeners.get(this.object());
--- 227,231 ----
  //JDK1.4  }
  
! //JDK1.4  getNiceDragSourceMotionListeners(java.awt.dnd.DragSource d)
  //JDK1.4  {
  //JDK1.4  	?java.util.List<NiceDragGestureListener> result = dragSourceMotionListeners.get(this.object());
***************
*** 233,237 ****
  //JDK1.4  }
  
! //JDK1.4  getNiceDragSourceListeners(th...@ja...t.dnd.DragSource)
  //JDK1.4  {
  //JDK1.4  	?java.util.List<NiceDragSourceListener> result = dragSourceListeners.get(this.object());
--- 233,237 ----
  //JDK1.4  }
  
! //JDK1.4  getNiceDragSourceListeners(java.awt.dnd.DragSource this)
  //JDK1.4  {
  //JDK1.4  	?java.util.List<NiceDragSourceListener> result = dragSourceListeners.get(this.object());

Index: AWTListenerConverters.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/AWTListenerConverters.nice,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AWTListenerConverters.nice	13 Nov 2002 02:22:28 -0000	1.2
--- AWTListenerConverters.nice	27 Feb 2004 18:32:08 -0000	1.3
***************
*** 22,26 ****
  
  NiceActionListener toNiceActionListener(EventListener);
! toNiceActionListener(this@NiceActionListener) = this;
  toNiceActionListener(this)
  { 
--- 22,26 ----
  
  NiceActionListener toNiceActionListener(EventListener);
! toNiceActionListener(NiceActionListener this) = this;
  toNiceActionListener(this)
  { 
***************
*** 29,33 ****
  
  NiceItemListener toNiceItemListener(EventListener);
! toNiceItemListener(this@NiceItemListener) = this;
  toNiceItemListener(this)
  { 
--- 29,33 ----
  
  NiceItemListener toNiceItemListener(EventListener);
! toNiceItemListener(NiceItemListener this) = this;
  toNiceItemListener(this)
  { 
***************
*** 36,40 ****
  
  NiceTextListener toNiceTextListener(EventListener);
! toNiceTextListener(this@NiceTextListener) = this;
  toNiceTextListener(this)
  { 
--- 36,40 ----
  
  NiceTextListener toNiceTextListener(EventListener);
! toNiceTextListener(NiceTextListener this) = this;
  toNiceTextListener(this)
  { 
***************
*** 43,47 ****
  
  NiceAdjustmentListener toNiceAdjustmentListener(EventListener);
! toNiceAdjustmentListener(this@NiceAdjustmentListener) = this;
  toNiceAdjustmentListener(this)
  { 
--- 43,47 ----
  
  NiceAdjustmentListener toNiceAdjustmentListener(EventListener);
! toNiceAdjustmentListener(NiceAdjustmentListener this) = this;
  toNiceAdjustmentListener(this)
  { 
***************
*** 50,54 ****
  
  NiceContainerListener toNiceContainerListener(EventListener);
! toNiceContainerListener(this@NiceContainerListener) = this;
  toNiceContainerListener(this)
  { 
--- 50,54 ----
  
  NiceContainerListener toNiceContainerListener(EventListener);
! toNiceContainerListener(NiceContainerListener this) = this;
  toNiceContainerListener(this)
  { 
***************
*** 57,61 ****
  
  NiceWindowListener toNiceWindowListener(EventListener);
! toNiceWindowListener(this@NiceWindowListener) = this;
  toNiceWindowListener(this)
  { 
--- 57,61 ----
  
  NiceWindowListener toNiceWindowListener(EventListener);
! toNiceWindowListener(NiceWindowListener this) = this;
  toNiceWindowListener(this)
  { 
***************
*** 64,68 ****
  
  NiceComponentListener toNiceComponentListener(EventListener);
! toNiceComponentListener(this@NiceComponentListener) = this;
  toNiceComponentListener(this)
  { 
--- 64,68 ----
  
  NiceComponentListener toNiceComponentListener(EventListener);
! toNiceComponentListener(NiceComponentListener this) = this;
  toNiceComponentListener(this)
  { 
***************
*** 71,75 ****
  
  NiceFocusListener toNiceFocusListener(EventListener);
! toNiceFocusListener(this@NiceFocusListener) = this;
  toNiceFocusListener(this)
  { 
--- 71,75 ----
  
  NiceFocusListener toNiceFocusListener(EventListener);
! toNiceFocusListener(NiceFocusListener this) = this;
  toNiceFocusListener(this)
  { 
***************
*** 78,82 ****
  
  NiceHierarchyBoundsListener toNiceHierarchyBoundsListener(EventListener);
! toNiceHierarchyBoundsListener(this@NiceHierarchyBoundsListener) = this;
  toNiceHierarchyBoundsListener(this)
  { 
--- 78,82 ----
  
  NiceHierarchyBoundsListener toNiceHierarchyBoundsListener(EventListener);
! toNiceHierarchyBoundsListener(NiceHierarchyBoundsListener this) = this;
  toNiceHierarchyBoundsListener(this)
  { 
***************
*** 85,89 ****
  
  NiceHierarchyListener toNiceHierarchyListener(EventListener);
! toNiceHierarchyListener(this@NiceHierarchyListener) = this;
  toNiceHierarchyListener(this)
  { 
--- 85,89 ----
  
  NiceHierarchyListener toNiceHierarchyListener(EventListener);
! toNiceHierarchyListener(NiceHierarchyListener this) = this;
  toNiceHierarchyListener(this)
  { 
***************
*** 92,96 ****
  
  NiceInputMethodListener toNiceInputMethodListener(EventListener);
! toNiceInputMethodListener(this@NiceInputMethodListener) = this;
  toNiceInputMethodListener(this)
  { 
--- 92,96 ----
  
  NiceInputMethodListener toNiceInputMethodListener(EventListener);
! toNiceInputMethodListener(NiceInputMethodListener this) = this;
  toNiceInputMethodListener(this)
  { 
***************
*** 99,103 ****
  
  NiceKeyListener toNiceKeyListener(EventListener);
! toNiceKeyListener(this@NiceKeyListener) = this;
  toNiceKeyListener(this)
  { 
--- 99,103 ----
  
  NiceKeyListener toNiceKeyListener(EventListener);
! toNiceKeyListener(NiceKeyListener this) = this;
  toNiceKeyListener(this)
  { 
***************
*** 106,110 ****
  
  NiceMouseListener toNiceMouseListener(EventListener);
! toNiceMouseListener(this@NiceMouseListener) = this;
  toNiceMouseListener(this)
  { 
--- 106,110 ----
  
  NiceMouseListener toNiceMouseListener(EventListener);
! toNiceMouseListener(NiceMouseListener this) = this;
  toNiceMouseListener(this)
  { 
***************
*** 113,117 ****
  
  NiceMouseMotionListener toNiceMouseMotionListener(EventListener);
! toNiceMouseMotionListener(this@NiceMouseMotionListener) = this;
  toNiceMouseMotionListener(this)
  { 
--- 113,117 ----
  
  NiceMouseMotionListener toNiceMouseMotionListener(EventListener);
! toNiceMouseMotionListener(NiceMouseMotionListener this) = this;
  toNiceMouseMotionListener(this)
  { 
***************
*** 120,124 ****
  
  NiceDragSourceListener toNiceDragSourceListener(EventListener);
! toNiceDragSourceListener(this@NiceDragSourceListener) = this;
  toNiceDragSourceListener(this)
  { 
--- 120,124 ----
  
  NiceDragSourceListener toNiceDragSourceListener(EventListener);
! toNiceDragSourceListener(NiceDragSourceListener this) = this;
  toNiceDragSourceListener(this)
  { 
***************
*** 127,131 ****
  
  NiceDragGestureListener toNiceDragGestureListener(EventListener);
! toNiceDragGestureListener(this@NiceDragGestureListener) = this;
  toNiceDragGestureListener(this)
  { 
--- 127,131 ----
  
  NiceDragGestureListener toNiceDragGestureListener(EventListener);
! toNiceDragGestureListener(NiceDragGestureListener this) = this;
  toNiceDragGestureListener(this)
  { 
***************
*** 134,138 ****
  
  NiceDropTargetListener toNiceDropTargetListener(EventListener);
! toNiceDropTargetListener(this@NiceDropTargetListener) = this;
  toNiceDropTargetListener(this)
  { 
--- 134,138 ----
  
  NiceDropTargetListener toNiceDropTargetListener(EventListener);
! toNiceDropTargetListener(NiceDropTargetListener this) = this;
  toNiceDropTargetListener(this)
  { 
***************
*** 141,145 ****
  
  //JDK1.4  NiceAWTEventListener toNiceAWTEventListener(EventListener);
! //JDK1.4  toNiceAWTEventListener(this@NiceAWTEventListener) = this;
  //JDK1.4  toNiceAWTEventListener(this)
  //JDK1.4  { 
--- 141,145 ----
  
  //JDK1.4  NiceAWTEventListener toNiceAWTEventListener(EventListener);
! //JDK1.4  toNiceAWTEventListener(NiceAWTEventListener this) = this;
  //JDK1.4  toNiceAWTEventListener(this)
  //JDK1.4  { 
***************
*** 148,152 ****
  
  //JDK1.4  NiceWindowFocusListener toNiceWindowFocusListener(EventListener);
! //JDK1.4  toNiceWindowFocusListener(this@NiceWindowFocusListener) = this;
  //JDK1.4  toNiceWindowFocusListener(this)
  //JDK1.4  { 
--- 148,152 ----
  
  //JDK1.4  NiceWindowFocusListener toNiceWindowFocusListener(EventListener);
! //JDK1.4  toNiceWindowFocusListener(NiceWindowFocusListener this) = this;
  //JDK1.4  toNiceWindowFocusListener(this)
  //JDK1.4  { 
***************
*** 155,159 ****
  
  //JDK1.4  NiceWindowStateListener toNiceWindowStateListener(EventListener);
! //JDK1.4  toNiceWindowStateListener(this@NiceWindowStateListener) = this;
  //JDK1.4  toNiceWindowStateListener(this)
  //JDK1.4  { 
--- 155,159 ----
  
  //JDK1.4  NiceWindowStateListener toNiceWindowStateListener(EventListener);
! //JDK1.4  toNiceWindowStateListener(NiceWindowStateListener this) = this;
  //JDK1.4  toNiceWindowStateListener(this)
  //JDK1.4  { 
***************
*** 162,166 ****
  
  //JDK1.4  NiceMouseWheelListener toNiceMouseWheelListener(EventListener);
! //JDK1.4  toNiceMouseWheelListener(this@NiceMouseWheelListener) = this;
  //JDK1.4  toNiceMouseWheelListener(this) 
  //JDK1.4  { 
--- 162,166 ----
  
  //JDK1.4  NiceMouseWheelListener toNiceMouseWheelListener(EventListener);
! //JDK1.4  toNiceMouseWheelListener(NiceMouseWheelListener this) = this;
  //JDK1.4  toNiceMouseWheelListener(this) 
  //JDK1.4  { 
***************
*** 169,173 ****
  
  //JDK1.4  NiceDragSourceMotionListener toNiceDragSourceMotionListener(EventListener);
! //JDK1.4  toNiceDragSourceMotionListener(this@NiceDragSourceMotionListener) = this;
  //JDK1.4  toNiceDragSourceMotionListener(this)
  //JDK1.4  { 
--- 169,173 ----
  
  //JDK1.4  NiceDragSourceMotionListener toNiceDragSourceMotionListener(EventListener);
! //JDK1.4  toNiceDragSourceMotionListener(NiceDragSourceMotionListener this) = this;
  //JDK1.4  toNiceDragSourceMotionListener(this)
  //JDK1.4  { 

Index: AWTListenerDecorators.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/AWTListenerDecorators.nice,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AWTListenerDecorators.nice	13 Nov 2002 02:22:28 -0000	1.3
--- AWTListenerDecorators.nice	27 Feb 2004 18:32:08 -0000	1.4
***************
*** 44,70 ****
   * DEFINITION of methods to add nice.ui.awt.NiceListener to nice.ui.awt.NiceListenerHandler
   */
! addNiceActionListener(th...@ja...t.Button,listener) = this.addActionListener(listener);
! addNiceActionListener(th...@ja...st,listener) = this.addActionListener(listener);
! addNiceActionListener(th...@ja...nuItem,listener) = this.addActionListener(listener);
! addNiceActionListener(th...@ja...t.TextField,listener) = this.addActionListener(listener);
! addNiceItemListener(th...@ja...eckbox,listener) = this.addItemListener(listener);
! addNiceItemListener(th...@ja...eckboxMenuItem,listener) = this.addItemListener(listener);
! addNiceItemListener(th...@ja...oice,listener) = this.addItemListener(listener);
! addNiceItemListener(th...@ja...st,listener) = this.addItemListener(listener);
! addNiceTextListener(th...@ja...t.TextComponent,listener) = this.addTextListener(listener);
! addNiceAdjustmentListener(th...@ja...rollbar,listener) = this.addAdjustmentListener(listener);
! addNiceContainerListener(th...@ja...ntainer,listener) = this.addContainerListener(listener);
! addNiceWindowListener(th...@ja...t.Window,listener) = this.addWindowListener(listener);
! addNiceComponentListener(th...@ja...ponent,listener) = this.addComponentListener(listener);
! addNiceFocusListener(th...@ja...ponent,listener) = this.addFocusListener(listener);
! addNiceHierarchyBoundsListener(th...@ja...ponent,listener) = this.addHierarchyBoundsListener(listener);
! addNiceHierarchyListener(th...@ja...ponent,listener) = this.addHierarchyListener(listener);
! addNiceInputMethodListener(th...@ja...ponent,listener) = this.addInputMethodListener(listener);
! addNiceKeyListener(th...@ja...ponent,listener) = this.addKeyListener(listener);
! addNiceMouseListener(th...@ja...ponent,listener) = this.addMouseListener(listener);
! addNiceMouseMotionListener(th...@ja...ponent,listener) = this.addMouseMotionListener(listener);
! addNicePropertyChangeListener(th...@ja...ponent,listener) = this.addPropertyChangeListener(listener);
  
! addNicePropertyChangeListener(th...@ja...ponent,key@String,listener)
  {
  	this.addPropertyChangeListener(key,listener);
--- 44,70 ----
   * DEFINITION of methods to add nice.ui.awt.NiceListener to nice.ui.awt.NiceListenerHandler
   */
! addNiceActionListener(java.awt.Button this,listener) = this.addActionListener(listener);
! addNiceActionListener(java.awt.List this,listener) = this.addActionListener(listener);
! addNiceActionListener(java.awt.MenuItem this,listener) = this.addActionListener(listener);
! addNiceActionListener(java.awt.TextField this,listener) = this.addActionListener(listener);
! addNiceItemListener(java.awt.Checkbox this,listener) = this.addItemListener(listener);
! addNiceItemListener(java.awt.CheckboxMenuItem this,listener) = this.addItemListener(listener);
! addNiceItemListener(java.awt.Choice this,listener) = this.addItemListener(listener);
! addNiceItemListener(java.awt.List this,listener) = this.addItemListener(listener);
! addNiceTextListener(java.awt.TextComponent this,listener) = this.addTextListener(listener);
! addNiceAdjustmentListener(java.awt.Scrollbar this,listener) = this.addAdjustmentListener(listener);
! addNiceContainerListener(java.awt.Container this,listener) = this.addContainerListener(listener);
! addNiceWindowListener(java.awt.Window this,listener) = this.addWindowListener(listener);
! addNiceComponentListener(java.awt.Component this,listener) = this.addComponentListener(listener);
! addNiceFocusListener(java.awt.Component this,listener) = this.addFocusListener(listener);
! addNiceHierarchyBoundsListener(java.awt.Component this,listener) = this.addHierarchyBoundsListener(listener);
! addNiceHierarchyListener(java.awt.Component this,listener) = this.addHierarchyListener(listener);
! addNiceInputMethodListener(java.awt.Component this,listener) = this.addInputMethodListener(listener);
! addNiceKeyListener(java.awt.Component this,listener) = this.addKeyListener(listener);
! addNiceMouseListener(java.awt.Component this,listener) = this.addMouseListener(listener);
! addNiceMouseMotionListener(java.awt.Component this,listener) = this.addMouseMotionListener(listener);
! addNicePropertyChangeListener(java.awt.Component this,listener) = this.addPropertyChangeListener(listener);
  
! addNicePropertyChangeListener(java.awt.Component this,String key,listener)
  {
  	this.addPropertyChangeListener(key,listener);
***************
*** 72,76 ****
  }
  
! addNiceDragSourceListener(th...@ja...t.dnd.DragSourceContext,listener)
  {
  	this.addDragSourceListener(listener);
--- 72,76 ----
  }
  
! addNiceDragSourceListener(java.awt.dnd.DragSourceContext this,listener)
  {
  	this.addDragSourceListener(listener);
***************
*** 78,82 ****
  }
  
! addNiceDropTargetListener(th...@ja...t.dnd.DropTarget,listener)
  {
  	this.addDropTargetListener(listener);
--- 78,82 ----
  }
  
! addNiceDropTargetListener(java.awt.dnd.DropTarget this,listener)
  {
  	this.addDropTargetListener(listener);
***************
*** 84,88 ****
  }
  
! addNiceDragGestureListener(th...@ja...t.dnd.DragGestureRecognizer,listener)
  {
  	this.addDragGestureListener(listener);
--- 84,88 ----
  }
  
! addNiceDragGestureListener(java.awt.dnd.DragGestureRecognizer this,listener)
  {
  	this.addDragGestureListener(listener);
***************
*** 90,94 ****
  }
  
! //JDK1.4  addNicePropertyChangeListeners(th...@ja...olkit,key@String,listener)
  //JDK1.4  {
  //JDK1.4  	this.addPropertyChangeListener(key,listener);
--- 90,94 ----
  }
  
! //JDK1.4  addNicePropertyChangeListeners(java.awt.Toolkit thisString ,key,listener)
  //JDK1.4  {
  //JDK1.4  	this.addPropertyChangeListener(key,listener);
***************
*** 96,100 ****
  //JDK1.4  }
  
! //JDK1.4  addNiceAWTEventListeners(th...@ja...olkit,key@long,listener)  
  //JDK1.4  {
  //JDK1.4  	this.addAWTEventListener(listener,key);
--- 96,100 ----
  //JDK1.4  }
  
! //JDK1.4  addNiceAWTEventListeners(java.awt.Toolkit thislong ,key,listener)  
  //JDK1.4  {
  //JDK1.4  	this.addAWTEventListener(listener,key);
***************
*** 102,106 ****
  //JDK1.4  }
  
! //JDK1.4  addNiceDragSourceListener(th...@ja...t.dnd.DragSource,listener)
  //JDK1.4  {
  //JDK1.4  	this.addDragSourceListener(listener);
--- 102,106 ----
  //JDK1.4  }
  
! //JDK1.4  addNiceDragSourceListener(java.awt.dnd.DragSource this,listener)
  //JDK1.4  {
  //JDK1.4  	this.addDragSourceListener(listener);
***************
*** 108,116 ****
  //JDK1.4  }
  
! //JDK1.4  addNiceAdjustmentListener(th...@ja...rollPaneAdjustable,listener) = this.addAdjustmentListener(listener);
! //JDK1.4  addNiceWindowFocusListener(th...@ja...t.Window,listener) = this.addWindowFocusListener(listener);
! //JDK1.4  addNiceWindowStateListener(th...@ja...t.Window,listener) = this.addWindowStateListener(listener);
! //JDK1.4  addNiceMouseWheelListener(th...@ja...ponent,listener) = this.addMouseWheelListener(listener);
! //JDK1.4  addNiceDragSourceMotionListener(th...@ja...t.dnd.DragSource,listener) = this.addDragSourceMotionListener(listener);
  
  
--- 108,116 ----
  //JDK1.4  }
  
! //JDK1.4  addNiceAdjustmentListener(java.awt.ScrollPaneAdjustable this,listener) = this.addAdjustmentListener(listener);
! //JDK1.4  addNiceWindowFocusListener(java.awt.Window this,listener) = this.addWindowFocusListener(listener);
! //JDK1.4  addNiceWindowStateListener(java.awt.Window this,listener) = this.addWindowStateListener(listener);
! //JDK1.4  addNiceMouseWheelListener(java.awt.Component this,listener) = this.addMouseWheelListener(listener);
! //JDK1.4  addNiceDragSourceMotionListener(java.awt.dnd.DragSource this,listener) = this.addDragSourceMotionListener(listener);
  
  

Index: AWTListenerRemovers.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/AWTListenerRemovers.nice,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AWTListenerRemovers.nice	13 Nov 2002 02:22:28 -0000	1.5
--- AWTListenerRemovers.nice	27 Feb 2004 18:32:08 -0000	1.6
***************
*** 43,69 ****
   * DEFINITION of methods to remove nice.ui.awt.NiceListener from nice.ui.awt.NiceListenerHandler
   */
! removeNiceActionListener(th...@ja...t.Button,listener) = this.removeActionListener(listener);
! removeNiceActionListener(th...@ja...st,listener) = this.removeActionListener(listener);
! removeNiceActionListener(th...@ja...nuItem,listener) = this.removeActionListener(listener);
! removeNiceActionListener(th...@ja...t.TextField,listener) = this.removeActionListener(listener);
! removeNiceItemListener(th...@ja...eckbox,listener) = this.removeItemListener(listener);
! removeNiceItemListener(th...@ja...eckboxMenuItem,listener) = this.removeItemListener(listener);
! removeNiceItemListener(th...@ja...oice,listener) = this.removeItemListener(listener);
! removeNiceItemListener(th...@ja...st,listener) = this.removeItemListener(listener);
! removeNiceTextListener(th...@ja...t.TextComponent,listener) = this.removeTextListener(listener);
! removeNiceAdjustmentListener(th...@ja...rollbar,listener) = this.removeAdjustmentListener(listener);
! removeNiceContainerListener(th...@ja...ntainer,listener) = this.removeContainerListener(listener);
! removeNiceWindowListener(th...@ja...t.Window,listener) = this.removeWindowListener(listener);
! removeNiceComponentListener(th...@ja...ponent,listener) = this.removeComponentListener(listener);
! removeNiceFocusListener(th...@ja...ponent,listener) = this.removeFocusListener(listener);
! removeNiceHierarchyBoundsListener(th...@ja...ponent,listener) = this.removeHierarchyBoundsListener(listener);
! removeNiceHierarchyListener(th...@ja...ponent,listener) = this.removeHierarchyListener(listener);
! removeNiceInputMethodListener(th...@ja...ponent,listener) = this.removeInputMethodListener(listener);
! removeNiceKeyListener(th...@ja...ponent,listener) = this.removeKeyListener(listener);
! removeNiceMouseListener(th...@ja...ponent,listener) = this.removeMouseListener(listener);
! removeNiceMouseMotionListener(th...@ja...ponent,listener) = this.removeMouseMotionListener(listener);
! removeNicePropertyChangeListener(th...@ja...ponent,listener) = this.removePropertyChangeListener(listener);
  
! removeNicePropertyChangeListener(th...@ja...ponent,key@String,listener)
  {
  	this.removePropertyChangeListener(key,listener);
--- 43,69 ----
   * DEFINITION of methods to remove nice.ui.awt.NiceListener from nice.ui.awt.NiceListenerHandler
   */
! removeNiceActionListener(java.awt.Button this,listener) = this.removeActionListener(listener);
! removeNiceActionListener(java.awt.List this,listener) = this.removeActionListener(listener);
! removeNiceActionListener(java.awt.MenuItem this,listener) = this.removeActionListener(listener);
! removeNiceActionListener(java.awt.TextField this,listener) = this.removeActionListener(listener);
! removeNiceItemListener(java.awt.Checkbox this,listener) = this.removeItemListener(listener);
! removeNiceItemListener(java.awt.CheckboxMenuItem this,listener) = this.removeItemListener(listener);
! removeNiceItemListener(java.awt.Choice this,listener) = this.removeItemListener(listener);
! removeNiceItemListener(java.awt.List this,listener) = this.removeItemListener(listener);
! removeNiceTextListener(java.awt.TextComponent this,listener) = this.removeTextListener(listener);
! removeNiceAdjustmentListener(java.awt.Scrollbar this,listener) = this.removeAdjustmentListener(listener);
! removeNiceContainerListener(java.awt.Container this,listener) = this.removeContainerListener(listener);
! removeNiceWindowListener(java.awt.Window this,listener) = this.removeWindowListener(listener);
! removeNiceComponentListener(java.awt.Component this,listener) = this.removeComponentListener(listener);
! removeNiceFocusListener(java.awt.Component this,listener) = this.removeFocusListener(listener);
! removeNiceHierarchyBoundsListener(java.awt.Component this,listener) = this.removeHierarchyBoundsListener(listener);
! removeNiceHierarchyListener(java.awt.Component this,listener) = this.removeHierarchyListener(listener);
! removeNiceInputMethodListener(java.awt.Component this,listener) = this.removeInputMethodListener(listener);
! removeNiceKeyListener(java.awt.Component this,listener) = this.removeKeyListener(listener);
! removeNiceMouseListener(java.awt.Component this,listener) = this.removeMouseListener(listener);
! removeNiceMouseMotionListener(java.awt.Component this,listener) = this.removeMouseMotionListener(listener);
! removeNicePropertyChangeListener(java.awt.Component this,listener) = this.removePropertyChangeListener(listener);
  
! removeNicePropertyChangeListener(java.awt.Component this, String key,listener)
  {
  	this.removePropertyChangeListener(key,listener);
***************
*** 71,75 ****
  }
  
! removeNiceDragSourceListener(th...@ja...t.dnd.DragSourceContext,listener)
  {
  	this.removeDragSourceListener(listener);
--- 71,75 ----
  }
  
! removeNiceDragSourceListener(java.awt.dnd.DragSourceContext this,listener)
  {
  	this.removeDragSourceListener(listener);
***************
*** 77,81 ****
  }
  
! removeNiceDropTargetListener(th...@ja...t.dnd.DropTarget,listener)
  {
  	this.removeDropTargetListener(listener);
--- 77,81 ----
  }
  
! removeNiceDropTargetListener(java.awt.dnd.DropTarget this,listener)
  {
  	this.removeDropTargetListener(listener);
***************
*** 83,87 ****
  }
  
! removeNiceDragGestureListener(th...@ja...t.dnd.DragGestureRecognizer,listener)
  {
  	this.removeDragGestureListener(listener);
--- 83,87 ----
  }
  
! removeNiceDragGestureListener(java.awt.dnd.DragGestureRecognizer this,listener)
  {
  	this.removeDragGestureListener(listener);
***************
*** 89,93 ****
  }
  
! //JDK1.4  removeNicePropertyChangeListeners(th...@ja...olkit,key@String,listener)
  //JDK1.4  {
  //JDK1.4  	this.removePropertyChangeListener(key,listener);
--- 89,93 ----
  }
  
! //JDK1.4  removeNicePropertyChangeListeners(java.awt.Toolkit thisString ,key,listener)
  //JDK1.4  {
  //JDK1.4  	this.removePropertyChangeListener(key,listener);
***************
*** 95,99 ****
  //JDK1.4  }
  
! //JDK1.4  removeNiceAWTEventListeners(th...@ja...olkit,key@long,listener)  
  //JDK1.4  {
  //JDK1.4  	this.removeAWTEventListener(listener,key);
--- 95,99 ----
  //JDK1.4  }
  
! //JDK1.4  removeNiceAWTEventListeners(java.awt.Toolkit thislong ,key,listener)  
  //JDK1.4  {
  //JDK1.4  	this.removeAWTEventListener(listener,key);
***************
*** 101,105 ****
  //JDK1.4  }
  
! //JDK1.4  removeNiceDragSourceListener(th...@ja...t.dnd.DragSource,listener)
  //JDK1.4  {
  //JDK1.4  	this.removeDragSourceListener(listener);
--- 101,105 ----
  //JDK1.4  }
  
! //JDK1.4  removeNiceDragSourceListener(java.awt.dnd.DragSource this,listener)
  //JDK1.4  {
  //JDK1.4  	this.removeDragSourceListener(listener);
***************
*** 107,115 ****
  //JDK1.4  }
  
! //JDK1.4  removeNiceAdjustmentListener(th...@ja...rollPaneAdjustable,listener) = this.removeAdjustmentListener(listener);
! //JDK1.4  removeNiceWindowFocusListener(th...@ja...t.Window,listener) = this.removeWindowFocusListener(listener);
! //JDK1.4  removeNiceWindowStateListener(th...@ja...t.Window,listener) = this.removeWindowStateListener(listener);
! //JDK1.4  removeNiceMouseWheelListener(th...@ja...ponent,listener) = this.removeMouseWheelListener(listener);
! //JDK1.4  removeNiceDragSourceMotionListener(th...@ja...t.dnd.DragSource,listener) = this.removeDragSourceMotionListener(listener);
  
  
--- 107,115 ----
  //JDK1.4  }
  
! //JDK1.4  removeNiceAdjustmentListener(java.awt.ScrollPaneAdjustable this,listener) = this.removeAdjustmentListener(listener);
! //JDK1.4  removeNiceWindowFocusListener(java.awt.Window this,listener) = this.removeWindowFocusListener(listener);
! //JDK1.4  removeNiceWindowStateListener(java.awt.Window this,listener) = this.removeWindowStateListener(listener);
! //JDK1.4  removeNiceMouseWheelListener(java.awt.Component this,listener) = this.removeMouseWheelListener(listener);
! //JDK1.4  removeNiceDragSourceMotionListener(java.awt.dnd.DragSource this,listener) = this.removeDragSourceMotionListener(listener);
  
  

Index: BeanListenerAccessors.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/BeanListenerAccessors.nice,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BeanListenerAccessors.nice	13 Nov 2002 02:22:28 -0000	1.3
--- BeanListenerAccessors.nice	27 Feb 2004 18:32:08 -0000	1.4
***************
*** 41,45 ****
  }
  
! getNicePropertyChangeListeners(this,propertyName@String)
  {
  	?java.util.List<NicePropertyChangeListener> result = mappablePropertyChangeListeners.get((this.object(),propertyName));
--- 41,45 ----
  }
  
! getNicePropertyChangeListeners(this, String propertyName)
  {
  	?java.util.List<NicePropertyChangeListener> result = mappablePropertyChangeListeners.get((this.object(),propertyName));
***************
*** 47,51 ****
  }
  
! getNiceVetoableChangeListeners(this,propertyName@String)
  {
  	?java.util.List<NiceVetoableChangeListener> result = mappableVetoableChangeListeners.get((this.object(),propertyName));
--- 47,51 ----
  }
  
! getNiceVetoableChangeListeners(this, String propertyName)
  {
  	?java.util.List<NiceVetoableChangeListener> result = mappableVetoableChangeListeners.get((this.object(),propertyName));
***************
*** 53,57 ****
  }
  
! //JDK1.4  getNiceExceptionListeners(this@Encoder)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getExceptionListeners();
--- 53,57 ----
  }
  
! //JDK1.4  getNiceExceptionListeners(Encoder this)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getExceptionListeners();
***************
*** 59,63 ****
  //JDK1.4  }
  
! //JDK1.4  getNiceExceptionListeners(this@XMLDecoder)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getExceptionListeners();
--- 59,63 ----
  //JDK1.4  }
  
! //JDK1.4  getNiceExceptionListeners(XMLDecoder this)
  //JDK1.4  {
  //JDK1.4    EventListener[?] listeners = this.getExceptionListeners();

Index: BeanListenerConverters.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/BeanListenerConverters.nice,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BeanListenerConverters.nice	13 Nov 2002 02:22:28 -0000	1.2
--- BeanListenerConverters.nice	27 Feb 2004 18:32:08 -0000	1.3
***************
*** 19,23 ****
  
  NicePropertyChangeListener toNicePropertyChangeListener(EventListener);
! toNicePropertyChangeListener(this@NicePropertyChangeListener) = this;
  toNicePropertyChangeListener(this) 
  { 
--- 19,23 ----
  
  NicePropertyChangeListener toNicePropertyChangeListener(EventListener);
! toNicePropertyChangeListener(NicePropertyChangeListener this) = this;
  toNicePropertyChangeListener(this) 
  { 
***************
*** 26,30 ****
  
  NiceVetoableChangeListener toNiceVetoableChangeListener(EventListener);
! toNiceVetoableChangeListener(this@NiceVetoableChangeListener) = this;
  toNiceVetoableChangeListener(this) 
  { 
--- 26,30 ----
  
  NiceVetoableChangeListener toNiceVetoableChangeListener(EventListener);
! toNiceVetoableChangeListener(NiceVetoableChangeListener this) = this;
  toNiceVetoableChangeListener(this) 
  { 
***************
*** 33,37 ****
  
  //JDK1.4  NiceExceptionListener toNiceExceptionListener(EventListener);
! //JDK1.4  toNiceExceptionListener(this@NiceExceptionListener) = this;
  //JDK1.4  toNiceExceptionListener(this)
  //JDK1.4  { 
--- 33,37 ----
  
  //JDK1.4  NiceExceptionListener toNiceExceptionListener(EventListener);
! //JDK1.4  toNiceExceptionListener(NiceExceptionListener this) = this;
  //JDK1.4  toNiceExceptionListener(this)
  //JDK1.4  { 

Index: BeanListenerDecorators.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/BeanListenerDecorators.nice,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BeanListenerDecorators.nice	13 Nov 2002 02:22:28 -0000	1.3
--- BeanListenerDecorators.nice	27 Feb 2004 18:32:08 -0000	1.4
***************
*** 31,35 ****
   */
  
! addNicePropertyChangeListener(this@PropertyEditorSupport,listener)
  {
  	this.addPropertyChangeListener(listener);
--- 31,35 ----
   */
  
! addNicePropertyChangeListener(PropertyEditorSupport this,listener)
  {
  	this.addPropertyChangeListener(listener);
***************
*** 37,41 ****
  }
  
! addNicePropertyChangeListener(this@PropertyChangeSupport,listener)
  {
  	this.addPropertyChangeListener(listener);
--- 37,41 ----
  }
  
! addNicePropertyChangeListener(PropertyChangeSupport this,listener)
  {
  	this.addPropertyChangeListener(listener);
***************
*** 43,47 ****
  }
  
! addNiceVetoableChangeListener(this@VetoableChangeSupport,listener)
  {
  	this.addVetoableChangeListener(listener);
--- 43,47 ----
  }
  
! addNiceVetoableChangeListener(VetoableChangeSupport this,listener)
  {
  	this.addVetoableChangeListener(listener);
***************
*** 49,53 ****
  }
  
! addNicePropertyChangeListener(this@PropertyChangeSupport,key@String,listener)
  {
  	this.addPropertyChangeListener(key,listener);
--- 49,53 ----
  }
  
! addNicePropertyChangeListener(PropertyChangeSupport this, String key,listener)
  {
  	this.addPropertyChangeListener(key,listener);
***************
*** 55,59 ****
  }
  
! addNicePropertyChangeListener(this@BeanContextChildSupport,key@String,listener)
  {
  	this.addPropertyChangeListener(key,listener);
--- 55,59 ----
  }
  
! addNicePropertyChangeListener(BeanContextChildSupport this, String key,listener)
  {
  	this.addPropertyChangeListener(key,listener);
***************
*** 61,65 ****
  }
  
! addNiceVetoableChangeListener(this@VetoableChangeSupport,key@String,listener)
  {
  	this.addVetoableChangeListener(key,listener);
--- 61,65 ----
  }
  
! addNiceVetoableChangeListener(VetoableChangeSupport this, String key,listener)
  {
  	this.addVetoableChangeListener(key,listener);
***************
*** 67,71 ****
  }
  
! addNiceVetoableChangeListener(this@BeanContextChildSupport,key@String,listener)
  {
  	this.addVetoableChangeListener(key,listener);
--- 67,71 ----
  }
  
! addNiceVetoableChangeListener(BeanContextChildSupport this, String key,listener)
  {
  	this.addVetoableChangeListener(key,listener);
***************
*** 73,78 ****
  }
  
! //JDK1.4  addNiceExceptionListener(this@XMLDecoder,listener) = this.setExceptionListener(listener);
! //JDK1.4  addNiceExceptionListener(this@Encoder,listener) = this.setExceptionListener(listener);
  
  
--- 73,78 ----
  }
  
! //JDK1.4  addNiceExceptionListener(XMLDecoder this,listener) = this.setExceptionListener(listener);
! //JDK1.4  addNiceExceptionListener(Encoder this,listener) = this.setExceptionListener(listener);
  
  

Index: BeanListenerRemovers.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/BeanListenerRemovers.nice,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BeanListenerRemovers.nice	13 Nov 2002 02:22:28 -0000	1.5
--- BeanListenerRemovers.nice	27 Feb 2004 18:32:08 -0000	1.6
***************
*** 31,35 ****
   */
  
! removeNicePropertyChangeListener(this@PropertyEditorSupport,listener)
  {
  	this.removePropertyChangeListener(listener);
--- 31,35 ----
   */
  
! removeNicePropertyChangeListener(PropertyEditorSupport this,listener)
  {
  	this.removePropertyChangeListener(listener);
***************
*** 37,41 ****
  }
  
! removeNicePropertyChangeListener(this@PropertyChangeSupport,listener)
  {
  	this.removePropertyChangeListener(listener);
--- 37,41 ----
  }
  
! removeNicePropertyChangeListener(PropertyChangeSupport this,listener)
  {
  	this.removePropertyChangeListener(listener);
***************
*** 43,47 ****
  }
  
! removeNiceVetoableChangeListener(this@VetoableChangeSupport,listener)
  {
  	this.removeVetoableChangeListener(listener);
--- 43,47 ----
  }
  
! removeNiceVetoableChangeListener(VetoableChangeSupport this,listener)
  {
  	this.removeVetoableChangeListener(listener);
***************
*** 49,53 ****
  }
  
! removeNicePropertyChangeListener(this@PropertyChangeSupport,key@String,listener)
  {
  	this.removePropertyChangeListener(key,listener);
--- 49,53 ----
  }
  
! removeNicePropertyChangeListener(PropertyChangeSupport this,String key,listener)
  {
  	this.removePropertyChangeListener(key,listener);
***************
*** 55,59 ****
  }
  
! removeNicePropertyChangeListener(this@BeanContextChildSupport,key@String,listener)
  {
  	this.removePropertyChangeListener(key,listener);
--- 55,59 ----
  }
  
! removeNicePropertyChangeListener(BeanContextChildSupport this,String key,listener)
  {
  	this.removePropertyChangeListener(key,listener);
***************
*** 61,65 ****
  }
  
! removeNiceVetoableChangeListener(this@VetoableChangeSupport,key@String,listener)
  {
  	this.removeVetoableChangeListener(key,listener);
--- 61,65 ----
  }
  
! removeNiceVetoableChangeListener(VetoableChangeSupport this,String key,listener)
  {
  	this.removeVetoableChangeListener(key,listener);
***************
*** 67,71 ****
  }
  
! removeNiceVetoableChangeListener(this@BeanContextChildSupport,key@String,listener)
  {
  	this.removeVetoableChangeListener(key,listener);
--- 67,71 ----
  }
  
! removeNiceVetoableChangeListener(BeanContextChildSupport this,String key,listener)
  {
  	this.removeVetoableChangeListener(key,listener);
***************
*** 73,78 ****
  }
  
! //JDK1.4  removeNiceExceptionListener(this@XMLDecoder,listener) = this.setExceptionListener(listener);
! //JDK1.4  removeNiceExceptionListener(this@Encoder,listener) = this.setExceptionListener(listener);
  
  
--- 73,78 ----
  }
  
! //JDK1.4  removeNiceExceptionListener(XMLDecoder this,listener) = this.setExceptionListener(listener);
! //JDK1.4  removeNiceExceptionListener(Encoder this,listener) = this.setExceptionListener(listener);
  
  

Index: common.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/common.nice,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** common.nice	12 Dec 2003 17:33:48 -0000	1.5
--- common.nice	27 Feb 2004 18:32:08 -0000	1.6
***************
*** 73,77 ****
  }
  
! getListener(this@NoNiceListenerException) = this.listener;
  
  
--- 73,77 ----
  }
  
! getListener(NoNiceListenerException this) = this.listener;
  
  

Index: SwingListenerAccessors.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/SwingListenerAccessors.nice,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SwingListenerAccessors.nice	21 Nov 2003 18:56:28 -0000	1.4
--- SwingListenerAccessors.nice	27 Feb 2004 18:32:08 -0000	1.5
***************
*** 46,50 ****
   */
  
! getNiceTableModelListeners(this@javax.swing.table.TableModel)
  {
  	?java.util.List<NiceTableModelListener> result = tableModelListeners.get(this.object());
--- 46,50 ----
   */
  
! getNiceTableModelListeners(javax.swing.table.TableModel this)
  {
  	?java.util.List<NiceTableModelListener> result = tableModelListeners.get(this.object());
***************
*** 52,56 ****
  }
  
! getNiceTableColumnModelListeners(this@javax.swing.table.TableColumnModel)
  {
  	?java.util.List<NiceTableColumnModelListener> result = tableColumnModelListeners.get(this.object());
--- 52,56 ----
  }
  
! getNiceTableColumnModelListeners(javax.swing.table.TableColumnModel this)
  {
  	?java.util.List<NiceTableColumnModelListener> result = tableColumnModelListeners.get(this.object());
***************
*** 58,62 ****
  }
  
! getNiceCellEditorListeners(this@javax.swing.AbstractCellEditor)
  {
  	?java.util.List<NiceCellEditorListener> result = cellEditorListeners.get(this.object());
--- 58,62 ----
  }
  
! getNiceCellEditorListeners(javax.swing.AbstractCellEditor this)
  {
  	?java.util.List<NiceCellEditorListener> result = cellEditorListeners.get(this.object());
***************
*** 64,68 ****
  }
  
! getNiceChangeListeners(th...@ja...faultColorSelectionModel)
  {
  	?java.util.List<NiceChangeListener> result = changeListeners.get(this.object());
--- 64,68 ----
  }
  
! getNiceChangeListeners(javax.swing.colorchooser.DefaultColorSelectionModel this)
  {
  	?java.util.List<NiceChangeListener> result = changeListeners.get(this.object());
***************
*** 70,74 ****
  }
  
! getNiceChangeListeners(th...@ja...nuSelectionManager)
  {
  	?java.util.List<NiceChangeListener> result = changeListeners.get(this.object());
--- 70,74 ----
  }
  
! getNiceChangeListeners(javax.swing.MenuSelectionManager this)
  {
  	?java.util.List<NiceChangeListener> result = changeListeners.get(this.object());
***************
*** 76,80 ****
  }
  
! getNiceUndoableEditListeners(this@javax.swing.undo.UndoableEditSupport)
  {
  	?java.util.List<NiceUndoableEditListener> result = undoableEditListeners.get(this.object());
--- 76,80 ----
  }
  
! getNiceUndoableEditListeners(javax.swing.undo.UndoableEditSupport this)
  {
  	?java.util.List<NiceUndoableEditListener> result = undoableEditListeners.get(this.object());
***************
*** 82,86 ****
  }
  
! getNiceActionListeners(this@javax.swing.AbstractButton)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 82,86 ----
  }
  
! getNiceActionListeners(javax.swing.AbstractButton this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 88,92 ****
  }
  
! getNiceActionListeners(th...@ja...faultButtonModel)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 88,92 ----
  }
  
! getNiceActionListeners(javax.swing.DefaultButtonModel this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 94,98 ****
  }
  
! getNiceActionListeners(this@javax.swing.JComboBox)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 94,98 ----
  }
  
! getNiceActionListeners(javax.swing.JComboBox this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 100,104 ****
  }
  
! getNiceActionListeners(this@javax.swing.JFileChooser)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 100,104 ----
  }
  
! getNiceActionListeners(javax.swing.JFileChooser this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 106,110 ****
  }
  
! getNiceActionListeners(this@javax.swing.JTextField)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 106,110 ----
  }
  
! getNiceActionListeners(javax.swing.JTextField this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 112,116 ****
  }
  
! getNiceActionListeners(this@javax.swing.Timer)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
--- 112,116 ----
  }
  
! getNiceActionListeners(javax.swing.Timer this)
  {
    EventListener[?] listeners = this.getListeners(ActionListener.class);
***************
*** 118,122 ****
  }
  
! getNiceItemListeners(th...@ja...faultButtonModel)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
--- 118,122 ----
  }
  
! getNiceItemListeners(javax.swing.DefaultButtonModel this)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
***************
*** 124,128 ****
  }
  
! getNiceItemListeners(this@javax.swing.AbstractButton)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
--- 124,128 ----
  }
  
! getNiceItemListeners(javax.swing.AbstractButton this)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
***************
*** 130,134 ****
  }
  
! getNiceItemListeners(this@javax.swing.JComboBox)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
--- 130,134 ----
  }
  
! getNiceItemListeners(javax.swing.JComboBox this)
  {
    EventListener[?] listeners = this.getListeners(ItemListener.class);
***************
*** 136,140 ****
  }
  
! getNiceAdjustmentListeners(this@javax.swing.JScrollBar)
  {
    EventListener[?] listeners = this.getListeners(AdjustmentListener.class);
--- 136,140 ----
  }
  
! getNiceAdjustmentListeners(javax.swing.JScrollBar this)
  {
    EventListener[?] listeners = this.getListeners(AdjustmentListener.class);
***************
*** 142,146 ****
  }
  
! getNiceCaretListeners(this@javax.swing.text.JTextComponent)
  {
    EventListener[?] listeners = this.getListeners(CaretListener.class);
--- 142,146 ----
  }
  
! getNiceCaretListeners(javax.swing.text.JTextComponent this)
  {
    EventListener[?] listeners = this.getListeners(CaretListener.class);
***************
*** 148,152 ****
  }
  
! getNiceChangeListeners(this@javax.swing.AbstractButton)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 148,152 ----
  }
  
! getNiceChangeListeners(javax.swing.AbstractButton this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 154,158 ****
  }
  
! getNiceChangeListeners(th...@ja...faultBoundedRangeModel)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 154,158 ----
  }
  
! getNiceChangeListeners(javax.swing.DefaultBoundedRangeModel this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 160,164 ****
  }
  
! getNiceChangeListeners(th...@ja...faultSingleSelectionModel)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 160,164 ----
  }
  
! getNiceChangeListeners(javax.swing.DefaultSingleSelectionModel this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 166,170 ****
  }
  
! getNiceChangeListeners(th...@ja...faultCaret)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 166,170 ----
  }
  
! getNiceChangeListeners(javax.swing.text.DefaultCaret this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 172,176 ****
  }
  
! getNiceChangeListeners(th...@ja...rogressBar)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 172,176 ----
  }
  
! getNiceChangeListeners(javax.swing.JProgressBar this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 178,182 ****
  }
  
! getNiceChangeListeners(this@javax.swing.JSlider)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 178,182 ----
  }
  
! getNiceChangeListeners(javax.swing.JSlider this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 184,188 ****
  }
  
! getNiceChangeListeners(this@javax.swing.JTabbedPane)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 184,188 ----
  }
  
! getNiceChangeListeners(javax.swing.JTabbedPane this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 190,194 ****
  }
  
! getNiceChangeListeners(this@javax.swing.JViewport)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 190,194 ----
  }
  
! getNiceChangeListeners(javax.swing.JViewport this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 196,200 ****
  }
  
! getNiceChangeListeners(th...@ja...faultButtonModel)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
--- 196,200 ----
  }
  
! getNiceChangeListeners(javax.swing.DefaultButtonModel this)
  {
    EventListener[?] listeners = this.getListeners(ChangeListener.class);
***************
*** 202,206 ****
  }
  
! getNiceListDataListeners(this@javax.swing.AbstractListModel)
  {
    EventListener[?] listeners = this.getListeners(ListDataListener.class);
--- 202,206 ----
  }
  
! getNiceListDataListeners(javax.swing.AbstractListModel this)
  {
    EventListener[?] listeners = this.getListeners(ListDataListener.class);
***************
*** 208,212 ****
  }
  
! getNiceListSelectionListeners(th...@ja...faultListSelectionModel)
  {
    EventListener[?] listeners = this.getListeners(ListSelectionListener.class);
--- 208,212 ----
  }
  
! getNiceListSelectionListeners(javax.swing.DefaultListSelectionModel this)
  {
    EventListener[?] listeners = this.getListeners(ListSelectionListener.class);
***************
*** 214,218 ****
  }
  
! getNiceListSelectionListeners(this@javax.swing.JList)
  {
    EventListener[?] listeners = this.getListeners(ListSelectionListener.class);
--- 214,218 ----
  }
  
! getNiceListSelectionListeners(javax.swing.JList this)
  {
    EventListener[?] listeners = this.getListeners(ListSelectionListener.class);
***************
*** 220,224 ****
  }
  
! getNiceAncestorListeners(this@javax.swing.JComponent)
  {
    EventListener[?] listeners = this.getListeners(AncestorListener.class);
--- 220,224 ----
  }
  
! getNiceAncestorListeners(javax.swing.JComponent this)
  {
    EventListener[?] listeners = this.getListeners(AncestorListener.class);
***************
*** 226,230 ****
  }
  
! getNiceHyperlinkListeners(th...@ja...ditorPane)
  {
    EventListener[?] listeners = this.getListeners(HyperlinkListener.class);
--- 226,230 ----
  }
  
! getNiceHyperlinkListeners(javax.swing.JEditorPane this)
  {
    EventListener[?] listeners = this.getListeners(HyperlinkListener.class);
***************
*** 232,236 ****
  }
  
! getNiceInternalFrameListeners(this@javax.swing.JInternalFrame)
  {
    EventListener[?] listeners = this.getListeners(InternalFrameListener.class);
--- 232,236 ----
  }
  
! getNiceInternalFrameListeners(javax.swing.JInternalFrame this)
  {
    EventListener[?] listeners = this.getListeners(InternalFrameListener.class);
***************
*** 238,242 ****
  }
  
! getNiceMenuListeners(th...@ja...enu)
  {
    EventListener[?] listeners = this.getListeners(MenuListener.class);
--- 238,242 ----
  }
  
! getNiceMenuListeners(javax.swing.JMenu this)
  {
    EventListener[?] listeners = this.getListeners(MenuListener.class);
***************
*** 244,248 ****
  }
  
! getNiceMenuDragMouseListeners(th...@ja...enuItem)
  {
    EventListener[?] listeners = this.getListeners(MenuDragMouseListener.class);
--- 244,248 ----
  }
  
! getNiceMenuDragMouseListeners(javax.swing.JMenuItem this)
  {
    EventListener[?] listeners = this.getListeners(MenuDragMouseListener.class);
***************
*** 250,254 ****
  }
  
! getNiceMenuKeyListeners(th...@ja...enuItem)
  {
    EventListener[?] listeners = this.getListeners(MenuKeyListener.class);
--- 250,254 ----
  }
  
! getNiceMenuKeyListeners(javax.swing.JMenuItem this)
  {
    EventListener[?] listeners = this.getListeners(MenuKeyListener.clas...
 
[truncated message content]

[Nice-commit] swing/src/nice/ui/common/types/beans java.nice,1.2,1.3

[<ar...@us...>]

Update of /cvsroot/nice/swing/src/nice/ui/common/types/beans
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12429/D:/nice/nice/ui/common/types/beans

Modified Files:
	java.nice 
Log Message:
Syntax update for niceswing (new pattern style, removed Any keyword).

Index: java.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/types/beans/java.nice,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** java.nice	2 Oct 2002 03:20:39 -0000	1.2
--- java.nice	27 Feb 2004 18:32:08 -0000	1.3
***************
*** 142,146 ****
  
  // interfaces BeanContextServiceProvider 
! <Any Element> Iterator<Element> getCurrentServiceSelectors(BeanContextServiceProvider, BeanContextServices, Class)
    = native Iterator BeanContextServiceProvider.getCurrentServiceSelectors(BeanContextServices, Class);
  Object getService(BeanContextServiceProvider, BeanContextServices, Object, Class, ?Object)
--- 142,146 ----
  
  // interfaces BeanContextServiceProvider 
! <Element> Iterator<Element> getCurrentServiceSelectors(BeanContextServiceProvider, BeanContextServices, Class)
    = native Iterator BeanContextServiceProvider.getCurrentServiceSelectors(BeanContextServices, Class);
  Object getService(BeanContextServiceProvider, BeanContextServices, Object, Class, ?Object)
***************
*** 162,168 ****
  boolean addService(BeanContextServices, Class, BeanContextServiceProvider)
    = native boolean BeanContextServices.addService(Class, BeanContextServiceProvider);
! <Any Element> Iterator<Element> getCurrentServiceClasses(BeanContextServices)
    = native Iterator BeanContextServices.getCurrentServiceClasses();
! <Any Element> Iterator<Element> getCurrentServiceSelectors(BeanContextServices, Class)
    = native Iterator BeanContextServices.getCurrentServiceSelectors(Class);
  ?Object getService(BeanContextServices, BeanContextChild, Object, Class, Object, BeanContextServiceRevokedListener)
--- 162,168 ----
  boolean addService(BeanContextServices, Class, BeanContextServiceProvider)
    = native boolean BeanContextServices.addService(Class, BeanContextServiceProvider);
! <Element> Iterator<Element> getCurrentServiceClasses(BeanContextServices)
    = native Iterator BeanContextServices.getCurrentServiceClasses();
! <Element> Iterator<Element> getCurrentServiceSelectors(BeanContextServices, Class)
    = native Iterator BeanContextServices.getCurrentServiceSelectors(Class);
  ?Object getService(BeanContextServices, BeanContextChild, Object, Class, Object, BeanContextServiceRevokedListener)
***************
*** 198,202 ****
  
  /* class FeatureDescriptor */
! <Any T> Enumeration<T> attributeNames(FeatureDescriptor) = native Enumeration FeatureDescriptor.attributeNames(); 
  String getDisplayName(FeatureDescriptor) = native String FeatureDescriptor.getDisplayName(); 
  String getName(FeatureDescriptor) = native String FeatureDescriptor.getName();
--- 198,202 ----
  
  /* class FeatureDescriptor */
! <T> Enumeration<T> attributeNames(FeatureDescriptor) = native Enumeration FeatureDescriptor.attributeNames(); 
  String getDisplayName(FeatureDescriptor) = native String FeatureDescriptor.getDisplayName(); 
  String getName(FeatureDescriptor) = native String FeatureDescriptor.getName();
***************
*** 315,319 ****
  
  /* class BeanContextMembershipEvent */
! <Any T> Iterator<T> iterator(BeanContextMembershipEvent) = native Iterator BeanContextMembershipEvent.iterator();
  Object[] toArray(BeanContextMembershipEvent) = native Object[] BeanContextMembershipEvent.toArray();
  
--- 315,319 ----
  
  /* class BeanContextMembershipEvent */
! <T> Iterator<T> iterator(BeanContextMembershipEvent) = native Iterator BeanContextMembershipEvent.iterator();
  Object[] toArray(BeanContextMembershipEvent) = native Object[] BeanContextMembershipEvent.toArray();
  
***************
*** 321,325 ****
  BeanContextServices getSourceAsBeanContextServices(BeanContextServiceAvailableEvent) = native BeanContextServices BeanContextServiceAvailableEvent.getSourceAsBeanContextServices();
  Class getServiceClass(BeanContextServiceAvailableEvent) = native Class BeanContextServiceAvailableEvent.getServiceClass();
! <Any T> Iterator<T> getCurrentServiceSelectors(BeanContextServiceAvailableEvent) = native Iterator BeanContextServiceAvailableEvent.getCurrentServiceSelectors();
  
  /* class BeanContextServiceRevokedEvent */
--- 321,325 ----
  BeanContextServices getSourceAsBeanContextServices(BeanContextServiceAvailableEvent) = native BeanContextServices BeanContextServiceAvailableEvent.getSourceAsBeanContextServices();
  Class getServiceClass(BeanContextServiceAvailableEvent) = native Class BeanContextServiceAvailableEvent.getServiceClass();
! <T> Iterator<T> getCurrentServiceSelectors(BeanContextServiceAvailableEvent) = native Iterator BeanContextServiceAvailableEvent.getCurrentServiceSelectors();
  
  /* class BeanContextServiceRevokedEvent */
***************
*** 329,334 ****
  /* class BeanContextServicesSupport */
  BeanContextServices getBeanContextServicesPeer(BeanContextServicesSupport) = native BeanContextServices BeanContextServicesSupport.getBeanContextServicesPeer();
! <Any T> Iterator<T> getCurrentServiceClasses(BeanContextServicesSupport) = native Iterator BeanContextServicesSupport.getCurrentServiceClasses();
! <Any T> Iterator<T> getCurrentServiceSelectors(BeanContextServicesSupport, Class) = native Iterator BeanContextServicesSupport.getCurrentServiceSelectors(Class);
  
  /* class BeanContextSupport */
--- 329,334 ----
  /* class BeanContextServicesSupport */
  BeanContextServices getBeanContextServicesPeer(BeanContextServicesSupport) = native BeanContextServices BeanContextServicesSupport.getBeanContextServicesPeer();
! <T> Iterator<T> getCurrentServiceClasses(BeanContextServicesSupport) = native Iterator BeanContextServicesSupport.getCurrentServiceClasses();
! <T> Iterator<T> getCurrentServiceSelectors(BeanContextServicesSupport, Class) = native Iterator BeanContextServicesSupport.getCurrentServiceSelectors(Class);
  
  /* class BeanContextSupport */
***************
*** 338,342 ****
  InputStream getResourceAsStream(BeanContextSupport, String, BeanContextChild) = native InputStream BeanContextSupport.getResourceAsStream(String, BeanContextChild);
  Object instantiateChild(BeanContextSupport, String) = native Object BeanContextSupport.instantiateChild(String);
! <Any T> Iterator<T> iterator(BeanContextSupport) = native Iterator BeanContextSupport.iterator();
  Object[] toArray(BeanContextSupport) = native Object[] BeanContextSupport.toArray();
  Object[] toArray(BeanContextSupport, Object[]) = native Object[] BeanContextSupport.toArray(Object[]); 
--- 338,342 ----
  InputStream getResourceAsStream(BeanContextSupport, String, BeanContextChild) = native InputStream BeanContextSupport.getResourceAsStream(String, BeanContextChild);
  Object instantiateChild(BeanContextSupport, String) = native Object BeanContextSupport.instantiateChild(String);
! <T> Iterator<T> iterator(BeanContextSupport) = native Iterator BeanContextSupport.iterator();
  Object[] toArray(BeanContextSupport) = native Object[] BeanContextSupport.toArray();
  Object[] toArray(BeanContextSupport, Object[]) = native Object[] BeanContextSupport.toArray(Object[]);