[Libreoffice-commits] core.git: scripting/java

2023-04-18 Thread Stephan Bergmann (via logerrit) 
 
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
 |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 4b3308a8c24d71c30145c93411fab12c0b5e
Author: Stephan Bergmann 
AuthorDate: Tue Apr 18 15:06:49 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 18 16:31:04 2023 +0200

Avoid NullPointerException

...when dispose is called without a preceding call to initialize (as would
happen with an improved CppunitTest_services)

Change-Id: Ic632d736ecb27509b092ef526cf0dfc964023663
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150576
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
 
b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index 078f63395384..dcef62d86077 100644
--- 
a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ 
b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -515,10 +515,12 @@ public class SecurityDialog extends WeakBase implements
 
 public void dispose() {
 
-XComponent xComponent =
-UnoRuntime.queryInterface(XComponent.class, _xDialog);
+if (_xDialog != null) {
+XComponent xComponent =
+UnoRuntime.queryInterface(XComponent.class, _xDialog);
 
-xComponent.dispose();
+xComponent.dispose();
+}
 }
 
 public void addEventListener(com.sun.star.lang.XEventListener xListener) {

[Libreoffice-commits] core.git: scripting/java

2023-03-20 Thread Damjan Jovanovic (via logerrit) 
 scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java |   12 
+++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit d0159892793860e53ddc068b4bdb707a521def19
Author: Damjan Jovanovic 
AuthorDate: Sun Oct 16 18:31:15 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Mar 20 14:43:13 2023 +

Fix some errors in the scripting module's XInputStreamImpl:

- Check the loop termination in readBytes() properly: currently it 
increments
totalBytesRead while also decrementing nBytesToRead, so when compared to
each other, the loop terminates when the buffer is half full. Only check
for nBytesToRead instead.
- Deal with the possibility of available() returning 0 in readSomeBytes().

Patch by: me

Cherry-picked from

https://github.com/apache/openoffice/commit/7e29bacc90c4b1b9788c3b71dfacd17daecde7a7
"Fix some errors in the scripting module's XInputStreamImpl:"

Change-Id: I951dc10565afa3519b0ddf98de559a7b585b1627
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149156
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git 
a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java 
b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
index 8320b6227cdb..3270d40d5bfb 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
@@ -41,11 +41,16 @@ public class XInputStreamImpl implements XInputStream {
 try {
 int bytesRead;
 
-while ((bytesRead = is.read(aData[ 0 ], totalBytesRead, 
nBytesToRead)) > 0
-   && (totalBytesRead < nBytesToRead)) {
+while (( nBytesToRead > 0 ) && (bytesRead = is.read(aData[ 0 ], 
totalBytesRead, nBytesToRead)) > 0) {
 totalBytesRead += bytesRead;
 nBytesToRead -= bytesRead;
 }
+if ( totalBytesRead < aData[ 0 ].length )
+{
+byte[] out = new byte[ totalBytesRead ];
+System.arraycopy( aData[ 0 ], 0, out, 0, totalBytesRead );
+aData[ 0 ] = out;
+}
 } catch (IOException e) {
 throw new com.sun.star.io.IOException(e);
 } catch (IndexOutOfBoundsException aie) {
@@ -62,7 +67,8 @@ public class XInputStreamImpl implements XInputStream {
 int bytesToRead = nMaxBytesToRead;
 int availableBytes = available();
 
-if (availableBytes < nMaxBytesToRead) {
+if (0 < availableBytes && availableBytes < nMaxBytesToRead)
+{
 bytesToRead = availableBytes;
 }

[Libreoffice-commits] core.git: scripting/java

2022-05-31 Thread Stephan Bergmann (via logerrit) 
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java  
   |4 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |   91 --
 2 files changed, 43 insertions(+), 52 deletions(-)

New commits:
commit 2a263cbdaf16c723a93af020ebc11b3e07210242
Author: Stephan Bergmann 
AuthorDate: Tue May 31 09:27:20 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 31 14:51:57 2022 +0200

tdf#145527 Revert "Related tdf#116767: Call URLClassLoader.close"

This reverts commit 418533f0af7cd303d559c8fb136c49e7e9fb0d79.  Turned out 
that
closing the given URLClassLoader once the script's main class has been 
loaded
prevents the script from loading further classes located next to that main
class.  So abandon the Coverity suggestion that such class loaders should be
closed promptly to avoid resource leaks.

Change-Id: I1bcf83117836cfe317eac9850d413f2c3767bd8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135158
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index 0974b8874110..b5e6e3085bd2 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -33,7 +33,7 @@ public class ClassLoaderFactory {
 
 private ClassLoaderFactory() {}
 
-public static URLClassLoader getURLClassLoader(ScriptMetaData scriptData) {
+public static ClassLoader getURLClassLoader(ScriptMetaData scriptData) {
 ClassLoader parent = scriptData.getClass().getClassLoader();
 URL[] classPath = scriptData.getClassPath();
 LogUtils.DEBUG("Classpath has length " + classPath.length);
@@ -45,7 +45,7 @@ public class ClassLoaderFactory {
 return getURLClassLoader(parent, classPath);
 }
 
-public static URLClassLoader getURLClassLoader(final ClassLoader parent,
+public static ClassLoader getURLClassLoader(final ClassLoader parent,
 final URL[] classpath) {
 return AccessController.doPrivileged(
 new PrivilegedAction() {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 63dc3169f759..eeea0d49ebe5 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -45,8 +45,6 @@ import com.sun.star.uno.Any;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.XComponentContext;
 
-import java.io.IOException;
-import java.net.URLClassLoader;
 import java.util.ArrayList;
 
 public class ScriptProviderForJava {
@@ -184,63 +182,56 @@ class ScriptImpl implements XScript {
 ScriptDescriptor scriptDesc =
 new ScriptDescriptor(metaData.getLanguageName());
 
+LogUtils.DEBUG("Classloader starting...");
+
+ClassLoader scriptLoader =
+ClassLoaderFactory.getURLClassLoader(metaData);
+
+LogUtils.DEBUG("Classloader finished...");
+
+ArrayList invocationArgList = new ArrayList();
 Object[] invocationArgs = null;
-ScriptProxy script = null;
 
-LogUtils.DEBUG("Classloader starting...");
+LogUtils.DEBUG("Parameter Mapping...");
 
-try (URLClassLoader scriptLoader = 
ClassLoaderFactory.getURLClassLoader(metaData)) {
-LogUtils.DEBUG("Classloader finished...");
+// Setup Context Object
+XScriptContext xSc =
+ScriptContext.createContext(m_xModel, m_xInvocContext,
+m_xContext, m_xMultiComponentFactory);
 
-ArrayList invocationArgList = new ArrayList();
+scriptDesc.addArgumentType(XScriptContext.class);
+invocationArgList.add(xSc);
 
-LogUtils.DEBUG("Parameter Mapping...");
+for (int i = 0; i < params.length; i++) {
+scriptDesc.addArgumentType(params[ i ].getClass());
+invocationArgList.add(params[ i ]);
+}
 
-// Setup Context Object
-XScriptContext xSc =
-ScriptContext.createContext(m_xModel, m_xInvocContext,
-m_xContext, 
m_xMultiComponentFactory);
+if (!invocationArgList.isEmpty()) {
+invocationArgs = invocationArgList.toArray();
+}
 
-scriptDesc.addArgumentType(XScriptContext.class);
-invocationArgList.add(xSc);
+LogUtils.DEBUG("ScriptProxy starting... ");
+ScriptProxy script = null;
 
-for (int i = 0; i < params.length; i++) {
-scriptDesc.addArgumentType(params[ i

[Libreoffice-commits] core.git: scripting/java

2021-03-31 Thread Stephan Bergmann (via logerrit) 
 scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java | 
 101 --
 1 file changed, 7 insertions(+), 94 deletions(-)

New commits:
commit 5707ec3303f8215af91aac7d7f7cc29bf67b6c99
Author: Stephan Bergmann 
AuthorDate: Wed Mar 31 16:30:23 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Mar 31 22:13:08 2021 +0200

Use javax.xml.transform instead of reflection to write a Document

At least on Fedora 34 when building with 
--with-jdk-home=/usr/lib/jvm/java-16
against java-latest-openjdk-headless-16.0.0.0.36-1.rolling.fc34.x86_64,
CustomTarget_odk/build-examples_java failed with

> ERROR: Exception occurred: An error occurred while enabling: SayHello 
.../desktop/source/deployment/registry/dp_backend.cxx:645
>
> ERROR: unopkg failed.
>
> make[2]: *** [Makefile:92: 
.../workdir/CustomTarget/odk/build-examples_java/out/sdk/LINUXexample.out/misc/ScriptingFramework/SayHello/devguide_scriptingframework_SayHello_register_scriptpkg.flag]
 Error 1

because of

> info:bridges:1209707:1209707:bridges/source/jni_uno/jni_uno2java.cxx:117: 
exception occurred uno->java: [com.sun.star.lang.WrappedTargetException] 
java.io.IOException
> java stack trace:
> com.sun.star.lang.WrappedTargetException: java.io.IOException
> at 
com.sun.star.script.framework.container.UnoPkgContainer.writeUnoPackageDB(UnoPkgContainer.java:279)
> at 
com.sun.star.script.framework.container.UnoPkgContainer.processUnoPackage(UnoPkgContainer.java:330)
> at 
com.sun.star.script.framework.provider.ScriptProvider.insertByName(ScriptProvider.java:563)
> Caused by: java.io.IOException
> at 
com.sun.star.script.framework.container.XMLParserFactory$DefaultParser.write(XMLParserFactory.java:190)
> at 
com.sun.star.script.framework.container.DeployedUnoPackagesDB.write(DeployedUnoPackagesDB.java:107)
> at 
com.sun.star.script.framework.container.UnoPkgContainer.writeUnoPackageDB(UnoPkgContainer.java:270)
> ... 2 more
> Caused by: java.lang.IllegalAccessException: class 
com.sun.star.script.framework.container.XMLParserFactory$DefaultParser cannot 
access class com.sun.org.apache.xml.internal.serialize.XMLSerializer (in module 
java.xml) because module java.xml does not export 
com.sun.org.apache.xml.internal.serialize to unnamed module @50860e85
> at 
java.base/jdk.internal.reflect.Reflection.newIllegalAccessException(Reflection.java:385)
> at 
java.base/java.lang.reflect.AccessibleObject.checkAccess(AccessibleObject.java:687)
> at 
java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:489)
> at 
java.base/java.lang.reflect.ReflectAccess.newInstance(ReflectAccess.java:128)
> at 
java.base/jdk.internal.reflect.ReflectionFactory.newInstance(ReflectionFactory.java:350)
> at java.base/java.lang.Class.newInstance(Class.java:642)
> at 
com.sun.star.script.framework.container.XMLParserFactory$DefaultParser.write(XMLParserFactory.java:145)
> ... 4 more

The javax.xml.transform functionality appears to be available since Java 
1.4, so
it should not be a problem if we unconditionally use it.

Change-Id: Idc31f8f6fb092b6603c537414497d24aec886ce7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113421
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java 
b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
index c34908f8c773..02c9e6c34244 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
@@ -22,11 +22,13 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import java.lang.reflect.Method;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 import org.w3c.dom.Document;
 
@@ -91,99 +93,10 @@ public class XMLParserFactory {
 }
 
 public void write(Document doc, OutputStream out) throws IOException {
-
-Class clazz = doc.getClass();
-String name = clazz.getName();
-
-// depending on the class of the Document object use introspection
-// to invoke the appropriate methods for writing the XML
-// this code is based on the code used by the NetBeans
-// class XMLUtilImpl in the openide module
 try {
-if (name.equals("com.sun.xml.tree.XmlDocument") ||
-

[Libreoffice-commits] core.git: scripting/java

2020-08-31 Thread Andrea Gelmini (via logerrit) 
 scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
 |2 +-
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
   |2 +-
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f10a4e20100515f1fc95b3254ac52894ec59bdda
Author: Andrea Gelmini 
AuthorDate: Fri Aug 28 11:59:42 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 31 16:07:31 2020 +0200

Fix typos in code

It passed "make check" on Linux

Change-Id: Id7c7ac1b88d290ed71f03fa28dec144bcd29b692
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101590
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
index dbcb3b0bc7a9..395a1b6a8abb 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
@@ -43,7 +43,7 @@ public abstract class ScriptEditor {
 this.context = context;
 }
 
-public boolean isMacroExectionEnabled() {
+public boolean isMacroExecutionEnabled() {
 XNameAccess xNameAccess = null;
 try {
 String sAccess = "com.sun.star.configuration.ConfigurationAccess";
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 31c26dc51334..2a972df92ff6 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -170,7 +170,7 @@ public class ScriptEditorForBeanShell extends ScriptEditor 
implements ActionList
  *
  */
 public Object execute() throws Exception {
-if (!isMacroExectionEnabled()) {
+if (!isMacroExecutionEnabled()) {
 showErrorMessage("Macro Execution has been disabled.");
 return null;
 }
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index 4cf5cc3384ca..8bb0828aff03 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -196,7 +196,7 @@ public class ScriptEditorForJavaScript extends ScriptEditor 
{
 private ScriptEditorForJavaScript(XScriptContext context, URL url) {
 setContext(context);
 // Need to check that before showing the window. Checking in execute() 
has no effect.
-if (!isMacroExectionEnabled()) {
+if (!isMacroExecutionEnabled()) {
 showErrorMessage("Macro Execution has been disabled.");
 return ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java scripting/source sc/source sd/source sfx2/source

2020-08-19 Thread Andrea Gelmini (via logerrit) 
 sc/source/filter/excel/xehelper.cxx |  
  2 +-
 sc/source/filter/excel/xihelper.cxx |  
  4 ++--
 sc/source/filter/oox/pagesettings.cxx   |  
  2 +-
 sc/source/filter/oox/pivottablebuffer.cxx   |  
  2 +-
 sc/source/ui/unoobj/celllistsource.hxx  |  
  2 +-
 sc/source/ui/unoobj/styleuno.cxx|  
  2 +-
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java |  
  2 +-
 scripting/source/basprov/basprov.cxx|  
  1 -
 sd/source/filter/eppt/pptx-text.cxx |  
  2 +-
 sfx2/source/view/viewfrm.cxx|  
  2 +-
 10 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit dd2b3210127b57ccb1953403a075783faf8c0ae0
Author: Andrea Gelmini 
AuthorDate: Wed Aug 19 13:05:24 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Wed Aug 19 15:37:24 2020 +0200

Fix typos

Change-Id: Ibe3cd52117f7f47e1806bde76114cb1644d78763
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100969
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/sc/source/filter/excel/xehelper.cxx 
b/sc/source/filter/excel/xehelper.cxx
index 9bb3d905f1e3..532e9187f289 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -1027,7 +1027,7 @@ void XclExpCachedMatrix::Save( XclExpStream& rStrm ) const
 // in BIFF2-BIFF7: 256 columns represented by 0 columns
 rStrm << static_cast< sal_uInt8 >( nCols ) << static_cast< sal_uInt16 
>( nRows );
 else
-// in BIFF8: columns and rows decreaed by 1
+// in BIFF8: columns and rows decreased by 1
 rStrm << static_cast< sal_uInt8 >( nCols - 1 ) << static_cast< 
sal_uInt16 >( nRows - 1 );
 
 for( SCSIZE nRow = 0; nRow < nRows; ++nRow )
diff --git a/sc/source/filter/excel/xihelper.cxx 
b/sc/source/filter/excel/xihelper.cxx
index 8e1c6aecd196..29bc604c7e25 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -375,7 +375,7 @@ void XclImpHFConverter::ParseString( const OUString& 
rHFString )
 mxFontData->mnEscapem = (mxFontData->mnEscapem == 
EXC_FONTESC_SUPER) ?
 EXC_FONTESC_NONE : EXC_FONTESC_SUPER;
 break;
-case 'Y':   // subsrcipt
+case 'Y':   // subscript
 SetAttribs();
 mxFontData->mnEscapem = (mxFontData->mnEscapem == 
EXC_FONTESC_SUB) ?
 EXC_FONTESC_NONE : EXC_FONTESC_SUB;
@@ -828,7 +828,7 @@ XclImpCachedMatrix::XclImpCachedMatrix( XclImpStream& rStrm 
) :
 }
 else
 {
-// in BIFF8: columns and rows decreaed by 1
+// in BIFF8: columns and rows decreased by 1
 ++mnScCols;
 ++mnScRows;
 }
diff --git a/sc/source/filter/oox/pagesettings.cxx 
b/sc/source/filter/oox/pagesettings.cxx
index 8965d78974b7..e47fee274329 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -623,7 +623,7 @@ double HeaderFooterParser::parse( const 
Reference&
 setAttributes();
 maFontModel.mnEscapement = (maFontModel.mnEscapement 
== XML_superscript) ? XML_baseline : XML_superscript;
 break;
-case 'Y':   // subsrcipt
+case 'Y':   // subscript
 setAttributes();
 maFontModel.mnEscapement = (maFontModel.mnEscapement 
== XML_subscript) ? XML_baseline : XML_subscript;
 break;
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx 
b/sc/source/filter/oox/pivottablebuffer.cxx
index 2717fff2a610..6469f8da70be 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -378,7 +378,7 @@ void PivotTableField::importPTReferenceItem( 
SequenceInputStream& rStrm )
 void PivotTableField::finalizeImport( const Reference< XDataPilotDescriptor >& 
rxDPDesc )
 {
 /*  Process all fields based on source data, other fields (e.g. group
-fields) are processed from here. PivotCacahe::getDatabaseIndex()
+fields) are processed from here. PivotCache::getCacheDatabaseIndex()
 returns -1 for all fields not based on source data. */
 Reference< XDataPilotField > xDPField;
 sal_Int32 nDatabaseIdx = mrPivotTable.getCacheDatabaseIndex( mnFieldIndex 
);
diff --git a/sc/source/ui/unoobj/celllistsource.hxx 
b/sc/source/ui/unoobj/celllistsource.hxx
index 7a09e42cc9db..b665d2cdb767 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -130,7 +130,7 @@ namespace

[Libreoffice-commits] core.git: scripting/java

2019-11-08 Thread Samuel Mehrbrodt (via logerrit) 
 scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
 |   61 +-
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
   |   46 ---
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 |8 +
 3 files changed, 64 insertions(+), 51 deletions(-)

New commits:
commit 1c42afc194da2288c5a738b727952e80c323885c
Author: Samuel Mehrbrodt 
AuthorDate: Fri Nov 8 12:37:11 2019 +0100
Commit: Serge Krot (CIB) 
CommitDate: Fri Nov 8 14:23:26 2019 +0100

Respect DisableMacrosExecution option in javascript editor

Change-Id: I44c2d3a706a99839369bd4aff2abbb675e430926
Reviewed-on: https://gerrit.libreoffice.org/82286
Tested-by: Jenkins
Reviewed-by: Serge Krot (CIB) 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
index 32ebd2fefb41..dbcb3b0bc7a9 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
@@ -18,13 +18,62 @@
 
 package com.sun.star.script.framework.provider;
 
+import com.sun.star.beans.NamedValue;
+import com.sun.star.configuration.theDefaultProvider;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.script.framework.container.ScriptMetaData;
 import com.sun.star.script.provider.XScriptContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
 
-public interface ScriptEditor {
-Object execute() throws Exception;
-void indicateErrorLine(int lineNum);
-void edit(XScriptContext context, ScriptMetaData entry);
-String getTemplate();
-String getExtension();
+import javax.swing.JOptionPane;
+import javax.swing.JDialog;
+
+public abstract class ScriptEditor {
+public XScriptContext context;
+
+public abstract Object execute() throws Exception;
+public abstract void indicateErrorLine(int lineNum);
+public abstract void edit(XScriptContext context, ScriptMetaData entry);
+public abstract String getTemplate();
+public abstract String getExtension();
+
+public void setContext(XScriptContext context) {
+this.context = context;
+}
+
+public boolean isMacroExectionEnabled() {
+XNameAccess xNameAccess = null;
+try {
+String sAccess = "com.sun.star.configuration.ConfigurationAccess";
+XMultiServiceFactory xMSFCfg = 
theDefaultProvider.get(context.getComponentContext());
+Object oAccess = xMSFCfg.createInstanceWithArguments(sAccess,
+new Object[] { new NamedValue("nodepath", 
"org.openoffice.Office.Common/Security/Scripting") });
+xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, 
oAccess);
+Object result = xNameAccess.getByName("DisableMacrosExecution");
+boolean bMacrosDisabled = AnyConverter.toBoolean(result);
+if (bMacrosDisabled)
+return false;
+} catch (com.sun.star.uno.Exception e) {
+return false;
+}
+return true;
+}
+
+// Wraps long error messages
+private static class NarrowOptionPane extends JOptionPane {
+private static final long serialVersionUID = 1L;
+public int getMaxCharactersPerLineCount() {
+return 100;
+}
+}
+
+public void showErrorMessage(String message) {
+JOptionPane optionPane = new NarrowOptionPane();
+optionPane.setMessage(message);
+optionPane.setMessageType(JOptionPane.ERROR_MESSAGE);
+JDialog dialog = optionPane.createDialog(null, "Error");
+dialog.setVisible(true);
+}
 }
\ No newline at end of file
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 5c12bc775786..31c26dc51334 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -17,17 +17,11 @@
  */
 package com.sun.star.script.framework.provider.beanshell;
 
-import com.sun.star.beans.NamedValue;
-import com.sun.star.configuration.theDefaultProvider;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.script.framework.container.ScriptMetaData;
 import com.sun.star.script.framework.provider.ClassLoaderFactory;
 import com.sun.star.script.framework.provider.ScriptEditor;
 import com.sun.star.script.framework.provider.SwingInvocation;
 import com.sun.star.script.provider.XScriptContext;
-import com.sun.star.uno.AnyConverter;
-import

[Libreoffice-commits] core.git: scripting/java

2019-11-08 Thread Samuel Mehrbrodt (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |   29 ++
 1 file changed, 29 insertions(+)

New commits:
commit 83579e8018bf998552394cfe1e4d57f023e07382
Author: Samuel Mehrbrodt 
AuthorDate: Fri Nov 8 09:32:36 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Fri Nov 8 11:27:07 2019 +0100

Respect DisableMacrosExecution option in beanshell editor

Change-Id: I0713b3d1ab45519aef25b5bd3d912baf2252d37b
Reviewed-on: https://gerrit.libreoffice.org/82262
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 36b9bf9839ff..5c12bc775786 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -17,11 +17,17 @@
  */
 package com.sun.star.script.framework.provider.beanshell;
 
+import com.sun.star.beans.NamedValue;
+import com.sun.star.configuration.theDefaultProvider;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.script.framework.container.ScriptMetaData;
 import com.sun.star.script.framework.provider.ClassLoaderFactory;
 import com.sun.star.script.framework.provider.ScriptEditor;
 import com.sun.star.script.framework.provider.SwingInvocation;
 import com.sun.star.script.provider.XScriptContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
@@ -172,10 +178,33 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
  *
  */
 public Object execute() throws Exception {
+if (!isMacroExectionEnabled()) {
+showErrorMessage("Macro Execution has been disabled.");
+return null;
+}
+
 frame.toFront();
 return model.execute(context, cl);
 }
 
+private boolean isMacroExectionEnabled() {
+XNameAccess xNameAccess = null;
+try {
+String sAccess = "com.sun.star.configuration.ConfigurationAccess";
+XMultiServiceFactory xMSFCfg = 
theDefaultProvider.get(context.getComponentContext());
+Object oAccess = xMSFCfg.createInstanceWithArguments(sAccess,
+new Object[] { new NamedValue("nodepath", 
"org.openoffice.Office.Common/Security/Scripting") });
+xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, 
oAccess);
+Object result = xNameAccess.getByName("DisableMacrosExecution");
+boolean bMacrosDisabled = AnyConverter.toBoolean(result);
+if (bMacrosDisabled)
+return false;
+} catch (com.sun.star.uno.Exception e) {
+return false;
+}
+return true;
+}
+
 /**
  *  Opens an editor window for the specified ScriptMetaData.
  *  If an editor window is already open for that data it will be
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java sw/source xmloff/source

2019-09-28 Thread Andrea Gelmini (via logerrit) 
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java |  
  6 +++---
 sw/source/filter/ww8/writerwordglue.cxx |  
  2 +-
 sw/source/filter/ww8/wrtw8esh.cxx   |  
  2 +-
 sw/source/filter/ww8/ww8par3.cxx|  
  2 +-
 xmloff/source/draw/ximpstyl.cxx |  
  2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f4a07458fbf1679ce1f115ecbed16d47ccbc530d
Author: Andrea Gelmini 
AuthorDate: Sat Sep 28 20:56:51 2019 +0200
Commit: Julien Nabet 
CommitDate: Sun Sep 29 00:09:20 2019 +0200

Fix typos

Change-Id: I8a93a6ed49661ddfae390a0302fca1fab5c95f14
Reviewed-on: https://gerrit.libreoffice.org/79795
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 6907990f1c68..1fca1419f4aa 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -711,9 +711,9 @@ public class ParcelContainer implements XNameAccess {
 // parse location
 parsedUri.location = sfUri.getParameter("location");
 
-// TODO basic sanity check on language, location, functioname, parcel
-// should be correct e.g. verified  by MSP and LangProvider by the
-// time its got to here
+// TODO basic sanity check on language, location, function name, parcel
+// should be correct e.g. verified by MSP and LangProvider by the
+// time it's got to here
 
 LogUtils.DEBUG("** location = " + parsedUri.location +
"\nfunction = " + parsedUri.function +
diff --git a/sw/source/filter/ww8/writerwordglue.cxx 
b/sw/source/filter/ww8/writerwordglue.cxx
index ff17f3ccbcec..9853bb36fee6 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -296,7 +296,7 @@ namespace myImplHelpers
 {
 //If the style collides first stick WW- in front of it, unless
 //it already has it and then successively add a larger and
-//larger number after it, its got to work at some stage!
+//larger number after it, it's got to work at some stage!
 if (!aName.startsWith("WW-"))
 aName = "WW-" + aName;
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 10272bac7467..3d38d9ced1e8 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -534,7 +534,7 @@ PlcDrawObj::~PlcDrawObj()
 {
 }
 
-//Its irritating to have to change the RTL frames position into LTR ones
+//It's irritating to have to change the RTL frames position into LTR ones
 //so that word will have to place them in the right place. Doubly so that
 //the SO drawings and writer frames have different ideas themselves as to
 //how to be positioned when in RTL mode!
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 3f618e6dc99e..1fd69d154894 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1964,7 +1964,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const 
sal_uInt8* pData,
 /*
 If you have a paragraph in word with left and/or hanging indent
 and remove its numbering, then the indentation appears to get
-reset, but not back to the base style, instead its goes to a blank
+reset, but not back to the base style, instead it goes to a blank
 setting.
 Unless it's a broken ww6 list in 97 in which case more hackery is
 required, some more details about broken ww6 list in
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 08b345dcaa48..a27dd8e7c1d1 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1167,7 +1167,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const
 
 //Resolves: fdo#34987 if the style's auto height before and after is the same
 //then don't reset it back to the underlying default of true for the small
-//period before its going to be reset to false again. Doing this avoids the
+//period before it's going to be reset to false again. Doing this avoids the
 //master page shapes from resizing themselves due to autoheight becoming
 //enabled before having autoheight turned off again and getting stuck on that
 //autosized height
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java sc/source sfx2/classification sfx2/source

2019-08-31 Thread Andrea Gelmini (via logerrit) 
 sc/source/filter/inc/xiescher.hxx   |  
 10 +-
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java |  
  2 +-
 sfx2/classification/xNL-types.xsd   |  
  2 +-
 sfx2/source/doc/objstor.cxx |  
  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bec318a4accf6a026577dd33825d0359868daf8f
Author: Andrea Gelmini 
AuthorDate: Tue Aug 20 09:11:04 2019 +0200
Commit: Julien Nabet 
CommitDate: Sat Aug 31 14:38:58 2019 +0200

Fix typos

Change-Id: Iac08e415f84741ecdb151788776ee15e7364fae1
Reviewed-on: https://gerrit.libreoffice.org/77762
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sc/source/filter/inc/xiescher.hxx 
b/sc/source/filter/inc/xiescher.hxx
index 37f457920d57..1d1c42859cb9 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -959,7 +959,7 @@ private:
 DffRecordHeader& rHeader,
 SvxMSDffClientData& rClientData,
 DffObjData& rObjData ) override;
-/** Processes an DFF object, reads properties from DFF stream. */
+/** Processes a DFF object, reads properties from DFF stream. */
 virtual SdrObject*  ProcessObj(
 SvStream& rDffStrm,
 DffObjData& rDffObjData,
@@ -1086,7 +1086,7 @@ private:
 /** Reads and returns a bitmap from BMP format. */
 static void ReadBmp( Graphic& rGraphic, const XclImpRoot& rRoot, 
XclImpStream& rStrm );
 
-/** Reads contents of an DFF record and append data to internal DFF 
stream. */
+/** Reads contents of a DFF record and append data to internal DFF stream. 
*/
 voidReadDffRecord( XclImpStream& rStrm );
 /** Reads a BIFF8 OBJ record following an MSODRAWING record. */
 voidReadObj8( XclImpStream& rStrm );
@@ -1181,7 +1181,7 @@ private:
 
 // DFF property set helper 
 
-/** This class reads an DFF property set (msofbtOPT record).
+/** This class reads a DFF property set (msofbtOPT record).
 
 It can return separate property values or an item set which contains items
 translated from these properties.
@@ -1191,8 +1191,8 @@ class XclImpDffPropSet : protected XclImpRoot
 public:
 explicitXclImpDffPropSet( const XclImpRoot& rRoot );
 
-/** Reads an DFF property set from the stream.
-@descr  The stream must point to the start of an DFF record containing 
properties. */
+/** Reads a DFF property set from the stream.
+@descr  The stream must point to the start of a DFF record containing 
properties. */
 voidRead( XclImpStream& rStrm );
 
 /** Returns the specified property or zero, if not extant. */
diff --git 
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java 
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 0b5194215d36..821e2e84ab37 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -348,7 +348,7 @@ public class UnoPkgContainer extends ParcelContainer {
 uri.contains("$BUNDLED_EXTENSIONS/")) {
 
 //its in a bundle need to determine the uno-package file its in
-LogUtils.DEBUG("processUnoPackage - is part of a uno bundle");
+LogUtils.DEBUG("processUnoPackage - is part of a UNO bundle");
 
 int index = uri.lastIndexOf('/');
 
diff --git a/sfx2/classification/xNL-types.xsd 
b/sfx2/classification/xNL-types.xsd
index 7c52e5ba3307..dc8769ae34be 100644
--- a/sfx2/classification/xNL-types.xsd
+++ b/sfx2/classification/xNL-types.xsd
@@ -112,7 +112,7 @@



-   A list of organisation name element 
types, e.g. Name, propriety type, liability type, etc.
+   A list of organisation name element 
types, e.g. Name, property type, liability type, etc.



diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b703f0ffdfeb..aa4357d61b5d 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3049,7 +3049,7 @@ bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium )
 {
 sal_Int32 nVersion = rMedium.GetFilter()->GetVersion();
 
-// OASIS templates have own mediatypes (SO7 also actually, but it is 
to late to use them here)
+// OASIS templates have own mediatypes (SO7 also actually, but it is 
too late to use them here)
 const bool bTemplate = rMedium.GetFilter()->IsOwnTemplateFormat()
 && nVersion > SOFFICE_FILEFORMAT_60;

[Libreoffice-commits] core.git: scripting/java

2019-08-08 Thread Stephan Bergmann (via logerrit) 
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java  
   |4 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |   91 +-
 2 files changed, 52 insertions(+), 43 deletions(-)

New commits:
commit 418533f0af7cd303d559c8fb136c49e7e9fb0d79
Author: Stephan Bergmann 
AuthorDate: Thu Aug 8 11:33:16 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 8 13:27:52 2019 +0200

Related tdf#116767: Call URLClassLoader.close

...which required the return type of
com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader 
to
be changed.  (In theory, there could be 3rd-party scripting providers that 
hook
into the framework and are affected by that incompatible change, but,
practically, chances should be low.)

Change-Id: I083c398726aaf62df7286d6da86b9d2056a5a8c1
Reviewed-on: https://gerrit.libreoffice.org/77146
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index b5e6e3085bd2..0974b8874110 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -33,7 +33,7 @@ public class ClassLoaderFactory {
 
 private ClassLoaderFactory() {}
 
-public static ClassLoader getURLClassLoader(ScriptMetaData scriptData) {
+public static URLClassLoader getURLClassLoader(ScriptMetaData scriptData) {
 ClassLoader parent = scriptData.getClass().getClassLoader();
 URL[] classPath = scriptData.getClassPath();
 LogUtils.DEBUG("Classpath has length " + classPath.length);
@@ -45,7 +45,7 @@ public class ClassLoaderFactory {
 return getURLClassLoader(parent, classPath);
 }
 
-public static ClassLoader getURLClassLoader(final ClassLoader parent,
+public static URLClassLoader getURLClassLoader(final ClassLoader parent,
 final URL[] classpath) {
 return AccessController.doPrivileged(
 new PrivilegedAction() {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index eeea0d49ebe5..63dc3169f759 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -45,6 +45,8 @@ import com.sun.star.uno.Any;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.XComponentContext;
 
+import java.io.IOException;
+import java.net.URLClassLoader;
 import java.util.ArrayList;
 
 public class ScriptProviderForJava {
@@ -182,56 +184,63 @@ class ScriptImpl implements XScript {
 ScriptDescriptor scriptDesc =
 new ScriptDescriptor(metaData.getLanguageName());
 
-LogUtils.DEBUG("Classloader starting...");
-
-ClassLoader scriptLoader =
-ClassLoaderFactory.getURLClassLoader(metaData);
-
-LogUtils.DEBUG("Classloader finished...");
-
-ArrayList invocationArgList = new ArrayList();
 Object[] invocationArgs = null;
+ScriptProxy script = null;
 
-LogUtils.DEBUG("Parameter Mapping...");
+LogUtils.DEBUG("Classloader starting...");
 
-// Setup Context Object
-XScriptContext xSc =
-ScriptContext.createContext(m_xModel, m_xInvocContext,
-m_xContext, m_xMultiComponentFactory);
+try (URLClassLoader scriptLoader = 
ClassLoaderFactory.getURLClassLoader(metaData)) {
+LogUtils.DEBUG("Classloader finished...");
 
-scriptDesc.addArgumentType(XScriptContext.class);
-invocationArgList.add(xSc);
+ArrayList invocationArgList = new ArrayList();
 
-for (int i = 0; i < params.length; i++) {
-scriptDesc.addArgumentType(params[ i ].getClass());
-invocationArgList.add(params[ i ]);
-}
+LogUtils.DEBUG("Parameter Mapping...");
 
-if (!invocationArgList.isEmpty()) {
-invocationArgs = invocationArgList.toArray();
-}
+// Setup Context Object
+XScriptContext xSc =
+ScriptContext.createContext(m_xModel, m_xInvocContext,
+m_xContext, 
m_xMultiComponentFactory);
 
-LogUtils.DEBUG("ScriptProxy starting... ");
-ScriptProxy script = null;
+scriptDesc.addArgumentType(XScriptContext.class);
+invocationArgList.add(xSc);
 
-try {
-
-String className = metaData.getLanguageName().substring(0,
-   metaData.getLanguageName().lastIndexOf('.'));
-
-

[Libreoffice-commits] core.git: scripting/java

2019-08-08 Thread Stephan Bergmann (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |   21 +-
 1 file changed, 4 insertions(+), 17 deletions(-)

New commits:
commit c4bb20a47981126a3ca3645c3a06afa963184fb9
Author: Stephan Bergmann 
AuthorDate: Thu Aug 8 08:49:21 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 8 10:21:31 2019 +0200

Remove odd catch of ArrayStoreException

...(which is a RuntimeException) around a call of
com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader.
The catch block was introduced in 3076ea9dc6677dcf0f65c53c8f205d870dc27d53
"INTEGRATION: CWS scriptingf2 (1.2.2); FILE MERGED", for no apparent 
reason.  It
was introduced along with catch blocks for MalformedURLException and
NoSuitableClassLoaderException, but which have already been removed with
616b3ad50404f35d84708b3feeb8c66f2f23f1b1 "java: remove exceptions from 
throws
clauses that are not".

Change-Id: I8d2890aed1b0f50fe817002cb6f1610c550568f1
Reviewed-on: https://gerrit.libreoffice.org/77140
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 5a59407d..eeea0d49ebe5 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -182,25 +182,12 @@ class ScriptImpl implements XScript {
 ScriptDescriptor scriptDesc =
 new ScriptDescriptor(metaData.getLanguageName());
 
-ClassLoader scriptLoader = null;
+LogUtils.DEBUG("Classloader starting...");
 
-try {
-LogUtils.DEBUG("Classloader starting...");
-
-scriptLoader =
-ClassLoaderFactory.getURLClassLoader(metaData);
+ClassLoader scriptLoader =
+ClassLoaderFactory.getURLClassLoader(metaData);
 
-LogUtils.DEBUG("Classloader finished...");
-} catch (ArrayStoreException e) {
-// Framework error
-ScriptFrameworkErrorException e2 =
-new ScriptFrameworkErrorException(
-e.toString(), null,
-metaData.getLanguageName(), metaData.getLanguage(),
-ScriptFrameworkErrorType.UNKNOWN);
-e2.initCause(e);
-throw e2;
-}
+LogUtils.DEBUG("Classloader finished...");
 
 ArrayList invocationArgList = new ArrayList();
 Object[] invocationArgs = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-07-23 Thread Caolán McNamara (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cb1c937ef6d565d7576ace72e9dfab952d43691d
Author: Caolán McNamara 
AuthorDate: Mon Jul 22 17:14:45 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 23 09:34:53 2019 +0200

cid#1448376 SIC: Inner class could be made static

Change-Id: Id9923031c1fe91ba71dfe8d68cbe23b72e9637b5
Reviewed-on: https://gerrit.libreoffice.org/76143
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 9ba128b42669..36b9bf9839ff 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -267,7 +267,7 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 }
 
 // Wraps long error messages
-class NarrowOptionPane extends JOptionPane {
+private static class NarrowOptionPane extends JOptionPane {
 private static final long serialVersionUID = 1L;
 public int getMaxCharactersPerLineCount() {
 return 100;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-07-09 Thread Andreas Heinisch (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |   26 ++
 1 file changed, 26 insertions(+)

New commits:
commit 60f7236293bc3bd4a9b2962a5f1f9af6f2998808
Author: Andreas Heinisch 
AuthorDate: Mon Jun 3 07:52:24 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 9 09:51:59 2019 +0200

tdf#125355 Beanshell Editor: Corrected indentation when Enter is pressed

Change-Id: Ife96256da02c4b21e2649040c53b7d16f236e3a0
Reviewed-on: https://gerrit.libreoffice.org/73371
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index b2a4dd61c243..e519587ff944 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -64,6 +64,7 @@ public class PlainSourceView extends JScrollPane implements
 private List unsavedListener = new 
ArrayList();
 
 private static final Pattern tabPattern = Pattern.compile("^ *(\\t)");
+private static final Pattern indentationPattern = 
Pattern.compile("^([^\\S\\r\\n]*)(([^\\{])*\\{\\s*)*");
 
 public PlainSourceView(ScriptSourceModel model) {
 this.model = model;
@@ -192,6 +193,31 @@ public class PlainSourceView extends JScrollPane implements
 // could not find correct location of the tab
 }
 }
+// if the enter key was pressed, adjust indentation of the 
current line accordingly
+if (ke.getKeyCode() == KeyEvent.VK_ENTER) {
+try {
+int caretOffset = ta.getCaretPosition();
+int lineOffset = ta.getLineOfOffset(caretOffset);
+int startOffset = ta.getLineStartOffset(lineOffset);
+int endOffset = ta.getLineEndOffset(lineOffset);
+
+Matcher matcher = 
indentationPattern.matcher(ta.getText(startOffset, endOffset - startOffset));
+// insert new line including indentation of the 
previous line
+ta.insert("\n", caretOffset++);
+if (matcher.find()) {
+if (matcher.group(1).length() > 0) {
+ta.insert(matcher.group(1), caretOffset++);
+}
+// if there is an open curly bracket in the 
current line, increase indentation level
+if (matcher.group(3) != null) {
+ta.insert("\t", caretOffset);
+}
+}
+ke.consume();
+} catch (BadLocationException e) {
+// could not find correct location of the indentation
+}
+}
 }
 
 @Override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-07-03 Thread Julien Nabet (via logerrit) 
 scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 
   9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 04fbd174cb787ea15fb74abeca37589ab74df6ab
Author: Julien Nabet 
AuthorDate: Wed Jul 3 21:46:42 2019 +0200
Commit: Julien Nabet 
CommitDate: Wed Jul 3 22:54:07 2019 +0200

cid#1448470: perf inefficient map iterator

Change-Id: If7dd6455ca02d6c78ac997bd9c2924863db1d906
Reviewed-on: https://gerrit.libreoffice.org/75059
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index a8b12e071284..eeb8f9ef2cfc 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -338,13 +338,10 @@ public class ParcelDescriptor {
 String key;
 item = document.createElement("languagedepprops");
 
-Iterator iter = languagedepprops.keySet().iterator();
-
-while (iter.hasNext()) {
+for (Map.Entry entry : 
languagedepprops.entrySet()) {
 tempitem = document.createElement("prop");
-key = iter.next();
-tempitem.setAttribute("name", key);
-tempitem.setAttribute("value", languagedepprops.get(key));
+tempitem.setAttribute("name", entry.getKey());
+tempitem.setAttribute("value", entry.getValue());
 item.appendChild(tempitem);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-05-21 Thread Andreas Heinisch (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d7f1ca82198e1cc73fe4bb38f3034c6dc110af83
Author: Andreas Heinisch 
AuthorDate: Tue May 21 11:14:04 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue May 21 12:39:43 2019 +0200

tdf#97635 Added unindentation using shift-tab (mimicked eclipse behavior)

Restored java 6 compatibility

Change-Id: I550920457874b9261bdde07040aad8f7b67773d8
Reviewed-on: https://gerrit.libreoffice.org/72671
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index cc1e22ee21e7..b2a4dd61c243 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -63,7 +63,7 @@ public class PlainSourceView extends JScrollPane implements
 UndoManager undoManager;
 private List unsavedListener = new 
ArrayList();
 
-private static final Pattern tabPattern = Pattern.compile("^ 
*(?\\t)");
+private static final Pattern tabPattern = Pattern.compile("^ *(\\t)");
 
 public PlainSourceView(ScriptSourceModel model) {
 this.model = model;
@@ -186,7 +186,7 @@ public class PlainSourceView extends JScrollPane implements
 
 Matcher matcher = 
tabPattern.matcher(ta.getText(startOffset, endOffset - startOffset));
 if (matcher.find()) {
-ta.replaceRange(null, startOffset + 
matcher.start("tab"), startOffset + matcher.end("tab"));
+ta.replaceRange(null, startOffset + 
matcher.start(1), startOffset + matcher.end(1));
 }
 } catch (BadLocationException e) {
 // could not find correct location of the tab
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-05-20 Thread Andreas Heinisch (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |   13 ++
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 9ee0a1f16682139c5be28a05d33e980123da4c6f
Author: Andreas Heinisch 
AuthorDate: Mon May 20 07:58:03 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon May 20 15:44:41 2019 +0200

tdf#97635 Added unindentation using shift-tab (mimicked eclipse's behavior)

Moved shift+tab check to the keyPressed function to provide continuous 
insertion
and compiled tab-pattern only once

Change-Id: Iffe847fea07295075dc1a280f0697e8c798e8d6f
Reviewed-on: https://gerrit.libreoffice.org/72580
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 581ef48138c8..cc1e22ee21e7 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -63,6 +63,8 @@ public class PlainSourceView extends JScrollPane implements
 UndoManager undoManager;
 private List unsavedListener = new 
ArrayList();
 
+private static final Pattern tabPattern = Pattern.compile("^ 
*(?\\t)");
+
 public PlainSourceView(ScriptSourceModel model) {
 this.model = model;
 initUI();
@@ -173,7 +175,7 @@ public class PlainSourceView extends JScrollPane implements
 
 ta.addKeyListener(new KeyAdapter(){
 @Override
-public void keyReleased(KeyEvent ke){
+public void keyPressed(KeyEvent ke) {
 // if shift + tab was pressed, remove the first tab before any 
code begins
 if (ke.isShiftDown() && ke.getKeyCode() == KeyEvent.VK_TAB) {
 try {
@@ -182,17 +184,18 @@ public class PlainSourceView extends JScrollPane 
implements
 int startOffset = ta.getLineStartOffset(lineOffset);
 int endOffset = ta.getLineEndOffset(lineOffset);
 
-Pattern pattern = Pattern.compile("^ *(\\t)");
-Matcher matcher = 
pattern.matcher(ta.getText(startOffset, endOffset - startOffset));
-
+Matcher matcher = 
tabPattern.matcher(ta.getText(startOffset, endOffset - startOffset));
 if (matcher.find()) {
-ta.replaceRange(null, startOffset + 
matcher.start(1), startOffset + matcher.end(1));
+ta.replaceRange(null, startOffset + 
matcher.start("tab"), startOffset + matcher.end("tab"));
 }
 } catch (BadLocationException e) {
 // could not find correct location of the tab
 }
 }
+}
 
+@Override
+public void keyReleased(KeyEvent ke){
 if(ke.getKeyCode() == KeyEvent.VK_SPACE || ke.getKeyCode() == 
KeyEvent.VK_ENTER){
 compoundEdit.end();
 undoManager.addEdit(compoundEdit);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-05-16 Thread Andreas Heinisch (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit e875a317c4adf00bbad00fb8176c26cd1a66973e
Author: Andreas Heinisch 
AuthorDate: Mon May 13 13:08:29 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu May 16 11:32:06 2019 +0200

tdf#97635 Added unindentation using shift-tab (mimicked eclipse behavior)

Change-Id: Iaf64451c92f3465751032dde9c283141e548b3ca
Reviewed-on: https://gerrit.libreoffice.org/72228
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index f75b1e75fb0e..581ef48138c8 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -45,6 +45,9 @@ import javax.swing.undo.UndoManager;
 import java.util.List;
 import java.util.ArrayList;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class PlainSourceView extends JScrollPane implements
 ScriptSourceView, DocumentListener {
 
@@ -171,6 +174,25 @@ public class PlainSourceView extends JScrollPane implements
 ta.addKeyListener(new KeyAdapter(){
 @Override
 public void keyReleased(KeyEvent ke){
+// if shift + tab was pressed, remove the first tab before any 
code begins
+if (ke.isShiftDown() && ke.getKeyCode() == KeyEvent.VK_TAB) {
+try {
+int caretOffset = ta.getCaretPosition();
+int lineOffset = ta.getLineOfOffset(caretOffset);
+int startOffset = ta.getLineStartOffset(lineOffset);
+int endOffset = ta.getLineEndOffset(lineOffset);
+
+Pattern pattern = Pattern.compile("^ *(\\t)");
+Matcher matcher = 
pattern.matcher(ta.getText(startOffset, endOffset - startOffset));
+
+if (matcher.find()) {
+ta.replaceRange(null, startOffset + 
matcher.start(1), startOffset + matcher.end(1));
+}
+} catch (BadLocationException e) {
+// could not find correct location of the tab
+}
+}
+
 if(ke.getKeyCode() == KeyEvent.VK_SPACE || ke.getKeyCode() == 
KeyEvent.VK_ENTER){
 compoundEdit.end();
 undoManager.addEdit(compoundEdit);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-03-27 Thread Samuel Mehrbrodt (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d54a104ae97a3218bf58eb38f28c03e26ba7e43
Author: Samuel Mehrbrodt 
AuthorDate: Wed Mar 27 09:54:39 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Mar 27 12:45:19 2019 +0100

Beanshell: Display full exception message

Useful to see where exactly the error occured

Change-Id: I716f54c4b1286d705b52f19a58f36f28a801e1d0
Reviewed-on: https://gerrit.libreoffice.org/69799
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 91bd98894798..279e75fb3584 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -398,7 +398,7 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 try {
 execute();
 } catch (Exception invokeException) {
-showErrorMessage(invokeException.getMessage());
+showErrorMessage(invokeException.toString());
 }
 } else if (actionCommand.equals("Save")) {
 saveTextArea();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-03-27 Thread Samuel Mehrbrodt (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |   16 --
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 3c72945de874aceb12a405c03f5b0c8b3937f5cf
Author: Samuel Mehrbrodt 
AuthorDate: Wed Mar 27 09:54:17 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Mar 27 12:37:17 2019 +0100

Beanshell: Wrap long error messages

Change-Id: I5e607f4b94733700810d37c289f6cc29492da5f2
Reviewed-on: https://gerrit.libreoffice.org/69798
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 5cb701e5bb79..91bd98894798 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -42,6 +42,7 @@ import java.util.Map;
 
 import javax.swing.JButton;
 import javax.swing.JComponent;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -265,9 +266,20 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 frame.setVisible(true);
 }
 
+// Wraps long error messages
+class NarrowOptionPane extends JOptionPane {
+private static final long serialVersionUID = 1L;
+public int getMaxCharactersPerLineCount() {
+return 100;
+}
+}
+
 private void showErrorMessage(String message) {
-JOptionPane.showMessageDialog(frame, message,
-  "Error", JOptionPane.ERROR_MESSAGE);
+JOptionPane optionPane = new NarrowOptionPane();
+optionPane.setMessage(message);
+optionPane.setMessageType(JOptionPane.ERROR_MESSAGE);
+JDialog dialog = optionPane.createDialog(null, "Error");
+dialog.setVisible(true);
 }
 
 private void initUI() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-03-27 Thread kushagrakasliwal1 (via logerrit) 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 60a3e721aaf9a9220563d045c2387cb2378e607f
Author: kushagrakasliwal1 <2016bit...@sggs.ac.in>
AuthorDate: Mon Mar 18 22:51:29 2019 +0530
Commit: Samuel Mehrbrodt 
CommitDate: Wed Mar 27 10:05:21 2019 +0100

tdf#123586 Set minimum size for beanshell editor

Change-Id: I49e2ca387de5d520efdda0c964203c530fe016c4
Reviewed-on: https://gerrit.libreoffice.org/69394
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index ca00b6c7dd85..5cb701e5bb79 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -29,6 +29,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.awt.Dimension;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -304,6 +305,7 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 frame.pack();
 frame.setSize(590, 480);
 frame.setLocation(300, 200);
+frame.setMinimumSize(new Dimension(500, 300));
 }
 
 private void doClose() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2019-02-23 Thread Libreoffice Gerrit user 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ca8eef6be3e45b934879780e847d6ef4faba857a
Author: EL-SHREIF 
AuthorDate: Sun Feb 24 03:52:27 2019 +0200
Commit: Noel Grandin 
CommitDate: Sun Feb 24 07:59:08 2019 +0100

tdf#123589 Removing close button from toolbar in Beanshell editor

The Beanshell Editor has a "Close" button in the toolbar.This button can be 
removed as the window already has a close button.so i remove it from 
ScriptEditorForBeanShell.java easly .

Change-Id: Icf2e56f664df56a01a2cf1935700ebe1888a7156
Reviewed-on: https://gerrit.libreoffice.org/68273
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 32fa751351d0..6ddb7e5deb51 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -272,7 +272,7 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 }
 );
 
-String[] labels = {"Run", "Clear", "Save", "Close","Undo","Redo"};
+String[] labels = {"Run", "Clear", "Save","Undo","Redo"};
 JToolBar toolbar = new JToolBar();
 toolbar.setRollover(true);
 for (String label : labels) {
@@ -373,8 +373,6 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 } catch (Exception invokeException) {
 showErrorMessage(invokeException.getMessage());
 }
-} else if (actionCommand.equals("Close")) {
-doClose();
 } else if (actionCommand.equals("Save")) {
 saveTextArea();
 } else if (actionCommand.equals("Clear")) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2018-07-05 Thread Stephan Bergmann 
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
|   11 +++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 8b17679fca3564643ff248149e9d9d895e28dda5
Author: Stephan Bergmann 
Date:   Thu Jul 5 16:47:00 2018 +0200

cid#1437407: create class loader in doPrivileged

Change-Id: Iade079e44c8d88a13830258157d9481f4b8b3358
Reviewed-on: https://gerrit.libreoffice.org/57013
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index 5434945ed41e..b5e6e3085bd2 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -23,6 +23,8 @@ import com.sun.star.script.framework.log.LogUtils;
 
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 /**
  *  Class Loader Factory
@@ -43,8 +45,11 @@ public class ClassLoaderFactory {
 return getURLClassLoader(parent, classPath);
 }
 
-public static ClassLoader getURLClassLoader(ClassLoader parent,
-URL[] classpath) {
-return new URLClassLoader(classpath, parent);
+public static ClassLoader getURLClassLoader(final ClassLoader parent,
+final URL[] classpath) {
+return AccessController.doPrivileged(
+new PrivilegedAction() {
+public URLClassLoader run() { return new 
URLClassLoader(classpath, parent); }
+});
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2018-06-15 Thread Stephan Bergmann 
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java  
   |4 ++--
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |5 ++---
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
   |3 +--
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 1b897f16e3ab45d87fe34011fa3bdb2a1680901c
Author: Stephan Bergmann 
Date:   Fri Jun 15 15:55:37 2018 +0200

Restore binary compatibility for ClassLoaderFactory

As discussed in the mail thread starting at 
 "Just a little side note on the scripting framework ...",
external code that uses the Java class
com.sun.star.script.framework.provider.ClassLoaderFactory stopped working
because LO changed that class in binary (and compile-time) incompatible ways
over time.

The class is not listed at
 (and neither at
), so it 
was
not considered part of the stable URE interface.  But it is apparently used 
by
external code, and it indeed seems to make sense that it is used by external
code that implements scripting providers.  (A follow-up commit should 
therefore
mark the class as part of the stable URE interface.  I keep that separate so
that it is easier to backport this functional fix.)

With ScriptProviderForooRexx.oxt from
https://svn.code.sf.net/p/bsf4oorexx/code@r589 installed in LO, "Tools - 
Macros
- Organize Macros - ooRexx... - My Macros - Create... - Library1 - OK -
Create... - Macro1 - OK - Edit" failed due to

> warn:cui.dialogs:21768:21768:cui/source/dialogs/scriptdlg.cxx:740: Caught 
exception trying to invoke N3com3sun4star3uno9ExceptionE msg: [jni_uno bridge 
error] UNO calling Java method invoke: non-UNO exception occurred: 
java.lang.NoSuchMethodError: 
com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader(Lcom/sun/star/script/framework/container/ScriptMetaData;)Ljava/lang/ClassLoader;
> java stack trace:
> java.lang.NoSuchMethodError: 
com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader(Lcom/sun/star/script/framework/container/ScriptMetaData;)Ljava/lang/ClassLoader;
>   at 
com.sun.star.script.framework.provider.oorexx.ScriptEditorForooRexx.edit(ScriptEditorForooRexx.java:305)
>   at 
com.sun.star.script.framework.browse.ScriptBrowseNode.invoke(ScriptBrowseNode.java:200)

cae57d2e588a4b5a104171e022b00abcc1605775 "ClassLoader->URLClassLoader" 
(which
this commit reverts) had changed the return type of the two 
getURLClassLoader
overloads from ClassLoader to derived URLClassLoader (and ultimately only 
for
cosmetic effect; it was leftover from a previous attempt at fixing a 
Coverity
issue by using URLClassLoader.close(), but which is only available in Java 
1.7,
so the attempt had been reverted).  That caused the above failure.

And 68cd011c907d00493bf2bfde531c1e244819596b "java: reduce scope, make some
methods private" (which this commit also reverts) had changed the second
getURLClassLoader overload (which is not called in the above scenario) from
public to private, which is also a binary-incompatible change.

Other commits removed throws clauses, which is only a compile-time issue 
but not
a binary-incompatible change.  I left those changes in for now, but if need 
be
they could also be reverted.

Change-Id: I98f533d88c7c1580956c3c281e72a1c78fa3f56f
Reviewed-on: https://gerrit.libreoffice.org/55871
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index 73ba06938884..5434945ed41e 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -31,7 +31,7 @@ public class ClassLoaderFactory {
 
 private ClassLoaderFactory() {}
 
-public static URLClassLoader getURLClassLoader(ScriptMetaData scriptData) {
+public static ClassLoader getURLClassLoader(ScriptMetaData scriptData) {
 ClassLoader parent = scriptData.getClass().getClassLoader();
 URL[] classPath = scriptData.getClassPath();
 LogUtils.DEBUG("Classpath has length " + classPath.length);
@@ -43,7 +43,7 @@ public class ClassLoaderFactory {
 return getURLClassLoader(parent, classPath);
 }
 
-private static

[Libreoffice-commits] core.git: scripting/java

2017-02-23 Thread Stephan Bergmann 
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java |
2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59a63d8161b4948766c075224599ded44b01d3ce
Author: Stephan Bergmann 
Date:   Thu Feb 23 11:43:22 2017 +0100

In Java, css.uno.RuntimeException doesn't derive from css.uno.Exception

Change-Id: I83850db6e3f3ac87d52e75f122ba2b6bba3905b9

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 31475a0..e48bc48 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -359,7 +359,7 @@ public abstract class ScriptProvider implements
 throw e2;
 } catch (com.sun.star.lang.WrappedTargetException wta) {
 // TODO specify the correct error Type
-Exception wrapped = (Exception) wta.TargetException;
+java.lang.Exception wrapped = (java.lang.Exception) 
wta.TargetException;
 String message = wta.getMessage();
 
 if (wrapped != null) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-10-16 Thread nadith 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |   15 ++
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 71901bfedd9f0f6f31be8a9ff54253d56c10b5f3
Author: nadith 
Date:   Fri Oct 14 08:06:10 2016 +0530

tdf#98004 - Enhansment on Editor(Beanshell)

Add a toolbar A little enhasment for the editor has been done.
Added a toolbar for set of buttons that was previously in a JPanel
and now it is in Jtoolbar in the editor

Change-Id: Ie04232e7824c051f272d69cc109eec0e70ccf921
Reviewed-on: https://gerrit.libreoffice.org/29806
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 9c1f583..87553b7 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -46,6 +46,9 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
+import javax.swing.JToolBar;
+import javax.swing.BorderFactory;
+
 public class ScriptEditorForBeanShell implements ScriptEditor, ActionListener {
 
 private JFrame frame;
@@ -271,21 +274,21 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 );
 
 String[] labels = {"Run", "Clear", "Save", "Close","Undo","Redo"};
-JPanel p = new JPanel();
-p.setLayout(new FlowLayout());
-
+JToolBar toolbar = new JToolBar();
+toolbar.setRollover(true);
 for (String label : labels) {
 JButton b = new JButton(label);
+b.setToolTipText(label);
 b.addActionListener(this);
-p.add(b);
-
+toolbar.add(b);
+toolbar.addSeparator();
 if (label.equals("Save") && filename == null) {
 b.setEnabled(false);
 }
 }
 
 frame.getContentPane().add((JComponent)view, BorderLayout.CENTER);
-frame.add(p, BorderLayout.NORTH);
+frame.add(toolbar, BorderLayout.NORTH);
 frame.pack();
 frame.setSize(590, 480);
 frame.setLocation(300, 200);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-10-03 Thread Caolán McNamara 
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java  
   |6 +++---
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |5 +++--
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
   |3 ++-
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit cae57d2e588a4b5a104171e022b00abcc1605775
Author: Caolán McNamara 
Date:   Mon Oct 3 09:40:45 2016 +0100

ClassLoader->URLClassLoader

Change-Id: I1f46a99025ba33d08842da9b06611dcfa6b1b49c
Reviewed-on: https://gerrit.libreoffice.org/29474
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index b3f3c50..73ba069 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -31,7 +31,7 @@ public class ClassLoaderFactory {
 
 private ClassLoaderFactory() {}
 
-public static ClassLoader getURLClassLoader(ScriptMetaData scriptData) {
+public static URLClassLoader getURLClassLoader(ScriptMetaData scriptData) {
 ClassLoader parent = scriptData.getClass().getClassLoader();
 URL[] classPath = scriptData.getClassPath();
 LogUtils.DEBUG("Classpath has length " + classPath.length);
@@ -43,8 +43,8 @@ public class ClassLoaderFactory {
 return getURLClassLoader(parent, classPath);
 }
 
-private static ClassLoader getURLClassLoader(ClassLoader parent,
+private static URLClassLoader getURLClassLoader(ClassLoader parent,
 URL[] classpath) {
 return new URLClassLoader(classpath, parent);
 }
-}
\ No newline at end of file
+}
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index c832e6e..9c1f583 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -35,6 +35,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import java.net.URL;
+import java.net.URLClassLoader;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -181,14 +182,14 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 public void edit(final XScriptContext context, ScriptMetaData entry) {
 if (entry != null) {
 try {
-ClassLoader cl = null;
+URLClassLoader cl = null;
 
 try {
 cl = ClassLoaderFactory.getURLClassLoader(entry);
 } catch (Exception ignore) { // TODO re-examine error handling
 }
 
-final ClassLoader theCl = cl;
+final URLClassLoader theCl = cl;
 final URL url = entry.getSourceURL();
 SwingInvocation.invoke(
 new Runnable() {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index 2aabba7..4caf645 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -50,6 +50,7 @@ import com.sun.star.uno.Type;
 import com.sun.star.uno.XComponentContext;
 
 import java.net.URL;
+import java.net.URLClassLoader;
 
 import java.util.StringTokenizer;
 
@@ -182,7 +183,7 @@ class ScriptImpl implements XScript {
 aOutParamIndex[0] = new short[0];
 aOutParam[0] = new Object[0];
 
-ClassLoader cl = null;
+URLClassLoader cl = null;
 URL sourceUrl = null;
 
 try {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index 9465a64..fcd08cd 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -45,6 +45,7 @@ import com.sun.star.script.provider.XScript;
 import com.sun.star.uno.XComponentContext;
 
 import java.net.URL;
+import

[Libreoffice-commits] core.git: scripting/java

2016-08-19 Thread Caolán McNamara 
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java  
   |6 ++---
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |   12 ++
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
   |   10 
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |   10 
 4 files changed, 8 insertions(+), 30 deletions(-)

New commits:
commit d02941ebdb023a6e3151878375a0ffbd163d9d51
Author: Caolán McNamara 
Date:   Fri Aug 19 14:08:57 2016 +0100

Revert "coverity#1371372 Resource leak on an exceptional path"

seeing as it doesn't build universally, java 1.7 onwards
apparently

This reverts commit 6830d8c2083fa66cc113f587cbfc4aa5a4f8a535.

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index 73ba069..b3f3c50 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -31,7 +31,7 @@ public class ClassLoaderFactory {
 
 private ClassLoaderFactory() {}
 
-public static URLClassLoader getURLClassLoader(ScriptMetaData scriptData) {
+public static ClassLoader getURLClassLoader(ScriptMetaData scriptData) {
 ClassLoader parent = scriptData.getClass().getClassLoader();
 URL[] classPath = scriptData.getClassPath();
 LogUtils.DEBUG("Classpath has length " + classPath.length);
@@ -43,8 +43,8 @@ public class ClassLoaderFactory {
 return getURLClassLoader(parent, classPath);
 }
 
-private static URLClassLoader getURLClassLoader(ClassLoader parent,
+private static ClassLoader getURLClassLoader(ClassLoader parent,
 URL[] classpath) {
 return new URLClassLoader(classpath, parent);
 }
-}
+}
\ No newline at end of file
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index b444cce..c832e6e 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -35,7 +35,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import java.net.URL;
-import java.net.URLClassLoader;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -181,14 +180,15 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
  */
 public void edit(final XScriptContext context, ScriptMetaData entry) {
 if (entry != null) {
-URLClassLoader cl = null;
 try {
+ClassLoader cl = null;
+
 try {
 cl = ClassLoaderFactory.getURLClassLoader(entry);
 } catch (Exception ignore) { // TODO re-examine error handling
 }
 
-final URLClassLoader theCl = cl;
+final ClassLoader theCl = cl;
 final URL url = entry.getSourceURL();
 SwingInvocation.invoke(
 new Runnable() {
@@ -210,12 +210,6 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 });
 } catch (IOException ioe) {
 showErrorMessage("Error loading file: " + ioe.getMessage());
-if (cl != null) {
-try {
-  cl.close();
-} catch (IOException e) {
-}
-}
 }
 }
 }
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index 76ee4ef..2aabba7 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -49,9 +49,7 @@ import com.sun.star.uno.Any;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.XComponentContext;
 
-import java.io.IOException;
 import java.net.URL;
-import java.net.URLClassLoader;
 
 import java.util.StringTokenizer;
 
@@ -184,19 +182,13 @@ class ScriptImpl implements XScript {
 aOutParamIndex[0] = new short[0];
 aOutParam[0] = new Object[0];
 
-URLClassLoader cl = null;
+ClassLoader cl = null;
 URL sourceUrl = null;
 
 try {
 cl = ClassLoaderFactory.getURLClassLoader(metaData);
 sourceUrl = metaData.getSourceURL();
 } catch

[Libreoffice-commits] core.git: scripting/java

2016-03-14 Thread Douglas Mencken 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 60286229fa54b71c67a5d25a7cce59e54b6b8680
Author: Douglas Mencken 
Date:   Mon Feb 29 01:43:36 2016 -0500

scripting: JDK 1.5 compatibility: don't use java.awt.Font.MONOSPACED

MONOSPACED is defined in java/awt/Font.java as
/* @since 1.6 */ static final String  MONOSPACED = "Monospaced";

Change-Id: I31847c939387c139971ff55f786773c7ce51448c
Reviewed-on: https://gerrit.libreoffice.org/23164
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index e7d71d3..ec2a56d 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -137,7 +137,7 @@ public class PlainSourceView extends JScrollPane implements
 ta.setColumns(40);
 ta.setLineWrap(false);
 ta.insert(model.getText(), 0);
-ta.setFont(new Font(Font.MONOSPACED, ta.getFont().getStyle(), 
ta.getFont().getSize()));
+ta.setFont(new Font("Monospaced", ta.getFont().getStyle(), 
ta.getFont().getSize()));
 undoManager = new UndoManager();
 undoManager.setLimit(noLimit);
 ta.getDocument().addUndoableEditListener(new UndoableEditListener(){
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-03-04 Thread Stephan Bergmann 
 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java |2 
+-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04b5ae6221bfe2e2a2828f4f1903e2a334761327
Author: Stephan Bergmann 
Date:   Fri Mar 4 15:23:26 2016 +0100

This ScriptEntry ctor is only needed by ctor of derived class ScriptMetaData

Change-Id: If3e6aae326aa53825edca9d5dc207d185d288cce

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index fe5d5e4..2165acee 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -45,7 +45,7 @@ public class ScriptEntry implements Cloneable {
 this.languagedepprops =  new HashMap();
 }
 
-public ScriptEntry(ScriptEntry entry) {
+protected ScriptEntry(ScriptEntry entry) {
 this.language = entry.language;
 this.languagename = entry.languagename;
 this.logicalname = entry.languagename;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-03-04 Thread Stephan Bergmann 
 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java |4 

 1 file changed, 4 deletions(-)

New commits:
commit 2e96766428b719c0dc42395bfcff5ed062f6f3f7
Author: Stephan Bergmann 
Date:   Fri Mar 4 15:20:45 2016 +0100

Remove unused ScriptEntry.setLogicalName

Change-Id: Iad58e4227433b766bbdce92a53c95aed48320f88

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index ad98264..fe5d5e4 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -102,10 +102,6 @@ public class ScriptEntry implements Cloneable {
 return logicalname;
 }
 
-public void setLogicalName(String name) {
-logicalname = name;
-}
-
 public String getLanguage() {
 return language;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-03-04 Thread Stephan Bergmann 
 scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java   |  
  8 
 scripting/java/com/sun/star/script/framework/container/Parcel.java  |  
 10 +-
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java |  
  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit cf6e5f5b6d5d18fc1792f436d573a292e7a38943
Author: Stephan Bergmann 
Date:   Fri Mar 4 15:09:14 2016 +0100

Parcel.getByName apparently wants to return ScriptMetaData

Change-Id: I4a710384ec3a0d719f2ad1fbbe7b43b0be1fa1d9

diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 2d293be..8c14918 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -75,7 +75,7 @@ public class ScriptBrowseNode extends PropertySet implements
 XMultiComponentFactory xFac = xCtx.getServiceManager();
 
 try {
-data = (ScriptMetaData)parent.getByName( name );
+data = parent.getByName( name );
 XSimpleFileAccess xSFA = UnoRuntime.queryInterface(
  XSimpleFileAccess.class,
  xFac.createInstanceWithContext(
@@ -146,7 +146,7 @@ public class ScriptBrowseNode extends PropertySet implements
 parent = p;
 
 try {
-ScriptMetaData data = (ScriptMetaData)parent.getByName(name);
+ScriptMetaData data = parent.getByName(name);
 uri = data.getShortFormScriptURL();
 }
 // TODO fix exception types to be caught here, should we rethrow?
@@ -189,7 +189,7 @@ public class ScriptBrowseNode extends PropertySet implements
 ScriptMetaData data = null;
 
 try {
-data = (ScriptMetaData)parent.getByName(name);
+data = parent.getByName(name);
 } catch (NoSuchElementException nse) {
 throw new com.sun.star.lang.IllegalArgumentException(nse,
 name + " does not exist or can't be found ");
@@ -236,7 +236,7 @@ public class ScriptBrowseNode extends PropertySet implements
 
 try {
 String newName = AnyConverter.toString(aParams[0]);
-ScriptMetaData oldData = 
(ScriptMetaData)parent.getByName(name);
+ScriptMetaData oldData = parent.getByName(name);
 oldData.loadSource();
 String oldSource = oldData.getSource();
 
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java 
b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index df94463..078ed73 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -69,7 +69,7 @@ public class Parcel implements XNameContainer {
 return name;
 }
 
-public java.lang.Object getByName(String aName) throws
+public ScriptMetaData getByName(String aName) throws
 com.sun.star.container.NoSuchElementException,
 com.sun.star.lang.WrappedTargetException {
 
@@ -126,7 +126,7 @@ public class Parcel implements XNameContainer {
 public boolean hasByName(String aName) {
 
 boolean result = true;
-Object containee  = null;
+ScriptMetaData containee  = null;
 
 try {
 containee = getByName(aName);
@@ -162,7 +162,7 @@ public class Parcel implements XNameContainer {
 // if not ok, throw IllegalArgument
 if (m_descriptor != null) {
 try {
-ScriptEntry script = (ScriptEntry)getByName(aName);
+ScriptMetaData script = getByName(aName);
 
 if (script != null) {
 //m_descriptor.removeScriptEntry( script );
@@ -253,7 +253,7 @@ public class Parcel implements XNameContainer {
 com.sun.star.lang.WrappedTargetException {
 
 try {
-ScriptMetaData script = (ScriptMetaData)getByName(Name);
+ScriptMetaData script = getByName(Name);
 
 if (script != null) {
 if (!script.removeSourceFile()) {
@@ -299,4 +299,4 @@ public class Parcel implements XNameContainer {
 return path;
 }
 
-}
\ No newline at end of file
+}
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index febd65a..35fc867 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -644,7 +644,7 @@ public class ParcelContainer implements XNameAccess {

[Libreoffice-commits] core.git: scripting/java

2016-02-25 Thread Caolán McNamara 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3029afd738e1e5d2c04654ecdc134f5503912203
Author: Caolán McNamara 
Date:   Thu Feb 25 20:28:23 2016 +

coverity#1354272 SS: Unread field should be static

Change-Id: Ie9480265be8053805cb48cefe189e65a47ce0908

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 2a6fde0..e7d71d3 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -55,7 +55,7 @@ public class PlainSourceView extends JScrollPane implements
 private static final String undoKey = "Undo";
 private static final String redoKey = "Redo";
 private CompoundEdit compoundEdit = null;
-private final int noLimit = -1;
+private static final int noLimit = -1;
 UndoManager undoManager;
 
 public PlainSourceView(ScriptSourceModel model) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-02-22 Thread Chirag Manwani 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
  |   33 ++
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |   22 --
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
 |4 -
 3 files changed, 37 insertions(+), 22 deletions(-)

New commits:
commit 1b287f14b2adc79586ae2dde6b08cd8eb960e0ce
Author: Chirag Manwani 
Date:   Mon Feb 22 15:22:30 2016 +0530

tdf#98004 Added toolbar to beanshell editor with undo/redo buttons

Change-Id: I1d553473f34622e1cb1dab3ffe74ec0c5fa05605
Reviewed-on: https://gerrit.libreoffice.org/22612
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index fe0a1cd..2a6fde0 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -52,10 +52,11 @@ public class PlainSourceView extends JScrollPane implements
 private GlyphGutter gg;
 private int linecount;
 private boolean isModified = false;
-private UndoManager undoManager;
 private static final String undoKey = "Undo";
 private static final String redoKey = "Redo";
 private CompoundEdit compoundEdit = null;
+private final int noLimit = -1;
+UndoManager undoManager;
 
 public PlainSourceView(ScriptSourceModel model) {
 this.model = model;
@@ -63,6 +64,21 @@ public class PlainSourceView extends JScrollPane implements
 model.setView(this);
 }
 
+public void undo(){
+if(compoundEdit!=null){
+compoundEdit.end();
+undoManager.addEdit(compoundEdit);
+compoundEdit = null;
+}
+if(undoManager.canUndo()){
+undoManager.undo();
+}
+}
+public void redo(){
+if(undoManager.canRedo()){
+undoManager.redo();
+}
+}
 public void clear() {
 ta.setText("");
 }
@@ -123,7 +139,7 @@ public class PlainSourceView extends JScrollPane implements
 ta.insert(model.getText(), 0);
 ta.setFont(new Font(Font.MONOSPACED, ta.getFont().getStyle(), 
ta.getFont().getSize()));
 undoManager = new UndoManager();
-
+undoManager.setLimit(noLimit);
 ta.getDocument().addUndoableEditListener(new UndoableEditListener(){
 @Override
 public void undoableEditHappened(UndoableEditEvent editEvent) {
@@ -151,23 +167,14 @@ public class PlainSourceView extends JScrollPane 
implements
 ta.getActionMap().put(undoKey, new AbstractAction(undoKey){
 @Override
 public void actionPerformed(ActionEvent event) {
-if(compoundEdit!=null){
-compoundEdit.end();
-undoManager.addEdit(compoundEdit);
-compoundEdit = null;
-}
-if(undoManager.canUndo()){
-undoManager.undo();
-}
+undo();
 }
 });
 
 ta.getActionMap().put(redoKey, new AbstractAction(redoKey){
 @Override
 public void actionPerformed(ActionEvent event) {
-if(undoManager.canRedo()){
-undoManager.redo();
-}
+redo();
 }
 });
 
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index d63eb84..5c8bd6a 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -23,6 +23,7 @@ import com.sun.star.script.framework.provider.ScriptEditor;
 import com.sun.star.script.framework.provider.SwingInvocation;
 import com.sun.star.script.provider.XScriptContext;
 
+import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -267,7 +268,7 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 }
 );
 
-String[] labels = {"Run", "Clear", "Save", "Close"};
+String[] labels = {"Run", "Clear", "Save", "Close","Undo","Redo"};
 JPanel p = new JPanel();
 p.setLayout(new FlowLayout());
 
@@ -281,8 +282,8 @@ public class ScriptEditorForBeanShell implements 
ScriptEditor, ActionListener {
 }
 }
 
-frame.getContentPane().add((JComponent)view, "Center");
-

[Libreoffice-commits] core.git: scripting/java

2016-02-21 Thread Chirag Manwani 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |   67 +-
 1 file changed, 66 insertions(+), 1 deletion(-)

New commits:
commit 03a5995ab03b6bc16a3363cfdc45b7039114ab6a
Author: Chirag Manwani 
Date:   Fri Feb 19 17:14:05 2016 +0530

tdf#97636 Added Undo/Redo functionality to Beanshell Editor

Change-Id: Ie24f7bb5e59cd78ba2d06a4ed1b6a0bcaf1a3736
Reviewed-on: https://gerrit.libreoffice.org/22500
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 5f11a6e..fe0a1cd 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -24,14 +24,25 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Polygon;
 import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 
+import javax.swing.AbstractAction;
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
+import javax.swing.KeyStroke;
+import javax.swing.UIManager;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.UIManager;
+import javax.swing.event.UndoableEditEvent;
+import javax.swing.event.UndoableEditListener;
 import javax.swing.text.BadLocationException;
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.CompoundEdit;
+import javax.swing.undo.UndoManager;
 
 public class PlainSourceView extends JScrollPane implements
 ScriptSourceView, DocumentListener {
@@ -41,6 +52,10 @@ public class PlainSourceView extends JScrollPane implements
 private GlyphGutter gg;
 private int linecount;
 private boolean isModified = false;
+private UndoManager undoManager;
+private static final String undoKey = "Undo";
+private static final String redoKey = "Redo";
+private CompoundEdit compoundEdit = null;
 
 public PlainSourceView(ScriptSourceModel model) {
 this.model = model;
@@ -107,6 +122,55 @@ public class PlainSourceView extends JScrollPane implements
 ta.setLineWrap(false);
 ta.insert(model.getText(), 0);
 ta.setFont(new Font(Font.MONOSPACED, ta.getFont().getStyle(), 
ta.getFont().getSize()));
+undoManager = new UndoManager();
+
+ta.getDocument().addUndoableEditListener(new UndoableEditListener(){
+@Override
+public void undoableEditHappened(UndoableEditEvent editEvent) {
+if(compoundEdit == null){
+compoundEdit = new CompoundEdit();
+}
+compoundEdit.addEdit(editEvent.getEdit());
+}
+});
+
+ta.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, 
InputEvent.CTRL_MASK), undoKey);
+ta.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_Y, 
InputEvent.CTRL_MASK), redoKey);
+
+ta.addKeyListener(new KeyAdapter(){
+@Override
+public void keyReleased(KeyEvent ke){
+if(ke.getKeyCode() == KeyEvent.VK_SPACE || ke.getKeyCode() == 
KeyEvent.VK_ENTER){
+compoundEdit.end();
+undoManager.addEdit(compoundEdit);
+compoundEdit = null;
+}
+}
+});
+
+ta.getActionMap().put(undoKey, new AbstractAction(undoKey){
+@Override
+public void actionPerformed(ActionEvent event) {
+if(compoundEdit!=null){
+compoundEdit.end();
+undoManager.addEdit(compoundEdit);
+compoundEdit = null;
+}
+if(undoManager.canUndo()){
+undoManager.undo();
+}
+}
+});
+
+ta.getActionMap().put(redoKey, new AbstractAction(redoKey){
+@Override
+public void actionPerformed(ActionEvent event) {
+if(undoManager.canRedo()){
+undoManager.redo();
+}
+}
+});
+
 linecount = ta.getLineCount();
 
 gg = new GlyphGutter(this);
@@ -251,3 +315,4 @@ class GlyphGutter extends JComponent {
 g.drawPolygon(arrow);
 }
 }
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-02-18 Thread Chirag Manwani 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bc9ff64c40a3e39b705f9fb141a63fc5c014b930
Author: Chirag Manwani 
Date:   Thu Feb 18 16:58:24 2016 +0530

tdf#97637 Fixed Tab size of beanshell editor to 4

Change-Id: Ifeb73ab210d9d955e502fab3e3ec993081625945
Reviewed-on: https://gerrit.libreoffice.org/22473
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 916234a..5f11a6e 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -101,6 +101,7 @@ public class PlainSourceView extends JScrollPane implements
 // What to do here
 }
 ta = new JTextArea();
+ta.setTabSize(4);
 ta.setRows(15);
 ta.setColumns(40);
 ta.setLineWrap(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-02-17 Thread Chirag Manwani 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 9046ce5cb9df2cdb379bc460dfd23e00f96e51f3
Author: Chirag Manwani 
Date:   Wed Feb 17 19:54:52 2016 +0530

tdf#97642 Use native theming for swing controls in Beanshell Editor

Change-Id: Ifb2f3cfe5132e9b6f7d5d2df5868b09b39c5ec47
Reviewed-on: https://gerrit.libreoffice.org/22429
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 91e7b91..916234a 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -30,6 +30,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.UIManager;
 import javax.swing.text.BadLocationException;
 
 public class PlainSourceView extends JScrollPane implements
@@ -93,6 +94,12 @@ public class PlainSourceView extends JScrollPane implements
 }
 
 private void initUI() {
+try{
+
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+}
+catch(Exception e){
+// What to do here
+}
 ta = new JTextArea();
 ta.setRows(15);
 ta.setColumns(40);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2016-02-16 Thread Chirag Manwani 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 38969497cbccacf2999d92b06a85946c1f71be05
Author: Chirag Manwani 
Date:   Wed Feb 17 02:52:45 2016 +0530

tdf#97640 Fixed-Width Font for Beanshell Editor

Change-Id: I809253a4f0481c825368d9c608cac77e64376aa0
Reviewed-on: https://gerrit.libreoffice.org/22404
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 34aac4c..91e7b91 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -98,6 +98,7 @@ public class PlainSourceView extends JScrollPane implements
 ta.setColumns(40);
 ta.setLineWrap(false);
 ta.insert(model.getText(), 0);
+ta.setFont(new Font(Font.MONOSPACED, ta.getFont().getStyle(), 
ta.getFont().getSize()));
 linecount = ta.getLineCount();
 
 gg = new GlyphGutter(this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java xmerge/source

2015-10-15 Thread Caolán McNamara 
 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java|   
 5 +
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |   
 5 +
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java |   
 8 +++-
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java |   
 8 +++-
 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java |   
 7 ++-
 5 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 5d5e14e97eafa22280250d5dab95c3228c68fb9a
Author: Caolán McNamara 
Date:   Wed Oct 14 21:15:18 2015 +0100

coverity#1326899 HE: Equal objects must have equal hashcodes

and...

coverity#1326898 HE: Equal objects must have equal hashcodes
coverity#1326897 HE: Equal objects must have equal hashcodes
coverity#1326896 HE: Equal objects must have equal hashcodes
coverity#1326895 HE: Equal objects must have equal hashcodes

Change-Id: Ic9cb7542c1bf0608a97e5b4756b737cdf1bb4bd8

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index 6020e81..ad98264 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -85,6 +85,11 @@ public class ScriptEntry implements Cloneable {
location.equals(other.getLocation());
 }
 
+@Override
+public int hashCode() {
+return 0;
+}
+
 public Map getLanguageProperties() {
 return languagedepprops;
 }
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 3841c18..75f0752 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -70,6 +70,11 @@ public class ScriptMetaData extends ScriptEntry {
 return super.equals(other) && hasSource == other.hasSource();
 }
 
+@Override
+public int hashCode() {
+return 0;
+}
+
 public String getScriptFullURL() {
 String url = "vnd.sun.star.script:" + parent.getName() + "."
  + getLanguageName() + "?" + "language=" + getLanguage()
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
index 4c48e3fe..2f6ca01 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
@@ -351,4 +351,10 @@ public final class PalmDB {
 
 return bool;
 }
-}
\ No newline at end of file
+
+@Override
+public int hashCode() {
+return 0;
+}
+
+}
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
index cf9fad8..12d7a02 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
@@ -167,4 +167,10 @@ public final class Record {
 }
 return false;
 }
-}
\ No newline at end of file
+
+@Override
+public int hashCode() {
+return 0;
+}
+
+}
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
index b797f3a8..74e95fb 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
@@ -175,6 +175,11 @@ public final class Difference {
 return false;
 }
 
+@Override
+public int hashCode() {
+return 0;
+}
+
 /**
  * Display debug information.
  *
@@ -215,4 +220,4 @@ public final class Difference {
 
 return orgPosition + " " + modPosition + " " + operation;
 }
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2015-10-15 Thread Caolán McNamara 
 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java |
3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 04a7df738aae3b255c1faa80fa79262602eaead7
Author: Caolán McNamara 
Date:   Thu Oct 15 15:35:03 2015 +0100

coverity#1327168 see if stock SuppressWarnings is sufficient to

silence UrF: Unread field, some sources online suggest that it
might be the case

Change-Id: I2287da343e97bec93e0aaf7a82a408c18ab76d9b
Reviewed-on: https://gerrit.libreoffice.org/19396
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index d447e66..de285a2 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -52,6 +52,7 @@ public class ScriptContext extends PropertySet implements 
XScriptContext {
 private final XComponentContext m_xComponentContext;
 
 // property, accessed via reflection
+@SuppressWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
 public String m_sDocURI = null;
 
 private ScriptContext(XComponentContext xmComponentContext, XDesktop 
xDesktop,
@@ -140,4 +141,4 @@ public class ScriptContext extends PropertySet implements 
XScriptContext {
 public XComponentContext getComponentContext() {
 return m_xComponentContext;
 }
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2015-02-16 Thread Stephan Bergmann 
 scripting/java/com/sun/star/script/framework/log/LogUtils.java |   31 
+-
 1 file changed, 6 insertions(+), 25 deletions(-)

New commits:
commit f1f6edaae13c9591e391d52856c31c6cdc303f3e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 16 11:26:45 2015 +0100

Make LogUtils.getTrace actually work

Change-Id: I59e2b93ed1142bac22ead08cc101e27cfa3e02df

diff --git a/scripting/java/com/sun/star/script/framework/log/LogUtils.java 
b/scripting/java/com/sun/star/script/framework/log/LogUtils.java
index 183f94a..cd42b9d 100644
--- a/scripting/java/com/sun/star/script/framework/log/LogUtils.java
+++ b/scripting/java/com/sun/star/script/framework/log/LogUtils.java
@@ -18,8 +18,8 @@
 
 package com.sun.star.script.framework.log;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
+import java.io.StringWriter;
+import java.io.PrintWriter;
 
 public class LogUtils {
 
@@ -50,27 +50,8 @@ public class LogUtils {
 }
 
 public static String getTrace(Exception e) {
-ByteArrayOutputStream baos = null;
-PrintStream ps = null;
-String result = ;
-
-try {
-baos = new ByteArrayOutputStream();
-ps = new PrintStream(baos);
-e.printStackTrace(ps);
-} finally {
-try {
-if (baos != null) {
-baos.close();
-}
-
-if (ps != null) {
-ps.close();
-}
-} catch (Exception excp) {
-}
-}
-
-return result;
+StringWriter w = new StringWriter();
+e.printStackTrace(new PrintWriter(w));
+return w.toString();
 }
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2015-02-16 Thread Stephan Bergmann 
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3336a5071bdf56f112f866a714a19ec70fc7e55c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 16 10:40:07 2015 +0100

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).

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index 41ab77c..63023ea 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -48,7 +48,7 @@ public class ScriptEditorForJavaScript implements 
ScriptEditor {
 // template for JavaScript scripts
 private static String JSTEMPLATE;
 
-private Main rhinoWindow;
+static private Main rhinoWindow;
 private URL scriptURL;
 // global list of ScriptEditors, key is URL of file being edited
 private static MapURL, ScriptEditorForJavaScript BEING_EDITED = new
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java sd/source

2015-01-23 Thread Andras Timar 
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java |  
  4 ++--
 sd/source/ui/inc/ViewShell.hxx  |  
  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b55ef81671d441d5e8b7c30bb2b2a1af48c46bcc
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Jan 23 15:00:54 2015 +0100

typo: langugage - language

Change-Id: Ifabd5a7851946b3e4109e22e6e9a1ff34575c1e5

diff --git 
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java 
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 29d059d..dfbac7c 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -63,7 +63,7 @@ public class UnoPkgContainer extends ParcelContainer {
 
 LogUtils.DEBUG(** getRegisterPackage ctx =  + containerUrl);
 LogUtils.DEBUG(** getRegisterPackage  for uri  + url);
-LogUtils.DEBUG(** getRegisterPackage  for langugage  + language);
+LogUtils.DEBUG(** getRegisterPackage  for language  + language);
 
 ParcelContainer result = registeredPackages.get(url);
 LogUtils.DEBUG(getRegisterPackage result is   + result);
@@ -400,4 +400,4 @@ public class UnoPkgContainer extends ParcelContainer {
 registerPackageContainer(uri, this);
 }
 }
-}
\ No newline at end of file
+}
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 8aa15c4..352b6f9 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -563,7 +563,7 @@ protected:
 private:
 ::vcl::Window* mpParentWindow;
 /** This window updater is used to keep all relevant windows up to date
-with reference to the digit langugage used to display digits in text
+with reference to the digit language used to display digits in text
 shapes.
 */
 ::std::unique_ptr ::sd::WindowUpdater mpWindowUpdater;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-12-11 Thread Noel Grandin 
 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java|   
 6 +++---
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |   
 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 08ece8d8731c045aee98e3ba7446f7683bb5ab84
Author: Noel Grandin n...@peralex.com
Date:   Thu Dec 11 15:18:39 2014 +0200

java: revert part of commit, scripting/ is public API

revert part of my commit
7557f23b31dcfb4d86c122bb34d9675c0db9a694
java: reduce visibility of fields and methods

Change-Id: I2049a154b60b165d4d2217495935442d6da66e97

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index b0f8658..6020e81 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -31,7 +31,7 @@ public class ScriptEntry implements Cloneable {
 
 private MapString, String languagedepprops;
 
-private ScriptEntry(String language, String languagename,
+public  ScriptEntry(String language, String languagename,
String location) {
 
 this.language = language;
@@ -105,7 +105,7 @@ public class ScriptEntry implements Cloneable {
 return language;
 }
 
-private String getLocation() {
+public  String getLocation() {
 return location;
 }
 
@@ -120,4 +120,4 @@ public class ScriptEntry implements Cloneable {
\nLocation =  + location +
\nLanguaguageProperties =  + languagedepprops;
 }
-}
\ No newline at end of file
+}
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index fd3c108..3841c18 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -62,7 +62,7 @@ public class ScriptMetaData extends ScriptEntry {
 return (source != null  hasSource) ? source : null;
 }
 
-private byte[] getSourceBytes() {
+public  byte[] getSourceBytes() {
 return (source != null  hasSource) ? source.getBytes() : null;
 }
 
@@ -126,7 +126,7 @@ public class ScriptMetaData extends ScriptEntry {
 return result;
 }
 
-private String getLocationPlaceHolder() {
+public String getLocationPlaceHolder() {
 String placeHolder = Unknown;
 String pathToParcel = parent.getPathToParcel();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java scripting/workben

2014-10-24 Thread David Ostrovsky 
 dev/null   
  |binary
 scripting/java/manifest.mf 
  |   26 
 scripting/java/org/openoffice/idesupport/CommandLineTools.java 
  |  337 -
 scripting/java/org/openoffice/idesupport/ExtensionFinder.java  
  |   81 
 scripting/java/org/openoffice/idesupport/JavaFinder.java   
  |  231 -
 scripting/java/org/openoffice/idesupport/LocalOffice.java  
  |   54 
 scripting/java/org/openoffice/idesupport/MethodFinder.java 
  |   26 
 scripting/java/org/openoffice/idesupport/OfficeDocument.java   
  |  106 
 scripting/java/org/openoffice/idesupport/OfficeInstallation.java   
  |   85 
 scripting/java/org/openoffice/idesupport/SVersionRCFile.java   
  |  226 -
 scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
  |   39 
 scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java  
  |   44 
 scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
  |   45 
 scripting/java/org/openoffice/idesupport/filter/FileFilter.java
  |   23 
 scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java  
  |  131 
 scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
  |  223 -
 scripting/java/org/openoffice/idesupport/ui/MethodPanel.java   
  |  164 
 scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java   
  |  199 
 scripting/java/org/openoffice/idesupport/xml/Manifest.java 
  |  125 
 scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java 
  |  159 
 scripting/java/org/openoffice/netbeans/editor/JavaKit.java 
  |  237 -
 scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java  
  |  197 
 scripting/java/org/openoffice/netbeans/editor/OOo.jcb  
  |5 
 scripting/java/org/openoffice/netbeans/editor/OOo.jcs  
  |   21 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
 |   60 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
   |   35 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
 |   61 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
|  238 -
 
scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
   |   62 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
 |   61 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
  |   32 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
 |  133 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java 
 |   32 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
 |  136 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
  |   32 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
 |  107 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
|   32 
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
   |  242 -
 
scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
 |  175 
 
scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle.properties
   |   61 
 
scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
| 1182 -
 
scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
|  110 
 scripting/java/org/openoffice/netbeans/modules/office/loader/Bundle.properties 
  |   30

[Libreoffice-commits] core.git: scripting/java

2014-10-14 Thread Robert Antoni Buj i Gelonch 
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
   |5 +
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
   |4 ++--
 scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java  
   |3 ++-
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  
   |6 ++
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |6 ++
 5 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 791ed2c654509c8e20af473d5413e8031bceddc0
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Oct 14 11:57:25 2014 +0200

scripting: use new exception constructors

Change-Id: I7eeece85d4e462bf2df010ee29c062941a677759
Reviewed-on: https://gerrit.libreoffice.org/11966
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index be72d78..b641cd0 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -193,10 +193,7 @@ public class ParcelContainer implements XNameAccess {
 name =  decodedUrl.substring(indexOfSlash + 1);
 }
 } catch (UnsupportedEncodingException e) {
-com.sun.star.uno.RuntimeException e2 =
-new com.sun.star.uno.RuntimeException();
-e2.initCause(e);
-throw e2;
+throw new com.sun.star.uno.RuntimeException(e);
 }
 } else {
 name =  document;
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index db30afb..cc4094d 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -218,9 +218,9 @@ public class ScriptMetaData extends ScriptEntry {
 if (url != null) {
 classPathVec.add(url);
 }
- }
+}
 
- return  classPathVec.toArray(new URL[classPathVec.size()]);
+return  classPathVec.toArray(new URL[classPathVec.size()]);
 } catch (Exception e) {
 LogUtils.DEBUG(Failed to build class path  + e.toString());
 LogUtils.DEBUG(LogUtils.getTrace(e));
diff --git 
a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java 
b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index 05384a7..79f933c 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -117,7 +117,8 @@ public class UCBStreamHandler extends URLStreamHandler {
 
 try {
 String sUrl = url.toString();
-if ( sUrl.lastIndexOf(separator) != -1 ) {
+
+if (sUrl.lastIndexOf(separator) != -1) {
 String path = sUrl.substring(0, 
sUrl.lastIndexOf(separator));
 
 if (m_xSimpleFileAccess.isReadOnly(path)) {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 8daf836..497b073 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -131,10 +131,8 @@ public abstract class ScriptProvider implements
 
 } catch (Exception e) {
 LogUtils.DEBUG(LogUtils.getTrace(e));
-com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException(
-Error constructing  ScriptProvider:  + e);
-e2.initCause(e);
-throw e2;
+throw new com.sun.star.uno.RuntimeException(
+e, Error constructing  ScriptProvider:  + e);
 }
 
 LogUtils.DEBUG(ScriptProvider: constructor - finished.);
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index bc896cb..881ae81 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -147,10 +147,8 @@ class ScriptImpl implements XScript {
 this.m_xMultiComponentFactory = m_xContext.getServiceManager();
 } catch (Exception e) {

[Libreoffice-commits] core.git: scripting/java

2014-10-14 Thread Robert Antoni Buj i Gelonch 
 scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 
   2 +-
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java   | 
   2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0fdba36ab6aa1eef3e147371153b7c5d12c11cae
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Oct 14 12:32:15 2014 +0200

scripting: replace '.size() == 0' with '.isEmpty()' (collections)

http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Map.html#isEmpty()

http://docs.oracle.com/javase/1.5.0/docs/api/java/util/ArrayList.html#isEmpty()

Change-Id: I76d8d8be2794655cb27ab121759494d7084b4744
Reviewed-on: https://gerrit.libreoffice.org/11967
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index 14ebb24..f8b5d0d 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -352,7 +352,7 @@ public class ParcelDescriptor {
 item.setAttribute(value, script.getLanguageName());
 root.appendChild(item);
 
-if (languagedepprops != null  languagedepprops.size() != 0) {
+if (languagedepprops != null  !languagedepprops.isEmpty()) {
 String key;
 item = document.createElement(languagedepprops);
 
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index cc4094d..d19928f 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -212,7 +212,7 @@ public class ScriptMetaData extends ScriptEntry {
 
 }
 
-if (classPathVec.size() == 0) {
+if (classPathVec.isEmpty()) {
 URL url = createURL(parcelPath);
 
 if (url != null) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-10-13 Thread Robert Antoni Buj i Gelonch 
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java |
2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b862f6e92357f8d4a8d88072ce5caf44bd6f1c6d
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Sat Oct 11 20:10:51 2014 +0200

scripting: Null pointer dereference

Change-Id: I0d72ef34945065f68e9af8b0957dc440a74c14ce
Reviewed-on: https://gerrit.libreoffice.org/11923
Reviewed-by: Matthew Francis mjay.fran...@gmail.com
Tested-by: Matthew Francis mjay.fran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index bcef577..8daf836 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -171,7 +171,7 @@ public abstract class ScriptProvider implements
 } else {
 // otherwise, check whether it's an XModel
 m_xModel =
-UnoRuntime.queryInterface(XModel.class, 
m_xInvocContext.getScriptContainer());
+UnoRuntime.queryInterface(XModel.class, aArguments[0]);
 }
 
 if (m_xModel == null) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-10-08 Thread Robert Antoni Buj i Gelonch 
 
scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
 |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1df9d5767b3222cace051a75259dea5d951cbfaf
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Wed Oct 8 18:22:16 2014 +0200

scripting: as of release 5, 'enum' is a keyword

Change-Id: Ia45890892f3a0fa89b4c1f97a4c169de5e25c593
Reviewed-on: https://gerrit.libreoffice.org/11860
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com

diff --git 
a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
 
b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
index 1caa883..4a91798 100644
--- 
a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
+++ 
b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
@@ -52,11 +52,11 @@ public class OfficeSettings extends SystemOption {
 SVersionRCFile sversion = SVersionRCFile.createInstance();
 
 try {
-Enumeration enum = sversion.getVersions();
+Enumeration enumeration = sversion.getVersions();
 OfficeInstallation oi;
 
-while (enum.hasMoreElements()) {
-oi = (OfficeInstallation)enum.nextElement();
+while (enumeration.hasMoreElements()) {
+oi = (OfficeInstallation)enumeration.nextElement();
 setOfficeDirectory(oi);
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-10-06 Thread Robert Antoni Buj i Gelonch 
 
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
   |  246 ++
 scripting/java/com/sun/star/script/framework/browse/DialogFactory.java 
   |   95 ++-
 scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java  
   |   86 +--
 scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java 
   |6 
 scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
   |   70 +-
 scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java  
   |  114 ++--
 
scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
 |8 
 scripting/java/com/sun/star/script/framework/container/Parcel.java 
   |   63 +-
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
   |  177 ---
 scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java   
   |   15 
 scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
   |3 
 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
   |9 
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
   |   52 +-
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
   |  100 ++--
 scripting/java/com/sun/star/script/framework/container/XMLParser.java  
   |2 
 scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java   
   |   55 +-
 scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java  
   |   47 +
 scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java  
   |   19 
 scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java   
   |4 
 scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java  
   |   24 
 scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
   |   53 +-
 scripting/java/com/sun/star/script/framework/log/LogUtils.java 
   |2 
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java  
   |5 
 scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java 
   |   16 
 
scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java
 |5 
 scripting/java/com/sun/star/script/framework/provider/PathUtils.java   
   |   10 
 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java   
   |   24 
 scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
   |2 
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  
   |  239 -
 scripting/java/com/sun/star/script/framework/provider/SwingInvocation.java 
   |3 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
  |6 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |   26 -
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
   |  116 ++--
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
|3 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
 |2 
 scripting/java/com/sun/star/script/framework/provider/java/Resolver.java   
   |   10 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
  |   20 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |  124 ++---
 scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
   |   14 
 scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java 
   |   33 -
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
   |   24 
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |   79 +--
 
scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
 |8 
 43 files changed, 1136 insertions(+), 883 deletions(-)

New commits:
commit e41597eade24f04893752a4339112b13419fefdd
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Fri Oct 3 17:07:28 2014 +0200

scripting: line break (code formatting)

[Libreoffice-commits] core.git: scripting/java

2014-10-02 Thread Robert Antoni Buj i Gelonch 
 
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
   |5 +
 scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
   |6 ++
 
scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
 |7 ++-
 scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java 
   |6 +-
 4 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit 4959ff5fef4381b7d09650fa62e8cda649ba7676
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Thu Oct 2 19:51:11 2014 +0200

scripting: The if statement is redundant

Change-Id: Ia6186be4ed48fd75d1063eed233a88e09b675bf1
Reviewed-on: https://gerrit.libreoffice.org/11774
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com

diff --git 
a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
 
b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index e789d86..adcde1f 100644
--- 
a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ 
b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -210,10 +210,7 @@ public class SecurityDialog extends WeakBase implements 
XComponent,
 
 // XServiceInfo
 public boolean supportsService(/*IN*/String serviceName) {
-if (serviceName.equals(__serviceName))
-return true;
-
-return false;
+return serviceName.equals(__serviceName);
 }
 
 // XServiceInfo
diff --git 
a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java 
b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
index 178d449..25ce356 100644
--- a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
@@ -33,11 +33,9 @@ public class ExceptParcelFilter implements FileFilter {
 public static ExceptParcelFilter getInstance() {
 return filter;
 }
-public boolean validate(String name) {
-if (name.startsWith(ExceptParcelFilter.parcelName))
-return true;
 
-return false;
+public boolean validate(String name) {
+return name.startsWith(ExceptParcelFilter.parcelName);
 }
 
 @Override
diff --git 
a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
 
b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
index 6f9f48b..e662fae 100644
--- 
a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
+++ 
b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
@@ -215,14 +215,11 @@ public class DeployParcelAction extends CookieAction 
implements
 chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
 chooser.setFileFilter(new FileFilter() {
 public boolean accept(File file) {
-if (file.isDirectory() ||
+return file.isDirectory() ||
 file.getName().endsWith(.sxw) ||
 file.getName().endsWith(.sxc) ||
 file.getName().endsWith(.sxd) ||
-file.getName().endsWith(.sxi))
-return true;
-
-return false;
+file.getName().endsWith(.sxi);
 }
 
 public String getDescription() {
diff --git 
a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
 
b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
index a9f0456..8d27555 100644
--- 
a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
+++ 
b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
@@ -284,11 +284,7 @@ public class ParcelFolder extends DataFolder {
 private class ParcelFolderFilter implements DataFilter {
 public boolean acceptDataObject(DataObject dobj) {
 String name = dobj.getPrimaryFile().getNameExt();
-
-if (name.equals(ParcelZipper.PARCEL_DESCRIPTOR_XML))
-return false;
-
-return true;
+return !name.equals(ParcelZipper.PARCEL_DESCRIPTOR_XML);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-10-02 Thread Robert Antoni Buj i Gelonch 
 
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
   |   22 +-
 scripting/java/com/sun/star/script/framework/browse/DialogFactory.java 
   |   21 +-
 scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java  
   |   35 ++--
 scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java 
   |8 -
 scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
   |   30 ++-
 scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java  
   |   43 +++--
 
scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
 |8 -
 scripting/java/com/sun/star/script/framework/container/Parcel.java 
   |   19 +-
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
   |   36 +++-
 scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java   
   |1 
 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
   |4 
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
   |   20 +-
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
   |   23 +-
 scripting/java/com/sun/star/script/framework/container/XMLParser.java  
   |3 
 scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java   
   |9 -
 scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java  
   |   25 ++-
 scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java  
   |4 
 scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java   
   |3 
 scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java  
   |3 
 scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
   |   33 ++--
 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java  
   |7 
 scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java 
   |   10 -
 scripting/java/com/sun/star/script/framework/provider/PathUtils.java   
   |6 
 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java   
   |   16 +-
 scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
   |2 
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  
   |   77 --
 
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
  |   16 +-
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |   28 +--
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
   |   38 ++--
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
|6 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
  |2 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |   29 ++-
 scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
   |2 
 scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java 
   |4 
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
   |   26 +--
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |   33 ++--
 36 files changed, 370 insertions(+), 282 deletions(-)

New commits:
commit 4a0fc2fb026ee46f7ef8e75135e2ae9b411ae134
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Thu Oct 2 17:38:29 2014 +0200

scripting: organize imports

Change-Id: I26a1164d44f464a44ed7deb93ac39465feb0541c
Reviewed-on: https://gerrit.libreoffice.org/11768
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
 
b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index adcde1f..3a4f413 100644
--- 
a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ 
b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -23,32 +23,38 @@ import com.sun.star.awt.ItemEvent;
 import com.sun.star.awt.XButton;
 import com.sun.star.awt.XCheckBox;
 import com.sun.star.awt.XControl;
-import

[Libreoffice-commits] core.git: scripting/java

2014-09-14 Thread rbuj 
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
 |2 +-
 scripting/java/com/sun/star/script/framework/provider/PathUtils.java   
 |3 ++-
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
   |2 +-
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
  |2 +-
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
|2 +-
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 |2 +-
 scripting/java/org/openoffice/idesupport/SVersionRCFile.java   
 |2 +-
 scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
 |6 +-
 8 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 44304a8147eb10489cf8b748076754b2fbda9e76
Author: rbuj robert@gmail.com
Date:   Sun Sep 14 00:28:07 2014 +0200

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 noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index c0d53a7..55eb560 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -279,7 +279,7 @@ public class ScriptMetaData extends ScriptEntry {
 
 if ( sourceUrl != null )
 {
-StringBuffer buf = new StringBuffer();
+StringBuilder buf = new StringBuilder();
 InputStream in = sourceUrl.openStream();
 
 byte[] contents = new byte[1024];
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java 
b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 5bea115..af7772f 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -60,7 +60,8 @@ public class PathUtils {
 }
 static  public String make_url( String baseUrl, String url )
 {
-StringBuffer buff = new StringBuffer( baseUrl.length() + url.length() 
);buff.append( baseUrl );
+StringBuilder buff = new StringBuilder( baseUrl.length() + 
url.length() );
+buff.append( baseUrl );
 StringTokenizer t = new StringTokenizer( url, /);
 while ( t.hasMoreElements() )
 {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 04b15c2..c0cfd1f 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -71,7 +71,7 @@ public class ScriptEditorForBeanShell
 ScriptEditorForBeanShell.class.getResource(template.bsh);
 
 InputStream in = url.openStream();
-StringBuffer buf = new StringBuffer();
+StringBuilder buf = new StringBuilder();
 byte[] b = new byte[1024];
 int len;
 while ((len = in.read(b)) != -1) {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
index 00399ca..ef4719e 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
@@ -35,7 +35,7 @@ public class ScriptSourceModel {
 }
 
 private String load() throws IOException {
-StringBuffer buf = new StringBuffer();
+StringBuilder buf = new StringBuilder();
 InputStream in =

[Libreoffice-commits] core.git: scripting/java

2014-09-14 Thread rbuj 
 scripting/java/com/sun/star/script/framework/provider/PathUtils.java |   10 
+-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1ebbb8bceb9f8e5876894f04b2e52cf772eb06a0
Author: rbuj robert@gmail.com
Date:   Sun Sep 14 01:22:53 2014 +0200

scripting: Uncaught Exception

Change-Id: I949aa58416dbd80d87c9455009258f7bd2fd8520
Reviewed-on: https://gerrit.libreoffice.org/11439
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java 
b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index af7772f..1bd7bd2 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -69,7 +69,15 @@ public class PathUtils {
{
buff.append('/');
}
-   buff.append( java.net.URLEncoder.encode( 
(String)t.nextElement(),UTF-8 ) );}
+   try
+   {
+   buff.append( java.net.URLEncoder.encode( 
(String)t.nextElement(), UTF-8 ) );
+   }
+   catch (java.io.UnsupportedEncodingException e)
+   {
+   e.printStackTrace();
+   }
+}
 return buff.toString();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-13 Thread rbuj 
 scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java  
   |5 -
 scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
   |   19 ++
 scripting/java/com/sun/star/script/framework/container/Parcel.java 
   |   14 ++---
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
   |   28 +++---
 scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java   
   |5 +
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
   |   21 ++-
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |7 +-
 7 files changed, 38 insertions(+), 61 deletions(-)

New commits:
commit e41cc6898abe5f46a98085c1a42608cca7813317
Author: rbuj robert@gmail.com
Date:   Fri Sep 5 12:31:14 2014 +0200

scripting: Enhanced For-Loops

Change-Id: Ib5e59a8c153e7d788c14153fa3b94c8b2d0a068c
Reviewed-on: https://gerrit.libreoffice.org/11292
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 71cfbe7..0e5c721 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -118,9 +118,8 @@ public class ParcelBrowseNode extends PropertySet
 String[] names = parcel.getElementNames();
 browsenodes = new ArrayListXBrowseNode( names.length );
 
-for ( int index = 0; index  names.length; index++ )
-{
-browsenodes.add( new ScriptBrowseNode( provider, parcel, 
names[ index ] ));
+for (String name : names) {
+browsenodes.add(new ScriptBrowseNode(provider, parcel, 
name));
 }
 }
 else
diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index fc6a6d4..7e7c938 100644
--- 
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ 
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -99,25 +99,20 @@ public class ProviderBrowseNode extends PropertySet
 LogUtils.DEBUG(** ProviderBrowseNode.getChildNodes(), container 
is  + container );
 String[] parcels = container.getElementNames();
 browsenodes = new ArrayListXBrowseNode( parcels.length );
-for ( int index = 0; index  parcels.length; index++ )
-{
-try
-{
-XBrowseNode node  = new ParcelBrowseNode( provider, 
container, parcels[ index ] );
+for (String parcel : parcels) {
+try {
+XBrowseNode node = new ParcelBrowseNode(provider, 
container, parcel);
 browsenodes.add( node );
-}
-catch ( Exception e )
-{
-LogUtils.DEBUG(*** Failed to create parcel node for  + 
parcels[ index ] );
+} catch (Exception e) {
+LogUtils.DEBUG(*** Failed to create parcel node for  + 
parcel);
 LogUtils.DEBUG( e.toString() );
 }
 }
 ParcelContainer[] packageContainers = 
container.getChildContainers();
 LogUtils.DEBUG( For container named  + container.getName() + 
 with root path  + container.getParcelContainerDir() +  has  + 
packageContainers.length +  child containers  );
 
-for ( int i = 0; i  packageContainers.length; i++ )
-{
-XBrowseNode node = new PkgProviderBrowseNode( provider, 
packageContainers[ i ], m_xCtx );
+for (ParcelContainer packageContainer : packageContainers) {
+XBrowseNode node = new PkgProviderBrowseNode(provider, 
packageContainer, m_xCtx);
 browsenodes.add( node );
 }
 }
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java 
b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index e9c3bfe..ba269ac 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -62,7 +62,7 @@ public class Parcel implements XNameContainer
 public java.lang.Object getByName( String aName ) throws 
com.sun.star.container.NoSuchElementException, 
com.sun.star.lang.WrappedTargetException
 {
 LogUtils.DEBUG(** Parcel.getByName for  + aName  );
-ScriptEntry script = null;
+ScriptEntry thescript =

[Libreoffice-commits] core.git: scripting/java

2014-09-13 Thread rbuj 
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
 |4 ++--
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
 |2 +-
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
 |4 ++--
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  
 |6 +++---
 scripting/java/org/openoffice/idesupport/OfficeDocument.java   
 |2 +-
 
scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
 |2 +-
 scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
 |2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 81711134207a2715ba6b41e659c1e80e0cd4e05d
Author: rbuj robert@gmail.com
Date:   Sat Sep 13 10:35:23 2014 +0200

scripting: use a character literal

Change-Id: Iabd3514f3c64ff851463cb9b2c1c425164285eb5
Reviewed-on: https://gerrit.libreoffice.org/11430
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 38b7dff..0b41f28 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -176,7 +176,7 @@ public class ParcelContainer implements XNameAccess
 {
 // return name
 String decodedUrl = java.net.URLDecoder.decode( containerUrl );
-int indexOfSlash = decodedUrl.lastIndexOf( / );
+int indexOfSlash = decodedUrl.lastIndexOf('/');
 if ( indexOfSlash != -1 )
 {
 name =  decodedUrl.substring( indexOfSlash + 1 );
@@ -479,7 +479,7 @@ public class ParcelContainer implements XNameAccess
 }
 LogUtils.DEBUG(Processing  + parcelDescUrl +  closed  );
 
-int indexOfSlash = parcelUrl.lastIndexOf(/);
+int indexOfSlash = parcelUrl.lastIndexOf('/');
 String name = parcelUrl.substring( indexOfSlash + 1 );
 
 parcel = new Parcel( m_xSFA, this, pd, name );
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index b6cc860..c0d53a7 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -260,7 +260,7 @@ public class ScriptMetaData extends ScriptEntry {
 }
 private URL createURL( String path ) throws java.net.MalformedURLException
 {
-int indexOfColon = path.indexOf(:);
+int indexOfColon = path.indexOf(':');
 String scheme = path.substring( 0, indexOfColon );
 UCBStreamHandler handler = new UCBStreamHandler( scheme, 
parent.m_xSFA);
 
diff --git 
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java 
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 657e7dc..d36bada 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -357,11 +357,11 @@ public class UnoPkgContainer extends ParcelContainer
 //its in a bundle need to determine the uno-package file its in
 LogUtils.DEBUG(processUnoPackage - is part of a uno bundle);
 
-int index = uri.lastIndexOf(/);
+int index = uri.lastIndexOf('/');
 if ( uri.endsWith(/) )
 {
 uri = uri.substring( 0, index );
-index = uri.lastIndexOf(/);
+index = uri.lastIndexOf('/');
 }
 
 if ( index  -1 )
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index d08011b..2da7926 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -612,12 +612,12 @@ public abstract class ScriptProvider
 String libName;
 if (Name.endsWith(/))
 {
-String tmp = Name.substring( 0, Name.lastIndexOf( / ) );
-libName = tmp.substring( tmp.lastIndexOf( / ) + 1 );
+String tmp = Name.substring( 0, Name.lastIndexOf('/') );
+libName = tmp.substring( tmp.lastIndexOf('/') + 1 );
 }
 else
 {
-libName = Name.substring( Name.lastIndexOf( / ) + 1 );
+libName =

[Libreoffice-commits] core.git: scripting/java

2014-09-13 Thread rbuj 
 scripting/java/com/sun/star/script/framework/browse/DialogFactory.java 
   |4 ++--
 scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java  
   |2 +-
 scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
   |2 +-
 scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java   
   |2 +-
 scripting/java/org/openoffice/idesupport/SVersionRCFile.java   
   |2 +-
 
scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java
 |2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit fafb0db5d24010f7390df0df791cebe3e6ce3164
Author: rbuj robert@gmail.com
Date:   Sat Sep 13 10:45:57 2014 +0200

scripting: use String.length()==0 instead of String.equals(empty string)

Change-Id: Icff6a5d19aaf7ac7ebb0cd54140bd388cba0f24d
Reviewed-on: https://gerrit.libreoffice.org/11431
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git 
a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java 
b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
index 78c97cf..1708bdc 100644
--- a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
+++ b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
@@ -140,12 +140,12 @@ public class DialogFactory
 private XDialog createInputDialog(String title, String prompt)
 throws com.sun.star.uno.Exception
 {
-if (title == null || title.equals())
+if (title == null || title.length() == 0)
 {
 title = Scripting Framework;
 }
 
-if (prompt == null || prompt.equals())
+if (prompt == null || prompt.length() == 0)
 {
 prompt = Enter name;
 }
diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 0e5c721..a2e2423 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -206,7 +206,7 @@ public class ParcelBrowseNode extends PropertySet
 newName = AnyConverter.toString(aParams[0]);
 }
 
-if ( newName == null || newName.equals())
+if ( newName == null || newName.length() == 0)
 {
 result =  new Any(new Type(Boolean.class), Boolean.FALSE);
 }
diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 7e7c938..18cefb0 100644
--- 
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ 
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -201,7 +201,7 @@ public class ProviderBrowseNode extends PropertySet
 name = AnyConverter.toString(aParams[0]);
 }
 
-if (name == null || name.equals())
+if (name == null || name.length() == 0)
 {
 result =  new Any(new Type(Boolean.class), Boolean.FALSE);
 }
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index e94e0de..2d44ff5 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -332,7 +332,7 @@ public class ParcelDescriptor {
 
 tempitem = document.createElement(description);
 String description = script.getDescription();
-if (description == null || description.equals())
+if (description == null || description.length() == 0)
 {
 description = script.getLogicalName();
 }
diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java 
b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index a6a841f..883b28f 100644
--- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
@@ -127,7 +127,7 @@ public class SVersionRCFile {
   !(s.equals(VERSIONS_LINE))) {}
 
 while ((s = br.readLine()) != null 
-  !(s.equals())) {
+  s.length() != 0) {
 StringTokenizer tokens = new StringTokenizer(s, =);
 int count = tokens.countTokens();
 
diff --git 
a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java

[Libreoffice-commits] core.git: scripting/java

2014-09-13 Thread rbuj 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a28ad55a306d31a49061b1564a3f86e219a8a55b
Author: rbuj robert@gmail.com
Date:   Sun Sep 14 01:02:05 2014 +0200

scripting: [deprecation] show() in Window has been deprecated

Change-Id: I1c157ebbfa0c307fd92c0a2d26e7d530be8ea9da
Reviewed-on: https://gerrit.libreoffice.org/11437
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 1520f3f..04b15c2 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -256,7 +256,7 @@ public class ScriptEditorForBeanShell
 
 this.model.setView(this.view);
 initUI();
-frame.show();
+frame.setVisible(true);
 }
 
 private void showErrorMessage(String message) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-13 Thread rbuj 
 scripting/java/com/sun/star/script/framework/provider/PathUtils.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40f1849e0f68ff07201015fdba18d297d71b9c4a
Author: rbuj robert@gmail.com
Date:   Sun Sep 14 01:08:10 2014 +0200

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 tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java 
b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 48ca6c9..5bea115 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -68,7 +68,7 @@ public class PathUtils {
{
buff.append('/');
}
-   buff.append( java.net.URLEncoder.encode( (String)t.nextElement() ) 
);}
+   buff.append( java.net.URLEncoder.encode( 
(String)t.nextElement(),UTF-8 ) );}
 return buff.toString();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-11 Thread rbuj 
 scripting/java/org/openoffice/idesupport/CommandLineTools.java |2 +-
 scripting/java/org/openoffice/idesupport/JavaFinder.java   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit de1db03480c86aa386b5cff09c4eac0eddbadf53
Author: rbuj robert@gmail.com
Date:   Wed Sep 10 12:39:29 2014 +0200

scripting: Pass a proper array equal to collection size.

Change-Id: I2c4c85b2da7b7037fc9da16793d18667b3d25503
Reviewed-on: https://gerrit.libreoffice.org/11375
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/scripting/java/org/openoffice/idesupport/CommandLineTools.java 
b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
index 8e2b397..c47e245 100644
--- a/scripting/java/org/openoffice/idesupport/CommandLineTools.java
+++ b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
@@ -293,7 +293,7 @@ public class CommandLineTools {
 throw new Exception(No valid scripts found);
 
 ParcelDescriptor desc = new ParcelDescriptor(parcelxml, 
language);
-desc.setScriptEntries((ScriptEntry[])scripts.toArray(new 
ScriptEntry[0]));
+desc.setScriptEntries((ScriptEntry[])scripts.toArray(new 
ScriptEntry[scripts.size()]));
 if (properties.size() != 0) {
 Enumeration enumer = properties.keys();
 
diff --git a/scripting/java/org/openoffice/idesupport/JavaFinder.java 
b/scripting/java/org/openoffice/idesupport/JavaFinder.java
index f21cf3b..98043d2 100644
--- a/scripting/java/org/openoffice/idesupport/JavaFinder.java
+++ b/scripting/java/org/openoffice/idesupport/JavaFinder.java
@@ -138,7 +138,7 @@ public class JavaFinder implements MethodFinder {
 }
 }
 
-return new URLClassLoader(urls.toArray(new URL[0]));
+return new URLClassLoader(urls.toArray(new URL[urls.size()]));
 }
 
 private ClassLoader getClassLoader(File basedir) {
@@ -232,6 +232,6 @@ public class JavaFinder implements MethodFinder {
 }
 }
 }
-return result.toArray(new String[0]);
+return result.toArray(new String[result.size()]);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-11 Thread rbuj 
 scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java |   
49 --
 1 file changed, 23 insertions(+), 26 deletions(-)

New commits:
commit b50fedfc348eb9a834b6626dc95e3538c4962a47
Author: rbuj robert@gmail.com
Date:   Sat Sep 6 21:15:33 2014 +0200

scripting: avoid a possible NullPointerException

Change-Id: I90589bc042f4b88b700e9f3c167c460c3cff043c
Reviewed-on: https://gerrit.libreoffice.org/11311
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 5c744b1..6073eb0 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -64,46 +64,43 @@ public class ScriptBrowseNode extends PropertySet
 this.provider = provider;
 this.name = name;
 this.parent = parent;
-ScriptMetaData data = null;
-XSimpleFileAccess xSFA = null;
 XComponentContext xCtx = 
provider.getScriptingContext().getComponentContext();
 XMultiComponentFactory xFac = xCtx.getServiceManager();
 try
 {
-data = (ScriptMetaData)parent.getByName( name );
-xSFA = UnoRuntime.queryInterface( XSimpleFileAccess.class,
+ScriptMetaData data = (ScriptMetaData)parent.getByName( name );
+XSimpleFileAccess xSFA = UnoRuntime.queryInterface( 
XSimpleFileAccess.class,
 xFac.createInstanceWithContext(
 com.sun.star.ucb.SimpleFileAccess,
 xCtx ) );
-}
-
-// TODO fix exception types to be caught here, should we rethrow?
-catch (  Exception e )
-{
-LogUtils.DEBUG(** caught exception getting script data for  + 
name +  - + e.toString() );
-}
-
-if (provider.hasScriptEditor())
-{
 
-this.editable  = true;
-try
+if (provider.hasScriptEditor())
 {
-if ( !parent.isUnoPkg() 
-!xSFA.isReadOnly( parent.getPathToParcel() ) )
+this.editable = true;
+try
 {
-this.deletable = true;
-this.renamable = true;
+if (!parent.isUnoPkg()
+ !xSFA.isReadOnly(parent.getPathToParcel()))
+{
+this.deletable = true;
+this.renamable = true;
+}
 }
-}
-// TODO propagate errors
-catch ( Exception e )
-{
-LogUtils.DEBUG(Caught exception in creation of 
ScriptBrowseNode);
-LogUtils.DEBUG( LogUtils.getTrace(e));
+// TODO propagate errors
+catch (Exception e)
+{
+LogUtils.DEBUG(Caught exception in creation of 
ScriptBrowseNode);
+LogUtils.DEBUG(LogUtils.getTrace(e));
+}
+
 }
 
 }
+// TODO fix exception types to be caught here, should we rethrow?
+catch (  Exception e )
+{
+LogUtils.DEBUG(** caught exception getting script data for  + 
name +  - + e.toString() );
+}
 
 registerProperty(Deletable, new Type(boolean.class),
 (short)0, deletable);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-10 Thread rbuj 
 scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java |
5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 0876cc15fc188db801a2198d9ca90a5a8b88f92f
Author: rbuj robert@gmail.com
Date:   Tue Sep 9 15:38:30 2014 +0200

scripting: fix array copy and, use System.arraycopy

Change-Id: If8addcc5d95f610ade404e62e4a2a775319e9ff3
Reviewed-on: https://gerrit.libreoffice.org/11354
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java 
b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
index d221155..b1c663c 100644
--- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
@@ -71,10 +71,7 @@ public class XOutputStreamWrapper extends OutputStream {
 throw new java.io.IOException( Stream is null );
 }
 byte[] bytes = new byte[len];
-for ( int i=off; i off+len; i++ )
-{
-bytes[i] = b[i];
-}
+System.arraycopy(b, off, bytes, 0, len);
 try
 {
 m_xOutputStream.writeBytes(bytes);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-08 Thread rbuj 
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java |   
14 +-
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3bb05281cb980c01cde07b5412c2e4c440e4ab7d
Author: rbuj robert@gmail.com
Date:   Sun Sep 7 12:29:27 2014 +0200

scripting: if...else if...else Statement

Change-Id: Ia60b352b4cb52d2712b2499550859ece699341d1
Reviewed-on: https://gerrit.libreoffice.org/11322
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index b49a526..d08011b 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -214,8 +214,7 @@ public abstract class ScriptProvider
 extensionDb = 
vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/ + 
PathUtils.BOOTSTRAP_NAME + ::UserInstallation}/user;
 extensionRepository = bundled;
 }
-
-if ( originalContextURL.startsWith( share ) )
+else if ( originalContextURL.startsWith( share ) )
 {
 contextUrl = 
vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR;
 extensionDb = 
vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/ + 
PathUtils.BOOTSTRAP_NAME + ::UserInstallation}/user;
@@ -231,12 +230,13 @@ public abstract class ScriptProvider
 if ( originalContextURL.endsWith( uno_packages) )
 {
 isPkgProvider = true;
+if (!originalContextURL.equals(contextUrl)
+ !extensionRepository.equals(bundled))
+{
+contextUrl = PathUtils.make_url(contextUrl, 
uno_packages);
+}
 }
-if ( originalContextURL.endsWith( uno_packages)   
!originalContextURL.equals( contextUrl  )
- !extensionRepository.equals(bundled))
-{
-contextUrl = PathUtils.make_url( contextUrl, 
uno_packages  );
-}
+
 if ( isPkgProvider )
 {
 m_container = new UnoPkgContainer( m_xContext, 
contextUrl, extensionDb, extensionRepository, language  );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-07 Thread rbuj 
 scripting/java/com/sun/star/script/framework/container/Parcel.java |   15 
--
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 4d6bd06c3317ca6b5a4b873d523ead798cb825d8
Author: rbuj robert@gmail.com
Date:   Sat Sep 6 22:15:21 2014 +0200

scripting: there isn't any benefit by reducing the scope here.

Change-Id: I73ebfac7b44d3fba7da70788784492fa3c53c572
Reviewed-on: https://gerrit.libreoffice.org/11312
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java 
b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index 6b4fd8d..e9c3bfe 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -244,20 +244,17 @@ public class Parcel implements XNameContainer
 {
 try
 {
-ScriptMetaData script = null;
-if ( ( script = (ScriptMetaData)getByName( Name ) ) != null )
+ScriptMetaData script = (ScriptMetaData)getByName( Name );
+if ( script != null )
 {
+if ( !script.removeSourceFile() )
 {
-   if ( !script.removeSourceFile() )
-   {
-   LogUtils.DEBUG(** Parcel.removeByName Failed to remove 
script  + Name  );
-   throw new 
com.sun.star.lang.WrappedTargetException(Failed to remove script  + Name );
-   }
-   LogUtils.DEBUG(** Parcel.removeByName have removed script 
source file  + Name );
+LogUtils.DEBUG(** Parcel.removeByName Failed to remove 
script  + Name);
+throw new com.sun.star.lang.WrappedTargetException(Failed 
to remove script  + Name);
 }
+LogUtils.DEBUG(** Parcel.removeByName have removed script 
source file  + Name);
 m_descriptor.removeScriptEntry( script );
 writeParcelDescriptor();
-
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-06 Thread rbuj 
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
 |4 
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
   |2 --
 2 files changed, 6 deletions(-)

New commits:
commit 4464ada02f5dc41bca98abd3d9413cc06d401c6a
Author: rbuj robert@gmail.com
Date:   Sat Sep 6 15:29:09 2014 +0200

scripting: fix javadoc error: reference not found

Change-Id: Ife7bbd704211dd289b6066d541bd4ae0a1788ebf
Reviewed-on: https://gerrit.libreoffice.org/11307
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index c0bb93a..09c056c 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -166,10 +166,6 @@ class ScriptImpl implements XScript
  *
  * @throws IllegalArgumentException If there is no matching script name
  *
- * @throws CannotConvertException   If args do not match or cannot
- *  be converted the those of the
- *  invokee
- *
  * @throws InvocationTargetException If the running script throws
  *   an exception this information
  *   is captured and rethrown as
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 13db712..b3b0055 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -161,8 +161,6 @@ class ScriptImpl implements XScript
  * @param aOutParam Out parameters
  * @return  The value returned from the function being 
invoked
  * @throws IllegalArgumentException If there is no matching script name
- * @throws CannotConvertException   If args do not match or cannot be 
converted
- *  the those of the invokee
  * @throws com.sun.star.reflection.InvocationTargetException If the 
running script throws an exception
  *  this information is captured and rethrown as this 
exception type.
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-05 Thread rbuj 
 scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java   |  
  1 -
 scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java |  
  1 -
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java  |  
  8 +---
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit c562a0b58d429d28829c65321cf04ab6cf474bc9
Author: rbuj robert@gmail.com
Date:   Thu Sep 4 22:08:29 2014 +0200

scripting: remove import from the same package

Change-Id: If3a07e81f5d738395d6718302512c0172b90d977
Reviewed-on: https://gerrit.libreoffice.org/11285
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 3500ab0..71cfbe7 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -45,7 +45,6 @@ import com.sun.star.script.framework.container.ScriptMetaData;
 import com.sun.star.script.framework.container.ScriptEntry;
 import com.sun.star.script.framework.container.Parcel;
 import com.sun.star.script.framework.container.ParcelContainer;
-import com.sun.star.script.framework.browse.DialogFactory;
 
 import java.util.*;
 import javax.swing.JOptionPane;
diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 7722ce4..fc6a6d4 100644
--- 
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ 
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -38,7 +38,6 @@ import com.sun.star.script.browse.BrowseNodeTypes;
 import com.sun.star.script.framework.provider.ScriptProvider;
 import com.sun.star.script.framework.log.*;
 import com.sun.star.script.framework.container.*;
-import com.sun.star.script.framework.browse.DialogFactory;
 
 import java.util.*;
 import javax.swing.JOptionPane;
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index c644e53..b6cc860 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -20,21 +20,15 @@ package com.sun.star.script.framework.container;
 
 import java.net.URL;
 
+import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
-import java.io.InputStream;
 import com.sun.star.script.framework.log.LogUtils;
-
 import com.sun.star.script.framework.provider.PathUtils;
-
 import com.sun.star.script.framework.io.XInputStreamImpl;
-
-import com.sun.star.script.framework.container.ScriptEntry;
-import com.sun.star.script.framework.container.Parcel;
-
 import com.sun.star.script.framework.io.UCBStreamHandler;
 
 import com.sun.star.ucb.XSimpleFileAccess2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-04 Thread rbuj 
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
   |   18 ++
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
   |   15 ++--
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
   |   13 ++-
 scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java   
   |6 +--
 scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java  
   |6 +--
 scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java  
   |2 -
 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java   
   |7 +--
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
 |3 -
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
   |8 +---
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
|5 +-
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |6 +--
 scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java 
   |3 -
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
   |3 -
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |5 +-
 14 files changed, 32 insertions(+), 68 deletions(-)

New commits:
commit 652b807658a54cd2ccd04ebc6900d2cf1ce85015
Author: rbuj robert@gmail.com
Date:   Thu Sep 4 23:05:24 2014 +0200

scripting: the assigned value is never used

Change-Id: I430da93e985291300ac5fdaccc7f907535771a07
Reviewed-on: https://gerrit.libreoffice.org/11287
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index c957657..866059f 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -459,8 +459,6 @@ public class ParcelContainer implements XNameAccess
 public Parcel loadParcel( String parcelUrl ) throws 
com.sun.star.lang.WrappedTargetException, 
com.sun.star.lang.IllegalArgumentException
 {
 
-String name = null;
-
 String parcelDescUrl =  PathUtils.make_url( parcelUrl,  
ParcelDescriptor.PARCEL_DESCRIPTOR_NAME );
 Parcel parcel = null;
 
@@ -494,7 +492,7 @@ public class ParcelContainer implements XNameAccess
 LogUtils.DEBUG(Processing  + parcelDescUrl +  closed  );
 
 int indexOfSlash = parcelUrl.lastIndexOf(/);
-name = parcelUrl.substring( indexOfSlash + 1 );
+String name = parcelUrl.substring( indexOfSlash + 1 );
 
 parcel = new Parcel( m_xSFA, this, pd, name );
 
@@ -588,20 +586,17 @@ public class ParcelContainer implements XNameAccess
 // removes but doesn't physically delele parcel from container
 public boolean removeParcel(String name) throws 
com.sun.star.container.NoSuchElementException, 
com.sun.star.lang.WrappedTargetException
 {
-boolean result = false;
 Parcel p = (Parcel)getByName( name );
 if ( p == null )
 {
 throw new com.sun.star.container.NoSuchElementException(No parcel 
named  + name );
 }
 
-result =  parcels.remove( p );
-return result;
+return  parcels.remove( p );
 }
 public boolean deleteParcel(String name) throws 
com.sun.star.container.NoSuchElementException, 
com.sun.star.lang.WrappedTargetException
 {
 LogUtils.DEBUG( deleteParcel for containerURL  + containerUrl +  
name =  + name  +  Langueg =  + language );
-boolean result = false;
 
 Parcel p = (Parcel)getByName( name );
 if ( p == null )
@@ -620,18 +615,15 @@ public class ParcelContainer implements XNameAccess
 throw new com.sun.star.lang.WrappedTargetException( e.toString() );
 }
 
-result =  parcels.remove( p );
-return result;
+return  parcels.remove( p );
 }
 
 public String getLanguage() { return language; }
 
 public ScriptMetaData findScript( ParsedScriptUri  parsedUri ) throws  
com.sun.star.container.NoSuchElementException,  
com.sun.star.lang.WrappedTargetException
 {
-ScriptMetaData scriptData = null;
-Parcel p = null;
-p = (Parcel)getByName( parsedUri.parcel);
-scriptData = (ScriptMetaData)p.getByName( parsedUri.function);
+Parcel p = (Parcel)getByName( parsedUri.parcel);
+ScriptMetaData scriptData =

[Libreoffice-commits] core.git: scripting/java

2014-09-04 Thread rbuj 
 scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java 
|7 --
 scripting/java/com/sun/star/script/framework/container/Parcel.java 
|6 -
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
|6 -
 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
|   12 +--
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
|   32 +-
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
|   10 ---
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  
|   10 ---
 7 files changed, 17 insertions(+), 66 deletions(-)

New commits:
commit a795c3660b543239431f3c6f7df383140da18fe5
Author: rbuj robert@gmail.com
Date:   Fri Sep 5 00:07:55 2014 +0200

scripting: the if statement is redundant

Change-Id: I7e61d740d6f58afbcdad630deb0de0ef548efcfb
Reviewed-on: https://gerrit.libreoffice.org/11288
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git 
a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
 
b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index 900a4b3..ca5d94d 100644
--- 
a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++ 
b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
@@ -37,12 +37,7 @@ public class PkgProviderBrowseNode extends ProviderBrowseNode
 
 @Override
 public String getName() {
-String name = Unknown;
-if ( container != null )
-{
-name =  container.getName();
-}
-return name;
+return (container != null) ? container.getName() : Unknown;
 }
 
 }
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java 
b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index 0a5b75a..6b4fd8d 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -140,11 +140,7 @@ public class Parcel implements XNameContainer
 
 public boolean hasElements()
 {
-if ( m_descriptor != null  m_descriptor.getScriptEntries().length  
0 )
-{
-return true;
-}
-return false;
+return m_descriptor != null  m_descriptor.getScriptEntries().length 
 0;
 }
 
 public void replaceByName( String aName, java.lang.Object aElement ) 
throws com.sun.star.lang.IllegalArgumentException, 
com.sun.star.container.NoSuchElementException, 
com.sun.star.lang.WrappedTargetException
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 866059f..92e7a5b 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -362,11 +362,7 @@ public class ParcelContainer implements XNameAccess
 }
 public boolean hasElements()
 {
-if ( parcels == null || parcels.isEmpty() )
-{
-return false;
-}
-return true;
+return !(parcels == null || parcels.isEmpty());
 }
 
 private void loadParcels() throws 
com.sun.star.lang.IllegalArgumentException, 
com.sun.star.lang.WrappedTargetException
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index ddd3fa7..b4d6a70 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -76,13 +76,11 @@ public class ScriptEntry implements Cloneable {
 }
 
 public boolean equals(ScriptEntry other) {
-if (language.equals(other.getLanguage()) 
-languagename.equals(other.getLanguageName()) 
-logicalname.equals(other.getLogicalName()) 
-languagedepprops.equals(other.getLanguageProperties()) 
-location.equals(other.getLocation()))
-return true;
-return false;
+return language.equals(other.getLanguage()) 
+languagename.equals(other.getLanguageName()) 
+logicalname.equals(other.getLogicalName()) 
+languagedepprops.equals(other.getLanguageProperties()) 
+location.equals(other.getLocation());
 }
 
 public MapString,String getLanguageProperties()
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 89abbfd..1d92abc 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++

[Libreoffice-commits] core.git: scripting/java

2014-09-04 Thread rbuj 
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java  |  
 16 +-
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java |  
 10 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 015d65c7ea301ed1033dde71e722e32f94c49530
Author: rbuj robert@gmail.com
Date:   Fri Sep 5 00:46:03 2014 +0200

scripting: use contains to check if a string contains a substring

Change-Id: I7cbd32310e362f43f0a456e45b58930eb5453f0c
Reviewed-on: https://gerrit.libreoffice.org/11289
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 1d92abc..c644e53 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -121,13 +121,13 @@ public class ScriptMetaData extends ScriptEntry {
 {
 String result = Unknown;
 
-if ( url.indexOf(UNO_USER_PACKAGES1)  -1 ||
- url.indexOf(UNO_USER_PACKAGES2)  -1 )
+if ( url.contains(UNO_USER_PACKAGES1) ||
+ url.contains(UNO_USER_PACKAGES2) )
 {
 result = PathUtils.make_url( user:uno_packages, pkgname );
 }
-else if ( url.indexOf(UNO_SHARED_PACKAGES1)  -1 ||
-  url.indexOf(UNO_SHARED_PACKAGES2)  -1 )
+else if ( url.contains(UNO_SHARED_PACKAGES1) ||
+  url.contains(UNO_SHARED_PACKAGES2) )
 {
 result = PathUtils.make_url( share:uno_packages, pkgname );
 }
@@ -151,8 +151,8 @@ public class ScriptMetaData extends ScriptEntry {
 String placeHolder = Unknown;
 String pathToParcel = parent.getPathToParcel();
 
-if ( pathToParcel.indexOf(UNO_USER_PACKAGES1)  -1 ||
- pathToParcel.indexOf(UNO_USER_PACKAGES2)  -1 )
+if ( pathToParcel.contains(UNO_USER_PACKAGES1) ||
+ pathToParcel.contains(UNO_USER_PACKAGES2) )
 {
 // it's a package
 placeHolder = user:uno_packages;
@@ -162,8 +162,8 @@ public class ScriptMetaData extends ScriptEntry {
 placeHolder = PathUtils.make_url( placeHolder, unoPkg );
 }
 }
-else if ( pathToParcel.indexOf(UNO_SHARED_PACKAGES1)  -1 ||
-  pathToParcel.indexOf(UNO_SHARED_PACKAGES2)  -1 )
+else if ( pathToParcel.contains(UNO_SHARED_PACKAGES1) ||
+  pathToParcel.contains(UNO_SHARED_PACKAGES2) )
 {
 //its a package
 placeHolder = share:uno_packages;
diff --git 
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java 
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 2680772..d281b92 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -355,11 +355,11 @@ public class UnoPkgContainer extends ParcelContainer
 LogUtils.DEBUG(processUnoPackage - script library package);
 String parentUrl = uri;
 
-if ( uri.indexOf( %2Funo_packages%2F )  -1 ||
- uri.indexOf( /uno_packages/ )  -1 ||
- uri.indexOf($UNO_USER_PACKAGES_CACHE/)  -1 ||
- uri.indexOf($UNO_SHARED_PACKAGES_CACHE/)  -1 ||
- uri.indexOf($BUNDLED_EXTENSIONS/)  -1 )
+if ( uri.contains(%2Funo_packages%2F) ||
+ uri.contains(/uno_packages/) ||
+ uri.contains($UNO_USER_PACKAGES_CACHE/) ||
+ uri.contains($UNO_SHARED_PACKAGES_CACHE/) ||
+ uri.contains($BUNDLED_EXTENSIONS/) )
 {
 //its in a bundle need to determine the uno-package file its in
 LogUtils.DEBUG(processUnoPackage - is part of a uno bundle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-02 Thread rbuj 
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java |  
  4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 908ccc22d8f99930a4f43215990aa4852d79c76c
Author: rbuj robert@gmail.com
Date:   Mon Sep 1 17:18:26 2014 +0200

scripting: fix javadoc error: unknown tag: null

Change-Id: I7d9ec1759a1689943d51636926024278cec0dc3b
Reviewed-on: https://gerrit.libreoffice.org/11234
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index dc40198..c957657 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -118,7 +118,7 @@ public class ParcelContainer implements XNameAccess
  * @paramkey the ttlocation/tt which is to
  *   be matched.
  *
- * @returnchild ttParcelContainer/tt or null if none
+ * @returnchild ttParcelContainer/tt or {@code null} if none
  * found.
  */
 
@@ -148,7 +148,7 @@ public class ParcelContainer implements XNameAccess
  * @paramcontainerUrl the ttcontainerUrl/tt which is to
  *   be matched.
  *
- * @returnchild ttParcelContainer/tt or null if none
+ * @returnchild ttParcelContainer/tt or {@code null} if none
  * found.
  */
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

2014-09-02 Thread rbuj 
 scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java 
   |9 +++--
 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java   
   |9 +++--
 
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
   |2 +-
 
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 |2 +-
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |2 +-
 5 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit b1492e6af1e626b09ed5cc6e5f63c31605a6f582
Author: rbuj robert@gmail.com
Date:   Mon Sep 1 17:16:16 2014 +0200

scripting: fix javadoc error: unknown tag: returns

Change-Id: Ib257ad76b2571755bdb744ad128ba1e558207eee
Reviewed-on: https://gerrit.libreoffice.org/11233
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
 
b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
index 9575936..994a627 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
@@ -39,8 +39,7 @@ public class EditorScriptContext implements XScriptContext
 /**
 Obtain the document reference on which the script can operate
 
-@returns
-  XModel interface
+@return  XModel interface
 */
 public XModel getDocument()
 {
@@ -60,8 +59,7 @@ public class EditorScriptContext implements XScriptContext
 /**
 Obtain the desktop reference on which the script can operate
 
-@returns
-  XDesktop interface
+@return  XDesktop interface
 */
 public XDesktop getDesktop()
 {
@@ -71,8 +69,7 @@ public class EditorScriptContext implements XScriptContext
 /**
 Obtain the component context which the script can use to create other 
uno components
 
-@returns
-  XComponentContext interface
+@return  XComponentContext interface
 */
 public XComponentContext getComponentContext()
 {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index 8e7d0ec..2fda9de 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -102,8 +102,7 @@ public class ScriptContext extends PropertySet implements 
XScriptContext
 /**
 Obtain the document reference on which the script can operate
 
-@returns
-  XModel interface
+@return  XModel interface
 */
 public XModel getDocument()
 {
@@ -118,8 +117,7 @@ public class ScriptContext extends PropertySet implements 
XScriptContext
 /**
 Obtain the desktop reference on which the script can operate
 
-@returns
-  XDesktop interface
+@return  XDesktop interface
 */
 public XDesktop getDesktop()
 {
@@ -129,8 +127,7 @@ public class ScriptContext extends PropertySet implements 
XScriptContext
 /**
 Obtain the component context which the script can use to create other 
uno components
 
-@returns
-  XComponentContext interface
+@return  XComponentContext interface
 */
 public XComponentContext getComponentContext()
 {
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index 82f2aff..6623005 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -161,7 +161,7 @@ class ScriptImpl implements XScript
  *
  * @param aOutParam Out parameters
  *
- * @returns The value returned from the function
+ * @return  The value returned from the function
  *  being invoked
  *
  * @throws IllegalArgumentException If there is no matching script name
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 66fe5a0..e5761d1 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -161,7 +161,7 @@ class ScriptImpl implements

[Libreoffice-commits] core.git: scripting/java

2014-08-19 Thread Noel Grandin 
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0c8c3a536b07d3adb8cd558debd0d409cabb8b9e
Author: Noel Grandin n...@peralex.com
Date:   Tue Aug 19 10:21:22 2014 +0200

fix java1.5 build compatibility

accidentally introduced by me in commit 0477e6c3 java: add
@Override annotation to overriding methods

Change-Id: Ieccd78f57282778a5e8f805f7a40f5e6a24e9498

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index ce909f0..e7ac14c 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -266,7 +266,6 @@ public class ScriptEditorForJavaScript implements 
ScriptEditor
 });
 Context.addContextListener(sdb);
 sdb.setScopeProvider(new ScopeProvider() {
-@Override
 public Scriptable getScope() {
 return 
org.mozilla.javascript.tools.shell.Main.getScope();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits