You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by py...@apache.org on 2007/10/31 09:42:35 UTC
svn commit: r590591 [11/12] - in /harmony/enhanced/classlib/branches/java6:
depends/build/platform/ depends/files/ depends/jars/icu4j_3.8/
depends/libs/freebsd.x86/ depends/manifests/icu4j_3.4.4/
depends/manifests/icu4j_3.8/ depends/manifests/icu4j_3.8...
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertFactoryPerfTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertFactoryPerfTest.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertFactoryPerfTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertFactoryPerfTest.java Wed Oct 31 01:42:07 2007
@@ -352,72 +352,57 @@
private static int XXX = 0, flag = 0;
- public void testCreationCRL() {
- try {
- byte[] stamp = new byte[10];
- if ((++flag)%2 != 0) {
- XXX++;
- }
- byte tmp[] = BigInteger.valueOf(XXX).toByteArray();
- System.arraycopy(tmp, 0, stamp, 0, tmp.length);
- System.arraycopy(stamp, 0, certEncoding,
- certEncoding.length-stamp.length, stamp.length);
+ public void testCreationCRL() throws Exception {
+ byte[] stamp = new byte[10];
+ if ((++flag)%2 != 0) {
+ XXX++;
+ }
+ byte tmp[] = BigInteger.valueOf(XXX).toByteArray();
+ System.arraycopy(tmp, 0, stamp, 0, tmp.length);
+ System.arraycopy(stamp, 0, certEncoding,
+ certEncoding.length-stamp.length, stamp.length);
- stream.reset();
- java.security.cert.Certificate c = factory.generateCertificate(stream);
+ stream.reset();
+ java.security.cert.Certificate c = factory.generateCertificate(stream);
- byte[] enc = c.getEncoded();
- byte[] stamp_chek = new byte[stamp.length];
-
- System.arraycopy(enc, enc.length - stamp.length,
- stamp_chek, 0, stamp.length);
-
- if (!Arrays.equals(stamp, stamp_chek)) {
- fail("Wrong encoding received.");
- }
- } catch (Exception e) {
- e.printStackTrace();
- fail("Creation of a certificate from a stream failed:"+e.getMessage());
+ byte[] enc = c.getEncoded();
+ byte[] stamp_chek = new byte[stamp.length];
+
+ System.arraycopy(enc, enc.length - stamp.length,
+ stamp_chek, 0, stamp.length);
+
+ if (!Arrays.equals(stamp, stamp_chek)) {
+ fail("Wrong encoding received.");
}
}
- public void testCreation1() {
- try {
- byte[] stamp = new byte[10];
- if ((++flag)%2 != 0) {
- XXX++;
- }
- byte tmp[] = BigInteger.valueOf(XXX).toByteArray();
- System.arraycopy(tmp, 0, stamp, 0, tmp.length);
- System.arraycopy(stamp, 0, certEncoding,
- certEncoding.length-stamp.length, stamp.length);
+ public void testCreation1() throws Exception {
+ byte[] stamp = new byte[10];
+ if ((++flag)%2 != 0) {
+ XXX++;
+ }
+ byte tmp[] = BigInteger.valueOf(XXX).toByteArray();
+ System.arraycopy(tmp, 0, stamp, 0, tmp.length);
+ System.arraycopy(stamp, 0, certEncoding,
+ certEncoding.length-stamp.length, stamp.length);
- stream.reset();
- java.security.cert.Certificate c = factory.generateCertificate(stream);
+ stream.reset();
+ java.security.cert.Certificate c = factory.generateCertificate(stream);
- byte[] enc = c.getEncoded();
- byte[] stamp_chek = new byte[stamp.length];
-
- System.arraycopy(enc, enc.length - stamp.length,
- stamp_chek, 0, stamp.length);
-
- if (!Arrays.equals(stamp, stamp_chek)) {
- fail("Wrong encoding received.");
- }
- } catch (Exception e) {
- e.printStackTrace();
- fail("Creation of a certificate from a stream failed:"+e.getMessage());
+ byte[] enc = c.getEncoded();
+ byte[] stamp_chek = new byte[stamp.length];
+
+ System.arraycopy(enc, enc.length - stamp.length,
+ stamp_chek, 0, stamp.length);
+
+ if (!Arrays.equals(stamp, stamp_chek)) {
+ fail("Wrong encoding received.");
}
}
- public void testCreation2() {
- try {
- stream_b64.reset();
- factory.generateCertificate(stream_b64);
- } catch (Exception e) {
- e.printStackTrace();
- fail("Creation of a certificate from a stream failed:"+e.getMessage());
- }
+ public void testCreation2() throws Exception {
+ stream_b64.reset();
+ factory.generateCertificate(stream_b64);
}
/**
@@ -635,22 +620,18 @@
/**
* getExtendedKeyUsage() method testing.
*/
- public void testGetExtendedKeyUsage() {
- try {
- List exku = certificate.getExtendedKeyUsage();
- if ((exku == null)
- || (exku.size() != extnExtendedKeyUsage.size())) {
- fail("Incorrect Extended Key Usage value.");
- }
- for (int i=0; i<extnExtendedKeyUsage.size(); i++) {
- String ku = ObjectIdentifier
- .toString((int[]) extnExtendedKeyUsage.get(i));
- if (!exku.contains(ku)) {
- fail("Missing value:" + ku);
- }
+ public void testGetExtendedKeyUsage() throws Exception {
+ List exku = certificate.getExtendedKeyUsage();
+ if ((exku == null)
+ || (exku.size() != extnExtendedKeyUsage.size())) {
+ fail("Incorrect Extended Key Usage value.");
+ }
+ for (int i=0; i<extnExtendedKeyUsage.size(); i++) {
+ String ku = ObjectIdentifier
+ .toString((int[]) extnExtendedKeyUsage.get(i));
+ if (!exku.contains(ku)) {
+ fail("Missing value:" + ku);
}
- } catch (Exception e) {
- fail("Incorrect Key Usage value.");
}
}
@@ -816,25 +797,17 @@
* verify(PublicKey key) method testing.
*/
public void testVerify1() throws Exception {
- try {
- certificate.verify(publicKey);
- } catch (Exception e) {
- fail("Signature verifying process failed.");
- }
+ certificate.verify(publicKey);
}
/**
* TODO
* verify(PublicKey key, String sigProvider) method testing.
*/
- public void testVerify2() {
- try {
- certificate.verify(publicKey,
- Signature.getInstance("SHA1withDSA")
- .getProvider().getName());
- } catch (Exception e) {
- fail("Signature verifying process failed.");
- }
+ public void testVerify2() throws Exception {
+ certificate.verify(publicKey,
+ Signature.getInstance("SHA1withDSA")
+ .getProvider().getName());
}
/**
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java Wed Oct 31 01:42:07 2007
@@ -314,13 +314,9 @@
certificate = new X509CertImpl(cert);
}
- public void testCreation() {
- try {
- ByteArrayInputStream bis = new ByteArrayInputStream(certEncoding);
- certificate = new X509CertImpl(bis);
- } catch (Exception e) {
- fail("Creation of a certificate from a stream failed.");
- }
+ public void testCreation() throws Exception {
+ ByteArrayInputStream bis = new ByteArrayInputStream(certEncoding);
+ certificate = new X509CertImpl(bis);
}
/**
@@ -558,22 +554,18 @@
/**
* getExtendedKeyUsage() method testing.
*/
- public void testGetExtendedKeyUsage() {
- try {
- List exku = certificate.getExtendedKeyUsage();
- if ((exku == null)
- || (exku.size() != extnExtendedKeyUsage.size())) {
- fail("Incorrect Extended Key Usage value.");
+ public void testGetExtendedKeyUsage() throws Exception {
+ List exku = certificate.getExtendedKeyUsage();
+ if ((exku == null)
+ || (exku.size() != extnExtendedKeyUsage.size())) {
+ fail("Incorrect Extended Key Usage value.");
+ }
+ for (int i=0; i<extnExtendedKeyUsage.size(); i++) {
+ String ku = ObjectIdentifier
+ .toString((int[]) extnExtendedKeyUsage.get(i));
+ if (!exku.contains(ku)) {
+ fail("Missing value:" + ku);
}
- for (int i=0; i<extnExtendedKeyUsage.size(); i++) {
- String ku = ObjectIdentifier
- .toString((int[]) extnExtendedKeyUsage.get(i));
- if (!exku.contains(ku)) {
- fail("Missing value:" + ku);
- }
- }
- } catch (Exception e) {
- fail("Incorrect Key Usage value.");
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/CertificatePoliciesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/CertificatePoliciesTest.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/CertificatePoliciesTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/CertificatePoliciesTest.java Wed Oct 31 01:42:07 2007
@@ -40,31 +40,26 @@
/**
* CertificatePolicies() method testing.
*/
- public void testCertificatePolicies() {
- try {
- String[] policies = new String[] {
- "0.0.0.0.0.0",
- "1.1.1.1.1.1",
- "2.2.2.2.2.2"
- };
- CertificatePolicies certificatePolicies =
- new CertificatePolicies();
- for (int i=0; i<policies.length; i++) {
- PolicyInformation policyInformation =
- new PolicyInformation(policies[i]);
- certificatePolicies.addPolicyInformation(policyInformation);
- }
-
- byte[] encoding = certificatePolicies.getEncoded();
- List policyInformations = ((CertificatePolicies)
- CertificatePolicies.ASN1.decode(encoding))
- .getPolicyInformations();
- Iterator it = policyInformations.iterator();
- ((PolicyInformation) it.next()).getPolicyIdentifier();
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
+ public void testCertificatePolicies() throws Exception {
+ String[] policies = new String[] {
+ "0.0.0.0.0.0",
+ "1.1.1.1.1.1",
+ "2.2.2.2.2.2"
+ };
+ CertificatePolicies certificatePolicies =
+ new CertificatePolicies();
+ for (int i=0; i<policies.length; i++) {
+ PolicyInformation policyInformation =
+ new PolicyInformation(policies[i]);
+ certificatePolicies.addPolicyInformation(policyInformation);
}
+
+ byte[] encoding = certificatePolicies.getEncoded();
+ List policyInformations = ((CertificatePolicies)
+ CertificatePolicies.ASN1.decode(encoding))
+ .getPolicyInformations();
+ Iterator it = policyInformations.iterator();
+ ((PolicyInformation) it.next()).getPolicyIdentifier();
}
public static Test suite() {
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/EDIPartyNameTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/EDIPartyNameTest.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/EDIPartyNameTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/EDIPartyNameTest.java Wed Oct 31 01:42:07 2007
@@ -58,78 +58,75 @@
*/
public void _testEDIPartyName1() {
boolean pass = true;
- try {
- EDIPartyName ediPN = new EDIPartyName("nameAssigner", "partyName");
- byte[] encoded = ediPN.getEncoded();
- // manually derived data:
- byte[] _encoded = {
- (byte) 0x30, (byte) 0x1d, (byte) 0x80, (byte) 0x0e,
- (byte) 0x13, (byte) 0x0c, (byte) 0x6e, (byte) 0x61,
- (byte) 0x6d, (byte) 0x65, (byte) 0x41, (byte) 0x73,
- (byte) 0x73, (byte) 0x69, (byte) 0x67, (byte) 0x6e,
- (byte) 0x65, (byte) 0x72, (byte) 0x81, (byte) 0x0b,
- (byte) 0x13, (byte) 0x09, (byte) 0x70, (byte) 0x61,
- (byte) 0x72, (byte) 0x74, (byte) 0x79, (byte) 0x4e,
- (byte) 0x61, (byte) 0x6d, (byte) 0x65
- };
- if (!Arrays.equals(encoded, _encoded)) {
- System.out.println("Got encoded form of EDIPartyName is:");
- printAsHex(16, "", " ", encoded);
- System.out.println("But should be like this:");
- printAsHex(16, "", " ", _encoded);
- System.out.println("");
- pass = false;
- }
- GeneralName gName = new GeneralName(ediPN);
- encoded = gName.getEncoded();
- // manually derived data:
- _encoded = new byte[] {
- (byte) 0xa5, (byte) 0x1d, (byte) 0x80, (byte) 0x0e,
- (byte) 0x13, (byte) 0x0c, (byte) 0x6e, (byte) 0x61,
- (byte) 0x6d, (byte) 0x65, (byte) 0x41, (byte) 0x73,
- (byte) 0x73, (byte) 0x69, (byte) 0x67, (byte) 0x6e,
- (byte) 0x65, (byte) 0x72, (byte) 0x81, (byte) 0x0b,
- (byte) 0x13, (byte) 0x09, (byte) 0x70, (byte) 0x61,
- (byte) 0x72, (byte) 0x74, (byte) 0x79, (byte) 0x4e,
- (byte) 0x61, (byte) 0x6d, (byte) 0x65
- };
- if (!Arrays.equals(encoded, _encoded)) {
- System.out.println("Got encoded form of GeneralName is:");
- printAsHex(16, "", " ", encoded);
- System.out.println("But should be like this:");
- printAsHex(16, "", " ", _encoded);
- System.out.println("");
- pass = false;
- }
+ EDIPartyName ediPN = new EDIPartyName("nameAssigner", "partyName");
+ byte[] encoded = ediPN.getEncoded();
+ // manually derived data:
+ byte[] _encoded = {
+ (byte) 0x30, (byte) 0x1d, (byte) 0x80, (byte) 0x0e,
+ (byte) 0x13, (byte) 0x0c, (byte) 0x6e, (byte) 0x61,
+ (byte) 0x6d, (byte) 0x65, (byte) 0x41, (byte) 0x73,
+ (byte) 0x73, (byte) 0x69, (byte) 0x67, (byte) 0x6e,
+ (byte) 0x65, (byte) 0x72, (byte) 0x81, (byte) 0x0b,
+ (byte) 0x13, (byte) 0x09, (byte) 0x70, (byte) 0x61,
+ (byte) 0x72, (byte) 0x74, (byte) 0x79, (byte) 0x4e,
+ (byte) 0x61, (byte) 0x6d, (byte) 0x65
+ };
+ if (!Arrays.equals(encoded, _encoded)) {
+ System.out.println("Got encoded form of EDIPartyName is:");
+ printAsHex(16, "", " ", encoded);
+ System.out.println("But should be like this:");
+ printAsHex(16, "", " ", _encoded);
+ System.out.println("");
+ pass = false;
+ }
+
+ GeneralName gName = new GeneralName(ediPN);
+ encoded = gName.getEncoded();
+ // manually derived data:
+ _encoded = new byte[] {
+ (byte) 0xa5, (byte) 0x1d, (byte) 0x80, (byte) 0x0e,
+ (byte) 0x13, (byte) 0x0c, (byte) 0x6e, (byte) 0x61,
+ (byte) 0x6d, (byte) 0x65, (byte) 0x41, (byte) 0x73,
+ (byte) 0x73, (byte) 0x69, (byte) 0x67, (byte) 0x6e,
+ (byte) 0x65, (byte) 0x72, (byte) 0x81, (byte) 0x0b,
+ (byte) 0x13, (byte) 0x09, (byte) 0x70, (byte) 0x61,
+ (byte) 0x72, (byte) 0x74, (byte) 0x79, (byte) 0x4e,
+ (byte) 0x61, (byte) 0x6d, (byte) 0x65
+ };
+ if (!Arrays.equals(encoded, _encoded)) {
+ System.out.println("Got encoded form of GeneralName is:");
+ printAsHex(16, "", " ", encoded);
+ System.out.println("But should be like this:");
+ printAsHex(16, "", " ", _encoded);
+ System.out.println("");
+ pass = false;
+ }
- GeneralNames gNames = new GeneralNames();
- gNames.addName(gName);
- encoded = gNames.getEncoded();
- // manually derived data:
- _encoded = new byte[] {
- (byte) 0x30, (byte) 0x1f, (byte) 0xa5, (byte) 0x1d,
- (byte) 0x80, (byte) 0x0e, (byte) 0x13, (byte) 0x0c,
- (byte) 0x6e, (byte) 0x61, (byte) 0x6d, (byte) 0x65,
- (byte) 0x41, (byte) 0x73, (byte) 0x73, (byte) 0x69,
- (byte) 0x67, (byte) 0x6e, (byte) 0x65, (byte) 0x72,
- (byte) 0x81, (byte) 0x0b, (byte) 0x13, (byte) 0x09,
- (byte) 0x70, (byte) 0x61, (byte) 0x72, (byte) 0x74,
- (byte) 0x79, (byte) 0x4e, (byte) 0x61, (byte) 0x6d,
- (byte) 0x65
- };
- if (!Arrays.equals(encoded, _encoded)) {
- System.out.println("Got encoded form of GeneralNames is:");
- printAsHex(16, "", " ", encoded);
- System.out.println("But should be like this:");
- printAsHex(16, "", " ", _encoded);
- System.out.println("");
- pass = false;
- }
- } catch (Exception e) {
- e.printStackTrace();
- fail("Unexpected Exception was thrown.");
+ GeneralNames gNames = new GeneralNames();
+ gNames.addName(gName);
+ encoded = gNames.getEncoded();
+ // manually derived data:
+ _encoded = new byte[] {
+ (byte) 0x30, (byte) 0x1f, (byte) 0xa5, (byte) 0x1d,
+ (byte) 0x80, (byte) 0x0e, (byte) 0x13, (byte) 0x0c,
+ (byte) 0x6e, (byte) 0x61, (byte) 0x6d, (byte) 0x65,
+ (byte) 0x41, (byte) 0x73, (byte) 0x73, (byte) 0x69,
+ (byte) 0x67, (byte) 0x6e, (byte) 0x65, (byte) 0x72,
+ (byte) 0x81, (byte) 0x0b, (byte) 0x13, (byte) 0x09,
+ (byte) 0x70, (byte) 0x61, (byte) 0x72, (byte) 0x74,
+ (byte) 0x79, (byte) 0x4e, (byte) 0x61, (byte) 0x6d,
+ (byte) 0x65
+ };
+ if (!Arrays.equals(encoded, _encoded)) {
+ System.out.println("Got encoded form of GeneralNames is:");
+ printAsHex(16, "", " ", encoded);
+ System.out.println("But should be like this:");
+ printAsHex(16, "", " ", _encoded);
+ System.out.println("");
+ pass = false;
}
+
assertTrue("Some problems occured.", pass);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/GeneralNameTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/GeneralNameTest.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/GeneralNameTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/GeneralNameTest.java Wed Oct 31 01:42:07 2007
@@ -73,20 +73,15 @@
}
}
- public void testGeneralName1() {
- try {
- OtherName on =
- new OtherName("1.2.3.4.5", new byte[] {1, 2, 0, 1});
- byte[] encoding = OtherName.ASN1.encode(on);
- new GeneralName(0, encoding);
- OtherName.ASN1.decode(encoding);
- GeneralName gn = new GeneralName(on);
- new GeneralName(0, gn.getEncodedName());
- assertEquals(gn, new GeneralName(0, gn.getEncodedName()));
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testGeneralName1() throws Exception {
+ OtherName on =
+ new OtherName("1.2.3.4.5", new byte[] {1, 2, 0, 1});
+ byte[] encoding = OtherName.ASN1.encode(on);
+ new GeneralName(0, encoding);
+ OtherName.ASN1.decode(encoding);
+ GeneralName gn = new GeneralName(on);
+ new GeneralName(0, gn.getEncodedName());
+ assertEquals(gn, new GeneralName(0, gn.getEncodedName()));
}
/**
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/ORAddressTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/ORAddressTest.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/ORAddressTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/ORAddressTest.java Wed Oct 31 01:42:07 2007
@@ -55,28 +55,22 @@
* ORAddress() method testing.
*/
public void testORAddress() {
- try {
- ORAddress ora = new ORAddress();
- System.out.println("");
- System.out.println("ORAddress:");
- printAsHex(8, "", " ", ora.getEncoded());
- System.out.println("");
-
- GeneralName gName = new GeneralName(ora);
- System.out.println("GeneralName:");
- printAsHex(8, "", " ", gName.getEncoded());
- System.out.println("");
+ ORAddress ora = new ORAddress();
+ System.out.println("");
+ System.out.println("ORAddress:");
+ printAsHex(8, "", " ", ora.getEncoded());
+ System.out.println("");
+
+ GeneralName gName = new GeneralName(ora);
+ System.out.println("GeneralName:");
+ printAsHex(8, "", " ", gName.getEncoded());
+ System.out.println("");
- GeneralNames gNames = new GeneralNames();
- gNames.addName(gName);
- System.out.println("GeneralNames:");
- printAsHex(8, "", " ", gNames.getEncoded());
- System.out.println("");
-
- } catch (Exception e) {
- e.printStackTrace();
- fail("Exception was thrown.");
- }
+ GeneralNames gNames = new GeneralNames();
+ gNames.addName(gName);
+ System.out.println("GeneralNames:");
+ printAsHex(8, "", " ", gNames.getEncoded());
+ System.out.println("");
}
public static Test suite() {
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.sql.rowset.spi;
import javax.sql.RowSetReader;
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/HYOptimisticProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/HYOptimisticProvider.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/HYOptimisticProvider.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/HYOptimisticProvider.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.sql.internal.rowset;
import javax.sql.RowSetReader;
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java Wed Oct 31 01:42:07 2007
@@ -79,7 +79,7 @@
*
* @throws SQLException
*/
- public void testDeregisterDriver() throws SQLException {
+ public void testDeregisterDriver() throws Exception {
// First get one of the drivers loaded by the test
Driver aDriver;
aDriver = DriverManager.getDriver(baseURL4);
@@ -103,24 +103,17 @@
// TODO - need to load a driver with a different classloader!!
aDriver = DriverManager.getDriver(baseURL1);
- try {
- Class<?> driverClass = Class
- .forName(
- "org.apache.harmony.sql.tests.java.sql.TestHelper_DriverManager",
- true, testClassLoader);
-
- // Give the Helper class one of our drivers....
- Class<?>[] methodClasses = { Class.forName("java.sql.Driver") };
- Method theMethod = driverClass.getDeclaredMethod("setDriver",
- methodClasses);
- Object[] args = { aDriver };
- theMethod.invoke(null, args);
- } catch (Exception e) {
- System.out
- .println("testDeregisterDriver: Got exception allocating TestHelper");
- e.printStackTrace();
- return;
- } // end try
+ Class<?> driverClass = Class
+ .forName(
+ "org.apache.harmony.sql.tests.java.sql.TestHelper_DriverManager",
+ true, testClassLoader);
+
+ // Give the Helper class one of our drivers....
+ Class<?>[] methodClasses = { Class.forName("java.sql.Driver") };
+ Method theMethod = driverClass.getDeclaredMethod("setDriver",
+ methodClasses);
+ Object[] args = { aDriver };
+ theMethod.invoke(null, args);
// Check that the driver was not deregistered
assertTrue(
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.sql.tests.javax.sql.rowset;
import java.io.Serializable;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/MenuKeyBindingProcessor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/MenuKeyBindingProcessor.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/MenuKeyBindingProcessor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/MenuKeyBindingProcessor.java Wed Oct 31 01:42:07 2007
@@ -22,8 +22,11 @@
import java.awt.Component;
import java.awt.KeyEventDispatcher;
+import java.awt.Toolkit;
+import java.awt.AWTEvent;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.awt.event.AWTEventListener;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -326,10 +329,22 @@
}
public boolean dispatchKeyEvent(final KeyEvent e) {
- if (e.getID() != KeyEvent.KEY_PRESSED) {
+ if (e.getID() != KeyEvent.KEY_PRESSED || e.isConsumed()) {
return false;
}
+ // dispatch event to user listeners
+ for (AWTEventListener listener :
+ Toolkit.getDefaultToolkit().getAWTEventListeners(
+ AWTEvent.KEY_EVENT_MASK)) {
+ listener.eventDispatched(e);
+ }
+
+ if (e.isConsumed()) {
+ // consumed by user listener
+ return true;
+ }
+
final JPopupMenu activePopupMenu = getActivePopupMenu();
if (activePopupMenu == null) {
return false;
@@ -340,6 +355,7 @@
if (action == null) {
return false;
}
+
SwingUtilities.notifyAction(action, ks, e, activePopupMenu, e.getModifiersEx());
return true;
}
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiButtonUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiButtonUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiButtonUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiButtonUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiColorChooserUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiColorChooserUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiColorChooserUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiColorChooserUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiComboBoxUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiComboBoxUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiComboBoxUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiComboBoxUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopIconUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopIconUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopIconUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopIconUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopPaneUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopPaneUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopPaneUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopPaneUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiFileChooserUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiFileChooserUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiFileChooserUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiFileChooserUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiInternalFrameUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiInternalFrameUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiInternalFrameUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiInternalFrameUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLabelUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLabelUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLabelUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLabelUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiListUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiListUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiListUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiListUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLookAndFeel.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLookAndFeel.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLookAndFeel.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLookAndFeel.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.util.Vector;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuBarUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuBarUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuBarUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuBarUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuItemUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuItemUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuItemUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuItemUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiOptionPaneUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiOptionPaneUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiOptionPaneUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiOptionPaneUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPanelUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPanelUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPanelUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPanelUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPopupMenuUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPopupMenuUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPopupMenuUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPopupMenuUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiProgressBarUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiProgressBarUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiProgressBarUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiProgressBarUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiRootPaneUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiRootPaneUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiRootPaneUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiRootPaneUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollBarUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollBarUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollBarUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollBarUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollPaneUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollPaneUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollPaneUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollPaneUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSeparatorUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSeparatorUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSeparatorUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSeparatorUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSliderUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSliderUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSliderUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSliderUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSpinnerUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSpinnerUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSpinnerUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSpinnerUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSplitPaneUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSplitPaneUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSplitPaneUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSplitPaneUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTabbedPaneUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTabbedPaneUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTabbedPaneUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTabbedPaneUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableHeaderUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableHeaderUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableHeaderUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableHeaderUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTextUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTextUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTextUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTextUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolBarUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolBarUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolBarUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolBarUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolTipUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolTipUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolTipUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolTipUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTreeUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTreeUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTreeUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTreeUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiViewportUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiViewportUI.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiViewportUI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiViewportUI.java Wed Oct 31 01:42:07 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package javax.swing.plaf.multi;
import java.awt.Dimension;
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/AbstractExtendedListElement.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/AbstractExtendedListElement.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/AbstractExtendedListElement.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/AbstractExtendedListElement.java Wed Oct 31 01:42:07 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2005 - 2006 The Apache Software Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListCellRenderer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListCellRenderer.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListCellRenderer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListCellRenderer.java Wed Oct 31 01:42:07 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2005 - 2006 The Apache Software Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListElement.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListElement.java?rev=590591&r1=590590&r2=590591&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListElement.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListElement.java Wed Oct 31 01:42:07 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 2005 - 2006 The Apache Software Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*