Commit Graph
426 Commits
Author SHA1 Message Date
Andrea Gelmini f4a07458fb Fix typos
Change-Id: I8a93a6ed49661ddfae390a0302fca1fab5c95f14
Reviewed-on: https://gerrit.libreoffice.org/79795
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-09-29 00:09:20 +02:00
Andrea Gelmini c12c84e6d8 Fixing "...."
Change-Id: I3424e17cfdfb563fdc5882942031deafae8689fe
Reviewed-on: https://gerrit.libreoffice.org/78678
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-09-06 09:13:38 +02:00
Andrea Gelmini bec318a4ac Fix typos
Change-Id: Iac08e415f84741ecdb151788776ee15e7364fae1
Reviewed-on: https://gerrit.libreoffice.org/77762
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-31 14:38:58 +02:00
Andrea Gelmini 1a75143159 Fix typos
Change-Id: I3e6b96f4ea341130e98ee54ed8c124209b05d343
Reviewed-on: https://gerrit.libreoffice.org/77291
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-12 10:56:06 +02:00
Stephan Bergmann 418533f0af Related tdf#116767: Call URLClassLoader.close
...which required the return type of
com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader to
be changed.  (In theory, there could be 3rd-party scripting providers that hook
into the framework and are affected by that incompatible change, but,
practically, chances should be low.)

Change-Id: I083c398726aaf62df7286d6da86b9d2056a5a8c1
Reviewed-on: https://gerrit.libreoffice.org/77146
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-08-08 13:27:52 +02:00
Stephan Bergmann 664eea94a2 Remove unused NoSuitableClassLoaderException
It was introduced with 980aa9b06c "#i19331#" (or
at least moved to its current place there, with older traces lost to history),
but its only actual use in the code has since been removed with
8087d5389f "Java new cannot return null".

(In theory, there could be 3rd-party scripting providers that hook into the
framework and use that class, but, practically, chances should be low.)

Change-Id: I8586fccf120c93391308ede547bbeec6fabf2743
Reviewed-on: https://gerrit.libreoffice.org/77142
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-08-08 11:06:35 +02:00
Stephan Bergmann c4bb20a479 Remove odd catch of ArrayStoreException
...(which is a RuntimeException) around a call of
com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader.
The catch block was introduced in 3076ea9dc6
"INTEGRATION: CWS scriptingf2 (1.2.2); FILE MERGED", for no apparent reason.  It
was introduced along with catch blocks for MalformedURLException and
NoSuitableClassLoaderException, but which have already been removed with
616b3ad504 "java: remove exceptions from throws
clauses that are not".

Change-Id: I8d2890aed1b0f50fe817002cb6f1610c550568f1
Reviewed-on: https://gerrit.libreoffice.org/77140
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-08-08 10:21:31 +02:00
Caolán McNamara cb1c937ef6 cid#1448376 SIC: Inner class could be made static
Change-Id: Id9923031c1fe91ba71dfe8d68cbe23b72e9637b5
Reviewed-on: https://gerrit.libreoffice.org/76143
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-23 09:34:53 +02:00
Andreas Heinisch 1223bede82 tdf#123587 Beanshell editor: Show current file name as window title
Change-Id: I7a817d19cfadc46b1f35a4e42e5a6177c1910a4b
Reviewed-on: https://gerrit.libreoffice.org/75869
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-07-19 18:30:06 +02:00
Andreas Heinisch 60f7236293 tdf#125355 Beanshell Editor: Corrected indentation when Enter is pressed
Change-Id: Ife96256da02c4b21e2649040c53b7d16f236e3a0
Reviewed-on: https://gerrit.libreoffice.org/73371
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-07-09 09:51:59 +02:00
Julien Nabet 04fbd174cb cid#1448470: perf inefficient map iterator
Change-Id: If7dd6455ca02d6c78ac997bd9c2924863db1d906
Reviewed-on: https://gerrit.libreoffice.org/75059
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-07-03 22:54:07 +02:00
Andreas Heinisch d7f1ca8219 tdf#97635 Added unindentation using shift-tab (mimicked eclipse behavior)
Restored java 6 compatibility

Change-Id: I550920457874b9261bdde07040aad8f7b67773d8
Reviewed-on: https://gerrit.libreoffice.org/72671
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-21 12:39:43 +02:00
Andreas Heinisch 9ee0a1f166 tdf#97635 Added unindentation using shift-tab (mimicked eclipse's behavior)
Moved shift+tab check to the keyPressed function to provide continuous insertion
and compiled tab-pattern only once

Change-Id: Iffe847fea07295075dc1a280f0697e8c798e8d6f
Reviewed-on: https://gerrit.libreoffice.org/72580
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-20 15:44:41 +02:00
Andreas Heinisch e875a317c4 tdf#97635 Added unindentation using shift-tab (mimicked eclipse behavior)
Change-Id: Iaf64451c92f3465751032dde9c283141e548b3ca
Reviewed-on: https://gerrit.libreoffice.org/72228
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-16 11:32:06 +02:00
Caolán McNamara fbc038cc4f an uno -> a uno
Change-Id: I538db88f8477dd2d2ad25c372928fec6c11d979d
Reviewed-on: https://gerrit.libreoffice.org/72105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-05-10 14:50:59 +02:00
Samuel Mehrbrodt 3d54a104ae Beanshell: Display full exception message
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>
2019-03-27 12:45:19 +01:00
Samuel Mehrbrodt 3c72945de8 Beanshell: Wrap long error messages
Change-Id: I5e607f4b94733700810d37c289f6cc29492da5f2
Reviewed-on: https://gerrit.libreoffice.org/69798
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-03-27 12:37:17 +01:00
kushagrakasliwal1 60a3e721aa tdf#123586 Set minimum size for beanshell editor
Change-Id: I49e2ca387de5d520efdda0c964203c530fe016c4
Reviewed-on: https://gerrit.libreoffice.org/69394
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-03-27 10:05:21 +01:00
Sainal Shah f480c6cb7f tdf#123588 Beanshell editor to indicate whether script is saved
Beanshell to enable save button only upon modification of script.
Save button disables after script is successfully saved. Also, save
button will be disabled when there are no undoable changes.
ScriptEditorForBeanShell registers listener for unsaved changes.
PlainSourceView triggers listener calls upon modification of script or
after a successful save, which lets to enable/ disable the save button
accordingly.

Change-Id: I32a2fc473924a7c85cdd6004637ab6a0b60acf38
Reviewed-on: https://gerrit.libreoffice.org/69046
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-03-13 07:46:20 +01:00
EL-SHREIF ca8eef6be3 tdf#123589 Removing close button from toolbar in Beanshell editor
The Beanshell Editor has a "Close" button in the toolbar.This button can be removed as the window already has a close button.so i remove it from ScriptEditorForBeanShell.java easly .

Change-Id: Icf2e56f664df56a01a2cf1935700ebe1888a7156
Reviewed-on: https://gerrit.libreoffice.org/68273
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-02-24 07:59:08 +01:00
Samuel Mehrbrodt 9fe1eefe25 Fix product name
Change-Id: I35ac8f6ad54c7990bd5fb24dc0a30ebb8e1e8254
Reviewed-on: https://gerrit.libreoffice.org/67949
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-02-18 09:22:07 +01:00
Bartosz Kosiorek 9c0d40fbc7 Rename Mac OS X to official name macOS in comments and documentation
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95
Reviewed-on: https://gerrit.libreoffice.org/64102
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-11-29 14:08:26 +01:00
Stephan Bergmann 8b17679fca cid#1437407: create class loader in doPrivileged
Change-Id: Iade079e44c8d88a13830258157d9481f4b8b3358
Reviewed-on: https://gerrit.libreoffice.org/57013
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-07-05 21:58:34 +02:00
Stephan Bergmann 1b897f16e3 Restore binary compatibility for ClassLoaderFactory
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)

cae57d2e58 "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 68cd011c90 "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/55871
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-06-15 21:57:37 +02:00
dennisroczek e39c75b05c use https links for api.libreoffice.org and opengrok
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-04-02 22:25:53 +02:00
Andrea Gelmini 5c0af52feb Fix typos
Change-Id: I8d5a8251a01af7cdf9832d98d8a6573b907f8532
Reviewed-on: https://gerrit.libreoffice.org/48683
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-01-27 08:49:38 +01:00
Stephan Bergmann 59a63d8161 In Java, css.uno.RuntimeException doesn't derive from css.uno.Exception
Change-Id: I83850db6e3f3ac87d52e75f122ba2b6bba3905b9
2017-02-23 11:43:22 +01:00
nadith 71901bfedd tdf#98004 - Enhansment on Editor(Beanshell)
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-16 12:46:15 +00:00
Caolán McNamara cae57d2e58 ClassLoader->URLClassLoader
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-03 12:09:23 +00:00
Andrea Gelmini 0d4996862b Fix typos
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-10-01 20:05:49 +00:00
Caolán McNamara d02941ebdb Revert "coverity#1371372 Resource leak on an exceptional path"
seeing as it doesn't build universally, java 1.7 onwards
apparently

This reverts commit 6830d8c208.
2016-08-19 14:09:38 +01:00
Caolán McNamara 6830d8c208 coverity#1371372 Resource leak on an exceptional path
and

coverity#1371366 Resource leak on an exceptional path
coverity#1371376 Resource leak on an exceptional path

Change-Id: Ic0fd05f02b1d78a47d4ee924dee8f10811586d0d
2016-08-19 13:00:44 +01:00
Caolán McNamara 21b0cbfdc5 coverity#1371367 Resource leak on an exceptional path
Change-Id: I4da5f6d427e8132d62860b46cb4def88b8afb25d
2016-08-19 13:00:44 +01:00
Noel Grandin 5f42a268c3 remove unused imports in java code
Change-Id: I95041f49dd22ba9a15da3598b04a010eecf761a8
2016-06-06 14:28:41 +02:00
Caolán McNamara 49cdc1da76 coverity#1361587 Dereference null return value
and

coverity#1361588 Dereference null return value

Change-Id: Ia282c37e94d9d4131d18b3ccf6a8b7cb12c12344
2016-05-15 12:47:48 +01:00
Andrea Gelmini fc2590cfa1 Fix typos
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-04-30 15:06:45 +00:00
Noel Grandin b9d63d49be remove some unused Java code
found by UCDetector

Change-Id: Ic0295a24b26e206eb53eda2da540755477df86df
2016-03-14 13:44:39 +02:00
Douglas Mencken 60286229fa scripting: JDK 1.5 compatibility: don't use java.awt.Font.MONOSPACED
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-14 09:08:38 +00:00
Stephan Bergmann 4225092a35 cid#1326861,1326862: Eq: Problems with implementation of equals()
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-04 15:51:04 +01:00
Stephan Bergmann 305453d2c7 This ScriptEntry ctor is always called with empty languagedepprops
Change-Id: Ia8ddfecf2f809e9f0132ba59812446973532476c
2016-03-04 15:37:15 +01:00
Stephan Bergmann 8a4e256d67 Scripting.location is unused
Change-Id: Ia534b5aa579a678f8b0273e6c8c12a6ad335c67a
2016-03-04 15:34:45 +01:00
Stephan Bergmann 90033c542b ScriptEntry fields can be final
Change-Id: I7616641584b7ea8192cf3724d8b7d5b88af39da6
2016-03-04 15:31:38 +01:00
Stephan Bergmann 8e4c33799f Turn forwarding among ScriptEntry ctors around, dropping one
Change-Id: If3c86c7e5c4acaf4a3e48194e24c3c73e4e99499
2016-03-04 15:30:46 +01:00
Stephan Bergmann 9b70fdf5ed Remove unusd ScriptEntry ctor
Change-Id: I7109877e789659b87cbc16e9c5da39dcc8249e09
2016-03-04 15:29:19 +01:00
Stephan Bergmann 05dba6868e Forwarding-only ctor, can be private
Change-Id: I9ed2aa9c2bf2e17705dc711560154a9596c8264a
2016-03-04 15:26:03 +01:00
Stephan Bergmann 04b5ae6221 This ScriptEntry ctor is only needed by ctor of derived class ScriptMetaData
Change-Id: If3e6aae326aa53825edca9d5dc207d185d288cce
2016-03-04 15:23:38 +01:00
Stephan Bergmann 2e96766428 Remove unused ScriptEntry.setLogicalName
Change-Id: Iad58e4227433b766bbdce92a53c95aed48320f88
2016-03-04 15:20:45 +01:00
Stephan Bergmann cf6e5f5b6d Parcel.getByName apparently wants to return ScriptMetaData
Change-Id: I4a710384ec3a0d719f2ad1fbbe7b43b0be1fa1d9
2016-03-04 15:09:14 +01:00
Caolán McNamara 3029afd738 coverity#1354272 SS: Unread field should be static
Change-Id: Ie9480265be8053805cb48cefe189e65a47ce0908
2016-02-25 20:29:20 +00:00
Chirag Manwani 1b287f14b2 tdf#98004 Added toolbar to beanshell editor with undo/redo buttons
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-22 12:29:39 +00:00