lisp/cedet/semantic/java.el: File moved here from bovine/ subdirectory.

diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 9c506c54bd15c4902c9a77fc9758ce65a21527b7..31100e075c2678effe7b0298e4066c184e081599 100644 (file)
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -1,4 +1,4 @@
-;;; debug.el --- Language Debugger framework
+;;; semantic/debug.el --- Language Debugger framework
 
 ;;; Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
 
@@ -38,8 +38,6 @@
 
 (require 'semantic)
 (require 'eieio)
-;; (require 'inversion)
-;; (inversion-require 'eieio "0.18beta1")
 
 ;;; Code:
 (defvar semantic-debug-parser-source nil
@@ -141,7 +139,7 @@ These buffers are brought into view when layout occurs.")
          )
       ;; Set the number of lines to 1/3, or the size of the data buffer.
       (if (< cnt lines) (setq cnt lines))
-      
+
       (split-window-vertically cnt)
       (switch-to-buffer (oref iface data-buffer))
       )
@@ -175,7 +173,7 @@ NONTERM is the name of the rule currently being processed that shows up
 as a nonterminal (or tag) in the source buffer.
 If RULE and MATCH indicies are specified, highlight those also."
   (set-buffer (oref iface :parser-buffer))
-  
+
   (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer)))
         (nt (semantic-find-first-tag-by-name nonterm rules))
         (o nil)
@@ -183,7 +181,7 @@ If RULE and MATCH indicies are specified, highlight those also."
     (when nt
       ;; I know it is the first symbol appearing in the body of this token.
       (goto-char (semantic-tag-start nt))
-       
+
       (setq o (semantic-make-overlay (point) (progn (forward-sexp 1) (point))))
       (semantic-overlay-put o 'face 'highlight)
 
@@ -264,12 +262,12 @@ on different types of return values."
 
 (defmethod semantic-debug-frame-highlight ((frame semantic-debug-frame))
   "Highlight one parser frame."
-  
+
   )
 
 (defmethod semantic-debug-frame-info ((frame semantic-debug-frame))
   "Display info about this one parser frame."
-  
+
   )
 
 ;;; Major Mode
@@ -291,7 +289,7 @@ on different types of return values."
     (define-key km "b" 'semantic-debug-set-breakpoint)
     ;; Some boring bindings.
     (define-key km "e" 'eval-expression)
-   
+
     km)
   "Keymap used when in semantic-debug-node.")
 
@@ -308,7 +306,7 @@ Argument ONOFF is non-nil when we are entering debug mode.
          (use-local-map semantic-debug-mode-map)
          ;; Make the buffer read only
          (toggle-read-only 1)
-         
+
          (set-buffer (oref iface source-buffer))
          ;; Use our map in the source buffer also
          (use-local-map semantic-debug-mode-map)
@@ -563,4 +561,4 @@ A frame is of the form:
 
 (provide 'semantic/debug)
 
-;;; semantic-debug.el ends here
+;;; semantic/debug.el ends here

diff --git a/lisp/cedet/semantic/bovine/java.el b/lisp/cedet/semantic/java.el
similarity index 99%
rename from lisp/cedet/semantic/bovine/java.el
rename to lisp/cedet/semantic/java.el
index 1d01eb887f67204b137e7ba4f85244e6f0f5e074..3a57c65792d332283d07cc3f4490e8406584822c 100644 (file)
--- a/lisp/cedet/semantic/bovine/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -1,4 +1,4 @@
-;;; semantic/bovine/java.el --- Semantic functions for Java
+;;; semantic/java.el --- Semantic functions for Java
 
 ;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 ;;; 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -460,6 +460,6 @@ removed from the result list."
 
   )
 
-(provide 'semantic/bovine/java)
+(provide 'semantic/java)
 
-;;; semantic/bovine/java.el ends here
+;;; semantic/java.el ends here