Re: [cp-patches] DSSKeyPairGenerator JCE Adapter

2006-02-06 Thread Raif S. Naffah
hello Mark,

On Monday 06 February 2006 09:53, Mark Wielaard wrote:
 Hi Raif,

 On Sun, 2006-02-05 at 09:12 +1100, Raif S. Naffah wrote:
if (!(key instanceof DSSPublicKey))
  throw new InvalidParameterException(key);
  
   Officially there is a space after each operator, so also for ! to
   make it more clearly stand out...
 
  yes we can do that: force a white space after a unary operator, but
  then we get:
 
  boolean condition1 = false;
  boolean condition2 = true;
  // ...
  if (condition1  ! condition2)
{
  // do something
}
 
  rather than
  if (condition1  !condition2)
 
  if this is what we want then i'll update the style specs file
  accordingly.

 I think that is what we want yes...

ok.


  ...
  or a.2:
 
  public class Main
  extends KeyGenerator
  implements java.io.Serializable

 According to our coding style guide a.2 is the correct one.
 Although mostly people do a.1 and only fall back on a.2 when the line
 gets  78 chars. (And they would do an import java.io.Serializable
 and implements Serializable).

  b/ Javadoc style; which is more acceptable:
 
  b1:
 
 * @param input the byte array to unmarshall into a valid DSS
 *  [EMAIL PROTECTED] PublicKey} instance.

 I would say b1. Although we don't have a very precise coding style
 here.

cool.

i'll post shortly a patch for the .xml style file in the project.


thanks + cheers;
rsn


pgpwJV2wZYapI.pgp
Description: PGP signature


[cp-patches] Eclipse GNU style

2006-02-06 Thread Raif S. Naffah
hello there,

this is a patch for the srcipts/eclipse-gnu.xml style specs that does 
the following:

* force a line split on extends and implements clauses.
* force a whitespace after unary operators.
* does not force a new-line after a @param tag.
* force a new-line at the end of a .java file.

it has been generated from a Native

Eclipse SDK
Version: 3.1.1
Build id: M20050929-0840 (Fedora Core release 4 (Stentz))


cheers;
rsn
Index: eclipse-gnu.xml
===
RCS file: /cvsroot/classpath/classpath/scripts/eclipse-gnu.xml,v
retrieving revision 1.3
diff -u -r1.3 eclipse-gnu.xml
--- eclipse-gnu.xml	25 Aug 2005 20:56:07 -	1.3
+++ eclipse-gnu.xml	6 Feb 2006 08:42:24 -
@@ -1,31 +1,24 @@
 ?xml version=1.0 encoding=UTF-8?
-profiles version=6
-profile name=GNU version=6
-setting id=comment_clear_blank_lines value=true/
-setting id=comment_format_comments value=true/
-setting id=comment_format_header value=false/
-setting id=comment_format_html value=true/
-setting id=comment_format_source_code value=true/
-setting id=comment_indent_parameter_description value=true/
-setting id=comment_indent_root_tags value=true/
-setting id=comment_line_length value=80/
-setting id=comment_new_line_for_parameter value=true/
-setting id=comment_separate_root_tags value=true/
+profiles version=8
+profile name=GNU version=8
 setting id=org.eclipse.jdt.core.formatter.align_type_members_on_columns value=false/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression value=18/
+setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant value=16/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call value=18/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation value=18/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression value=18/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_binary_expression value=18/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_compact_if value=16/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_conditional_expression value=82/
+setting id=org.eclipse.jdt.core.formatter.alignment_for_enum_constants value=0/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer value=18/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_multiple_fields value=16/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration value=18/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration value=18/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation value=0/
-setting id=org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration value=16/
-setting id=org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration value=16/
+setting id=org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration value=17/
+setting id=org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration value=16/
+setting id=org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration value=17/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration value=16/
 setting id=org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration value=16/
 setting id=org.eclipse.jdt.core.formatter.blank_lines_after_imports value=1/
@@ -38,25 +31,43 @@
 setting id=org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk value=1/
 setting id=org.eclipse.jdt.core.formatter.blank_lines_before_package value=2/
 setting id=org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations value=1/
+setting id=org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration value=end_of_line/
 setting id=org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration value=next_line/
 setting id=org.eclipse.jdt.core.formatter.brace_position_for_array_initializer value=end_of_line/
 setting id=org.eclipse.jdt.core.formatter.brace_position_for_block value=next_line_shifted/
 setting id=org.eclipse.jdt.core.formatter.brace_position_for_block_in_case value=next_line/
 setting id=org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration value=next_line/
+setting id=org.eclipse.jdt.core.formatter.brace_position_for_enum_constant value=end_of_line/
+setting id=org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration value=end_of_line/
 setting id=org.eclipse.jdt.core.formatter.brace_position_for_method_declaration value=next_line/
 setting id=org.eclipse.jdt.core.formatter.brace_position_for_switch value=next_line_shifted/
 setting id=org.eclipse.jdt.core.formatter.brace_position_for_type_declaration value=next_line/
+setting 

[cp-patches] Use of OID strings

2006-02-06 Thread Raif S. Naffah
hello there,

this is a patch that fixes a wrong OID string used in GnuDSAPublicKey 
and replaces OID strings use in both the DSA and RSA public and private 
keys (under the gnu.java.secuity.provider hierarchy by their Registry 
equivalent.

ChangeLog entry is:

2006-02-06  Raif S. Naffah  [EMAIL PROTECTED]

* gnu/java/security/provider/GnuDSAPublicKey.java (getEncoded): Use
Registry constant.
* gnu/java/security/provider/GnuDSAPrivateKey.java (getEncoded):
Likewise.
* gnu/java/security/provider/GnuRSAPrivateKey.java (getEncoded):
Likewise.
* gnu/java/security/provider/GnuRSAPublicKey.java (getEncoded):
Likewise.
* gnu/java/security/provider/EncodedKeyFactory.java
(ID_DSA): Redefined in terms of Registry constant.
(ID_DSA): Redefined in terms of Registry constant.
(ID_DH): Redefined in terms of Registry constant.
* gnu/java/security/Registry.java (X509_ENCODING): New constant.
(PKCS8_ENCODING): Likewise.
(ASN1_ENCODING): Likewise.
(RAW_ENCODING_SHORT_NAME): Likewise.
(X509_ENCODING_SORT_NAME): Likewise.
(PKCS8_ENCODING_SHORT_NAME): Likewise.
(ASN1_ENCODING_SHORT_NAME): Likewise.
(X509_ENCODING_ID): Likewise.
(PKCS8_ENCODING_ID): Likewise.
(ASN1_ENCODING_ID): Likewise.
(DSA_OID_STRING): Likewise.
(RSA_OID_STRING): Likewise.
(DH_OID_STRING): Likewise.


ok to commit?

 
cheers;
rsn
Index: EncodedKeyFactory.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/EncodedKeyFactory.java,v
retrieving revision 1.4
diff -u -r1.4 EncodedKeyFactory.java
--- EncodedKeyFactory.java	2 Jul 2005 20:32:14 -	1.4
+++ EncodedKeyFactory.java	6 Feb 2006 09:16:45 -
@@ -39,6 +39,7 @@
 package gnu.java.security.provider;

 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
@@ -75,9 +76,9 @@
   // Constants.
   // 

-  private static final OID ID_DSA = new OID(1.2.840.10040.4.1);
-  private static final OID ID_RSA = new OID(1.2.840.113549.1.1.1);
-  private static final OID ID_DH  = new OID(1.2.840.10046.2.1);
+  private static final OID ID_DSA = new OID(Registry.DSA_OID_STRING);
+  private static final OID ID_RSA = new OID(Registry.RSA_OID_STRING);
+  private static final OID ID_DH  = new OID(Registry.DH_OID_STRING);

   // Instance methods.
   // 
Index: GnuDSAPrivateKey.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/GnuDSAPrivateKey.java,v
retrieving revision 1.7
diff -u -r1.7 GnuDSAPrivateKey.java
--- GnuDSAPrivateKey.java	2 Jul 2005 20:32:14 -	1.7
+++ GnuDSAPrivateKey.java	6 Feb 2006 09:17:12 -
@@ -39,6 +39,7 @@
 package gnu.java.security.provider;

 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
 import gnu.java.security.der.DERWriter;
@@ -110,7 +111,7 @@
 pki.add(new DERValue(DER.INTEGER, BigInteger.ZERO));
 ArrayList algId = new ArrayList(2);
 algId.add(new DERValue(DER.OBJECT_IDENTIFIER,
-  new OID(1.2.840.10040.4.1)));
+   new OID(Registry.DSA_OID_STRING)));
 ArrayList algParams = new ArrayList(3);
 algParams.add(new DERValue(DER.INTEGER, p));
 algParams.add(new DERValue(DER.INTEGER, q));
Index: GnuDSAPublicKey.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/GnuDSAPublicKey.java,v
retrieving revision 1.7
diff -u -r1.7 GnuDSAPublicKey.java
--- GnuDSAPublicKey.java	2 Jul 2005 20:32:14 -	1.7
+++ GnuDSAPublicKey.java	6 Feb 2006 09:17:33 -
@@ -39,6 +39,7 @@
 package gnu.java.security.provider;

 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
@@ -97,7 +98,7 @@
 ArrayList spki = new ArrayList(2);
 ArrayList alg = new ArrayList(2);
 alg.add(new DERValue(DER.OBJECT_IDENTIFIER,
-new OID(1.2.840.113549.1.1.1)));
+ new OID(Registry.DSA_OID_STRING)));
 ArrayList params = new ArrayList(3);
 params.add(new DERValue(DER.INTEGER, p));
 params.add(new DERValue(DER.INTEGER, q));
Index: Registry.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/security/Registry.java,v
retrieving revision 1.2
diff -u -r1.2 

Re: [cp-patches] Use of OID strings

2006-02-06 Thread Raif S. Naffah
On Monday 06 February 2006 20:40, Raif S. Naffah wrote:
 ...
 this is a patch that fixes a wrong OID string...

the previous patch did not include the RSA changes.  the attached patch 
is the correct one.


cheers;
rsn
Index: EncodedKeyFactory.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/EncodedKeyFactory.java,v
retrieving revision 1.4
diff -u -r1.4 EncodedKeyFactory.java
--- EncodedKeyFactory.java	2 Jul 2005 20:32:14 -	1.4
+++ EncodedKeyFactory.java	6 Feb 2006 09:16:45 -
@@ -39,6 +39,7 @@
 package gnu.java.security.provider;

 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
@@ -75,9 +76,9 @@
   // Constants.
   // 

-  private static final OID ID_DSA = new OID(1.2.840.10040.4.1);
-  private static final OID ID_RSA = new OID(1.2.840.113549.1.1.1);
-  private static final OID ID_DH  = new OID(1.2.840.10046.2.1);
+  private static final OID ID_DSA = new OID(Registry.DSA_OID_STRING);
+  private static final OID ID_RSA = new OID(Registry.RSA_OID_STRING);
+  private static final OID ID_DH  = new OID(Registry.DH_OID_STRING);

   // Instance methods.
   // 
Index: GnuDSAPrivateKey.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/GnuDSAPrivateKey.java,v
retrieving revision 1.7
diff -u -r1.7 GnuDSAPrivateKey.java
--- GnuDSAPrivateKey.java	2 Jul 2005 20:32:14 -	1.7
+++ GnuDSAPrivateKey.java	6 Feb 2006 09:17:12 -
@@ -39,6 +39,7 @@
 package gnu.java.security.provider;

 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
 import gnu.java.security.der.DERWriter;
@@ -110,7 +111,7 @@
 pki.add(new DERValue(DER.INTEGER, BigInteger.ZERO));
 ArrayList algId = new ArrayList(2);
 algId.add(new DERValue(DER.OBJECT_IDENTIFIER,
-  new OID(1.2.840.10040.4.1)));
+   new OID(Registry.DSA_OID_STRING)));
 ArrayList algParams = new ArrayList(3);
 algParams.add(new DERValue(DER.INTEGER, p));
 algParams.add(new DERValue(DER.INTEGER, q));
Index: GnuDSAPublicKey.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/GnuDSAPublicKey.java,v
retrieving revision 1.7
diff -u -r1.7 GnuDSAPublicKey.java
--- GnuDSAPublicKey.java	2 Jul 2005 20:32:14 -	1.7
+++ GnuDSAPublicKey.java	6 Feb 2006 09:17:33 -
@@ -39,6 +39,7 @@
 package gnu.java.security.provider;

 import gnu.java.security.OID;
+import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
@@ -97,7 +98,7 @@
 ArrayList spki = new ArrayList(2);
 ArrayList alg = new ArrayList(2);
 alg.add(new DERValue(DER.OBJECT_IDENTIFIER,
-new OID(1.2.840.113549.1.1.1)));
+ new OID(Registry.DSA_OID_STRING)));
 ArrayList params = new ArrayList(3);
 params.add(new DERValue(DER.INTEGER, p));
 params.add(new DERValue(DER.INTEGER, q));
Index: Registry.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/security/Registry.java,v
retrieving revision 1.2
diff -u -r1.2 Registry.java
--- Registry.java	28 Jan 2006 02:47:57 -	1.2
+++ Registry.java	6 Feb 2006 09:17:59 -
@@ -263,9 +263,28 @@
   //   String TMMH32 = tmmh32;

   // Format IDs used to identify how we externalise asymmetric keys ..
+  // fully-qualified names of the supported codecs
   String RAW_ENCODING = gnu.crypto.raw.format;
+  String X509_ENCODING = gnu.crypto.x509.format;
+  String PKCS8_ENCODING = gnu.crypto.pkcs8.format;
+  String ASN1_ENCODING = gnu.crypto.asn1.format;
+
+  // short names of the same.  used by JCE adapters
+  String RAW_ENCODING_SHORT_NAME = RAW;
+  String X509_ENCODING_SORT_NAME = X.509;
+  String PKCS8_ENCODING_SHORT_NAME = PKCS#8;
+  String ASN1_ENCODING_SHORT_NAME = ASN.1;

+  // unique identifiers of the same
   int RAW_ENCODING_ID = 1;
+  int X509_ENCODING_ID = 2;
+  int PKCS8_ENCODING_ID = 3;
+  int ASN1_ENCODING_ID = 4;
+
+  // OID strings used in encoding/decoding keys
+  String DSA_OID_STRING = 1.2.840.10040.4.1;
+  String RSA_OID_STRING = 1.2.840.113549.1.1.1;
+  String DH_OID_STRING =  1.2.840.10046.2.1;

   // Magic bytes we generate/expect in externalised asymmetric keys ..
   // the four bytes represent G (0x47) for GNU, 1 (0x01) for Raw format,
Index: GnuRSAPublicKey.java

[cp-patches] FYI: Compatibility fixes for javax.print.attribute.standard

2006-02-06 Thread Wolfgang Baer
Hi,

I am checking in some compatibility fixes pointed out by reverse japi.

2006-02-06  Wolfgang Baer  [EMAIL PROTECTED]

* javax/print/attribute/standard/Compression.java,
* javax/print/attribute/standard/Finishings.java,
* javax/print/attribute/standard/JobMediaSheets.java,
* javax/print/attribute/standard/JobSheets.java,
* javax/print/attribute/standard/JobState.java,
* javax/print/attribute/standard/JobStateReason.java,
* javax/print/attribute/standard/ReferenceUriSchemesSupported.java,
* javax/print/attribute/standard/PrintQuality.java,
* javax/print/attribute/standard/Media.java,
* javax/print/attribute/standard/MultipleDocumentHandling.java,
* javax/print/attribute/standard/PrinterStateReason.java,
* javax/print/attribute/standard/PDLOverrideSupported.java:
(getName): Make method final.
(getCategory): Likewise.
* javax/print/attribute/standard/MediaSize.java:
(getName): Make method final.
(getCategory): Likewise.
(ISO): Added private default constructor.
(NA): Likewise.
(JIS): Likewise.
(Other): Likewise.
(Engineering): Likewise.

Wolfgang

Index: javax/print/attribute/standard/Compression.java
===
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/Compression.java,v
retrieving revision 1.5
diff -u -r1.5 Compression.java
--- javax/print/attribute/standard/Compression.java	30 Nov 2005 18:34:59 -	1.5
+++ javax/print/attribute/standard/Compression.java	6 Feb 2006 11:06:21 -
@@ -1,5 +1,5 @@
 /* Compression.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -91,7 +91,7 @@
*
* @return The class codeCompression/code itself.
*/
-  public Class getCategory()
+  public final Class getCategory()
   {
 return Compression.class;
   }
@@ -101,7 +101,7 @@
*
* @return The name compression.
*/
-  public String getName()
+  public final String getName()
   {
 return compression;
   }
Index: javax/print/attribute/standard/Finishings.java
===
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/Finishings.java,v
retrieving revision 1.5
diff -u -r1.5 Finishings.java
--- javax/print/attribute/standard/Finishings.java	15 Dec 2005 21:31:33 -	1.5
+++ javax/print/attribute/standard/Finishings.java	6 Feb 2006 11:06:21 -
@@ -1,5 +1,5 @@
 /* Finishings.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -238,7 +238,7 @@
*
* @return the class codeFinishings/code itself
*/
-  public Class getCategory()
+  public final Class getCategory()
   {
 return Finishings.class;
   }
@@ -248,7 +248,7 @@
*
* @return The name finishings.
*/
-  public String getName()
+  public final String getName()
   {
 return finishings;
   }
Index: javax/print/attribute/standard/JobMediaSheets.java
===
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobMediaSheets.java,v
retrieving revision 1.5
diff -u -r1.5 JobMediaSheets.java
--- javax/print/attribute/standard/JobMediaSheets.java	16 Dec 2005 22:10:08 -	1.5
+++ javax/print/attribute/standard/JobMediaSheets.java	6 Feb 2006 11:06:21 -
@@ -1,5 +1,5 @@
 /* JobMediaSheets.java -- 
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -107,7 +107,7 @@
*
* @return The class codeJobMediaSheets/code itself.
*/
-  public Class getCategory()
+  public final Class getCategory()
   {
 return JobMediaSheets.class;
   }
@@ -117,7 +117,7 @@
*
* @return The name job-media-sheets.
*/
-  public String getName()
+  public final String getName()
   {
 return job-media-sheets;
   }
Index: javax/print/attribute/standard/JobSheets.java
===
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobSheets.java,v
retrieving revision 1.5
diff -u -r1.5 JobSheets.java
--- javax/print/attribute/standard/JobSheets.java	16 Dec 2005 19:27:47 -	1.5
+++ javax/print/attribute/standard/JobSheets.java	6 Feb 2006 11:06:21 -
@@ -1,5 +1,5 @@
 /* JobSheets.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -88,7 +88,7 @@
*
* @return The class codeJobSheets/code itself.
*/
-  public Class getCategory()
+  public final 

Re: [cp-patches] FYI: SwingPropertyChangeSupport fixlet

2006-02-06 Thread Roman Kennke
Hi there again,

Am Freitag, den 03.02.2006, 14:36 +0100 schrieb Roman Kennke:
 Hi Mark,
 
 Am Freitag, den 03.02.2006, 12:19 +0100 schrieb Mark Wielaard:
  Hi,
  
  This should get rid of the last regression that builder is complaining
  about (technically it isn't a regression, the test got changed to not
  expect a NullPointerException). It simply changes the Hashtable that
  doesn't allow null keys to a HashMap. The class wasn't thread-safe in
  the first place.
 
 Now that you say it, the point of the SwingProperyChangeSupport class is
 to be not thread safe. It's even specified in the API docs. So we should
 probably remove all the synchronization from this class. In Swing it is
 ok to be not thread safe, since normally all operations should be
 performed from the Event dispatch thread.

I just looked at the JDK1.5 API docs for that class and found that Sun
seems to have completely removed the implementation except for the
constructor which most likely only call super(bla) now. I guess the
java.beans.PropertyChangeSupport is now made more efficient (and not
thread safe) so that the SwingPropertyChangeSupport is not needed
anymore. Should we follow this?

/Roman



signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


[cp-patches] FYI: ObjectInputStream fix

2006-02-06 Thread Jeroen Frijters
Hi,

Committed.

Regards,
Jeroen

2006-02-06  Jeroen Frijters  [EMAIL PROTECTED]

Fixes PR 26121
* java/io/ObjectInputStream.java
(readNextBlock()): Handle TC_RESET.


ObjectInputStream.java.patch
Description: ObjectInputStream.java.patch


[cp-patches] FYI: InetAddress deserialization fix

2006-02-06 Thread Jeroen Frijters
Hi,

Committed.

Regards,
Jeroen

2006-02-06  Jeroen Frijters  [EMAIL PROTECTED]

Fixes PR 25313
* java/net/InetAddress.java
(readResolve): Implemented.


InetAddress.java.patch
Description: InetAddress.java.patch


[cp-patches] FYI: SwingPropertyChangeSupport

2006-02-06 Thread Roman Kennke
Hi there,

It seems that Sun has removed everything except the constructor from
javax.swing.event.SwingPropertyChangeSupport. See
http://java.sun.com/j2se/1.5.0/docs/guide/swing/1.5/index.html#swingMisc
for details.

2006-02-06  Roman Kennke  [EMAIL PROTECTED]

* javax/swing/event/SwingPropertyChangeSupport.java
(listeners): Removed field.
(propertyListeners): Removed field.
(source): Removed field.
(SwingPropertyChangeSupport()): Removed initialization of removed
fields.
(addPropertyChangeListener): Removed methods.
(removePropertyChangeListener): Removed methods.
(getPropertyChangeListeners): Removed methods.
(firePropertyChange): Removed methods.
(hasListeners): Removed methods.

/Roman
Index: javax/swing/event/SwingPropertyChangeSupport.java
===
RCS file: /cvsroot/classpath/classpath/javax/swing/event/SwingPropertyChangeSupport.java,v
retrieving revision 1.9
diff -u -r1.9 SwingPropertyChangeSupport.java
--- javax/swing/event/SwingPropertyChangeSupport.java	3 Feb 2006 11:20:46 -	1.9
+++ javax/swing/event/SwingPropertyChangeSupport.java	6 Feb 2006 12:48:50 -
@@ -39,48 +39,24 @@
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeListenerProxy;
 import java.beans.PropertyChangeSupport;
-import java.util.ArrayList;
-import java.util.EventListener;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * Provides a mechanism for registering [EMAIL PROTECTED] PropertyChangeListener}s and
  * forwarding [EMAIL PROTECTED] PropertyChangeEvent}s to those listeners.
- * 
+ *
+ * As of JDK1.5 this class is no longer in use. Use
+ * [EMAIL PROTECTED] PropertyChangeSupport} instead.
+ *
  * @author Andrew Selkirk
  */
 public final class SwingPropertyChangeSupport
-extends PropertyChangeSupport 
+  extends PropertyChangeSupport 
 {
 
   private static final long serialVersionUID = 7162625831330845068L;
 
   /**
-   * Storage for the listeners that are not linked to a specific property.
-   */
-  private transient EventListenerList listeners;
-
-  /**
-   * Storage for the listeners that are linked (by name) to a specific property.
-   * The hash table maps codeString/code objects (the property names) to 
-   * [EMAIL PROTECTED] EventListenerList} instances (which record the listener(s) for the 
-   * given property).
-   */
-  private HashMap propertyListeners;
-
-  /**
-   * The object that is used as the default source for the 
-   * [EMAIL PROTECTED] PropertyChangeEvent}s generated by this class.
-   */
-  private Object source;
-
-  /**
* Creates a new instance.
* 
* @param source  the source (codenull/code not permitted).
@@ -90,247 +66,5 @@
   public SwingPropertyChangeSupport(Object source) 
   {
 super(source);
-this.source = source;
-this.listeners = new EventListenerList();
-this.propertyListeners = new HashMap();
   }
-
-  /**
-   * Registers codelistener/code to receive notification of any future
-   * [EMAIL PROTECTED] PropertyChangeEvent}s generated by this instance.
-   * 
-   * @param listener  the listener (codenull/code is ignored).
-   * 
-   * @see #removePropertyChangeListener(PropertyChangeListener)
-   */
-  public synchronized void addPropertyChangeListener(PropertyChangeListener 
-  listener) 
-  {
-listeners.add(PropertyChangeListener.class, listener);
-  } 
-
-  /**
-   * Registers codelistener/code to receive notification of any future
-   * [EMAIL PROTECTED] PropertyChangeEvent}s generated by this instance for the named
-   * property.
-   * 
-   * @param propertyName  the property name.
-   * @param listener  the listener.
-   * 
-   * @see #removePropertyChangeListener(String, PropertyChangeListener)
-   */
-  public synchronized void addPropertyChangeListener(String propertyName, 
-  PropertyChangeListener listener) 
-  {
-EventListenerList list;
-list = (EventListenerList) propertyListeners.get(propertyName);
-if (list == null) 
-  {
-list = new EventListenerList();
-propertyListeners.put(propertyName, list);
-  }
-list.add(PropertyChangeListener.class, listener);
-  }
-
-  /**
-   * Removes codelistener/code from the list of registered listeners, so 
-   * that it will no longer receive notification of property change events.
-   * 
-   * @param listener  the listener to remove.
-   */
-  public synchronized void removePropertyChangeListener(PropertyChangeListener 
-  listener) 
-  {
-listeners.remove(PropertyChangeListener.class, listener);
-  }
-
-  /**
-   * Removes codelistener/code from the list of registered listeners for
-   * the named property, so that it will no longer receive notification of 
-   * property change events.
-   * 
-   * @param propertyName  the property 

Re: [cp-patches] FYI: SwingPropertyChangeSupport fixlet

2006-02-06 Thread Mark Wielaard
Hi Roman,

On Mon, 2006-02-06 at 12:09 +0100, Roman Kennke wrote:
 I guess the
 java.beans.PropertyChangeSupport is now made more efficient (and not
 thread safe) so that the SwingPropertyChangeSupport is not needed
 anymore. Should we follow this?

Sure. It will clean up some of our code especially if we also move some
if the JComponent property change methods up into the awt Component
class so they share the same change support mechanism. I do think you
have to be careful to keep beans PropertyChangeSupport thread-safe
though. But maybe it can be made a little more efficient by not using
the old Vector and Hashtable classes all the time which seem to double
the synchronization in that class, but use an List and Map for that and
only synchronize on those when really needed.

Cheers,

Mark


signature.asc
Description: This is a digitally signed message part


Re: [cp-patches] FYI: SwingPropertyChangeSupport fixlet

2006-02-06 Thread Roman Kennke
Hi Mark again,

 But maybe it can be made a little more efficient by not using
 the old Vector and Hashtable classes all the time which seem to double
 the synchronization in that class, but use an List and Map for that and
 only synchronize on those when really needed.

Thinking about it, I am not sure if we can change this. At least the
Hashtable is in the serialization spec for this class and changing this
would cause serialization incompatibilities. The Vector looks as if we
could change to an ArrayList though. OTOH, maybe we should leave the
fields as they are, and remove the superfluous synchronization
altogether from the class. Should also avoid redundant synchronization.
Does that sound ok?

/Roman



signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


[cp-patches] FYI: New java.awt.Component methods

2006-02-06 Thread Roman Kennke
I added a couple of JDK1.5 methods to java.awt.Component that are related
to my last 2 property related Swing patches. This adds the
firePropertyChange overloads that have been in javax.swing.JComponent
before JDK1.5.

2006-02-06  Roman Kennke  [EMAIL PROTECTED]

* java/awt/Component.java
(firePropertyChange(String,byte,byte)): New method.
(firePropertyChange(String,char,char)): New method.
(firePropertyChange(String,short,short)): New method.
(firePropertyChange(String,long,long)): New method.
(firePropertyChange(String,float,float)): New method.
(firePropertyChange(String,double,double)): New method.

/Roman
Index: java/awt/Component.java
===
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.93
diff -u -r1.93 Component.java
--- java/awt/Component.java	27 Jan 2006 09:32:57 -	1.93
+++ java/awt/Component.java	6 Feb 2006 13:46:18 -
@@ -4485,6 +4485,109 @@
   }
 
   /**
+   * Report a change in a bound property to any registered property listeners.
+   *
+   * @param propertyName the property that changed
+   * @param oldValue the old property value
+   * @param newValue the new property value
+   *
+   * @since 1.5
+   */
+  protected void firePropertyChange(String propertyName, byte oldValue,
+byte newValue)
+  {
+if (changeSupport != null)
+  changeSupport.firePropertyChange(propertyName, new Byte(oldValue),
+   new Byte(newValue));
+  }
+
+  /**
+   * Report a change in a bound property to any registered property listeners.
+   *
+   * @param propertyName the property that changed
+   * @param oldValue the old property value
+   * @param newValue the new property value
+   *
+   * @since 1.5
+   */
+  protected void firePropertyChange(String propertyName, char oldValue,
+char newValue)
+  {
+if (changeSupport != null)
+  changeSupport.firePropertyChange(propertyName, new Character(oldValue),
+   new Character(newValue));
+  }
+
+  /**
+   * Report a change in a bound property to any registered property listeners.
+   *
+   * @param propertyName the property that changed
+   * @param oldValue the old property value
+   * @param newValue the new property value
+   *
+   * @since 1.5
+   */
+  protected void firePropertyChange(String propertyName, short oldValue,
+short newValue)
+  {
+if (changeSupport != null)
+  changeSupport.firePropertyChange(propertyName, new Short(oldValue),
+   new Short(newValue));
+  }
+
+  /**
+   * Report a change in a bound property to any registered property listeners.
+   *
+   * @param propertyName the property that changed
+   * @param oldValue the old property value
+   * @param newValue the new property value
+   *
+   * @since 1.5
+   */
+  protected void firePropertyChange(String propertyName, long oldValue,
+long newValue)
+  {
+if (changeSupport != null)
+  changeSupport.firePropertyChange(propertyName, new Long(oldValue),
+   new Long(newValue));
+  }
+
+  /**
+   * Report a change in a bound property to any registered property listeners.
+   *
+   * @param propertyName the property that changed
+   * @param oldValue the old property value
+   * @param newValue the new property value
+   *
+   * @since 1.5
+   */
+  protected void firePropertyChange(String propertyName, float oldValue,
+float newValue)
+  {
+if (changeSupport != null)
+  changeSupport.firePropertyChange(propertyName, new Float(oldValue),
+   new Float(newValue));
+  }
+
+
+  /**
+   * Report a change in a bound property to any registered property listeners.
+   *
+   * @param propertyName the property that changed
+   * @param oldValue the old property value
+   * @param newValue the new property value
+   *
+   * @since 1.5
+   */
+  protected void firePropertyChange(String propertyName, double oldValue,
+double newValue)
+  {
+if (changeSupport != null)
+  changeSupport.firePropertyChange(propertyName, new Double(oldValue),
+   new Double(newValue));
+  }
+
+  /**
* Sets the text layout orientation of this component. New components default
* to UNKNOWN (which behaves like LEFT_TO_RIGHT). This method affects only
* the current component, while


Re: [cp-patches] FYI: SwingPropertyChangeSupport fixlet

2006-02-06 Thread Roman Kennke
Hi Mark,

Am Montag, den 06.02.2006, 14:21 +0100 schrieb Mark Wielaard:
 Hi Roman,
 
 On Mon, 2006-02-06 at 12:09 +0100, Roman Kennke wrote:
  I guess the
  java.beans.PropertyChangeSupport is now made more efficient (and not
  thread safe) so that the SwingPropertyChangeSupport is not needed
  anymore. Should we follow this?
 
 Sure. It will clean up some of our code especially if we also move some
 if the JComponent property change methods up into the awt Component
 class so they share the same change support mechanism.

I am working on this ATM. The SwingPropertyChangeSupport and JComponent
have been adjusted already, now comes the java.awt.Component additions.

  I do think you
 have to be careful to keep beans PropertyChangeSupport thread-safe
 though.

Indeed. It seems that Sun has considered the memory issue (duplicating
the changeSupport instances in JComponent and Component as well as their
internal datastructures) worse than the little performance gain from the
unsynchronized SwingPropertyChangeSupport, which is also what I feel.

  But maybe it can be made a little more efficient by not using
 the old Vector and Hashtable classes all the time which seem to double
 the synchronization in that class, but use an List and Map for that and
 only synchronize on those when really needed.

Agreed.

Cheers, Roman



signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


[cp-patches] FYI: gnu.regexp: fixed bugs in stingy match of RETokenRepeated

2006-02-06 Thread Ito Kazumitsu
From: Ito Kazumitsu [EMAIL PROTECTED]
Date: Mon, 30 Jan 2006 00:18:47 +0900 (JST)

 ChangeLog
 2006-01-29  Ito Kazumitsu  [EMAIL PROTECTED]
 
   Fixes bug #24876
   * gnu/regexp/gnu/regexp/RE.java(REG_TRY_ENTIRE_MATCH):
   New execution flag.
   (getMatchImpl): if REG_TRY_ENTIRE_MATCH is set, add an
   implicit RETokenEnd at the end of the regexp chain.
   Do not select the longest match, but select the first match.
   (match): Do not take care of REMatch.empty.
   * gnu/regexp/REMatch.java(empty): To be used only in RETokenRepeated.
   * gnu/regexp/RETokenOneOf.java: Corrected a typo in a comment.
   * gnu/regexp/RETokenBackRef.java: Do not take care of REMatch.empty.
   * gnu/regexp/RETokenRepeated.java (match): Rewrote stingy matching.
   Do not take care of REMatch.empty. Set and check REMatch.empty
   when trying to match the single token.

I should have checked this in at the same time as above.

2006-02-06  Ito Kazumitsu  [EMAIL PROTECTED]

* java/util/regex/Matcher.java(matches):
set RE.REG_TRY_ENTIRE_MATCH as an execution flag of getMatch.

Index: classpath/java/util/regex/Matcher.java
===
RCS file: /cvsroot/classpath/classpath/java/util/regex/Matcher.java,v
retrieving revision 1.11
diff -u -r1.11 Matcher.java
--- classpath/java/util/regex/Matcher.java  24 Jan 2006 15:44:28 -  
1.11
+++ classpath/java/util/regex/Matcher.java  6 Feb 2006 14:11:25 -
@@ -1,5 +1,5 @@
 /* Matcher.java -- Instance of a regular expression applied to a char sequence.
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,7 @@
 
 package java.util.regex;
 
+import gnu.regexp.RE;
 import gnu.regexp.REMatch;
 
 /**
@@ -233,10 +234,15 @@
*/
   public boolean matches ()
   {
-if (lookingAt())
+match = pattern.getRE().getMatch(input, 0, RE.REG_TRY_ENTIRE_MATCH);
+if (match != null)
   {
-   if (position == input.length())
- return true;
+   if (match.getStartIndex() == 0)
+ {
+   position = match.getEndIndex();
+   if (position == input.length())
+   return true;
+ }
match = null;
   }
 return false;


Re: [cp-patches] Patch: DefaultStyledDocument.ElementBuffer final fix

2006-02-06 Thread Lillian Angel

 
 Great work indeed! The BeanShell Swing console now starts up again and I
 am actually able to type into it. It looks a bit ugly and is slow like
 hell, but that seems to be a view problem. Now we should go on with
 fixing the styled text views and push HTML when that works. Maybe we can
 get something running for 0.21?

Sounds good, Roman! I am going to work on debugging an app for Tom
Fitzsimmons and James Damour (MegaMek). I will get back to HTML soon.

Thanks :)
Lillian 




[cp-patches] Re: Patch: DefaultStyledDocument.ElementBuffer final fix

2006-02-06 Thread Lillian Angel

 They are seen as just failures and not as regressions by builder.
 (Builder takes a snapshot of the PASS/FAILs at a certain date and only
 reports real regressions for those tests that used to PASS but now FAIL.
 The ElementBuffer.ElementStructure are seem as new failures (since they
 are new tests introduced after the baseline of builder), but not counted
 as regressions. These test should of course be adapted to be less strict
 about the order though to not make the failures.

I agree. Tony and I were unsure if we should just take these 'strict'
checks out. I will remove them, they are not really needed.


 As always you do such amazing work!
 

Thank you!

Lillian




[cp-patches] FYI: Container fix

2006-02-06 Thread Roman Kennke
I remove one more duplication of the PropertyChangeSupport thingy in
java.awt.Container. From the specs it is not immediately clear to me why
addPropertyChangeListener is overridden in java.awt.Container. So I let
it call super for now.

2006-02-06  Roman Kennke  [EMAIL PROTECTED]

* java/awt/Container.java
(changeSupport): Removed duplicate (from Component) field.
(addPropertyChangeListener): Call super.

/Roman
Index: java/awt/Container.java
===
RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.78
diff -u -r1.78 Container.java
--- java/awt/Container.java	4 Feb 2006 11:08:43 -	1.78
+++ java/awt/Container.java	6 Feb 2006 16:05:57 -
@@ -102,7 +102,6 @@
 
   /* Anything else is non-serializable, and should be declared transient. */
   transient ContainerListener containerListener;
-  transient PropertyChangeSupport changeSupport; 
 
   /** The focus traversal policy that determines how focus is
   transferred between this Container and its children. */
@@ -1541,28 +1540,18 @@
 if (orientation == null)
   throw new NullPointerException ();
   }
-  
+
   public void addPropertyChangeListener (PropertyChangeListener listener)
   {
-if (listener == null)
-  return;
-
-if (changeSupport == null)
-  changeSupport = new PropertyChangeSupport (this);
-
-changeSupport.addPropertyChangeListener (listener);
+// TODO: Why is this overridden?
+super.addPropertyChangeListener(listener);
   }
-  
-  public void addPropertyChangeListener (String name,
+
+  public void addPropertyChangeListener (String propertyName,
  PropertyChangeListener listener)
   {
-if (listener == null)
-  return;
-
-if (changeSupport == null)
-  changeSupport = new PropertyChangeSupport (this);
-
-changeSupport.addPropertyChangeListener (name, listener);
+// TODO: Why is this overridden?
+super.addPropertyChangeListener(propertyName, listener);
   }
 
 


[cp-patches] FYI: javax.swing.text fixes

2006-02-06 Thread Roman Kennke
The attached patch makes the BeanShell JConsole work quite well (ok, slow
and ugly, but anyway ;-) ). Thanks to Lillian and Anthony for making
this possible with their work on DefaultStyledDocument.

2006-02-06  Roman Kennke  [EMAIL PROTECTED]

* javax/swing/text/GlyphView.java:
(DefaultGlyphPainter.paint): Store/restore Graphics color setting.
Only fill background if there is a background set on the view.
Call Utilities.drawTabbedText with the baseline height, rather
than
the upper left corner of the view rectangle.
(getBackground): Return null if no background is set.
* javax/swing/text/GlyphView.java:
(setPropertiesFromAttributes): Use null for background when no
background is set. StyleConstants.getBackground() doesn't work
for this, because it returns Color.BLACK in that case.


/Roman
Index: javax/swing/text/GlyphView.java
===
RCS file: /cvsroot/classpath/classpath/javax/swing/text/GlyphView.java,v
retrieving revision 1.13
diff -u -r1.13 GlyphView.java
--- javax/swing/text/GlyphView.java	23 Nov 2005 14:23:14 -	1.13
+++ javax/swing/text/GlyphView.java	6 Feb 2006 16:32:46 -
@@ -277,35 +277,38 @@
 public void paint(GlyphView view, Graphics g, Shape a, int p0,
   int p1)
 {
+  Color oldColor = g.getColor();
   int height = (int) getHeight(view);
   Segment txt = view.getText(p0, p1);
   Rectangle bounds = a.getBounds();
-
   TabExpander tabEx = null;
   View parent = view.getParent();
   if (parent instanceof TabExpander)
 tabEx = (TabExpander) parent;
 
-  // Fill the background of the text run.
-  Color background = view.getBackground();
-  g.setColor(background);
   int width = Utilities.getTabbedTextWidth(txt, g.getFontMetrics(),
bounds.x, tabEx, txt.offset);
-  g.fillRect(bounds.x, bounds.y, width, height);
-
+  // Fill the background of the text run.
+  Color background = view.getBackground();
+  if (background != null)
+{
+  g.setColor(background);
+  g.fillRect(bounds.x, bounds.y, width, height);
+}
   // Draw the actual text.
   g.setColor(view.getForeground());
   g.setFont(view.getFont());
+  int ascent = g.getFontMetrics().getAscent();
   if (view.isSuperscript())
 // TODO: Adjust font for superscripting.
-Utilities.drawTabbedText(txt, bounds.x, bounds.y - height / 2, g, tabEx,
-   txt.offset);
+Utilities.drawTabbedText(txt, bounds.x, bounds.y + ascent - height / 2,
+ g, tabEx, txt.offset);
   else if (view.isSubscript())
 // TODO: Adjust font for subscripting.
-Utilities.drawTabbedText(txt, bounds.x, bounds.y + height / 2, g, tabEx,
- txt.offset);
+Utilities.drawTabbedText(txt, bounds.x, bounds.y + ascent + height / 2,
+ g, tabEx, txt.offset);
   else
-Utilities.drawTabbedText(txt, bounds.x, bounds.y, g, tabEx,
+Utilities.drawTabbedText(txt, bounds.x, bounds.y + ascent, g, tabEx,
  txt.offset);
 
   if (view.isStikeThrough())
@@ -320,6 +323,7 @@
   g.drawLine(bounds.x, bounds.y + lineHeight, bounds.height + width,
  bounds.y + lineHeight);
 }
+  g.setColor(oldColor);
 }
 
 /**
@@ -771,7 +775,11 @@
   {
 Element el = getElement();
 AttributeSet atts = el.getAttributes();
-return StyleConstants.getBackground(atts);
+// We cannot use StyleConstants.getBackground() here, because that returns
+// BLACK as default (when background == null). What we need is the
+// background setting of the text component instead, which is what we get
+// when background == null anyway.
+return (Color) atts.getAttribute(StyleConstants.Background);
   }
 
   /**
Index: javax/swing/text/LabelView.java
===
RCS file: /cvsroot/classpath/classpath/javax/swing/text/LabelView.java,v
retrieving revision 1.2
diff -u -r1.2 LabelView.java
--- javax/swing/text/LabelView.java	5 Oct 2005 15:03:46 -	1.2
+++ javax/swing/text/LabelView.java	6 Feb 2006 16:32:46 -
@@ -109,7 +109,11 @@
   {
 Element el = getElement();
 AttributeSet atts = el.getAttributes();
-background = StyleConstants.getBackground(atts);
+// We cannot use StyleConstants.getBackground() here, because that returns
+// BLACK as default (when background == null). What we need is the
+// background setting of the text component instead, which is what we get
+// when background == null anyway.
+background = (Color) atts.getAttribute(StyleConstants.Background);
 foreground = StyleConstants.getForeground(atts);
 

Re: [cp-patches] Eclipse GNU style

2006-02-06 Thread Tom Tromey
 Raif == Raif S Naffah [EMAIL PROTECTED] writes:

Raif this is a patch for the srcipts/eclipse-gnu.xml style specs that does 
Raif the following:

FWIW, with Eclipse 3.1 I don't think we need this file any more.
We have the style checked in .settings instead.

Tom



Re: [cp-patches] Eclipse GNU style

2006-02-06 Thread Raif S. Naffah
On Tuesday 07 February 2006 03:54, Tom Tromey wrote:
  Raif == Raif S Naffah [EMAIL PROTECTED] writes:

 Raif this is a patch for the srcipts/eclipse-gnu.xml style specs
 that does Raif the following:

 FWIW, with Eclipse 3.1 I don't think we need this file any more.
 We have the style checked in .settings instead.

you're right.  the attached patch does the same for the  
org.eclipse.jdt.core.prefs in .settings.

i also updated and kept the eclipse-gnu.xml because it can be handy for 
people using a stand-alone eclipse formatter; e.g. EFJ.


ok to commit?


cheers;
rsn
Index: org.eclipse.jdt.core.prefs
===
RCS file: /cvsroot/classpath/classpath/.settings/org.eclipse.jdt.core.prefs,v
retrieving revision 1.5
diff -u -r1.5 org.eclipse.jdt.core.prefs
--- org.eclipse.jdt.core.prefs	14 Sep 2005 01:33:27 -	1.5
+++ org.eclipse.jdt.core.prefs	6 Feb 2006 18:29:49 -
@@ -1,4 +1,4 @@
-#Tue Sep 13 16:15:04 MDT 2005
+#Tue Feb 07 05:21:36 EST 2006
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
@@ -72,14 +72,15 @@
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=18
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=82
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=17
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=17
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
@@ -111,7 +112,7 @@
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
 org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.compact_else_if=true
 org.eclipse.jdt.core.formatter.continuation_indentation=2
@@ -128,7 +129,7 @@
 org.eclipse.jdt.core.formatter.indentation.size=4
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
@@ -198,7 +199,7 @@
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
@@ -302,3 +303,4 @@
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
Index: eclipse-gnu.xml
===
RCS file: /cvsroot/classpath/classpath/scripts/eclipse-gnu.xml,v
retrieving revision 1.3
diff -u -r1.3 eclipse-gnu.xml
--- eclipse-gnu.xml	25 Aug 2005 20:56:07 -	1.3
+++ eclipse-gnu.xml	6 Feb 2006 18:30:51 -
@@ -1,31 

[cp-patches] FYI. was: Use of OID strings

2006-02-06 Thread Raif S. Naffah
On Monday 06 February 2006 20:44, Raif S. Naffah wrote:
 On Monday 06 February 2006 20:40, Raif S. Naffah wrote:
  ...
  this is a patch that fixes a wrong OID string...

 the previous patch did not include the RSA changes.  the attached
 patch is the correct one.

committed.


cheers;
rsn


pgpEccxvVf3pb.pgp
Description: PGP signature


[cp-patches] FYI. was: Eclipse GNU style

2006-02-06 Thread Raif S. Naffah
On Tuesday 07 February 2006 05:38, Raif S. Naffah wrote:
 On Tuesday 07 February 2006 03:54, Tom Tromey wrote:
   Raif == Raif S Naffah [EMAIL PROTECTED] writes:
  Raif this is a patch for the srcipts/eclipse-gnu.xml style specs
  that does Raif the following:
 
  FWIW, with Eclipse 3.1 I don't think we need this file any more.
  We have the style checked in .settings instead.

 you're right.  the attached patch does the same for the
 org.eclipse.jdt.core.prefs in .settings.

 i also updated and kept the eclipse-gnu.xml because it can be handy
 for people using a stand-alone eclipse formatter; e.g. EFJ.

 ok to commit?

committed.


cheers;
rsn


pgp6fMUidqvbW.pgp
Description: PGP signature


Re: [cp-patches] Eclipse GNU style

2006-02-06 Thread Tom Tromey
 Raif == Raif S Naffah [EMAIL PROTECTED] writes:

Raif ok to commit?

Sure, thanks.

Tom



Re: [cp-patches] Patch: add missing switch break?

2006-02-06 Thread Tom Tromey
 Anthony == Anthony Green [EMAIL PROTECTED] writes:

Anthony 2005-09-13  Anthony Green  [EMAIL PROTECTED]
Anthony* gnu/xml/aelfred2/XmlParser.java: Add missing break;.

This patch got dropped... I'm checking it in now.

Tom



[cp-patches] RFC: Introduction of VMMath

2006-02-06 Thread Andrew John Hughes
I'd welcome any comments on the attached patch,
which separates the Math native methods into a separate
class, VMMath, so that they can optionally be replaced
by the VM.  This fixes PR22198.

I also have code for most of the new Math methods here
as well.  However, I've had some problems in using the methods
for these in fdlibm.  Namely,

a) Existing methods such as sinh produce a linking error for
ClasspathSinH or something like that which seems to be something
to do with namespace.h.

b) Two of the methods require an update from 5.1 to 5.3 of fdlibm.
Merely adding the two new c files to Makefile.am didn't seem to work
(they don't seem to be being built).  The methods are log1p and expm1.

I'd appreciate some info. from anyone who knows how fdlibm works with
Classpath.  At worst, I can simply commit the code I have and someone
else can link these in, but it would be nice to know how to do this.
I'm guessing that mprec is separate from fdlibm although it appears in
the same directory; I recall there was talk of an update of this as well
to probably handle 64-bit support.

Changelog:

2006-02-06  Andrew John Hughes  [EMAIL PROTECTED]

* include/Makefile.am:
Swapped Math.h for VMMath.h
* include/java_lang_Math.h:
Removed.
* include/java_lang_VMMath.h:
New autogenerated header for the new class.
* java/lang/Math.java:
(sin(double)): Changed to link to VMMath.
(cos(double)): Changed to link to VMMath.
(tan(double)): Changed to link to VMMath.
(asin(double)): Changed to link to VMMath.
(acos(double)): Changed to link to VMMath.
(atan(double)): Changed to link to VMMath.
(atan2(double)): Changed to link to VMMath.
(exp(double)): Changed to link to VMMath.
(log(double)): Changed to link to VMMath.
(sqrt(double)): Changed to link to VMMath.
(pow(double,double)): Changed to link to VMMath.
(IEEEremainder(double,double)): Changed to link to VMMath.
(ceil(double)): Changed to link to VMMath.
(floor(double)): Changed to link to VMMath.
(rint(double)): Changed to link to VMMath.
* native/jni/java-lang/Makefile.am:
Replaced java_lang_Math.c with java_lang_VMMath.c
* native/jni/java-lang/java_lang_Math.c:
Removed.
* native/jni/java-lang/java_lang_VMMath.c:
Renamed from java_lang_Math.c.
* vm/reference/java/lang/VMMath.java:
New class.
(sin(double)): New native method.
(cos(double)): New native method.
(tan(double)): New native method.
(asin(double)): New native method.
(acos(double)): New native method.
(atan(double)): New native method.
(atan2(double)): New native method.
(exp(double)): New native method.
(log(double)): New native method.
(sqrt(double)): New native method.
(pow(double,double)): New native method.
(IEEEremainder(double,double)): New native method.
(ceil(double)): New native method.
(floor(double)): New native method.
(rint(double)): New native method.

-- 
Andrew :-)

Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html

If you use Microsoft Office, support movement towards the end of vendor lock-in:
http://opendocumentfellowship.org/petition/

Value your freedom, or you will lose it, teaches history. 
`Don't bother us with politics' respond those who don't want to learn. 
-- Richard Stallman

Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: include/Makefile.am
===
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.52
diff -u -3 -p -u -r1.52 Makefile.am
--- include/Makefile.am 4 Jan 2006 16:37:55 -   1.52
+++ include/Makefile.am 6 Feb 2006 21:57:01 -
@@ -127,9 +127,9 @@ $(top_srcdir)/include/gnu_java_nio_chars
 $(top_srcdir)/include/java_io_VMFile.h \
 $(top_srcdir)/include/java_io_VMObjectInputStream.h \
 $(top_srcdir)/include/java_io_VMObjectStreamClass.h \
-$(top_srcdir)/include/java_lang_Math.h \
 $(top_srcdir)/include/java_lang_VMDouble.h \
 $(top_srcdir)/include/java_lang_VMFloat.h \
+$(top_srcdir)/include/java_lang_VMMath.h \
 $(top_srcdir)/include/java_lang_VMProcess.h \
 $(top_srcdir)/include/java_lang_VMSystem.h \
 $(top_srcdir)/include/java_lang_reflect_Array.h \
@@ -178,8 +178,8 @@ $(top_srcdir)/include/java_io_VMObjectIn
$(JAVAH) -o $@ java.io.VMObjectInputStream
 $(top_srcdir)/include/java_io_VMObjectStreamClass.h: 
$(top_srcdir)/vm/reference/java/io/VMObjectStreamClass.java
$(JAVAH) -o $@ java.io.VMObjectStreamClass
-$(top_srcdir)/include/java_lang_Math.h: $(top_srcdir)/java/lang/Math.java
-   $(JAVAH) -o $@ java.lang.Math

Re: [cp-patches] FYI: SwingPropertyChangeSupport fixlet

2006-02-06 Thread Mark Wielaard
Hi Roman,

On Mon, 2006-02-06 at 14:54 +0100, Roman Kennke wrote:
  But maybe it can be made a little more efficient by not using
  the old Vector and Hashtable classes all the time which seem to double
  the synchronization in that class, but use an List and Map for that and
  only synchronize on those when really needed.
 
 Thinking about it, I am not sure if we can change this. At least the
 Hashtable is in the serialization spec for this class and changing this
 would cause serialization incompatibilities.

Serialization is already handled specially for this class. See the
readObject() and writeObject() methods. When you keep the
serialVersionUID field value the same you can replace the
ObjectInputStream.defaultReadObject() and
ObjectOutputStream.defaultWriteObject() calls with specific readFields()
and putFields()/writeFields() calls that translate between the
expected and actual fields. See java/util/PropertyPermission.java for an
example.

 OTOH, maybe we should leave the
 fields as they are, and remove the superfluous synchronization
 altogether from the class. Should also avoid redundant synchronization.
 Does that sound ok?

I am not sure that works in all cases (although I admit to have not
looked very carefully yet). It seems that some methods iterate over all
elements and at least such actions need to be synchronized as a whole.

Cheers,

Mark


signature.asc
Description: This is a digitally signed message part


[cp-patches] Patch: FYI: copyright update

2006-02-06 Thread Tom Tromey
I'm checking this in.

For GCC, the rule for '--version' output is that it should mention the
most recent year only.  I assume this applies to GNU Classpath as
well.  This patch makes this change.

Tom

2006-02-06  Tom Tromey  [EMAIL PROTECTED]

* gnu/CORBA/NamingService/NamingServiceTransient.java (main): Use
2006.
* gnu/java/rmi/registry/RegistryImpl.java (version): Use 2006.

Index: gnu/CORBA/NamingService/NamingServiceTransient.java
===
RCS file: 
/cvsroot/classpath/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java,v
retrieving revision 1.8
diff -u -r1.8 NamingServiceTransient.java
--- gnu/CORBA/NamingService/NamingServiceTransient.java 28 Oct 2005 12:04:39 
-  1.8
+++ gnu/CORBA/NamingService/NamingServiceTransient.java 6 Feb 2006 22:19:13 
-
@@ -136,7 +136,7 @@
 System.out.println(GNU Classpath transient naming service 
   + started at  + iorr.Internet.host + : + iorr.Internet.port
   +  key 'NameService'.\n\n
-  + Copyright (C) 2005 Free Software Foundation\n
+  + Copyright (C) 2006 Free Software Foundation\n
   + This tool comes with ABSOLUTELY NO WARRANTY. 
   + This is free software, and you are\nwelcome to 
   + redistribute it under conditions, defined in 
Index: gnu/java/rmi/registry/RegistryImpl.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/rmi/registry/RegistryImpl.java,v
retrieving revision 1.9
diff -u -r1.9 RegistryImpl.java
--- gnu/java/rmi/registry/RegistryImpl.java 2 Jul 2005 20:32:14 -   
1.9
+++ gnu/java/rmi/registry/RegistryImpl.java 6 Feb 2006 22:19:13 -
@@ -111,7 +111,7 @@
   + System.getProperty(java.vm.name)
   + ) 
   + System.getProperty(java.vm.version));
-   System.out.println(Copyright 2005 Free Software Foundation, Inc.);
+   System.out.println(Copyright 2006 Free Software Foundation, Inc.);
System.out.println(This is free software; see the source for copying 
conditions.  There is NO);
System.out.println(warranty; not even for MERCHANTABILITY or FITNESS 
FOR A PARTICULAR PURPOSE.);
System.exit(0);



Re: [cp-patches] RFC: Introduction of VMMath

2006-02-06 Thread Robert Schuster
Hi.

Nice work. I think the JNode guys will appreciate this. :)

 +package java.lang;
 +
 +import gnu.classpath.Configuration;
 +
 +class VMMath
 +{
 +
 +  static
 +  {
 +if (Configuration.INIT_LOAD_LIBRARY)
 +  System.loadLibrary(javanet);
 +  }
Should this really be javanet?

cya
Robert


signature.asc
Description: OpenPGP digital signature


Re: update gnu classpath to Unicode 4.0.0

2006-02-06 Thread Eric Blake
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

[I don't read the address the private mail was sent to as often, but am
still subscribed to classpath via a newer address.  Hopefully this is okay
to forward to the list.]

According to Anthony Balkissoon on 1/31/2006 11:43 AM:
 Hi Eric,
 
 I noticed you were the one that wrote the GNU Classpath scripts to read
 the Unicode data and generate the java files needed.  I want to update
 these to Unicode 4.0.0 but am unsure what this entails.  Could you
 perhaps suggest what you think will need to be done to make the scripts
 useable for 4.0.0, which assigns code points for supplementary
 characters?

I didn't write unicode_muncher.pl, just updated it from unicode 3.0 to
3.1.  I think the bulk of the work will just be making sure that you
enumerate for all characters, instead of stopping at 64k.  I'm not sure if
you will have to shuffle any bitfield sizes to fit the additional data,
but I do recall that the script looped through several block sizes to
choose the size that resulted in the smallest table.

 
 Also, was the encoding used (lower 5 bits for type of character, upper 9
 bits for offset into attribute tables) something you designed yourself
 or is that something that came from the Unicode specs/docs?

Inherited from the previous coder.  In fact, I liked gcj's
unicode-muncher.pl so much at the time that I rewrote Jikes' unicode
parser (written in Java instead of Perl) to use the same packing concept.
 The differences are that Jikes needed less information (it was only
making sure which characters were legal in identifires, instead of a
full-blown implementation of java.lang.Character), and that by writing it
in Java, then running against Sun's JDK, I picked up Sun's interpretation
of Unicode 4.0, instead of parsing Blocks-4.0.0.txt myself; but ISTR that
the results turned out the same.  Before I stepped down as a Jikes
maintainer, I managed to update the jikes' version of the script to build
a packed table based on Unicode 4.0:
http://cvs.sourceforge.net/viewcvs.py/jikes/jikes/src/gencode.java?rev=1.14view=markup

Hopefully that can give you some ideas of where to proceed with the perl
script.

 
 Thanks for any help you can offer!
 
 --Tony
 
 

- --
Life is short - so eat dessert first!

Eric Blake [EMAIL PROTECTED]
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD50yj84KuGfSFAYARAnKXAJ9N26VY4vkh+FdlOpfHFaTM7Y7kAQCgtPHk
no7WAhhnkuLRKVHDEdf+zPo=
=fguU
-END PGP SIGNATURE-



Planning to check-in new branch: the GIOP extensions for rmic.

2006-02-06 Thread Audrius Meskauskas
I have just finished writing the GIOP stub and tie code generator that 
is needed to develop the applications, using javax.rmi.CORBA package. It 
generates stubs and two required types of ties. I tested it with our x5 
CORBA game: the generated stubs and ties seem interoperating well with 
the code, generated by the Sun's rmic.


Implementing this functionality fixes the bug 25704.

Initially, I wanted to put the new classed to cp-tools branch. However 
the cp-tools has the shared build system that (due gcj problems) seems 
not providing access to the necessary classes from org.omg domain. Also, 
the cp-tools project depends on several external libraries. From these 
libraries, ASM must be rather old (the v 2.0 is already not working, 
despite the v 3.0 is recently released), and Kawa must be manually 
reworked, forging bytecode.jar with FileRoller or other similar tool. As 
the GIOP code generator is currently not dependent from these two 
libraries, I would suggest to check in it in as a separate branch of the 
GNU Classpath project. As the generator cannot be currently compiled 
with gcj, it is built as the executable jar archive (runs both under 
Sun's jre and jamvm).


The source code is now uploaded to the bug 25704 as the proposed fix.

Regards

Audrius.



[Bug cp-tools/25696] rmic needs to support generation of IIOP stub and tie classes

2006-02-06 Thread audriusa at bluewin dot ch


--- Comment #3 from audriusa at bluewin dot ch  2006-02-06 16:47 ---
I upload the first release (=proposed patch) of the compiler that generates
the mentioned stubs and ties.

The place of the compiler in GNU Classpath project will be decided later.


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25696



___
Bug-classpath mailing list
Bug-classpath@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-classpath


[Bug gjdoc/25704] gjdoc.sh can't handle arguments with single quotes

2006-02-06 Thread audriusa at bluewin dot ch


--- Comment #2 from audriusa at bluewin dot ch  2006-02-06 16:50 ---
Created an attachment (id=10786)
 -- (http://gcc.gnu.org/bugzilla/attachment.cgi?id=10786action=view)
As the size of the executable jar is just 18 K, I also put the first executable
here


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25704



___
Bug-classpath mailing list
Bug-classpath@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-classpath


[Bug classpath/25313] InetAddress objects do not serialize/deserialize

2006-02-06 Thread cvs-commit at developer dot classpath dot org


--- Comment #4 from cvs-commit at developer dot classpath dot org  
2006-02-06 15:10 ---
Subject: Bug 25313

CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Jeroen Frijters [EMAIL PROTECTED]06/02/06
12:50:03

Modified files:
.  : ChangeLog 
java/net   : InetAddress.java 

Log message:
2006-02-06  Jeroen Frijters  [EMAIL PROTECTED]

Fixes PR 25313
* java/net/InetAddress.java
(readResolve): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6270tr2=1.6271r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/net/InetAddress.java.diff?tr1=1.45tr2=1.46r1=textr2=text


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25313



___
Bug-classpath mailing list
Bug-classpath@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-classpath


[Bug gjdoc/25704] gjdoc.sh can't handle arguments with single quotes

2006-02-06 Thread audriusa at bluewin dot ch


--- Comment #1 from audriusa at bluewin dot ch  2006-02-06 16:49 ---
Created an attachment (id=10785)
 -- (http://gcc.gnu.org/bugzilla/attachment.cgi?id=10785action=view)
The source code of the requested code generator


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25704



___
Bug-classpath mailing list
Bug-classpath@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-classpath


[Bug swing/26126] JSpinner is unusable

2006-02-06 Thread audriusa at bluewin dot ch


-- 

audriusa at bluewin dot ch changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever Confirmed|0   |1
   Last reconfirmed|-00-00 00:00:00 |2006-02-06 17:12:00
   date||


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26126



___
Bug-classpath mailing list
Bug-classpath@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-classpath


Re: strange gcjappletviewer problem

2006-02-06 Thread Michael Koch
On Fri, Feb 03, 2006 at 09:49:45AM +0100, Christian Thalinger wrote:
 Hi!
 
 I just tried to get an applet running with gcjappletviewer but i get a
 strange exception:
 
 Exception in thread main java.lang.ClassFormatError: blaze3d (Bad
 magic number)
 
 This even happens when starting with sun's jvm.  But it works with sun's
 appletviewer.  So, i guess this is something about html parsing?

I guess this more that the verifier is less strict in SUNs appletviewer
case. Class file formats has nothing to do with HTML parsing. Normally
you get this when you compile something with SUN Java 5 and run it with
SUN Java 1.4.


Cheers,
Michael
-- 
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html

Join the community at http://planet.classpath.org/



Re: strange gcjappletviewer problem

2006-02-06 Thread Christian Thalinger
On Mon, 2006-02-06 at 19:32 +0100, Michael Koch wrote:
 I guess this more that the verifier is less strict in SUNs appletviewer
 case. Class file formats has nothing to do with HTML parsing. Normally
 you get this when you compile something with SUN Java 5 and run it with
 SUN Java 1.4.

Not agreed.  I dig a bit into it and found out that it actually gets a
file not found webpage.  It tries to load the blaze3d.class from:

http://drei.at/external/offer/java/nokia_6680/blaze3d.class

But this file does not exist, rather it's in the holomatix.jar.  Here
are the tags:

parsed applet tags:
 tag 0:
  name=
  code=blaze3d.class
  codebase=
  archive=[http://drei.at/external/offer/java/nokia_6680/holomatix.jar]
  parameters={salign=, width=290, height=395, scale=showall, 
src=3_3d_nokia_6680.h3f}
  
documentbase=http://drei.at/external/offer/java/nokia_6680/3_3d_nokia_6680.html

TWISTI



Re: strange gcjappletviewer problem

2006-02-06 Thread Michael Koch
On Mon, Feb 06, 2006 at 06:45:56PM +0100, Christian Thalinger wrote:
 On Mon, 2006-02-06 at 19:32 +0100, Michael Koch wrote:
  I guess this more that the verifier is less strict in SUNs appletviewer
  case. Class file formats has nothing to do with HTML parsing. Normally
  you get this when you compile something with SUN Java 5 and run it with
  SUN Java 1.4.
 
 Not agreed.  I dig a bit into it and found out that it actually gets a
 file not found webpage.  It tries to load the blaze3d.class from:
 
 http://drei.at/external/offer/java/nokia_6680/blaze3d.class
 
 But this file does not exist, rather it's in the holomatix.jar.  Here
 are the tags:
 
 parsed applet tags:
  tag 0:
   name=
   code=blaze3d.class
   codebase=
   archive=[http://drei.at/external/offer/java/nokia_6680/holomatix.jar]
   parameters={salign=, width=290, height=395, scale=showall, 
 src=3_3d_nokia_6680.h3f}
   
 documentbase=http://drei.at/external/offer/java/nokia_6680/3_3d_nokia_6680.html

Does it throw a FileNotFoundException or a ClassFormatError ? You are
unclear.


Cheers,
Michael
-- 
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html

Join the community at http://planet.classpath.org/



Re: strange gcjappletviewer problem

2006-02-06 Thread Christian Thalinger
On Mon, 2006-02-06 at 20:01 +0100, Michael Koch wrote:
 Does it throw a FileNotFoundException or a ClassFormatError ? You are
 unclear.

Eh... as i stated in my first mail:

Exception in thread main java.lang.ClassFormatError: blaze3d (Bad
magic number)

TWISTI



Re: Planning to check-in new branch: the GIOP extensions for rmic.

2006-02-06 Thread Thomas Fitzsimmons
On Mon, 2006-02-06 at 18:04 +0100, Audrius Meskauskas wrote:
 I have just finished writing the GIOP stub and tie code generator that 
 is needed to develop the applications, using javax.rmi.CORBA package. It 
 generates stubs and two required types of ties. I tested it with our x5 
 CORBA game: the generated stubs and ties seem interoperating well with 
 the code, generated by the Sun's rmic.
 
 Implementing this functionality fixes the bug 25704.
 
 Initially, I wanted to put the new classed to cp-tools branch.

I'd prefer if this tool were committed directly to GNU Classpath CVS.
It's much more convenient for bundlers of GNU Classpath (GCJ, Kaffe) if
the tools sources are right in cvs.savannah.gnu.org:/sources/classpath.
It means that we can do one source drop (GNU Classpath) instead of two
(GNU Classpath + cp-tools) and it will likely mean everyone will just
use the Classpath tools rather than everyone writing their own (e.g.
fastjar vs. jar).  In fact, long term, I'd rather see all of the tools
in cp-tools merged into cvs.savannah.gnu.org:/sources/classpath and used
by all bundlers of GNU Classpath.  Toward that end, I plan to propose
merging gcjappletviewer into GNU Classpath once the security work is
done.

Tom





[Bug classpath/25769] AbstractCollection.toString differers a bit.

2006-02-06 Thread mark at gcc dot gnu dot org


--- Comment #3 from mark at gcc dot gnu dot org  2006-02-06 19:18 ---
Subject: Bug 25769

Author: mark
Date: Mon Feb  6 19:18:36 2006
New Revision: 110662

URL: http://gcc.gnu.org/viewcvs?root=gccview=revrev=110662
Log:
   Backports from 0.21.

   2006-01-26  Mark Wielaard  [EMAIL PROTECTED]

   Fixes bug #25970 reported by Michael Kay [EMAIL PROTECTED]
   * java/math/BigDecimal.java (compareTo): Don't strip trailing zeros.
   Add trailing zeros to the fraction of the decimal with the smallest
   scale.

   2006-02-02  Mark Wielaard  [EMAIL PROTECTED]

   Fixes bug #25769 reported by Artemus Harper [EMAIL PROTECTED]
   * java/util/AbstractCollection.java (toString): Only use Iterator,
   check whether collection contains itself.

Modified:
branches/gcc-4_1-branch/libjava/classpath/ChangeLog.gcj
branches/gcc-4_1-branch/libjava/classpath/java/math/BigDecimal.java
branches/gcc-4_1-branch/libjava/classpath/java/util/AbstractCollection.java


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25769



___
Bug-classpath mailing list
Bug-classpath@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-classpath


[Bug classpath/25970] Incorrect results for BigDecimal.compareTo

2006-02-06 Thread mark at gcc dot gnu dot org


--- Comment #5 from mark at gcc dot gnu dot org  2006-02-06 19:18 ---
Subject: Bug 25970

Author: mark
Date: Mon Feb  6 19:18:36 2006
New Revision: 110662

URL: http://gcc.gnu.org/viewcvs?root=gccview=revrev=110662
Log:
   Backports from 0.21.

   2006-01-26  Mark Wielaard  [EMAIL PROTECTED]

   Fixes bug #25970 reported by Michael Kay [EMAIL PROTECTED]
   * java/math/BigDecimal.java (compareTo): Don't strip trailing zeros.
   Add trailing zeros to the fraction of the decimal with the smallest
   scale.

   2006-02-02  Mark Wielaard  [EMAIL PROTECTED]

   Fixes bug #25769 reported by Artemus Harper [EMAIL PROTECTED]
   * java/util/AbstractCollection.java (toString): Only use Iterator,
   check whether collection contains itself.

Modified:
branches/gcc-4_1-branch/libjava/classpath/ChangeLog.gcj
branches/gcc-4_1-branch/libjava/classpath/java/math/BigDecimal.java
branches/gcc-4_1-branch/libjava/classpath/java/util/AbstractCollection.java


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25970



___
Bug-classpath mailing list
Bug-classpath@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-classpath


[commit-cp] classpath ./ChangeLog java/io/ObjectInputStream...

2006-02-06 Thread Jeroen Frijters
CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Jeroen Frijters [EMAIL PROTECTED] 06/02/06 11:50:46

Modified files:
.  : ChangeLog 
java/io: ObjectInputStream.java 

Log message:
2006-02-06  Jeroen Frijters  [EMAIL PROTECTED]

Fixes PR 26121
* java/io/ObjectInputStream.java
(readNextBlock()): Handle TC_RESET.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6269tr2=1.6270r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/io/ObjectInputStream.java.diff?tr1=1.73tr2=1.74r1=textr2=text




[commit-cp] classpath ./ChangeLog javax/swing/JComponent.java

2006-02-06 Thread Roman Kennke
CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Roman Kennke [EMAIL PROTECTED]06/02/06 13:32:03

Modified files:
.  : ChangeLog 
javax/swing: JComponent.java 

Log message:
2006-02-06  Roman Kennke  [EMAIL PROTECTED]

* javax/swing/JComponent.java
(AccessibleJComponent.changeSupport): Changed to be a
java.beans.PropertyChangeSupport rather than
SwingPropertyChangeSupport.
(AccessibleJComponent.AccesibleJComponent()): Change initialization
of above field.
(changeSupport): Removed unneeded field.
(removePropertyChangeListener): Removed unneeded methods.
(addPropertyChangeListener): Removed unneeded methods.
(getPropertyChangeListeners): Removed unneeded methods.
(firePropertyChange(String,boolean,boolean)): Changed to simply
call super. Added specnote.
(firePropertyChange(String,char,char)): Changed to simply
call super. Added specnote.
(firePropertyChange(String,int,int)): Changed to simply
call super. Added specnote.
(firePropertyChange(String,byte,byte)): Removed.
(firePropertyChange(String,Object,Object)): Removed.
(firePropertyChange(String,double,double)): Removed.
(firePropertyChange(String,float,float)): Removed.
(firePropertyChange(String,long,long)): Removed.
(firePropertyChange(String,short,short)): Removed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6272tr2=1.6273r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JComponent.java.diff?tr1=1.97tr2=1.98r1=textr2=text




[commit-cp] classpath ./ChangeLog java/awt/Component.java

2006-02-06 Thread Roman Kennke
CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Roman Kennke [EMAIL PROTECTED]06/02/06 13:48:03

Modified files:
.  : ChangeLog 
java/awt   : Component.java 

Log message:
2006-02-06  Roman Kennke  [EMAIL PROTECTED]

* java/awt/Component.java
(firePropertyChange(String,byte,byte)): New method.
(firePropertyChange(String,char,char)): New method.
(firePropertyChange(String,short,short)): New method.
(firePropertyChange(String,long,long)): New method.
(firePropertyChange(String,float,float)): New method.
(firePropertyChange(String,double,double)): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6273tr2=1.6274r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/awt/Component.java.diff?tr1=1.93tr2=1.94r1=textr2=text




[commit-cp] classpath ./ChangeLog java/awt/Container.java

2006-02-06 Thread Roman Kennke
CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Roman Kennke [EMAIL PROTECTED]06/02/06 16:07:39

Modified files:
.  : ChangeLog 
java/awt   : Container.java 

Log message:
2006-02-06  Roman Kennke  [EMAIL PROTECTED]

* java/awt/Container.java
(changeSupport): Removed duplicate (from Component) field.
(addPropertyChangeListener): Call super.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6276tr2=1.6277r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/awt/Container.java.diff?tr1=1.78tr2=1.79r1=textr2=text




[commit-cp] classpath gnu/java/security/provider/GnuDSAPubl...

2006-02-06 Thread Raif S. Naffah
CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Raif S. Naffah [EMAIL PROTECTED]  06/02/06 18:42:51

Modified files:
gnu/java/security/provider: GnuDSAPublicKey.java 
GnuRSAPrivateKey.java 
GnuRSAPublicKey.java 
GnuDSAPrivateKey.java 
EncodedKeyFactory.java 
.  : ChangeLog 
gnu/java/security: Registry.java 

Log message:
2006-02-07  Raif S. Naffah  [EMAIL PROTECTED]

* gnu/java/security/provider/GnuDSAPublicKey.java (getEncoded): Use
Registry constant.
* gnu/java/security/provider/GnuDSAPrivateKey.java (getEncoded):
Likewise.
* gnu/java/security/provider/GnuRSAPrivateKey.java (getEncoded):
Likewise.
* gnu/java/security/provider/GnuRSAPublicKey.java (getEncoded):
Likewise.
* gnu/java/security/provider/EncodedKeyFactory.java
(ID_DSA): Redefined in terms of Registry constant.
(ID_DSA): Redefined in terms of Registry constant.
(ID_DH): Redefined in terms of Registry constant.
* gnu/java/security/Registry.java (X509_ENCODING): New constant.
(PKCS8_ENCODING): Likewise.
(ASN1_ENCODING): Likewise.
(RAW_ENCODING_SHORT_NAME): Likewise.
(X509_ENCODING_SORT_NAME): Likewise.
(PKCS8_ENCODING_SHORT_NAME): Likewise.
(ASN1_ENCODING_SHORT_NAME): Likewise.
(X509_ENCODING_ID): Likewise.
(PKCS8_ENCODING_ID): Likewise.
(ASN1_ENCODING_ID): Likewise.
(DSA_OID_STRING): Likewise.
(RSA_OID_STRING): Likewise.
(DH_OID_STRING): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/security/provider/GnuDSAPublicKey.java.diff?tr1=1.7tr2=1.8r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/security/provider/GnuRSAPrivateKey.java.diff?tr1=1.3tr2=1.4r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/security/provider/GnuRSAPublicKey.java.diff?tr1=1.3tr2=1.4r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/security/provider/GnuDSAPrivateKey.java.diff?tr1=1.7tr2=1.8r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/security/provider/EncodedKeyFactory.java.diff?tr1=1.4tr2=1.5r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6278tr2=1.6279r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/security/Registry.java.diff?tr1=1.2tr2=1.3r1=textr2=text




[commit-cp] classpath ChangeLog

2006-02-06 Thread Raif S. Naffah
CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Raif S. Naffah [EMAIL PROTECTED]  06/02/06 18:56:56

Modified files:
.  : ChangeLog 

Log message:
2006-02-07  Raif S. Naffah  [EMAIL PROTECTED]

* ChangeLog fixlet.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6279tr2=1.6280r1=textr2=text




[commit-cp] classpath scripts/eclipse-gnu.xml .settings/org...

2006-02-06 Thread Raif S. Naffah
CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Raif S. Naffah [EMAIL PROTECTED]  06/02/06 19:09:01

Modified files:
scripts: eclipse-gnu.xml 
.settings  : org.eclipse.jdt.core.prefs 
.  : ChangeLog 

Log message:
2006-02-07  Raif S. Naffah  [EMAIL PROTECTED]

* .settings/org.eclipse.jdt.core.prefs:
Force a line split on extends and implements.
Force a white-space after unary operators.
Don't force a new-line after @params.
Add new-line at end-of-file.
* scripts/eclipse-gnu.xml: Export version of the above named GNU.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/scripts/eclipse-gnu.xml.diff?tr1=1.3tr2=1.4r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/.settings/org.eclipse.jdt.core.prefs.diff?tr1=1.5tr2=1.6r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6280tr2=1.6281r1=textr2=text




[commit-cp] classpath gnu/CORBA/NamingService/NamingService...

2006-02-06 Thread Tom Tromey
CVSROOT:/cvsroot/classpath
Module name:classpath
Branch: 
Changes by: Tom Tromey [EMAIL PROTECTED]  06/02/06 22:21:51

Modified files:
gnu/CORBA/NamingService: NamingServiceTransient.java 
.  : ChangeLog 
gnu/java/rmi/registry: RegistryImpl.java 

Log message:
* gnu/CORBA/NamingService/NamingServiceTransient.java (main): Use
2006.
* gnu/java/rmi/registry/RegistryImpl.java (version): Use 2006.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java.diff?tr1=1.8tr2=1.9r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6282tr2=1.6283r1=textr2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/rmi/registry/RegistryImpl.java.diff?tr1=1.9tr2=1.10r1=textr2=text