Commit Graph

201 Commits

Author SHA1 Message Date
3336a5071b rhbz#1192732: Revert "From the context of the code, this field should...
...not be static."  This reverts commit
6d4c1f0d4a623bf7f3b3a0af2ece5c969d5aec77.  Whatever made the author of that
commit think rhinoWindow shouldn't be static, it clearly needs to be, as in
edit()'s Runnable.run(), the usage of rhinoWindow at the end relies on
rhinoWindow being set via the

  new ScriptEditorForJavaScript(context, url)

call to initUI() (or else rhinoWindow already being set from a previous such
call if already editor != null).
2015-02-16 10:45:50 +01:00
3ab2d3a2c5 fdo#88256 fix crash when running javascript macro
caused by my commit 8583da1e934a49791ef8d86668f3d5c3c5dae1d7
"java: remove unused fields"

Change-Id: Ibcd6462e8229a0a6cb98ebfd16ce5d2ea45ca931
2015-01-13 10:38:48 +02:00
7d812b09b5 java: unused imports
Change-Id: I05824a6f19a5f3048a52101b96f6bf3d3099df08
Reviewed-on: https://gerrit.libreoffice.org/13403
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-12-10 08:03:50 +00:00
c199b76d88 java: remove some unused local variables
Change-Id: Ia01528460e2f4b610d123e29cad66520abc6a965
2014-12-05 11:15:57 +02:00
0063cf2856 java: make fields final where possible
found by PMD

Change-Id: I87780366119c141cd2dafe6ca1bf2d9798b10aec
2014-11-18 12:44:28 +02:00
2a0569b53d scripting: redundant cast to String
Change-Id: I5e048964cc7885a32c59ff8a9eb1fc5b9523e843
Reviewed-on: https://gerrit.libreoffice.org/11859
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-19 10:12:55 +00:00
93056481e8 java: when rethrowing exceptions, store the original
Change-Id: I8a2a264597d0b1ae06b08136fea36003682380b5
2014-10-17 08:26:22 +02:00
03c7c26cbe java: final fields that can be static
Change-Id: I8c06be7bc0b8a38c662209f0de72a00550e25447
2014-10-17 08:26:21 +02:00
12b01b920f java: no need to call String.valueOf to append to a String
Change-Id: I5ef45b971d24dde814ab8cbb2e9503d9da4f0d73
2014-10-17 08:26:19 +02:00
b2f69f6264 java: when rethrowing, store the original exception
Change-Id: I14666493e72da177fcfff1895ef3206f0e13cc01
2014-10-16 12:27:14 +02:00
791ed2c654 scripting: use new exception constructors
Change-Id: I7eeece85d4e462bf2df010ee29c062941a677759
Reviewed-on: https://gerrit.libreoffice.org/11966
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-14 12:28:37 +00:00
b862f6e923 scripting: Null pointer dereference
Change-Id: I0d72ef34945065f68e9af8b0957dc440a74c14ce
Reviewed-on: https://gerrit.libreoffice.org/11923
Reviewed-by: Matthew Francis <mjay.francis@gmail.com>
Tested-by: Matthew Francis <mjay.francis@gmail.com>
2014-10-13 17:18:54 +00:00
e41597eade scripting: line break (code formatting)
Change-Id: Ib1a8d7e4bdaad2f4eae822d9af280fd5b6f9dd7b
Reviewed-on: https://gerrit.libreoffice.org/11794
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-10-06 14:10:27 +00:00
4a0fc2fb02 scripting: organize imports
Change-Id: I26a1164d44f464a44ed7deb93ac39465feb0541c
Reviewed-on: https://gerrit.libreoffice.org/11768
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-03 05:25:06 +00:00
6f42a71439 scripting: Format_java_code.sh initial run
Conflicts:
	scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java

Change-Id: I09b94d8c96dfbaf498bd93a0088feb80a9e4afb6
2014-10-02 15:25:29 +02:00
27d5b5c6dd BRAND_BIN_SUBDIR -> BRAND_INI_DIR, to cater for new Mac OS X layout
Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b
2014-09-17 11:45:14 +02:00
31c379041c ScriptProvider implementations need to be accessible
...from com.sun.star.comp.loader.FactoryHelper.  Regression introduced with
70f56bc22fe952c75ec714e05e1bb5296491a36a "java: reduce scope, make member
classes private."

Change-Id: Iabf41a5eca2df25408e90428c60736b4a73db4c3
2014-09-16 12:57:50 +02:00
1ebbb8bceb scripting: Uncaught Exception
Change-Id: I949aa58416dbd80d87c9455009258f7bd2fd8520
Reviewed-on: https://gerrit.libreoffice.org/11439
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-09-14 06:45:26 +00:00
44304a8147 scripting: replace StringBuffer with StringBuilder method
In JDK 1.3, StringBuffer makes the String concatenations faster.

public String concat(String s1, String s2) {
  StringBuffer sb = new StringBuffer();
  sb.append(s1);
  sb.append(s2);
  return sb.toString();
}

JDK 1.5 comes with StringBuilder (which is faster than StringBuffer) and the method:

public String concat(String s1, String s2) {
  return s1 + s2;
}

is translated to:

public String concat(String s1, String s2) {
  return new StringBuilder().append(s1).append(s2).toString();
}

Change-Id: I2924fcdf23d7ffbb567d9e924d02edcab4d21be6
NOTE: StringBuffer is synchronized, StringBuilder is not.
Reviewed-on: https://gerrit.libreoffice.org/11436
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-09-14 06:33:05 +00:00
40f1849e0f scripting: encode(String) in URLEncoder has been deprecated
http://docs.oracle.com/javase/1.5.0/docs/api/java/net/URLEncoder.html

Change-Id: I9d9b40ecf0d76618376975c52e5d9f27ec4bae8e
Reviewed-on: https://gerrit.libreoffice.org/11438
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-13 23:18:14 +00:00
a28ad55a30 scripting: [deprecation] show() in Window has been deprecated
Change-Id: I1c157ebbfa0c307fd92c0a2d26e7d530be8ea9da
Reviewed-on: https://gerrit.libreoffice.org/11437
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-13 23:04:57 +00:00
8171113420 scripting: use a character literal
Change-Id: Iabd3514f3c64ff851463cb9b2c1c425164285eb5
Reviewed-on: https://gerrit.libreoffice.org/11430
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-09-13 15:05:45 +00:00
e41cc6898a scripting: Enhanced For-Loops
Change-Id: Ib5e59a8c153e7d788c14153fa3b94c8b2d0a068c
Reviewed-on: https://gerrit.libreoffice.org/11292
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-09-13 15:03:32 +00:00
3bb05281cb scripting: if...else if...else Statement
Change-Id: Ia60b352b4cb52d2712b2499550859ece699341d1
Reviewed-on: https://gerrit.libreoffice.org/11322
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-09-08 03:30:06 -05:00
1fba1feac4 scripting: the assigned value is never used
Change-Id: I61dcf285ecc6d0affdb949ca03d686f96601d884
Reviewed-on: https://gerrit.libreoffice.org/11319
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-09-08 03:29:11 -05:00
4464ada02f scripting: fix javadoc error: reference not found
Change-Id: Ife7bbd704211dd289b6066d541bd4ae0a1788ebf
Reviewed-on: https://gerrit.libreoffice.org/11307
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-09-06 15:49:09 -05:00
a795c3660b scripting: the if statement is redundant
Change-Id: I7e61d740d6f58afbcdad630deb0de0ef548efcfb
Reviewed-on: https://gerrit.libreoffice.org/11288
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-04 20:34:16 -05:00
652b807658 scripting: the assigned value is never used
Change-Id: I430da93e985291300ac5fdaccc7f907535771a07
Reviewed-on: https://gerrit.libreoffice.org/11287
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-04 20:31:50 -05:00
b1492e6af1 scripting: fix javadoc error: unknown tag: returns
Change-Id: Ib257ad76b2571755bdb744ad128ba1e558207eee
Reviewed-on: https://gerrit.libreoffice.org/11233
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-09-02 02:05:52 -05:00
8c9fdc4a96 java: remove modifiers implied by the context
found by PMD

Change-Id: I04cbf986ddbcffff987784f381b8a9f52f1b3f31
2014-08-20 11:45:28 +02:00
60f152caee java: avoid unnecessary comparisons in boolean expressions
i.e. stuff like "x == true"

Change-Id: Ib82a4a30e736df392405332fa197b588482cffcf
2014-08-20 10:35:53 +02:00
252ed1708a double-checked locking is not thread-safe in Java
found by PMD

Change-Id: Ibd4a9139c626932bec56c0b1dd32b4d59c8440b1
2014-08-20 10:35:51 +02:00
4b4bff3402 java: no need to instantiate String objects directly
Change-Id: I7610774c94bf673ed3b574ffce04c4ee6ca93c03
2014-08-19 14:57:18 +02:00
0c8c3a536b fix java1.5 build compatibility
accidentally introduced by me in commit 0477e6c3 "java: add
@Override annotation to overriding methods"

Change-Id: Ieccd78f57282778a5e8f805f7a40f5e6a24e9498
2014-08-19 10:21:22 +02:00
ac5954d7c5 java: remove commented out code
Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1
2014-08-14 10:59:48 +02:00
34bcf9b498 java: remove dead methods
found by UCDetector

Change-Id: I219caa8e680dba5a395541a778df6144841c4dde
2014-08-13 10:24:10 +02:00
8583da1e93 java: remove unused fields
found by UCDetector

Change-Id: I4a7c56a9918054c23469de5680658e7b501f0165
2014-08-13 08:49:24 +02:00
68cd011c90 java: reduce scope, make some methods private
found by UCDetector

Change-Id: Ib1425edde146193a65c242dc159b7e3fbf0e4a2e
2014-08-13 08:49:23 +02:00
70f56bc22f java: reduce scope, make member classes private
found by UCDetector

Change-Id: Ief32d078090102b14b60b35fc36542f8d4fb252b
2014-08-13 08:49:23 +02:00
da677dfd59 java: reduce scope, make fields private
found by UCDetector

Change-Id: I7f97e15667159cf8ee776e8f32fdcdec8ec00ed6
2014-08-13 08:49:22 +02:00
14d1a11ec4 java: reduce scope, make constructors private
found by UCDetector

Change-Id: If05277fd2fe77ceabb4c7c87aeb8569e3406102d
2014-08-13 08:49:22 +02:00
e701b3f732 java: reduce scope, make constants private
found by UCDetector

Change-Id: Ide9975e361ed17ac8cdcbe67ba74c563a9392d57
2014-08-12 12:16:37 +02:00
5656fe58a0 java: fix broken javadoc tags
Change-Id: I43d25ba49b758739ee8dc891b0db3e527004ec8b
2014-08-12 09:41:31 +02:00
0477e6c39b java: add @Override annotation to overriding methods
Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a
2014-08-12 09:41:28 +02:00
d5a31b2215 java: remove unused parameters
Change-Id: Ifc44c51ddbd21fabaad686bc3d38e2dab54d97aa
2014-08-11 12:33:02 +02:00
616b3ad504 java: remove exceptions from throws clauses that are not
.. actually thrown

Change-Id: Ia326ac7f82e11b948ed0f34e20908a96e7adcd10
2014-08-08 09:48:20 +02:00
b6a83e99c8 java: remove redundant null checks
Change-Id: Ia42e5ed715fbd3f5b84029a9844da55f307c6260
2014-08-08 09:48:19 +02:00
e7a474b29a java: remove unused variables
Change-Id: I1b04fbf4d4562ff8e74f6ccdb2fd989d79cc869b
2014-08-08 09:48:16 +02:00
0c5f51ebbc java: remove commented out code
Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36
2014-08-05 11:31:50 +02:00
d26540bb05 java: remove unused fields
Change-Id: I6c93864f501f646a8940eac221a88c87b3f75525
2014-08-05 11:31:50 +02:00