[libjsyntaxpane-java] 01/03: fix a few upstream bugs

[Martin Quinson]

This is an automated email from the git hooks/post-receive script.

mquinson pushed a commit to branch master
in repository libjsyntaxpane-java.

commit 693c3a79b9c1da407bb14819f146ae7641b84b64
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Sat Aug 17 23:42:32 2013 +0200

    fix a few upstream bugs
    
    - The bundle files were not added to the jarfile
    - The one-line comment marker for scala was # (it should be //)
    - The ReplaceDialog was not starting if the localized bundle was not found
---
 debian/changelog                       |   10 ++++++++++
 debian/patches/load-bundle-i18n        |   28 ++++++++++++++++++++++++++++
 debian/patches/scala-property-comments |   16 ++++++++++++++++
 debian/patches/series                  |    2 ++
 debian/rules                           |    3 ++-
 5 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 370852b..336805b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libjsyntaxpane-java (0.9.6~r156-4) UNRELEASED; urgency=low
+
+  * d/p/scala-property-comments: fix upstream bug where # was used as
+    one-line comment marker instead of //
+  * d/p/load-bundle-i18n: fix upstream bug where missing localized
+    bundle was preventing the ReplaceDialog from getting initialized.
+  * Also add the bundles to the jarfile so that the ReplaceDialog works
+
+ -- Martin Quinson <mquinson at debian.org>  Sat, 17 Aug 2013 23:35:22 +0200
+
 libjsyntaxpane-java (0.9.6~r156-3) unstable; urgency=low
 
   * also add */config.properties to the jar , avoiding a runtime warning
diff --git a/debian/patches/load-bundle-i18n b/debian/patches/load-bundle-i18n
new file mode 100644
index 0000000..e412123
--- /dev/null
+++ b/debian/patches/load-bundle-i18n
@@ -0,0 +1,28 @@
+If the bundle for the current language was missing, a
+java.util.MissingResourceException was preventing the ReplaceDialog
+from starting.
+
+Now, the english bundle is loaded instead.
+---
+ src/main/java/jsyntaxpane/actions/gui/ReplaceDialog.java |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+Index: b/src/main/java/jsyntaxpane/actions/gui/ReplaceDialog.java
+===================================================================
+--- a/src/main/java/jsyntaxpane/actions/gui/ReplaceDialog.java
++++ b/src/main/java/jsyntaxpane/actions/gui/ReplaceDialog.java
+@@ -113,7 +113,13 @@
+         jCmbFind = new javax.swing.JComboBox();
+         jBtnReplace = new javax.swing.JButton();
+ 
+-        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle"); // NOI18N
++	java.util.ResourceBundle bundle = null;        
++        try {
++	   bundle = java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle"); // NOI18N
++	} catch (java.util.MissingResourceException e) {
++	   bundle = java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle", new java.util.Locale("")); // NOI18N
++	}
++        
+         setTitle(bundle.getString("ReplaceDialog.title")); // NOI18N
+         setName(""); // NOI18N
+         setResizable(false);
diff --git a/debian/patches/scala-property-comments b/debian/patches/scala-property-comments
new file mode 100644
index 0000000..b90dce3
--- /dev/null
+++ b/debian/patches/scala-property-comments
@@ -0,0 +1,16 @@
+Fix the comment marker for scala.
+
+---
+ src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/scalasyntaxkit/config.properties |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/scalasyntaxkit/config.properties
+===================================================================
+--- a/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/scalasyntaxkit/config.properties
++++ b/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/scalasyntaxkit/config.properties
+@@ -1,2 +1,2 @@
+ Action.toggle-comments = jsyntaxpane.actions.ToggleCommentsAction, control SLASH
+-Action.toggle-comments.LineComments = "# "
+\ No newline at end of file
++Action.toggle-comments.LineComments = "// "
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0f52ac1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+load-bundle-i18n
+scala-property-comments
diff --git a/debian/rules b/debian/rules
index dde8a14..c47e7fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,8 @@ override_dh_auto_build:
 
 override_dh_install:
 	# hack to get all files into the jar (jh_build can only include *.class)
-	(cd src/main/resources && jar uf ../../../jsyntaxpane.jar META-INF)
+	(cd src/main/resources                    && jar uf ../../../jsyntaxpane.jar META-INF)
 	(cd src/main/resources/META-INF/services/ && jar uf ../../../../../jsyntaxpane.jar `find -name "config.properties"`)
+	(cd src/main/resources/                   && jar uf ../../../jsyntaxpane.jar       `find -name "Bundle*properties"`)
 	dh_install
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsyntaxpane-java.git