[Libreoffice-commits] core.git: external/beanshell

rbuj robert.buj at gmail.com
Wed Jul 23 00:57:23 PDT 2014


 external/beanshell/bsh-2.0b1-src.patch |   33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

New commits:
commit 37594357cb9c46aff7304c669a160ff7ec916a45
Author: rbuj <robert.buj at gmail.com>
Date:   Wed Jul 23 07:38:15 2014 +0200

    beanshell: [deprecation] show() in Window has been deprecated
    
    http://docs.oracle.com/javase/1.5.0/docs/api/java/awt/Window.html#show()
    
    Change-Id: Id02e622f3335315747e7c66724f5a3f37992e85d
    Reviewed-on: https://gerrit.libreoffice.org/10481
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/beanshell/bsh-2.0b1-src.patch b/external/beanshell/bsh-2.0b1-src.patch
index a67e3ee..786bc9b 100644
--- a/external/beanshell/bsh-2.0b1-src.patch
+++ b/external/beanshell/bsh-2.0b1-src.patch
@@ -83,3 +83,36 @@
  		BshClassPath bcp = new BshClassPath( "Test", urls );
  	}
  
+--- misc/BeanShell/src/bsh/util/AWTConsole.java	2003-12-19 17:14:29.000000000 +0100
++++ misc/build/BeanShell/src/bsh/util/AWTConsole.java	2014-07-23 07:32:12.000000000 +0200
+@@ -325,7 +325,7 @@
+ 		final Frame f = new Frame("Bsh Console");
+ 		f.add(console, "Center");
+ 		f.pack();
+-		f.show();
++		f.setVisible(true);
+ 		f.addWindowListener( new WindowAdapter() {
+ 			public void windowClosing( WindowEvent e ) {
+ 				f.dispose();
+--- misc/BeanShell/src/bsh/util/ClassBrowser.java	2003-12-19 17:14:29.000000000 +0100
++++ misc/build/BeanShell/src/bsh/util/ClassBrowser.java	2014-07-23 07:32:52.000000000 +0200
+@@ -409,7 +409,7 @@
+ 		f.getContentPane().add( "Center", cb );
+ 		cb.setFrame( f );
+ 		f.pack();
+-		f.show();
++		f.setVisible(true);
+ 	}
+ 
+ 	public void setFrame( JFrame frame ) {
+--- misc/BeanShell/src/bsh/util/Util.java	2003-12-19 17:14:29.000000000 +0100
++++ misc/build/BeanShell/src/bsh/util/Util.java	2014-07-23 07:33:29.000000000 +0200
+@@ -80,7 +80,7 @@
+         try { mt.waitForAll(); } catch ( Exception e ) { }
+         Graphics gr=can.getBufferedGraphics();
+         gr.drawImage(img, 0, 0, can);
+-        win.show();
++        win.setVisible(true);
+         win.toFront();
+ 		splashScreen = win;
+ 	}


More information about the Libreoffice-commits mailing list