merge from trunk

1 files changed, 12 insertions, 5 deletions

diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index 58d8efc41e2..43e9273da76 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -26,6 +26,7 @@
 ;;; Code:
 
 (require 'srecode/dictionary)
+(require 'semantic/find)
 
 ;;;###autoload
 (defun srecode-semantic-handle-:java (dict)
@@ -33,7 +34,7 @@
 Adds the following:
 FILENAME_AS_PACKAGE - file/dir converted into a java package name.
 FILENAME_AS_CLASS - file converted to a Java class name."
-  ;; A symbol representing
+  ;; Symbols needed by empty files.
   (let* ((fsym (file-name-nondirectory (buffer-file-name)))
 	 (fnox (file-name-sans-extension fsym))
 	 (dir (file-name-directory (buffer-file-name)))
@@ -44,12 +45,18 @@ FILENAME_AS_CLASS - file converted to a Java class name."
     (if (string-match "src/" dir)
 	(setq dir (substring dir (match-end 0)))
       (setq dir (file-name-nondirectory (directory-file-name dir))))
+    (setq dir (directory-file-name dir))
     (while (string-match "/" dir)
-      (setq dir (replace-match "_" t t dir)))
-    (srecode-dictionary-set-value dict "FILENAME_AS_PACKAGE"
-				  (concat dir "." fpak))
+      (setq dir (replace-match "." t t dir)))
+    (srecode-dictionary-set-value dict "FILENAME_AS_PACKAGE" dir)
     (srecode-dictionary-set-value dict "FILENAME_AS_CLASS" fnox)
-    ))
+    )
+  ;; Symbols needed for most other files with stuff in them.
+  (let ((pkg (semantic-find-tags-by-class 'package (current-buffer))))
+    (when pkg
+      (srecode-dictionary-set-value dict "CURRENT_PACKAGE" (semantic-tag-name (car pkg)))
+      ))
+  )
 
 (provide 'srecode/java)