[Libreoffice-commits] core.git: unotest/source
unotest/source/java/org/openoffice/test/UnoApiTest.java |2 --
1 file changed, 2 deletions(-)
New commits:
commit e653fbfbfa41ec46431b84e50ac6f054e8713601
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Mon Sep 29 09:32:05 2014 +0200
unotest: remove import from the same package
Change-Id: I00b0f5624f5b03d53ff01660ca96dc355238b10c
Reviewed-on: https://gerrit.libreoffice.org/11685
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/unotest/source/java/org/openoffice/test/UnoApiTest.java
b/unotest/source/java/org/openoffice/test/UnoApiTest.java
index 6f0e024..13e5a14 100644
--- a/unotest/source/java/org/openoffice/test/UnoApiTest.java
+++ b/unotest/source/java/org/openoffice/test/UnoApiTest.java
@@ -19,8 +19,6 @@
package org.openoffice.test;
import org.openoffice.Runner;
-import org.openoffice.test.OfficeConnection;
-import org.openoffice.test.Argument;
import static org.junit.Assert.*;
public final class UnoApiTest {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/qa
forms/qa/integration/forms/ListBox.java |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 16417688ef874e55f27daafe5ddb2293a39a9423 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Mon Sep 29 10:12:34 2014 +0200 forms: Pass array of length equal to the size of the collection Change-Id: Id880953105f6100b15cd78f48ce0c8dbcb7ffb8d Reviewed-on: https://gerrit.libreoffice.org/11687 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java index 1d12751..b4412a09 100644 --- a/forms/qa/integration/forms/ListBox.java +++ b/forms/qa/integration/forms/ListBox.java @@ -229,7 +229,9 @@ public class ListBox extends TestCase } // create the table taking all those foreign keys -m_database.createTable( new HsqlTableDescriptor( m_foreignKeyTableName, foreignKeyColumns.toArray( new HsqlColumnDescriptor[0] ) ) ); +m_database.createTable( new HsqlTableDescriptor( +m_foreignKeyTableName, +foreignKeyColumns.toArray( new HsqlColumnDescriptor[foreignKeyColumns.size()] ) ) ); // fill in some data foreignKeyInsertSQL.append( ) ); XPreparedStatement statement = connection.prepareStatement( foreignKeyInsertSQL.toString() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/qa
connectivity/qa/connectivity/tools/HsqlDatabase.java |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 89ea05d8547b12de1041e9b637690731daa42a62
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Mon Sep 29 10:19:28 2014 +0200
connectivity: Use chain of .append methods
Change-Id: I15604e97dc38f1fcfa62c3d86208e72a86dda23e
Reviewed-on: https://gerrit.libreoffice.org/11688
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java
b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 3e1395b..b5a7e21 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -116,8 +116,8 @@ public class HsqlDatabase extends AbstractDatabase
createStatement.append(, );
}
-createStatement.append(\ + columns[i].getName());
-createStatement.append(\ + columns[i].getTypeName());
+createStatement.append(\).append(columns[i].getName());
+createStatement.append(\ ).append(columns[i].getTypeName());
if (columns[i].isRequired())
{
@@ -150,7 +150,7 @@ public class HsqlDatabase extends AbstractDatabase
{
foreignKeyRefsForTable.append(, );
}
-foreignKeyRefsForTable.append(\ +
columns[i].getForeignColumn() + \);
+
foreignKeyRefsForTable.append(\).append(columns[i].getForeignColumn()).append(\);
foreignKeyRefs.put(foreignTable,
foreignKeyRefsForTable.toString());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/qa
forms/qa/integration/forms/DateValidator.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 72f50083e713bb4f25b6acc31ecad3ae7aa9050e
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Mon Sep 29 11:58:04 2014 +0200
forms: getMonth() and getYear() are deprecated in java.util.Date
Change-Id: I31664bbd8c1c3b02e8a7381226d4d558b37466a2
Reviewed-on: https://gerrit.libreoffice.org/11690
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/forms/qa/integration/forms/DateValidator.java
b/forms/qa/integration/forms/DateValidator.java
index 0264642..76cb6ca 100644
--- a/forms/qa/integration/forms/DateValidator.java
+++ b/forms/qa/integration/forms/DateValidator.java
@@ -72,12 +72,11 @@ public class DateValidator extends
integration.forms.ControlValidator
private boolean isNextMonthsDate( com.sun.star.util.Date dateValue )
{
-int overallMonth = dateValue.Year * 12 + dateValue.Month - 1;
-
-int todaysMonth = new java.util.Date().getMonth();
-int todaysYear = new java.util.Date().getYear() + 1900;
-int todaysOverallMonth = todaysYear * 12 + todaysMonth;
-
-return overallMonth == todaysOverallMonth;
+java.util.Calendar today = java.util.Calendar.getInstance();
+java.util.Calendar date = (java.util.Calendar) today.clone();
+today.set(java.util.Calendar.DATE, 1);
+date.set(dateValue.Year, dateValue.Month, 1);
+date.add(java.util.Calendar.MONTH, -1);
+return date.compareTo(today) == 0;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/qa
forms/qa/integration/forms/DateValidator.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bf7ddfdeb7a81c112c5c9c25c4819bc576e87859 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Mon Sep 29 14:51:24 2014 +0200 Fix java.util.Calendar.set in integration.forms.DateValidator Change-Id: I1bd87c623b923469c325ebfcba4ba82e2a648ae2 Reviewed-on: https://gerrit.libreoffice.org/11694 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/forms/qa/integration/forms/DateValidator.java b/forms/qa/integration/forms/DateValidator.java index 76cb6ca..055e779 100644 --- a/forms/qa/integration/forms/DateValidator.java +++ b/forms/qa/integration/forms/DateValidator.java @@ -75,7 +75,7 @@ public class DateValidator extends integration.forms.ControlValidator java.util.Calendar today = java.util.Calendar.getInstance(); java.util.Calendar date = (java.util.Calendar) today.clone(); today.set(java.util.Calendar.DATE, 1); -date.set(dateValue.Year, dateValue.Month, 1); +date.set(dateValue.Year, dateValue.Month -1, 1); // Month value is 0-based. e.g., 0 for January. date.add(java.util.Calendar.MONTH, -1); return date.compareTo(today) == 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/78/11478/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/11685/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/11593/11'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/11677/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11690/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/11685/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11690/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11690/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/78/11478/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/11593/12'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/11639/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/11477/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11690/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11690/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/11477/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/11668/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/11668/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11690/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/11677/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/11477/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11690/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/11639/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/73/11673/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/11639/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/73/11673/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/73/11673/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/11639/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/11643/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/73/11673/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/11476/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/11640/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/11476/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/11615/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/11640/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/11564/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/11593/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/70/11470/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/11615/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/11615/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/11615/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/11615/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/11593/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/11640/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/73/11673/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/11630/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/11593/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/57/11557/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/11593/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/57/11557/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/11643/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/94/11694/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/11564/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/11630/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11492/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11492/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/11615/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11492/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/11593/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11492/8'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/11593/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11492/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/11630/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11492/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11492/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/46/11546/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/11564/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/46/11546/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11492/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/46/11546/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/11688/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/11688/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/11582/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/11687/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/11547/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/11547/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/11687/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/11547/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/11702/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/11547/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/11547/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/11582/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/11547/8'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/11547/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/11547/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/JunitTest_juh.mk javaunohelper/test
javaunohelper/JunitTest_juh.mk |3
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 2376
+-
2 files changed, 1204 insertions(+), 1175 deletions(-)
New commits:
commit 2348f05b31f5fc6f4e60b128e9133c76e6df8ae3
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Sun Sep 28 00:37:19 2014 +0200
javaunohelper: migrate PropertySet_Test to JUnit
$ make JunitTest_juh
Change-Id: Ie6ed5070db01d8c183ddaae1852117667eae02f3
Reviewed-on: https://gerrit.libreoffice.org/11668
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
index 03a..fc289ca 100644
--- a/javaunohelper/JunitTest_juh.mk
+++ b/javaunohelper/JunitTest_juh.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,juh,\
javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \
+javaunohelper/com/sun/star/lib/uno/helper/PropertySet \
javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \
javaunohelper/com/sun/star/lib/uno/helper/WeakBase \
javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \
@@ -36,6 +37,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,juh,\
javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test
\
+javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider \
javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test \
))
@@ -45,6 +47,7 @@ $(eval $(call gb_JunitTest_add_classes,juh,\
com.sun.star.lib.uno.helper.ComponentBase_Test \
com.sun.star.lib.uno.helper.InterfaceContainer_Test \
com.sun.star.lib.uno.helper.MultiTypeInterfaceContainer_Test \
+com.sun.star.lib.uno.helper.PropertySet_Test \
com.sun.star.lib.uno.helper.WeakBase_Test \
))
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 88956b7..9ceb74d 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -38,1013 +38,1009 @@ import com.sun.star.beans.XPropertiesChangeListener;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Test;
+
public class PropertySet_Test
{
private static final Logger logger =
Logger.getLogger(PropertySet_Test.class.getName());
-public boolean convertPropertyValue()
+@Test public void convertPropertyValue() throws Exception
{
logger.log(Level.INFO, PropertySet.convertPropertyValue);
-boolean[] r= new boolean[50];
-int i= 0;
-
TestClass cl= new TestClass();
-try {
-r[i++]= cl.test_convertPropertyValue();
-}catch(java.lang.Exception e){
-i++;
-}
-boolean bOk= true;
-for (int c= 0; c i; c++)
-bOk= bOk r[c];
-logger.log(Level.INFO, bOk ? Ok : Failed);
-return bOk;
+cl.test_convertPropertyValue();
}
-public boolean setPropertyValueNoBroadcast()
+@Test public void setPropertyValueNoBroadcast() throws Exception
{
logger.log(Level.INFO, PropertySet.setValueNoBroadcast);
-boolean[] r= new boolean[50];
-int i= 0;
-
TestClass cl= new TestClass();
-try {
-r[i++]= cl.test_setPropertyValueNoBroadcast();
-}catch(java.lang.Exception e){
-i++;
-}
-boolean bOk= true;
-for (int c= 0; c i; c++)
-bOk= bOk r[c];
-logger.log(Level.INFO, bOk ? Ok : Failed);
-return bOk;
+cl.test_setPropertyValueNoBroadcast();
}
-public boolean setPropertyValue()
+@Test public void setPropertyValue() throws Exception
{
logger.log(Level.INFO, PropertySet.setPropertyValue);
-boolean[] r= new boolean[150];
-int i= 0;
-
TestClass cl= new TestClass();
+cl.resetPropertyMembers();
+Object value;
+Object ret;
+
+value= Boolean.TRUE;
+cl.setPropertyValue(PropBoolA, value);
+assertEquals((Boolean) cl.getPropertyValue(PropBoolA), value);
+
+value= new Character('A');
+cl.setPropertyValue(PropCharA,value
[Libreoffice-commits] core.git: ridljar/test
ridljar/test/com/sun/star/uno/Any_Test.java| 10 +++---
ridljar/test/com/sun/star/uno/UnoRuntime_Test.java |6 +++---
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit ffbdd805062b6587d17395e956f275e70a72a6c7
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Sun Sep 28 11:07:12 2014 +0200
ridljar: Any_Test UnoRuntime_Test (JUnit)
Modify exception test in Any_Test.
Replace assertTrue with AsserSame AssertNotSame for equality operator
in UnoRuntime_Test.
$ make JunitTest_ridljar_uno
Change-Id: I42a8380e7c4aed79af976165224c2af25c50fbce
Reviewed-on: https://gerrit.libreoffice.org/11673
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: David Ostrovsky da...@ostrovsky.org
diff --git a/ridljar/test/com/sun/star/uno/Any_Test.java
b/ridljar/test/com/sun/star/uno/Any_Test.java
index 9ecde9e..6dc3a15 100644
--- a/ridljar/test/com/sun/star/uno/Any_Test.java
+++ b/ridljar/test/com/sun/star/uno/Any_Test.java
@@ -18,18 +18,22 @@
package com.sun.star.uno;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.junit.Test;
import static org.junit.Assert.*;
public final class Any_Test {
+
+private static final Logger logger =
Logger.getLogger(Any_Test.class.getName());
+
@Test public void testAnyAny() {
-boolean caught = false;
try {
new Any(Type.ANY, null);
+fail(IllegalArgumentException expected);
} catch (IllegalArgumentException e) {
-caught = true;
+logger.log(Level.FINE, IllegalArgumentException caught);
}
-assertTrue(caught);
}
@Test public void testComplete() {
diff --git a/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java
b/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java
index e92422f..fb2afe8 100644
--- a/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java
+++ b/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java
@@ -111,9 +111,9 @@ public final class UnoRuntime_Test {
Object v1 = t1.context.getValueByName();
Object v2 = t2.context.getValueByName();
assertFalse(t1.context == t2.context);
-assertTrue(v1 == t1);
-assertTrue(v2 == t2);
-assertFalse(v1 == v2);
+assertSame(v1, t1);
+assertSame(v2, t2);
+assertNotSame(v1, v2);
}
private interface Ifc extends XInterface {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jurt/test
jurt/test/com/sun/star/uno/AnyConverter_Test.java | 46 ++
1 file changed, 31 insertions(+), 15 deletions(-)
New commits:
commit ab7ccd81340d693008411e088e85d9f3d61645a4
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Sun Sep 28 17:17:17 2014 +0200
jurt: remove constructor in AnyConverter_Test (JUnit)
Change-Id: I4393b59d7d3a285160d6090847d9a16676f41f4d
Reviewed-on: https://gerrit.libreoffice.org/11677
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: David Ostrovsky da...@ostrovsky.org
diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
index eb55ae1..eba78ace 100644
--- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
+++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
@@ -19,8 +19,9 @@
package com.sun.star.uno;
import com.sun.star.lang.XTypeProvider;
-import org.junit.Test;
import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
public final class AnyConverter_Test {
Any anyBool;
@@ -37,20 +38,35 @@ public final class AnyConverter_Test {
Any anyVoid;
Any anyXTypeProvider;
-Boolean aBool= Boolean.TRUE;
-Character aChar= new Character('A');
-Byte aByte= Byte.valueOf((byte) 111);
-Short aShort= Short.valueOf((short) 1);
-Integer aInt= Integer.valueOf( 111);
-Long aLong= Long.valueOf( 0x);
-Float aFloat= new Float( 3.14);
-Double aDouble= new Double( 3.145);
-Object aObj= new ATypeProvider();
-String aStr= I am a string;
-Type aType= new Type(String.class);
-byte[] arByte= new byte[] {1,2,3};
-
-public AnyConverter_Test() {
+Boolean aBool;
+Character aChar;
+Byte aByte;
+Short aShort;
+Integer aInt;
+Long aLong;
+Float aFloat;
+Double aDouble;
+Object aObj;
+String aStr;
+Type aType;
+byte[] arByte;
+
+/** Class variables are initialized before each Test method */
+@Before public void setUp() throws Exception
+{
+aBool= Boolean.TRUE;
+aChar= new Character('A');
+aByte= Byte.valueOf((byte) 111);
+aShort= Short.valueOf((short) 1);
+aInt= Integer.valueOf( 111);
+aLong= Long.valueOf( 0x);
+aFloat= new Float( 3.14);
+aDouble= new Double( 3.145);
+aObj= new ATypeProvider();
+aStr= I am a string;
+aType= new Type(String.class);
+arByte= new byte[] {1,2,3};
+
anyVoid= new Any(new Type(void.class), null);
anyBool= new Any(new Type(Boolean.TYPE), aBool);
anyChar= new Any(new Type(Character.TYPE), aChar);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/astyle.options
scripting/astyle.options |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a0f3b9f9549bff55129b8b8031788c6d60005777 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Thu Sep 25 19:35:48 2014 +0200 scripting: modify astyle.options Change-Id: I0e5fb63e2c632890e774b59e6808907067c87ce6 Reviewed-on: https://gerrit.libreoffice.org/11643 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/scripting/astyle.options b/scripting/astyle.options index 3a6ea94..e8b3388 100755 --- a/scripting/astyle.options +++ b/scripting/astyle.options @@ -8,8 +8,7 @@ --unpad-paren --align-reference=name --pad-oper ---unpad-paren ---add-brackets +--pad-header -s4 --indent-col1-comments --lineend=linux @@ -17,3 +16,4 @@ --suffix=none --preserve-date --formatted +--max-code-length=80 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/astyle-java.conf scripting/astyle.options scripting/Format_java_code.sh scripting/README
scripting/Format_java_code.sh |2 +- scripting/README |5 + scripting/astyle-java.conf| 19 --- scripting/astyle.options | 19 +++ 4 files changed, 25 insertions(+), 20 deletions(-) New commits: commit 09b13e1e4c6667b307fdd9608a02d2a792efd940 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Thu Sep 25 15:50:05 2014 +0200 scripting: astyle-java.conf - astyle.options Reviewed on: https://gerrit.libreoffice.org/11639 Change-Id: I0852f9766495379b0208e236b3cbeafde5bf07b3 diff --git a/scripting/Format_java_code.sh b/scripting/Format_java_code.sh index edf75d1..8fbffe8 100755 --- a/scripting/Format_java_code.sh +++ b/scripting/Format_java_code.sh @@ -1,2 +1,2 @@ #!/bin/bash -astyle --options=astyle-java.conf --verbose --recursive ./*.java +astyle --options=astyle.options --verbose --recursive ./*.java diff --git a/scripting/README b/scripting/README index f19fa3b..1ca4fe9 100644 --- a/scripting/README +++ b/scripting/README @@ -3,6 +3,11 @@ This module provides the source code for the Scripting Framework. For more information on the Scripting Framework, see the project web page: [http://framework.openoffice.org/scripting/] +This module uses astyle to keep consistent java coding style. Please run + +./Format_java_code.sh + +before committing. == Source Code Structure == diff --git a/scripting/astyle-java.conf b/scripting/astyle.options similarity index 100% rename from scripting/astyle-java.conf rename to scripting/astyle.options ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac external/libmariadb external/mysqlcppconn
configure.ac |1
external/libmariadb/UnpackedTarball_mariadb.mk|5 -
external/libmariadb/mariadb-CONC-104.patch.1 | 49 ++
external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |1
external/mysqlcppconn/patches/enable-libmysql-proxy.patch | 27 +++
5 files changed, 80 insertions(+), 3 deletions(-)
New commits:
commit 5c6d26753d758c2173f21a14283bdafa54063b63
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Wed Sep 17 18:05:43 2014 +0200
Fix for CONC-104: mysql_options doesn't support MYSQL_SECURE_AUTH option
http://bazaar.launchpad.net/~maria-captains/mariadb-native-client/trunk/revision/149
Change-Id: I273f355b9fc922fdb9d9692e0057cfccfdcbcde1
Reviewed-on: https://gerrit.libreoffice.org/11492
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/configure.ac b/configure.ac
index ee434df..f9c04e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8070,7 +8070,6 @@ if test $ENABLE_MARIADBC = TRUE; then
fi
else
AC_MSG_RESULT([internal])
-AC_MSG_ERROR([libmariadb is known to be incompatible as of 2014-09;
use libmysqlclient])
SYSTEM_MARIADB=
MARIADB_CFLAGS=-I${WORKDIR}/UnpackedTarball/mariadb/include
MARIADB_LIBS=-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib
diff --git a/external/libmariadb/UnpackedTarball_mariadb.mk
b/external/libmariadb/UnpackedTarball_mariadb.mk
index d3a315f..d03e2ee 100644
--- a/external/libmariadb/UnpackedTarball_mariadb.mk
+++ b/external/libmariadb/UnpackedTarball_mariadb.mk
@@ -28,8 +28,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
# non-static inline local_thr_alarm in libmariadb/net.c:
$(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
external/libmariadb/mariadb-swap.patch \
-external/libmariadb/mariadb-msvc.patch.1 \
- external/libmariadb/mariadb-inline.patch.1 \
+$(if $(filter MSC,$(COM)),external/libmariadb/mariadb-msvc.patch.1) \
+external/libmariadb/mariadb-inline.patch.1 \
+external/libmariadb/mariadb-CONC-104.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libmariadb/mariadb-CONC-104.patch.1
b/external/libmariadb/mariadb-CONC-104.patch.1
new file mode 100644
index 000..cba9fbb
--- /dev/null
+++ b/external/libmariadb/mariadb-CONC-104.patch.1
@@ -0,0 +1,49 @@
+--- mariadb/include/errmsg.h 2014-04-04 12:21:01.0 +0200
mariadb/include/errmsg.h 2014-09-17 17:47:25.0 +0200
+@@ -66,6 +66,7 @@
+ #define CR_PARAMS_NOT_BOUND 2031
+ #define CR_INVALID_PARAMETER_NO 2034
+ #define CR_UNSUPPORTED_PARAM_TYPE 2036
++#define CR_SECURE_AUTH 2049
+ #define CR_NO_DATA 2051
+ #define CR_NO_STMT_METADATA 2052
+ #define CR_NOT_IMPLEMENTED 2054
+--- mariadb/libmariadb/errmsg.c2014-04-04 12:21:01.0 +0200
mariadb/libmariadb/errmsg.c2014-09-17 17:48:44.0 +0200
+@@ -129,7 +129,7 @@
+ /* 2046 */ ,
+ /* 2047 */ ,
+ /* 2048 */ ,
+-/* 2049 */ ,
++/* 2049 */ Connection with old authentication protocol refused.,
+ /* 2050 */ ,
+ /* 2051 */ ,
+ /* 2052 */ Prepared statement contains no metadata,
+--- mariadb/libmariadb/libmariadb.c2014-04-04 12:21:01.0 +0200
mariadb/libmariadb/libmariadb.c2014-09-17 17:56:13.0 +0200
+@@ -1864,7 +1864,14 @@
+ scramble_plugin= native_password_plugin_name;
+ }
+ } else
++ {
+ mysql-server_capabilities= ~CLIENT_SECURE_CONNECTION;
++if (mysql-options.secure_auth)
++{
++ SET_CLIENT_ERROR(mysql, CR_SECURE_AUTH, unknown_sqlstate, 0);
++ goto error;
++}
++ }
+
+ /* Set character set */
+ if (mysql-options.charset_name)
+@@ -3031,7 +3038,9 @@
+ }
+ }
+ break;
+-
++ case MYSQL_SECURE_AUTH:
++mysql-options.secure_auth= *(my_bool *)arg1;
++break;
+ default:
+ va_end(ap);
+ DBUG_RETURN(-1);
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 9647c38..65f0f83 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -19,6 +19,7 @@ $(eval $(call
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
$(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
external/mysqlcppconn/patches/warnings.patch.0 \
+external/mysqlcppconn/patches/enable-libmysql-proxy.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/patches/enable-libmysql-proxy.patch
b/external/mysqlcppconn/patches/enable-libmysql-proxy.patch
new file mode 100644
index 000..6a5894c
--- /dev/null
+++ b/external/mysqlcppconn/patches/enable-libmysql-proxy.patch
@@ -0,0 +1,27 @@
+--- UnpackedTarball
[Libreoffice-commits] core.git: javaunohelper/JunitTest_juh.mk javaunohelper/test
javaunohelper/JunitTest_juh.mk |
2
javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java |
5
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java |
718 +++---
3 files changed, 249 insertions(+), 476 deletions(-)
New commits:
commit b39a778b5efa73936893a91b3223bb350bae1fb2
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Wed Sep 24 01:05:37 2014 +0200
javaunohelper: migrate InterfaceContainer_Test to JUnit
integrate InterfaceContainer_Test in juh tests
use java.util.logging in ComponentContext_Test
$ make JunitTest_juh
Change-Id: I92a855f8dea4bc893bb65e23e57ea4b12f59a31d
Reviewed-on: https://gerrit.libreoffice.org/11615
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
index 4bbd3f8..3ba2f4e 100644
--- a/javaunohelper/JunitTest_juh.mk
+++ b/javaunohelper/JunitTest_juh.mk
@@ -34,12 +34,14 @@ $(eval $(call gb_JunitTest_add_sourcefiles,juh,\
javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase \
javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \
+javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider \
))
$(eval $(call gb_JunitTest_add_classes,juh,\
com.sun.star.comp.helper.ComponentContext_Test \
com.sun.star.lib.uno.helper.ComponentBase_Test \
+com.sun.star.lib.uno.helper.InterfaceContainer_Test \
))
# vim:set noet sw=4 ts=4:
diff --git
a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
index 22ecab8..122ed2c 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
@@ -18,6 +18,8 @@
package com.sun.star.comp.helper;
import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiComponentFactory;
@@ -30,7 +32,10 @@ import org.junit.Test;
public class ComponentContext_Test {
+private static final Logger logger =
Logger.getLogger(ComponentContext_Test.class.getName());
+
@Test public void test() throws Exception {
+logger.log(Level.INFO, Testing ComponentContext);
HashMapString, Object table = new HashMapString, Object();
table.put(bla1, new ComponentContextEntry(null, Integer.valueOf(1)));
XComponentContext xInitialContext =
Bootstrap.createInitialComponentContext(table);
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
index e352314..c98ceab 100644
---
a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
+++
b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -26,9 +26,22 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import java.util.NoSuchElementException;
+
import java.util.logging.Level;
import java.util.logging.Logger;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
public class InterfaceContainer_Test
{
private static final Logger logger =
Logger.getLogger(InterfaceContainer_Test.class.getName());
@@ -47,26 +60,36 @@ public class InterfaceContainer_Test
//contains original object + proxies + null value
ListObject list3;
-public InterfaceContainer_Test()
+/** Class variables are initialized before each Test method */
+@Before public void setUp() throws Exception
{
obj1= new AWeakBase();
obj2= new AWeakBase();
obj3= new AWeakBase();
obj4= new AWeakBase();
+
proxyObj1Weak1= ProxyProvider.createProxy(obj1, XWeak.class);
proxyObj3Weak1= ProxyProvider.createProxy(obj3, XWeak.class);
proxyObj3Weak2= ProxyProvider.createProxy(obj3, XWeak.class);
+assertNotNull(proxyObj1Weak1);
+assertNotNull(proxyObj3Weak1);
+assertNotNull(proxyObj3Weak2);
+
proxyObj2TypeProv= ProxyProvider.createProxy(obj2,
XTypeProvider.class);
proxyObj3TypeProv= ProxyProvider.createProxy(obj3,
XTypeProvider.class);
+assertNotNull
[Libreoffice-commits] core.git: javaunohelper/JunitTest_juh.mk javaunohelper/test
javaunohelper/JunitTest_juh.mk
|4
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
|1
javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
| 167 +++---
javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
| 147 ++--
4 files changed, 100 insertions(+), 219 deletions(-)
New commits:
commit f6001fb30c516ec6da39b0ca4058f8b28058df1f
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Wed Sep 24 13:57:50 2014 +0200
javaunohelper: WeakBase_Test MultiTypeInterfaceContainer_Test - JUnit
Integrate WeakBase_Test and MultiTypeInterfaceContainer_Test in juh tests.
Remove unused import in InterfaceContainer_Test.
Remove getImplementationId() test in WeakBase_Test. Deprecated as of
the commit: 90b27c9493f4225e1612364b5813971b45b681a6
$ make JunitTest_juh
Change-Id: I1205c001e7f15bc5a28289051194fb225e114f13
Reviewed-on: https://gerrit.libreoffice.org/11630
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: David Ostrovsky da...@ostrovsky.org
diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
index 3ba2f4e..03a 100644
--- a/javaunohelper/JunitTest_juh.mk
+++ b/javaunohelper/JunitTest_juh.mk
@@ -35,13 +35,17 @@ $(eval $(call gb_JunitTest_add_sourcefiles,juh,\
javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase \
javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test \
+
javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test
\
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider \
+javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test \
))
$(eval $(call gb_JunitTest_add_classes,juh,\
com.sun.star.comp.helper.ComponentContext_Test \
com.sun.star.lib.uno.helper.ComponentBase_Test \
com.sun.star.lib.uno.helper.InterfaceContainer_Test \
+com.sun.star.lib.uno.helper.MultiTypeInterfaceContainer_Test \
+com.sun.star.lib.uno.helper.WeakBase_Test \
))
# vim:set noet sw=4 ts=4:
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
index c98ceab..7459fae 100644
---
a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
+++
b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -40,7 +40,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class InterfaceContainer_Test
{
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
index 6f805d5..c483a04 100644
---
a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
+++
b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
@@ -30,6 +30,12 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+
public class MultiTypeInterfaceContainer_Test
{
private static final Logger logger =
Logger.getLogger(MultiTypeInterfaceContainer_Test.class.getName());
@@ -47,8 +53,8 @@ public class MultiTypeInterfaceContainer_Test
//contains original object + proxies + null value
ListObject list3;
-/** Creates a new instance of MultiTypeInterfaceContainer_Test */
-public MultiTypeInterfaceContainer_Test()
+/** Class variables are initialized before each Test method */
+@Before public void setUp() throws Exception
{
obj1= new AWeakBase();
obj2= new AWeakBase();
@@ -58,17 +64,25 @@ public class MultiTypeInterfaceContainer_Test
proxyObj1Weak1= ProxyProvider.createProxy(obj1, XWeak.class);
proxyObj3Weak1= ProxyProvider.createProxy(obj3, XWeak.class);
proxyObj3Weak2= ProxyProvider.createProxy(obj3, XWeak.class);
+assertNotNull(proxyObj1Weak1);
+assertNotNull(proxyObj3Weak1);
+assertNotNull(proxyObj3Weak2);
+
proxyObj2TypeProv= ProxyProvider.createProxy(obj2,
XTypeProvider.class);
proxyObj3TypeProv= ProxyProvider.createProxy(obj3,
XTypeProvider.class);
+assertNotNull(proxyObj2TypeProv);
+assertNotNull(proxyObj3TypeProv);
list1= new ArrayListObject();
list1.add(obj1);
list1.add(obj2);
list1.add(obj3);
+
list2= new ArrayListObject
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/comp/helper/ComponentContext.java
|1 -
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
|2 +-
javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
|2 +-
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
|2 +-
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
|2 +-
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
|2 +-
6 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 6ee1a5438061712d05e5a8a6b9820e27c3ab21f6
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Mon Sep 22 11:14:39 2014 +0200
javaunohelper: Using final modifier whenever applicable in java
All classes that belongs to the com.sun.star.lib.uno.adapter package are
not part of the stable URE interface.
(cf. http://api.libreoffice.org/docs/java/ref/index.html), for that
reason those classes may be final.
Remove unused import in com.sun.star.comp.helper.ComponentContext class.
Change-Id: I68be8da4324f5163505e65365bf49a6a9cd00672
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 563c0a9..0326ffa 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -29,7 +29,6 @@ import com.sun.star.lang.XEventListener;
import com.sun.star.lang.EventObject;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index 4999463..b802520 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
This allows users to access an codeInputStream/code
as if it were an codeXInputStream/code.
*/
-public class InputStreamToXInputStreamAdapter implements XInputStream {
+public final class InputStreamToXInputStreamAdapter implements XInputStream {
/**
* Internal store to the InputStream
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
index 4991e86..954888c 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
@@ -27,7 +27,7 @@ import java.io.OutputStream;
object in a Java. This allows users to access an codeOutputStream/code
as if it were an codeXOutputStream/code.
*/
-public class OutputStreamToXOutputStreamAdapter implements XOutputStream {
+public final class OutputStreamToXOutputStreamAdapter implements XOutputStream
{
/**
* Internal handle to the OutputStream
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
index 1a96828..2d9652e 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
* an codeXInputStream/code as if it were an
* codeInputStream/code.
*/
-public class XInputStreamToInputStreamAdapter extends InputStream {
+public final class XInputStreamToInputStreamAdapter extends InputStream {
/**
* Internal handle to the XInputStream
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
index ad60793..9ebcb06 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
@@ -27,7 +27,7 @@ package com.sun.star.lib.uno.adapter;
import com.sun.star.io.*;
import com.sun.star.lib.uno.helper.ComponentBase;
-public class XOutputStreamToByteArrayAdapter
+public final class XOutputStreamToByteArrayAdapter
extends ComponentBase
implements XOutputStream
{
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
index ecfee86..478dfc4 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter
[Libreoffice-commits] core.git: javaunohelper/JunitTest_juh_ComponentContext.mk javaunohelper/JunitTest_juh.mk javaunohelper/Module_javaunohelper.mk javaunohelper/test
javaunohelper/JunitTest_juh.mk | 45 + javaunohelper/JunitTest_juh_ComponentContext.mk| 31 --- javaunohelper/Module_javaunohelper.mk |2 javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java | 84 +++--- 4 files changed, 74 insertions(+), 88 deletions(-) New commits: commit 2d8348d298185cad7d2b6aec40e8e44f95be1b7a Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Mon Sep 22 16:31:56 2014 +0200 javaunohelper: migrate ComponentBase_Test to JUnit Use -XX:MaxGCPauseMillis=50 in conjunction with Thread.sleep(51) to wait 51ms after a GC call, instead of waiting 10s. http://docs.oracle.com/javase/1.5.0/docs/guide/vm/gc-ergonomics.html $ make JunitTest_juh Change-Id: Id2cdada0e493fd450aab5dbec164502e0173857f Reviewed-on: https://gerrit.libreoffice.org/11593 Reviewed-by: David Ostrovsky david.ostrov...@gmx.de Tested-by: David Ostrovsky david.ostrov...@gmx.de diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk new file mode 100644 index 000..4bbd3f8 --- /dev/null +++ b/javaunohelper/JunitTest_juh.mk @@ -0,0 +1,45 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_JunitTest_JunitTest,juh)) + +$(eval $(call gb_JunitTest_set_defs,juh,\ +$$(DEFS) \ +-XX:MaxGCPauseMillis=50 \ +)) + +$(eval $(call gb_JunitTest_use_jars,juh,\ +ridl \ +jurt \ +)) + +$(eval $(call gb_JunitTest_use_jar_classset,juh,ridljar)) + +$(eval $(call gb_JunitTest_add_sourcefiles,juh,\ +javaunohelper/com/sun/star/comp/helper/Bootstrap \ +javaunohelper/com/sun/star/comp/helper/BootstrapException \ +javaunohelper/com/sun/star/comp/helper/ComponentContext \ +javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \ +javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \ +javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \ +javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \ +javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \ +javaunohelper/com/sun/star/lib/uno/helper/WeakBase \ +javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \ +javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase \ +javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \ +javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider \ +)) + +$(eval $(call gb_JunitTest_add_classes,juh,\ +com.sun.star.comp.helper.ComponentContext_Test \ +com.sun.star.lib.uno.helper.ComponentBase_Test \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/javaunohelper/JunitTest_juh_ComponentContext.mk b/javaunohelper/JunitTest_juh_ComponentContext.mk deleted file mode 100644 index 11355e3..000 --- a/javaunohelper/JunitTest_juh_ComponentContext.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_JunitTest_JunitTest,juh_ComponentContext)) - -$(eval $(call gb_JunitTest_use_jars,juh_ComponentContext,\ -ridl \ -jurt \ -)) - -$(eval $(call gb_JunitTest_use_jar_classset,juh_ComponentContext,ridljar)) - -$(eval $(call gb_JunitTest_add_sourcefiles,juh_ComponentContext,\ -javaunohelper/com/sun/star/comp/helper/Bootstrap \ -javaunohelper/com/sun/star/comp/helper/BootstrapException \ -javaunohelper/com/sun/star/comp/helper/ComponentContext \ -javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \ -javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \ -)) - -$(eval $(call gb_JunitTest_add_classes,juh_ComponentContext,\ -com.sun.star.comp.helper.ComponentContext_Test \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk index 8a2e653..daafeda 100644 --- a/javaunohelper/Module_javaunohelper.mk +++ b/javaunohelper/Module_javaunohelper.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,javaunohelper,\ )) $(eval $(call gb_Module_add_subsequentcheck_targets,javaunohelper,\ -JunitTest_juh_ComponentContext \ +JunitTest_juh \ )) ifneq ($(DISABLE_DYNLOADING),TRUE) diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java index 7bf0484..89ab9dd 100644 --- a/javaunohelper/test/com
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
|2 +-
javaunohelper/com/sun/star/lib/uno/helper/Factory.java
|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b9f187055394713fbc58d149c6ea98fe13dbadd5
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Fri Sep 19 11:39:54 2014 +0200
javaunohelper: Using final modifier whenever applicable in java
* com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter class may be
final. There is a overridable method call in the constructor.
* Private methods can't be overridden. The private method instantiate is
declared final in the com.sun.star.lib.uno.helper.Factory class.
Change-Id: I7dba78a3d1857bbc328f6a581d8e9a5ae130739d
Reviewed-on: https://gerrit.libreoffice.org/11546
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
index fd6553a..ecb1df6 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
@@ -28,7 +28,7 @@ import com.sun.star.io.XInputStream;
import com.sun.star.io.XSeekable;
import com.sun.star.lib.uno.helper.ComponentBase;
-public class ByteArrayToXInputStreamAdapter
+public final class ByteArrayToXInputStreamAdapter
extends ComponentBase
implements XInputStream, XSeekable
{
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
index f136561..19f6fc0 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
@@ -165,7 +165,7 @@ public class Factory
}
-private final Object instantiate( XComponentContext xContext )
+private Object instantiate( XComponentContext xContext )
throws com.sun.star.uno.Exception
{
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
