summaryrefslogtreecommitdiff
path: root/scripting/java
AgeCommit message (Collapse)Author
2019-12-15Beanshell: Display full exception messageSamuel Mehrbrodt
Useful to see where exactly the error occured Change-Id: I716f54c4b1286d705b52f19a58f36f28a801e1d0 Reviewed-on: https://gerrit.libreoffice.org/69799 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 3d54a104ae97a3218bf58eb38f28c03e26ba7e43) Reviewed-on: https://gerrit.libreoffice.org/85034 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-12-15Beanshell: Wrap long error messagesSamuel Mehrbrodt
Change-Id: I5e607f4b94733700810d37c289f6cc29492da5f2 Reviewed-on: https://gerrit.libreoffice.org/69798 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 3c72945de874aceb12a405c03f5b0c8b3937f5cf) Reviewed-on: https://gerrit.libreoffice.org/85033 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-15Restore binary compatibility for ClassLoaderFactoryStephan Bergmann
As discussed in the mail thread starting at <http://mail-archives.apache.org/ mod_mbox/openoffice-dev/201806.mbox/%3c651c8fee-b467-421c-eae1-a8710f41692c @apache.org%3e> "Just a little side note on the scripting framework ...", external code that uses the Java class com.sun.star.script.framework.provider.ClassLoaderFactory stopped working because LO changed that class in binary (and compile-time) incompatible ways over time. The class is not listed at <https://api.libreoffice.org/docs/java/ref/index.html> (and neither at <http://www.openoffice.org/api/docs/java/ref/overview-summary.html>), so it was not considered part of the stable URE interface. But it is apparently used by external code, and it indeed seems to make sense that it is used by external code that implements scripting providers. (A follow-up commit should therefore mark the class as part of the stable URE interface. I keep that separate so that it is easier to backport this functional fix.) With ScriptProviderForooRexx.oxt from https://svn.code.sf.net/p/bsf4oorexx/code@r589 installed in LO, "Tools - Macros - Organize Macros - ooRexx... - My Macros - Create... - Library1 - OK - Create... - Macro1 - OK - Edit" failed due to > warn:cui.dialogs:21768:21768:cui/source/dialogs/scriptdlg.cxx:740: Caught exception trying to invoke N3com3sun4star3uno9ExceptionE msg: [jni_uno bridge error] UNO calling Java method invoke: non-UNO exception occurred: java.lang.NoSuchMethodError: com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader(Lcom/sun/star/script/framework/container/ScriptMetaData;)Ljava/lang/ClassLoader; > java stack trace: > java.lang.NoSuchMethodError: com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader(Lcom/sun/star/script/framework/container/ScriptMetaData;)Ljava/lang/ClassLoader; > at com.sun.star.script.framework.provider.oorexx.ScriptEditorForooRexx.edit(ScriptEditorForooRexx.java:305) > at com.sun.star.script.framework.browse.ScriptBrowseNode.invoke(ScriptBrowseNode.java:200) cae57d2e588a4b5a104171e022b00abcc1605775 "ClassLoader->URLClassLoader" (which this commit reverts) had changed the return type of the two getURLClassLoader overloads from ClassLoader to derived URLClassLoader (and ultimately only for cosmetic effect; it was leftover from a previous attempt at fixing a Coverity issue by using URLClassLoader.close(), but which is only available in Java 1.7, so the attempt had been reverted). That caused the above failure. And 68cd011c907d00493bf2bfde531c1e244819596b "java: reduce scope, make some methods private" (which this commit also reverts) had changed the second getURLClassLoader overload (which is not called in the above scenario) from public to private, which is also a binary-incompatible change. Other commits removed throws clauses, which is only a compile-time issue but not a binary-incompatible change. I left those changes in for now, but if need be they could also be reverted. Change-Id: I98f533d88c7c1580956c3c281e72a1c78fa3f56f Reviewed-on: https://gerrit.libreoffice.org/55872 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
2018-04-02use https links for api.libreoffice.org and opengrokdennisroczek
Change-Id: I74dd0142562cb8698f19b2715fa1d514f82bd749 Reviewed-on: https://gerrit.libreoffice.org/52262 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-01-27Fix typosAndrea Gelmini
Change-Id: I8d5a8251a01af7cdf9832d98d8a6573b907f8532 Reviewed-on: https://gerrit.libreoffice.org/48683 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jens Carl <j.carl43@gmx.de>
2017-02-23In Java, css.uno.RuntimeException doesn't derive from css.uno.ExceptionStephan Bergmann
Change-Id: I83850db6e3f3ac87d52e75f122ba2b6bba3905b9
2016-10-16tdf#98004 - Enhansment on Editor(Beanshell)nadith
Add a toolbar A little enhasment for the editor has been done. Added a toolbar for set of buttons that was previously in a JPanel and now it is in Jtoolbar in the editor Change-Id: Ie04232e7824c051f272d69cc109eec0e70ccf921 Reviewed-on: https://gerrit.libreoffice.org/29806 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-10-03ClassLoader->URLClassLoaderCaolán McNamara
Change-Id: I1f46a99025ba33d08842da9b06611dcfa6b1b49c Reviewed-on: https://gerrit.libreoffice.org/29474 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-10-01Fix typosAndrea Gelmini
Change-Id: I9701cc93a9f4315e71c133237fdd96ef6964c8ff Reviewed-on: https://gerrit.libreoffice.org/29438 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-08-19Revert "coverity#1371372 Resource leak on an exceptional path"Caolán McNamara
seeing as it doesn't build universally, java 1.7 onwards apparently This reverts commit 6830d8c2083fa66cc113f587cbfc4aa5a4f8a535.
2016-08-19coverity#1371372 Resource leak on an exceptional pathCaolán McNamara
and coverity#1371366 Resource leak on an exceptional path coverity#1371376 Resource leak on an exceptional path Change-Id: Ic0fd05f02b1d78a47d4ee924dee8f10811586d0d
2016-08-19coverity#1371367 Resource leak on an exceptional pathCaolán McNamara
Change-Id: I4da5f6d427e8132d62860b46cb4def88b8afb25d
2016-06-06remove unused imports in java codeNoel Grandin
Change-Id: I95041f49dd22ba9a15da3598b04a010eecf761a8
2016-05-15coverity#1361587 Dereference null return valueCaolán McNamara
and coverity#1361588 Dereference null return value Change-Id: Ia282c37e94d9d4131d18b3ccf6a8b7cb12c12344
2016-04-30Fix typosAndrea Gelmini
Change-Id: Id81b16ff26283611f0b84929d831c827f847ab73 Reviewed-on: https://gerrit.libreoffice.org/24317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-03-14remove some unused Java codeNoel Grandin
found by UCDetector Change-Id: Ic0295a24b26e206eb53eda2da540755477df86df
2016-03-14scripting: JDK 1.5 compatibility: don't use java.awt.Font.MONOSPACEDDouglas Mencken
MONOSPACED is defined in java/awt/Font.java as /* @since 1.6 */ static final String MONOSPACED = "Monospaced"; Change-Id: I31847c939387c139971ff55f786773c7ce51448c Reviewed-on: https://gerrit.libreoffice.org/23164 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-03-04cid#1326861,1326862: Eq: Problems with implementation of equals()Stephan Bergmann
Cloneable, odd additional equals overloads, odd hasCode implementation---all smells like clueless cargo cult. And I see no place where it would get used. Change-Id: Icca89531ce9181fb47eacfb6fae704f4f45012a9
2016-03-04This ScriptEntry ctor is always called with empty languagedeppropsStephan Bergmann
Change-Id: Ia8ddfecf2f809e9f0132ba59812446973532476c
2016-03-04Scripting.location is unusedStephan Bergmann
Change-Id: Ia534b5aa579a678f8b0273e6c8c12a6ad335c67a
2016-03-04ScriptEntry fields can be finalStephan Bergmann
Change-Id: I7616641584b7ea8192cf3724d8b7d5b88af39da6
2016-03-04Turn forwarding among ScriptEntry ctors around, dropping oneStephan Bergmann
Change-Id: If3c86c7e5c4acaf4a3e48194e24c3c73e4e99499
2016-03-04Remove unusd ScriptEntry ctorStephan Bergmann
Change-Id: I7109877e789659b87cbc16e9c5da39dcc8249e09
2016-03-04Forwarding-only ctor, can be privateStephan Bergmann
Change-Id: I9ed2aa9c2bf2e17705dc711560154a9596c8264a
2016-03-04This ScriptEntry ctor is only needed by ctor of derived class ScriptMetaDataStephan Bergmann
Change-Id: If3e6aae326aa53825edca9d5dc207d185d288cce
2016-03-04Remove unused ScriptEntry.setLogicalNameStephan Bergmann
Change-Id: Iad58e4227433b766bbdce92a53c95aed48320f88
2016-03-04Parcel.getByName apparently wants to return ScriptMetaDataStephan Bergmann
Change-Id: I4a710384ec3a0d719f2ad1fbbe7b43b0be1fa1d9
2016-02-25coverity#1354272 SS: Unread field should be staticCaolán McNamara
Change-Id: Ie9480265be8053805cb48cefe189e65a47ce0908
2016-02-22tdf#98004 Added toolbar to beanshell editor with undo/redo buttonsChirag Manwani
Change-Id: I1d553473f34622e1cb1dab3ffe74ec0c5fa05605 Reviewed-on: https://gerrit.libreoffice.org/22612 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-02-21tdf#97636 Added Undo/Redo functionality to Beanshell EditorChirag Manwani
Change-Id: Ie24f7bb5e59cd78ba2d06a4ed1b6a0bcaf1a3736 Reviewed-on: https://gerrit.libreoffice.org/22500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-02-18coverity#1326437 Dereference null return valueCaolán McNamara
Change-Id: I9fe5f799b7b47d8dc1fd34893c392fcecef5b5a4
2016-02-18tdf#97637 Fixed Tab size of beanshell editor to 4Chirag Manwani
Change-Id: Ifeb73ab210d9d955e502fab3e3ec993081625945 Reviewed-on: https://gerrit.libreoffice.org/22473 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-02-18tdf#97642 Use native theming for swing controls in Beanshell EditorChirag Manwani
Change-Id: Ifb2f3cfe5132e9b6f7d5d2df5868b09b39c5ec47 Reviewed-on: https://gerrit.libreoffice.org/22429 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-02-17tdf#97640 Fixed-Width Font for Beanshell EditorChirag Manwani
Change-Id: I809253a4f0481c825368d9c608cac77e64376aa0 Reviewed-on: https://gerrit.libreoffice.org/22404 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-02-16coverity#1326200 Explicit null dereferencedCaolán McNamara
Change-Id: I39ed18b55657e375b1c22f97c49a0e43aedce4f5
2016-02-16coverity#1326199 Explicit null dereferencedCaolán McNamara
extensionDb is always the same Change-Id: I57b59f09b3f55757844a6aab6c6698857da2e15b
2016-02-05Fix typosAndrea Gelmini
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3 Reviewed-on: https://gerrit.libreoffice.org/21797 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-02-04coverity#1326399 Dereference null return valueCaolán McNamara
Change-Id: I7828cdfcda5d4065fc3dafee744757292753abb5
2016-02-04coverity#1326631 DE: Dropped or ignored exceptionCaolán McNamara
Change-Id: If1f4f46ba51360eff3537f6804286adfe16c4a0e
2016-02-04coverity#1326630 DE: Dropped or ignored exceptionCaolán McNamara
Change-Id: I495c1b5d9d0e03a92330fe6b9371183471aee7bb
2016-02-04coverity#1326629 DE: Dropped or ignored exceptionCaolán McNamara
Change-Id: Ifb82c92eb0eaa019a19deee3dce375204576e2ee
2016-01-10Fix typosAndrea Gelmini
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86 Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2015-11-09java: add some @Override annotationsNoel Grandin
Change-Id: I291db1dff5ab3ce40fda6f822a0e3ff1e6ef36c1 Reviewed-on: https://gerrit.libreoffice.org/19855 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-05java: combine nested if statementsNoel Grandin
Change-Id: I0457b81668e9427a3c8d6a4af93438b7fb2bb7ba
2015-10-25cid#1326721 to cid#1326726 Dm: Dubious method usedCaolán McNamara
Change-Id: I5578dc3885945c013064cecf2ca86e7ca734368f
2015-10-25coverity#1326446 Dereference null return valueCaolán McNamara
Change-Id: I18b3e0cc30e05e9a53a0f7ae9997b9f190f192f4
2015-10-22coverity#1326446 Dereference null return valueCaolán McNamara
Change-Id: Ief00b565147bd4a08c4fd6de9df71d9126dc1f75
2015-10-22coverity#1326429 Dereference null return valueCaolán McNamara
Change-Id: Ib047f6cb255610422afb423006b58e0da7eacead
2015-10-20coverity#1326553 Dereference before null checkCaolán McNamara
Change-Id: I1fe2e0477f136f31b854672878d0544d9492d51b
2015-10-20coverity#1326552 Dereference before null checkCaolán McNamara
Change-Id: I5a3fb6b5e9966a8e0c5dd0175e4f4f3292025a2c