From fc71ef44dc3de39b7fe2dd67f3dadbfabc8ec573 Mon Sep 17 00:00:00 2001
From: Lincoln Stoll <lstoll@lstoll.net>
Date: Thu, 6 May 2010 19:24:25 +0200
Subject: [PATCH] Update to use built in semantic

---
 lisp/jde-complete.el     | 2 +-
 lisp/jde-imenu.el        | 4 ++--
 lisp/jde-import.el       | 6 +++---
 lisp/jde-java-grammar.el | 4 ++--
 lisp/jde-javadoc.el      | 2 +-
 lisp/jde-open-source.el  | 2 +-
 lisp/jde-parse.el        | 4 ++--
 lisp/jde-wiz.el          | 2 +-
 lisp/jde.el              | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lisp/jde-complete.el b/lisp/jde-complete.el
index 300c912..d2a4986 100644
--- 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
index 73a0df6..11169a6 100644
--- 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
index a33cd40..83ffef9 100644
--- 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
index 0e4ea7d..e3ff947 100644
--- 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
index 11f194e..a27af9c 100644
--- 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
index 2cdbc7e..6c0bc60 100644
--- 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
index 8e49b87..daebaf8 100644
--- 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
index de4f6e9..395bc83 100644
--- 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
index 2150c81..add3193 100644
--- 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)