summaryrefslogtreecommitdiffstats
path: root/xmerge
Commit message (Collapse)AuthorAgeFilesLines
* java: when rethrowing exceptions, store the original causeNoel Grandin2014-09-252-12/+6
| | | | | | | so that we get a nice complete stacktrace when it hits the final handler Change-Id: Iec4fcc15a2a25c55f591b5e069dce3d010197a90
* xmerge: Convert a primitive type into a stringrbuj2014-09-111-1/+1
| | | | | | | | | Avoid unnecessary temporaries when converting primitive data types into a String. Change-Id: Ied91859e756ff392b1a0ea8d6d889afae11b2f8d Reviewed-on: https://gerrit.libreoffice.org/11366 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: use String.length()==0 instead of String.equals(empty string)rbuj2014-09-092-2/+2
| | | | | | | Change-Id: I41b64c2dccad41193e15b6be2e62ce9dd63e0c3a Reviewed-on: https://gerrit.libreoffice.org/11358 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
* xmerge: use a character literalrbuj2014-09-096-11/+11
| | | | | | | Change-Id: I99168faf1ad346f4e18495c15b5bad79fd16818f Reviewed-on: https://gerrit.libreoffice.org/11357 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
* xmerge: Integer & Boolean Parsingrbuj2014-09-084-22/+7
| | | | | | | Change-Id: I9553121a7faf10799c9d9a53336470cb2634c4ee Reviewed-on: https://gerrit.libreoffice.org/11329 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: javadoc maintenance and minor code formattingrbuj2014-09-0496-4521/+3496
| | | | | | | | | | | | | | | | | | | | | | | Javadoc: * Replaces <code>..</code> tags with {@code ..}. * Replaces HTML entities with {@literal ..} * Removes <p>..</p> tags in the first sentence. * Reduces code snippet spacing. * Adds tables. * Uses only one space after a comment delimiter. * Adjusts the margins. Minor code formating: * Removes some extra blank lines (very few). * Fixes some indentations (very few). * Adjusts the margins in some method headers (very few). Change-Id: I01bd9df58e4cb41bc3a38a2b2d3d7d2612081c32 Reviewed-on: https://gerrit.libreoffice.org/11202 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: replace package.html with package-info.javarbuj2014-09-0320-583/+502
| | | | | | | Change-Id: Ia11a2da8ffd9be6942e52b84937d3aa15a1ecb82 Reviewed-on: https://gerrit.libreoffice.org/11221 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: fix javadoc errors for JDK 8rbuj2014-08-309-70/+76
| | | | | | | Change-Id: Ic8352b7460c36155215d25339650ede40735e65d Reviewed-on: https://gerrit.libreoffice.org/11189 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* java: don't catch and then just rethrow an exceptionNoel Grandin2014-08-201-6/+0
| | | | | | without doing anything else useful Change-Id: I5803d84d46e0a70e1759f2202e2c2273087f8723
* java: remove modifiers implied by the contextNoel Grandin2014-08-2015-112/+102
| | | | | | found by PMD Change-Id: I04cbf986ddbcffff987784f381b8a9f52f1b3f31
* java: avoid unnecessary comparisons in boolean expressionsNoel Grandin2014-08-205-10/+10
| | | | | | i.e. stuff like "x == true" Change-Id: Ib82a4a30e736df392405332fa197b588482cffcf
* no need to instantiate an object to get it's classNoel Grandin2014-08-201-2/+1
| | | | Change-Id: I7b1f8d4621a3db9094bb61753218db3646c33e34
* xmerge: Convert a primitive type into a stringrbuj2014-08-203-7/+5
| | | | | | | | | Avoid unnecessary temporaries when converting primitive data types into a String. Change-Id: If361383be52d8258be7c8c9bddf3ba05d5ca92c1 Reviewed-on: https://gerrit.libreoffice.org/11026 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* java: no need to instantiate String objects directlyNoel Grandin2014-08-196-9/+9
| | | | Change-Id: I7610774c94bf673ed3b574ffce04c4ee6ca93c03
* java: use 'Integer.valueOf' instead of 'new Integer'Noel Grandin2014-08-196-9/+9
| | | | Change-Id: Ia8befb8d69914ce971174fc5f2ffc0e2f506a940
* java: classes in java.lang package do not need to be fully qualifiedNoel Grandin2014-08-193-7/+6
| | | | Change-Id: I7b18f62336c3a8ca4c538b30ce04c99f202a4756
* java: remove unused methodsNoel Grandin2014-08-191-32/+0
| | | | Change-Id: Ibb905e6f3e7d92a0e558f1f6562e5b472cd2717b
* java: remove unused importsNoel Grandin2014-08-143-9/+0
| | | | Change-Id: Ic60b30141fd1dc61acfb97b811aec680a2ab9c22
* remove dead java constantsNoel Grandin2014-08-131-70/+0
| | | | | | found by UCDetector Change-Id: I1f8f5ba4f3ab1a1ef134dd0988f913dab7501351
* java: remove dead methodsNoel Grandin2014-08-1319-580/+14
| | | | | | found by UCDetector Change-Id: I219caa8e680dba5a395541a778df6144841c4dde
* java: remove unused fieldsNoel Grandin2014-08-137-42/+21
| | | | | | found by UCDetector Change-Id: I4a7c56a9918054c23469de5680658e7b501f0165
* java: reduce scope, make some methods privateNoel Grandin2014-08-1315-26/+26
| | | | | | found by UCDetector Change-Id: Ib1425edde146193a65c242dc159b7e3fbf0e4a2e
* java: reduce scope, make member classes privateNoel Grandin2014-08-131-1/+1
| | | | | | found by UCDetector Change-Id: Ief32d078090102b14b60b35fc36542f8d4fb252b
* java: reduce scope, make fields privateNoel Grandin2014-08-137-24/+24
| | | | | | found by UCDetector Change-Id: I7f97e15667159cf8ee776e8f32fdcdec8ec00ed6
* java: reduce scope, make constructors privateNoel Grandin2014-08-132-2/+2
| | | | | | found by UCDetector Change-Id: If05277fd2fe77ceabb4c7c87aeb8569e3406102d
* java: reduce scope, make constants privateNoel Grandin2014-08-124-14/+14
| | | | | | found by UCDetector Change-Id: Ide9975e361ed17ac8cdcbe67ba74c563a9392d57
* java: add @Override annotation to overriding methodsNoel Grandin2014-08-1220-6/+46
| | | | Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a
* java: remove exceptions from throws clauses that are notNoel Grandin2014-08-082-20/+4
| | | | | | .. actually thrown Change-Id: Ia326ac7f82e11b948ed0f34e20908a96e7adcd10
* xmerge: Remove local variable name conflictrbuj2014-08-021-3/+3
| | | | | | | Change-Id: Id1708504934588c2e881bf249bc07bc61dc2c3c6 Reviewed-on: https://gerrit.libreoffice.org/10690 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* xmerge: Avoid a possible null pointer exceptionrbuj2014-08-022-23/+12
| | | | | | | Change-Id: Ib6ce07aef1ae27f4e5db376667617432de9f41ef Reviewed-on: https://gerrit.libreoffice.org/10686 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* xmerge: javadoc <code>..</code> fixrbuj2014-08-021-1/+1
| | | | | | | Change-Id: Ic918df2ed1e4faff770107d92a75e32b51a91ddf Reviewed-on: https://gerrit.libreoffice.org/10689 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* xmerge: The assigned value is never usedrbuj2014-08-021-2/+2
| | | | | | | Change-Id: I0476332d43138f3403b85d7ce14f4e27376adc0c Reviewed-on: https://gerrit.libreoffice.org/10688 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* xmerge: String comparisonrbuj2014-08-021-2/+2
| | | | | | | Change-Id: I9a99c188eb63a7854890da8e4088a4ce15a169e0 Reviewed-on: https://gerrit.libreoffice.org/10687 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* xmerge: Use J2SE 5.0 String.{replace|contains}rbuj2014-08-011-10/+9
| | | | | | | | | | | Replace "String.indexOf(String str)!=-1" with String.contains(String str) Use J2SE 5.0 String String.replace(CharSequence target, CharSequence replacement). Format code in needsMask function. Change-Id: I787a61c4c090f95fb3862390cc1198f7209163a3 Reviewed-on: https://gerrit.libreoffice.org/10659 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: simplify static final constructorsNoel Grandin2014-08-012-19/+7
| | | | Change-Id: I40f98c77c5f922fdce8242dac402feaf534da6bf
* xmerge: static non-final variable in the initializationrbuj2014-08-011-2/+2
| | | | | | | Change-Id: Ide7ea42e570100766ef4d97fc3c29c5a5028ce37 Reviewed-on: https://gerrit.libreoffice.org/10662 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: Remove local variable name conflictrbuj2014-08-015-10/+10
| | | | | | | Change-Id: Iab2fdc516f5074a6957bde3be7aec52e48cbdc4b Reviewed-on: https://gerrit.libreoffice.org/10663 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: If statement is redundantrbuj2014-08-012-11/+3
| | | | | | | Change-Id: I1d4000ae68d109ed01d4197a71f9175f79aa59f0 Reviewed-on: https://gerrit.libreoffice.org/10668 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: The assigned value is never usedrbuj2014-08-014-8/+7
| | | | | | | Change-Id: I1c9730d494546b01836c60f49861784a068ca1a0 Reviewed-on: https://gerrit.libreoffice.org/10660 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: String comparisonrbuj2014-08-011-1/+1
| | | | | | | Change-Id: Icda2e693c1e0177708c83af8048bc4e56c0db4ce Reviewed-on: https://gerrit.libreoffice.org/10665 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: Avoid java.util.ConcurrentModificationExceptionrbuj2014-07-311-8/+7
| | | | | | | | Fix removeByName function, which deletes elements of the list without an iterator. Move declarations inside the for loop in the removeByJar function, and delete the comment about removing list elements. Change-Id: I6a9ba82af2999703d1447c5c0bc5800ec4367b65
* remove commented out codeNoel Grandin2014-07-311-36/+16
| | | | | | and fix up some formatting Change-Id: I8d24c66901eeaf8a6c7aa5e797821c807edaf6ee
* xmerge: The assigned value is never usedrbuj2014-07-292-19/+10
| | | | | | | Change-Id: I56ee6583e0e5d82db018b40882a64b0dc00ec90f Reviewed-on: https://gerrit.libreoffice.org/10575 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
* xmerge: If statement is redundantrbuj2014-07-283-21/+9
| | | | | | | Change-Id: I62914ab65258de36790387b7a8865a32b0d7bca6 Reviewed-on: https://gerrit.libreoffice.org/10587 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* xmerge: Enhanced For-Loopsrbuj2014-07-286-39/+22
| | | | | | | Change-Id: Id9fbffbf74d7583bf1ac8239899abdf0c2347cf2 Reviewed-on: https://gerrit.libreoffice.org/10573 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* xmerge: If statement is redundantrbuj2014-07-282-18/+6
| | | | | | | Change-Id: Ic36d66e376f6fca536a25db4b3b69b50e2b95ae2 Reviewed-on: https://gerrit.libreoffice.org/10570 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: @Overriderbuj2014-07-285-0/+11
| | | | | | | Change-Id: I9be006d018335dcbfad5ccba5f55648ba24f609c Reviewed-on: https://gerrit.libreoffice.org/10577 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: javadoc <code>..</code> fixrbuj2014-07-282-2/+2
| | | | | | | Change-Id: I44b7014d01e481a69c514fc52ffb7e0bf09999e5 Reviewed-on: https://gerrit.libreoffice.org/10571 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: remove String constructor invocationrbuj2014-07-281-12/+8
| | | | | | | Change-Id: Ibd7a94c0f53be3b3a3e9ee764dbdeb6199857441 Reviewed-on: https://gerrit.libreoffice.org/10576 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
* xmerge: Unused assignmentrbuj2014-07-281-1/+1
| | | | | | | Change-Id: Ie059c6689976c0a52fedaa6fdee2dd36d944eb56 Reviewed-on: https://gerrit.libreoffice.org/10574 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>