Implement extract-all in Java mode.

diff --git a/src/ChangeLog b/src/ChangeLog
index 520bdde1b126bc5495fd07e01faefc8f3e3d4fbd..fee09752156e836e719a3b68b83c01ee9a80dacb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-14  Tommy Johansson  <tommy.johansson@kanalen.org>
+
+       * x-java.h (x_java_extract_all): New declaration.
+       * x-java.l (extract_all_strings): New variable.
+       (x_java_extract_all): New function.
+       (extract_java): Test extract_all_strings.
+       * xgettext.c (main): Call x_java_extract_all.
+
 2001-09-03  Bruno Haible  <haible@clisp.cons.org>
 
        * x-c.h (EXTENSIONS_C, SCANNERS_C): Remove extraneous commas.

diff --git a/src/x-java.h b/src/x-java.h
index da0ac862b83c25a131a1f843022dd090eed1efaa..1deecac104e2f23a8db4b7de527efede25d4be77 100644 (file)
--- a/src/x-java.h
+++ b/src/x-java.h
@@ -27,3 +27,4 @@ extern void extract_java PARAMS ((FILE *fp, const char *real_filename,
                                  msgdomain_list_ty *mdlp));
 
 extern void x_java_keyword PARAMS ((const char *keyword));
+extern void x_java_extract_all PARAMS ((void));

diff --git a/src/x-java.l b/src/x-java.l
index ba0ae27300cd039b6f7b34e268fd56a2a4bea7f1..76d5c9f5279195d2a47d0ff03afa49ed26d8be8a 100644 (file)
--- a/src/x-java.l
+++ b/src/x-java.l
@@ -261,6 +261,17 @@ translate_esc (s)
   return n;
 }
 
+
+/* options */
+static bool extract_all_strings = false;
+
+void
+x_java_extract_all () 
+{
+  extract_all_strings = true;
+}
+
+
 static string_list_ty *java_keywords = NULL;
 
 /**
@@ -423,7 +434,8 @@ extract_java (f, real_filename, logical_filename, mdlp)
 
        case JAVA_FLOW:
          /* Did we get something? */
-         if (state == STATE_STRING && last_state == STATE_KEYWORD)
+         if (state == STATE_STRING
+             && (last_state == STATE_KEYWORD || extract_all_strings))
            {
              lex_pos_ty pos;
              pos.file_name = logical_file_name;

diff --git a/src/xgettext.c b/src/xgettext.c
index 628e021a5964bb45a87f284eb9c40c57d373285c..2a61815ca136057338d345bed44eb591f4175e05 100644 (file)
--- a/src/xgettext.c
+++ b/src/xgettext.c
@@ -221,6 +221,7 @@ main (argc, argv)
        break;
       case 'a':
        x_c_extract_all ();
+       x_java_extract_all ();
        break;
       case 'c':
        if (optarg == NULL)