[Libreoffice-commits] core.git: scripting/astyle-java.conf scripting/astyle.options scripting/Format_java_code.sh scripting/README

[Robert Antoni Buj i Gelonch]

 scripting/Format_java_code.sh |    2 +-
 scripting/README              |    5 +++++
 scripting/astyle-java.conf    |   19 -------------------
 scripting/astyle.options      |   19 +++++++++++++++++++
 4 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 09b13e1e4c6667b307fdd9608a02d2a792efd940
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Thu Sep 25 15:50:05 2014 +0200

    scripting: astyle-java.conf -> astyle.options
    
    Reviewed on:
    	https://gerrit.libreoffice.org/11639
    
    Change-Id: I0852f9766495379b0208e236b3cbeafde5bf07b3

diff --git a/scripting/Format_java_code.sh b/scripting/Format_java_code.sh
index edf75d1..8fbffe8 100755
--- a/scripting/Format_java_code.sh
+++ b/scripting/Format_java_code.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-astyle --options=astyle-java.conf --verbose --recursive ./*.java
+astyle --options=astyle.options --verbose --recursive ./*.java
diff --git a/scripting/README b/scripting/README
index f19fa3b..1ca4fe9 100644
--- a/scripting/README
+++ b/scripting/README
@@ -3,6 +3,11 @@ This module provides the source code for the Scripting Framework.
 For more information on the Scripting Framework, see the project web page:
 [http://framework.openoffice.org/scripting/]
 
+This module uses astyle to keep consistent java coding style. Please run
+
+./Format_java_code.sh
+
+before committing.
 
 == Source Code Structure ==
 
diff --git a/scripting/astyle-java.conf b/scripting/astyle.options
similarity index 100%
rename from scripting/astyle-java.conf
rename to scripting/astyle.options