harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r411704 - in /incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1: ASN1Choice.java ASN1Explicit.java ASN1Implicit.java ASN1Type.java ASN1TypeCollection.java ASN1ValueCollection.java
Date Mon, 05 Jun 2006 07:49:49 GMT
Author: smishura
Date: Mon Jun  5 00:49:48 2006
New Revision: 411704

URL: http://svn.apache.org/viewvc?rev=411704&view=rev
Log:
Default implementation for getDecodedObject()

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Choice.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Explicit.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Implicit.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1TypeCollection.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1ValueCollection.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Choice.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Choice.java?rev=411704&r1=411703&r2=411704&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Choice.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Choice.java
Mon Jun  5 00:49:48 2006
@@ -327,17 +327,6 @@
         return getDecodedObject(in);
     }
     
-    /**
-     * Extracts chosen object from BER input stream.
-     * 
-     * @param in -
-     *            decoding input stream
-     * @return object that represents this choice
-     */
-    public Object getDecodedObject(BerInputStream in) throws IOException {
-        return in.content;
-    }
-
     //
     //
     // ENCODE

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Explicit.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Explicit.java?rev=411704&r1=411703&r2=411704&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Explicit.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Explicit.java
Mon Jun  5 00:49:48 2006
@@ -88,10 +88,6 @@
         return getDecodedObject(in);
     }
 
-    public Object getDecodedObject(BerInputStream in) throws IOException {
-        return in.content;
-    }
-
     //
     //
     // Encode

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Implicit.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Implicit.java?rev=411704&r1=411703&r2=411704&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Implicit.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Implicit.java
Mon Jun  5 00:49:48 2006
@@ -146,13 +146,6 @@
         return getDecodedObject(in);
     }
 
-    /**
-     * TODO
-     */
-    public Object getDecodedObject(BerInputStream in) throws IOException {
-        return in.content;
-    }
-
     //
     //
     // Encode

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java?rev=411704&r1=411703&r2=411704&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Type.java
Mon Jun  5 00:49:48 2006
@@ -148,9 +148,22 @@
      */
     public abstract boolean checkTag(int identifier);
 
+    /**
+     * Creates decoded object.
+     * 
+     * Derived classes should override this method to provide creation for a
+     * selected class of objects during decoding.
+     * 
+     * The default implementation returns an object created by decoding stream.
+     * 
+     * @param -
+     *            input stream
+     * @return - created object
+     */
     //FIXME make me public
-    protected abstract Object getDecodedObject(BerInputStream in)
-            throws IOException;
+    protected Object getDecodedObject(BerInputStream in) throws IOException {
+        return in.content;
+    }
 
     //
     //

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1TypeCollection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1TypeCollection.java?rev=411704&r1=411703&r2=411704&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1TypeCollection.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1TypeCollection.java
Mon Jun  5 00:49:48 2006
@@ -21,8 +21,6 @@
 
 package org.apache.harmony.security.asn1;
 
-import java.io.IOException;
-
 
 /**
  * This abstract class represents ASN.1 type that is a collection of ASN.1 types.
@@ -78,21 +76,6 @@
     protected final void setDefault(Object object, int index) {
         OPTIONAL[index] = true;
         DEFAULT[index] = object;
-    }
-
-    /**
-     * Creates decoded object.
-     *
-     * Derived classes should override this method to provide
-     * creation for a selected class of objects during decoding. 
-     * 
-     * The default implementation returns array of decoded objects.
-
-     * @param - input stream
-     * @return - created object
-     */
-    protected Object getDecodedObject(BerInputStream in) throws IOException {
-        return in.content;
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1ValueCollection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1ValueCollection.java?rev=411704&r1=411703&r2=411704&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1ValueCollection.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1ValueCollection.java
Mon Jun  5 00:49:48 2006
@@ -21,7 +21,6 @@
 
 package org.apache.harmony.security.asn1;
 
-import java.io.IOException;
 import java.util.Collection;
 
 
@@ -51,21 +50,6 @@
         super(tagNumber);
 
         this.type = type;
-    }
-
-    /**
-     * Creates decoded object.
-     * 
-     * Derived classes should override this method to provide
-     * creation for a selected class of objects during decoding. 
-     * 
-     * The default implementation returns list of decoded objects.
-     *
-     * @param - input stream
-     * @return - created object
-     */
-    public Object getDecodedObject(BerInputStream in) throws IOException {
-        return in.content;
     }
 
     /**



Mime
View raw message