You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by db...@apache.org on 2010/05/06 18:43:17 UTC

svn commit: r941798 - in /jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile: EnclosingMethod.java LocalVariableTypeTable.java

Author: dbrosius
Date: Thu May  6 16:43:17 2010
New Revision: 941798

URL: http://svn.apache.org/viewvc?rev=941798&view=rev
Log:
Apply patch from Bug 49259 to relicense two files to Apache 2.0 from IBM as provided from GSOC student.

Modified:
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java?rev=941798&r1=941797&r2=941798&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java Thu May  6 16:43:17 2010
@@ -1,18 +1,22 @@
-/* *******************************************************************
- * Copyright (c) 2004 IBM Corporation
- * 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
- *  
- * Contributors: 
- *    Andy Clement     initial implementation 
- * ******************************************************************/
+/**
+ *  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.bcel.classfile;
 
-import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
@@ -39,7 +43,7 @@ public class EnclosingMethod extends Att
 	private int methodIndex;
 
 	// Ctors - and code to read an attribute in.
-	public EnclosingMethod(int nameIndex, int len, DataInput dis, ConstantPool cpool) throws IOException {
+	public EnclosingMethod(int nameIndex, int len, DataInputStream dis, ConstantPool cpool) throws IOException {
 		this(nameIndex, len, dis.readUnsignedShort(), dis.readUnsignedShort(), cpool);
 	}
 

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java?rev=941798&r1=941797&r2=941798&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java Thu May  6 16:43:17 2010
@@ -1,19 +1,21 @@
-/* *******************************************************************
- * Copyright (c) 2004 IBM Corporation
- * 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
- *  
- * Contributors: 
- *    Andy Clement     initial implementation 
- *    Heavily based on LocalVariableTable
- * ******************************************************************/
+/**
+ *  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.bcel.classfile;
 
-
 import  org.apache.bcel.Constants;
 import  java.io.*;
 
@@ -106,7 +108,7 @@ public class LocalVariableTypeTable exte
    * @return String representation.
    */ 
   public final String toString() {
-    StringBuffer buf = new StringBuffer();
+    StringBuffer buf = new StringBuffer("");
 
     for(int i=0; i < local_variable_type_table_length; i++) {
       buf.append(local_variable_type_table[i].toString());