Commit Graph
270 Commits
Author SHA1 Message Date
Samuel Mehrbrodt 35518c9236 Move all public Java classes to libreoffice.jar
This moves the classes from juh.jar and ridl.jar to libreoffice.jar

The goal is to have one single jar (and Java module, will be added later)
which developers can include to work with LO.

juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar
on its classpath to keep backwards compatibility.

This is a continuation of ae855bf481
and a preparation to have Java 9 module support.

Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-06 14:48:21 +02:00
Samuel MehrbrodtandStephan Bergmann ae855bf481 tdf#117331 Merge jurt and unoil into ridl
jurt.jar and unoil.jar are kept as effectively empty jars, each with a

  Class-Path: ridl.jar

in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or
without also loading ridl.jar) will still have access to their content.

Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi)
are not part of the URE, but are now made available by URE's ridl.jar.  This
should probably not cause problems in practice.

At least for now, we seal exactly those packages in ridl.jar that were
originally sealed in jurt.jar.  Ideally, all of ridl.jar could be sealed now,
but that would be mildly incompatible, as it would prevent 3rd-party code from
introducing additional UNOIDL entities in the relevant namespaces (even if that
is something we do not want 3rd-party code to do anyway).

However, some JunitTest_jurt_* define classes in those sealed packages.  In the
past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt.
Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the
gb_JunitTest_use_jar,*,ridl.  But the former only makes available the classes
that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the
UNOIDL entities specified via gb_Jar_add_packagedirs.  But the tests need the
udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests
get them explicitly.  (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use
gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets
leave that for a follow-up clean up.)

As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/.

Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a
Co-authored-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-04 22:03:54 +01:00
Andrea Gelmini 263e04b66d Fix typos
Change-Id: Ic472270afa13d2c96a4c7ccc185d183c3b7ade2c
Reviewed-on: https://gerrit.libreoffice.org/77277
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-12 10:50:55 +02:00
Samuel Thibault 4917430c1c tdf#116542 a11y: introduce STATIC role
This should be used for brief non-editable text which is not meant to have a
relation with another object (as opposed to text or label).

Change-Id: I46bfa56042a51295e9fa0d332babdbb40668ff0b
Reviewed-on: https://gerrit.libreoffice.org/58734
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-08-14 12:06:41 +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
Andrea Gelmini 73ded2398e Fix typos
Change-Id: Id1a19f2c8b44131773d4d5270a607c1907b16597
Reviewed-on: https://gerrit.libreoffice.org/48684
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-01-27 08:48:17 +01:00
Andrea Gelmini 4c0735830b Fix typos
Change-Id: Ieef0e3f21eb12cb5b72d39da4bc0a8c60dd0d5ce
Reviewed-on: https://gerrit.libreoffice.org/48545
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-25 08:52:34 +01:00
Andrea Gelmini 64a3124d92 Fix typos
Change-Id: Iaa9c0aea3ea1a239e378bd714ba335f91bb1faf3
Reviewed-on: https://gerrit.libreoffice.org/41194
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2017-08-17 21:53:28 +02:00
Andrea Gelmini f7eb8ae9d9 Fix typos
Change-Id: Ieea40e1b7282267157810f9f58ca083e68ae6715
Reviewed-on: https://gerrit.libreoffice.org/35659
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-03-25 12:57:18 +00:00
Noel Grandin d22f8bb626 fix compile error in SelectionDialog (java unit test)
I suspect that this code is not actually in use anymore

Change-Id: I1888c4beec9add7d82e321ad09e1116d1205fbca
2016-06-01 15:38:22 +02:00
Noel Grandin c47b170c71 Convert SelectionMode to scoped enum
Change-Id: I86c435de3918540cb54a0cb24568e58456c2f9d1
Reviewed-on: https://gerrit.libreoffice.org/25611
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-05-30 06:41:28 +00:00
Andrea Gelmini 64d624b651 Fix typos
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86
Reviewed-on: https://gerrit.libreoffice.org/21209
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-10 14:17:20 +00:00
Noel Grandin 3f50c6e050 java: remove ((unnecessary)) parentheses
Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195
2015-11-05 14:55:16 +02:00
Noel Grandin b73db446ac java: combine nested if statements
Change-Id: I0457b81668e9427a3c8d6a4af93438b7fb2bb7ba
2015-11-05 14:55:15 +02:00
Noel Grandin efd4bfa818 java:regulatize the order of 'final' and public/private
Make the order be 'public static' or 'private static'
Just makes the code nicer to read.

Change-Id: I182424bda45a2d68642e5d04c6091d268ace1fe2
Reviewed-on: https://gerrit.libreoffice.org/16202
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-06-11 09:34:00 +00:00
Noel Grandin 441407571e java:Non-synchronized method should not override a synchronized method
Change-Id: I46307828757ee1142747c14d2942515340083605
2015-06-09 13:10:43 +02:00
Andras Timar f62af191bf typo: strech -> stretch
Change-Id: I0de1cfaa0df460c7bc8e49752b31056f95c30053
Reviewed-on: https://gerrit.libreoffice.org/15628
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2015-05-05 07:25:21 +00:00
Noel Grandin 04cadb3191 java: remove some unused code
Change-Id: If1cdc67535b11d9309503b14ffad2aa3718661c6
2015-04-20 11:18:22 +02:00
Noel Grandin 822b4fdee7 java: unnecessary method overrides
these methods did nothing but call their super implementation.
found by CodePro

Change-Id: Iba40d10ca1db0b4a3b4b971cacc2f299c4d5f389
2015-01-05 10:15:25 +02:00
Noel Grandin 10039462df java: remove more dead code
found by looking for unused parameters (in Eclipse)

Change-Id: I03cf9bc8312e59747b2d0ac153ee2fc8d76be893
2015-01-05 09:59:03 +02:00
Noel Grandin 3c6d932fa8 java: was passing the wrong thing to the remove method
on a Map, we need to pass the key, not the value, to be deleted
Found by FindBugs.

Change-Id: If6fd3d8d56a7c7dfabac31d8ee268939e582f4eb
2015-01-05 09:56:12 +02:00
Noel Grandin 35f8d6afcc java: remove unnecessary reflection in toolkit tests
and delete a dead class

Change-Id: I7822ecff670d6036d0cf35f4b2d299b738f9061b
2015-01-05 08:23:30 +02:00
Noel Grandin 43cc8ad33e java: remove dead code
found by UCDetector

Change-Id: I6b0f49529379072da566e927b86815f173e7a90b
2015-01-05 08:23:29 +02:00
Noel Grandin 581d1e35f8 java: reduce visibility of some methods and fields
found by UCDetector

Change-Id: I0a0a00d1fae1fed2e6aef198b7a1482d7e7e29f0
2014-12-19 11:49:10 +02:00
Noel Grandin 0ae24c2189 java: fix access to always null field
this cannot have ever worked, but at least it'll stop bugging me now

Change-Id: Idd9738358d18770258ca0648afe4b9256458a4d6
2014-12-19 10:41:57 +02:00
Noel Grandin 52d8444858 java: synching on a global object is not very useful
when you're using it as a local lock

Change-Id: Ie7f42176f7b582c6dad426d9f8eb0a846a3519c2
2014-12-19 10:41:56 +02:00
Noel Grandin 41f4417ba4 java: dodgy synchronisation around clear
if we want to synchronize access to this datastructure, and we want
to use it as a lock object, creating a new one is not a good idea

Change-Id: I99c2f665242ef16611bc15a0690b8da222085efb
2014-12-19 10:41:55 +02:00
Noel Grandin 454ddddd99 java: remove some unused fields and variables
Change-Id: I5d6071096307adbe7df0178000346cf915afa3e7
Reviewed-on: https://gerrit.libreoffice.org/13477
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-12-15 12:36:40 +00:00
Noel Grandin 373affe59c java: remove some unnecessary interfaces
Change-Id: Ie2da7cbbd1733881ff2da6fa095c37c21cf19fe8
Reviewed-on: https://gerrit.libreoffice.org/13435
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-12-11 08:00:52 +00:00
Noel Grandin 7557f23b31 java: reduce visibility of fields and methods
found by PMD

Change-Id: Id6737916b68ccbdbdeec5d314747a38410923ac6
Reviewed-on: https://gerrit.libreoffice.org/13409
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2014-12-11 06:09:03 +00:00
Noel Grandin c199b76d88 java: remove some unused local variables
Change-Id: Ia01528460e2f4b610d123e29cad66520abc6a965
2014-12-05 11:15:57 +02:00
Noel Grandin 0063cf2856 java: make fields final where possible
found by PMD

Change-Id: I87780366119c141cd2dafe6ca1bf2d9798b10aec
2014-11-18 12:44:28 +02:00
Andrea Gelmini da40cac540 Fix common typos. No automatic tools. Handmade…
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959
Reviewed-on: https://gerrit.libreoffice.org/12164
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-12 11:04:11 +00:00
Noel Grandin bb437029c1 java: convert fields to local variables where possible
found by PMD

Change-Id: I05b45382b8fb1b734657ce9421a20e6ef6fbe542
Reviewed-on: https://gerrit.libreoffice.org/12376
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-12 11:03:29 +00:00
Noel Grandin 36ff1527c9 java: reduce excessive code indentation levels
by using early return in some methods

Change-Id: I3611c8c89b3a94ef7e1772d178acf065fd7fcdc7
Reviewed-on: https://gerrit.libreoffice.org/12374
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-12 08:01:55 +00:00
Noel Grandin cd3204559c fix spelling implemenation -> implementation
Change-Id: I5ac499df1f4063a80a5d41f60778106a7b96940d
2014-11-10 13:36:03 +02:00
Robert Antoni Buj i Gelonch 6412ebe5dd accessibility: shift by zero
Change-Id: I4e25b0a6929cc88aa2ec1d213b8f1115de6be607
Reviewed-on: https://gerrit.libreoffice.org/12146
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-30 08:58:03 +00:00
Robert Antoni Buj i Gelonch 5d8ecad569 java: Method uses the same code for two switch clauses
Change-Id: Ied82b0a39ff9dc9c7cc9539dec2b963059f3d4a5
Reviewed-on: https://gerrit.libreoffice.org/12139
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-30 08:57:28 +00:00
Noel Grandin 03c7c26cbe java: final fields that can be static
Change-Id: I8c06be7bc0b8a38c662209f0de72a00550e25447
2014-10-17 08:26:21 +02:00
Noel Grandin fa22664be2 java: always use braces for while loops
Change-Id: Iff896b0cace8b8305528b3b0140004ea856169ce
2014-10-16 08:15:52 +02:00
Noel Grandin 973eb2f6db java: reduce the depth of some deeply nested if blocks
Change-Id: I3c0c7f08d4d8ea594e72fc0d9b93d085d4ab4bf5
2014-10-16 08:15:48 +02:00
Robert Antoni Buj i Gelonch d0be30e8ee java: Collections.addAll for adding an array of elements to a Collection
Change-Id: I4689aa73e1e261c6461e04b9e814ffefa5817c09
Reviewed-on: https://gerrit.libreoffice.org/11953
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-13 15:18:56 +00:00
Robert Antoni Buj i Gelonch 3c27e31628 accessibility: ensure that the stream is cleaned up before the method returns
Change-Id: Ib46d24be831b5c9bda0582bd7064f34528e1d609
Reviewed-on: https://gerrit.libreoffice.org/11938
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-13 06:55:53 +00:00
Robert Antoni Buj i Gelonch 581234b213 accessibility: Calling String.toString()
Change-Id: I125d2c337df606c6388ddbd41030e51a558ad054
Reviewed-on: https://gerrit.libreoffice.org/11920
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-11 23:49:44 +00:00
Robert Antoni Buj i Gelonch d802b6d242 unchecked call to getDeclaredMethod(String,Class<?>...)
http://docs.oracle.com/javase/tutorial/reflect/class/classTrouble.html

Change-Id: I293e7ad3ace1a8876c34d7ffd070b49807a8b0a6
Reviewed-on: https://gerrit.libreoffice.org/11882
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-10 06:19:42 +00:00
Robert Antoni Buj i Gelonch 14cccfab81 As of JDK version 1.5, show() and hide() in Dialog have been deprecated
Change-Id: If96e40ebe2c59f31ca4e2b81c6583eb7f8d5ec81
Reviewed-on: https://gerrit.libreoffice.org/11873
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-09 11:37:52 +00:00
Noel Grandin fbf3aa391b spelling: instanciated -> instantiated
Change-Id: I99f3010e30f81786b938dc11736ea1597cd5530d
2014-10-08 11:02:55 +02:00
Noel Grandin 68fa141097 java: use isEmpty() instead of "size() == 0"
Change-Id: I23e1038246999b0744d8e9ae83b66fa1f7dafa99
2014-10-07 13:20:03 +02:00
Noel Grandin 04ace01ec5 java: remove unnecessary adding of empty strings
Change-Id: I3825ea5fb1eb34ca52659350e202f95abea945a9
2014-10-07 13:20:01 +02:00
Noel Grandin 610f3388c7 java: no need to check for null before calling instanceof
the instanceof check returns false when passed a null value

Change-Id: I7742d0d9cf25ef23d9adee7328f701c7efeea8b5
2014-10-07 13:20:00 +02:00