Update to use built in semantic

lstoll · May 6, 2010 · fc71ef4 · fc71ef4
1 parent 9de6870
commit fc71ef4
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/lisp/jde-complete.el b/lisp/jde-complete.el
@@ -56,7 +56,7 @@
 ;;jde-eldoc for completion signatures
 
 (require 'eldoc)
-(require 'semantic-idle)
+(require 'semantic/idle)
 
 (defgroup jde-complete nil
   "JDE Completion"

diff --git a/lisp/jde-imenu.el b/lisp/jde-imenu.el
@@ -28,8 +28,8 @@
 
 ;;; Code:
 
-(require 'semantic-java)
-(require 'semantic-imenu)
+(require 'semantic/java)
+(require 'semantic/imenu)
 (require 'regexp-opt)
 
 ;;; Compatibility

diff --git a/lisp/jde-import.el b/lisp/jde-import.el
@@ -38,9 +38,9 @@
 ;;; Code:
 
 (require 'efc)
-(require 'semantic-fw)
-(require 'semantic-find)
-(require 'semantic-util)
+(require 'semantic/fw)
+(require 'semantic/find)
+(require 'semantic/util)
 (jde-require 'sregex)
 
 ;;;;

diff --git a/lisp/jde-java-grammar.el b/lisp/jde-java-grammar.el
@@ -23,10 +23,10 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-(require 'semantic-java)
+(require 'semantic/java)
 (require 'jde-parse)
 (eval-when-compile
-  (require 'senator)
+  (require 'semantic/senator)
   (require 'jde-which-method))
 
 

diff --git a/lisp/jde-javadoc.el b/lisp/jde-javadoc.el
@@ -35,7 +35,7 @@
 ;;; Code:
 
 (require 'tempo)
-(require 'semantic-java)
+(require 'semantic/java)
 (require 'regexp-opt)
 
 (eval-when-compile

diff --git a/lisp/jde-open-source.el b/lisp/jde-open-source.el
@@ -25,7 +25,7 @@
 (require 'jde-parse)
 (require 'jde-util)
 (require 'jde-bsh)
-(require 'senator)
+(require 'semantic/senator)
 
 (defcustom jde-open-class-at-point-find-file-function 'find-file-other-window
   "Define the function for opening the class at point. See

diff --git a/lisp/jde-parse.el b/lisp/jde-parse.el
@@ -23,8 +23,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-(require 'semantic-sb)
-(require 'semantic-ctxt)
+(require 'semantic/sb)
+(require 'semantic/ctxt)
 (if (< emacs-major-version 23)
     (progn
       (require 'avltree)  ;; use elib's avltree with local compatibility kludges

diff --git a/lisp/jde-wiz.el b/lisp/jde-wiz.el
@@ -23,7 +23,7 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-(require 'semantic-util)
+(require 'semantic/util)
 (require 'beanshell)
 (require 'jde-complete)
 (require 'efc)

diff --git a/lisp/jde.el b/lisp/jde.el
@@ -32,7 +32,7 @@
 (defvar browse-url-new-window-p)
 
 ;;;###autoload
-(defconst jde-version "@@{project.version}@@"
+(defconst jde-version "2.4.1"
   "JDE version number.")
 
 (defconst jde-revision "$Revision$"
@@ -69,7 +69,7 @@
 (require 'jde-util)
 (require 'jde-custom)
 (require 'jde-help)
-(require 'semantic-load)
+;;(require 'semantic-load)
 (require 'easymenu)
 (require 'cl)
 (require 'font-lock)