diff options
Diffstat (limited to 'lisp/cedet/srecode/java.el')
| -rw-r--r-- | lisp/cedet/srecode/java.el | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el index 4e76c15e300..43e9273da76 100644 --- a/lisp/cedet/srecode/java.el +++ b/lisp/cedet/srecode/java.el @@ -1,6 +1,6 @@ ;;; srecode/java.el --- Srecode Java support -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <eric@siege-engine.com> @@ -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) |