diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:42:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:42:49 +0000 |
| commit | f0706331fae12a7f672598da9a3b865f70db584e (patch) | |
| tree | 753822f79be101ef9b66d825469333007d596095 /beanshell | |
| parent | 42a7392e9c9dba4cdf5b44f6ff5f7f5f8f88e384 (diff) | |
INTEGRATION: CWS morejava (1.3.2); FILE MERGED
2005/08/29 14:08:30 fridrich_strba 1.3.2.2: Issue number:
Submitted by: fridrich_strba
Reviewed by: fridrich_strba
Allow building OOo out-of-the-box with jdk 1.3.1
2005/08/26 13:45:16 fridrich_strba 1.3.2.1: Issue number:
Submitted by: cyrillem, fridrich_strba
Reviewed by: fridrich_strba
Avoid wildcard imports in order to prevent conflicts with classes with the same
name, but from different package (jdk1.5.0)
Diffstat (limited to 'beanshell')
| -rw-r--r-- | beanshell/bsh-2.0b1-src.patch | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch index 89d629e0ea3c..a1fcf230b0a5 100644 --- a/beanshell/bsh-2.0b1-src.patch +++ b/beanshell/bsh-2.0b1-src.patch @@ -46,16 +46,16 @@ *************** *** 1 **** ! dummy ---- 1,43 ---- +--- 1,46 ---- ! #************************************************************************* ! # ! # OpenOffice.org - a multi-platform office productivity suite ! # ! # $RCSfile: bsh-2.0b1-src.patch,v $ ! # -! # $Revision: 1.4 $ +! # $Revision: 1.5 $ ! # -! # last change: $Author: rt $ $Date: 2005-09-07 22:05:15 $ +! # last change: $Author: hr $ $Date: 2005-10-25 11:42:49 $ ! # ! # The Contents of this file are made available subject to ! # the terms of GNU Lesser General Public License Version 2.1. @@ -88,5 +88,29 @@ ! ! .INCLUDE : ant.mk ! +! CLASSPATH+=$PATH_SEPERATOR$SOLARVER/$UPD/$INPATH/bin/crimson.jar +! .EXPORT : CLASSPATH +! ! ALLTAR : ANTBUILD ! +*** misc/BeanShell/src/bsh/ClassGeneratorUtil.java 2003-12-19 17:14:28.000000000 +0100 +--- misc/build/BeanShell/src/bsh/ClassGeneratorUtil.java 2005-08-24 15:20:06.996244243 +0200 +*************** +*** 34,40 **** + package bsh; + + import bsh.org.objectweb.asm.*; +! import java.lang.reflect.*; + import java.util.ArrayList; + import java.util.List; + +--- 34,42 ---- + package bsh; + + import bsh.org.objectweb.asm.*; +! import java.lang.reflect.Constructor; +! import java.lang.reflect.InvocationTargetException; +! import java.lang.reflect.Method; + import java.util.ArrayList; + import java.util.List; + |