Update function naming for newer semantic

lisp/jde-imenu.el

@@ -309,9 +309,9 @@ index to go to class definition."
   "Creates an imenu index for class parts in TAGS.
 When`jde-imenu-include-signature' is non-nil the
 index menu displays full method signatures and field types."
-  (let ((methods (semantic-find-nonterminal-by-token 'function tags))
-	(fields  (semantic-find-nonterminal-by-token 'variable tags))
-	(classes (semantic-find-nonterminal-by-token 'type     tags))
+  (let ((methods (semantic-find-tags-by-class 'function tags))
+	(fields  (semantic-find-tags-by-class 'variable tags))
+	(classes (semantic-find-tags-by-class 'type     tags))
 	index)
 
     (setq methods (jde-imenu-sort-tags methods))
@@ -375,9 +375,9 @@ This function uses the semantic bovinator to index the buffer."
     (semantic-fetch-tags)
 
     (let* ((tags   (semantic-fetch-tags))
-	   (packages (semantic-find-nonterminal-by-token 'package tags))
-	   (depends  (semantic-find-nonterminal-by-token 'include tags))
-	   (classes  (semantic-find-nonterminal-by-token 'type tags))
+	   (packages (semantic-find-tags-by-class 'package tags))
+	   (depends  (semantic-find-tags-by-class 'include tags))
+	   (classes  (semantic-find-tags-by-class 'type tags))
 	   depend-index
 	   index)
 

lisp/jde-parse.el

@@ -179,7 +179,7 @@ replaced by that range.  See also `semantic-change-hooks'."
 (defun jde-parse-buffer-contains-multiple-classes-p ()
   "Return non-nil if buffer contains multiple class definitions."
   (let* ((top-level-classes
-	  (semantic-find-nonterminal-by-token
+	  (semantic-find-tags-by-class
 	   'type
 	   (semantic-fetch-tags)))
 	 (top-level-class-count (length top-level-classes)))
@@ -189,7 +189,7 @@ replaced by that range.  See also `semantic-change-hooks'."
       (= top-level-class-count 1)
       (let* ((inner-class-parts (semantic-tag-type-members (car top-level-classes)))
 	     (inner-classes
-	      (semantic-find-nonterminal-by-token
+	      (semantic-find-tags-by-class
 	       'type inner-class-parts)))
 	(>= (length inner-classes) 1))))))
 
@@ -244,7 +244,7 @@ moved also."
 	  (setq class-regexp (regexp-quote class-name)))))
 
   (let* ((tokens (semantic-fetch-tags))
-	 (classes (semantic-find-nonterminal-by-token 'type tokens))
+	 (classes (semantic-find-tags-by-class 'type tokens))
 	 class-parts pos)
 
     (setq pos
@@ -297,7 +297,7 @@ MODIFIERS creteria as an exact match or subset.  This defaults to `subset'."
   (if (null member-name-regexp) (setq member-name-regexp ".*"))
 
   (let* ((tokens (semantic-fetch-tags))
-	 (classes (semantic-find-nonterminal-by-token 'type tokens))
+	 (classes (semantic-find-tags-by-class 'type tokens))
 	 cmp-fn vars var-parts var-name var-modifiers i)
 
     (setq cmp-fn
@@ -328,7 +328,7 @@ MODIFIERS creteria as an exact match or subset.  This defaults to `subset'."
 		      (string-equal class-name (semantic-tag-name class)))
 
 	      (setq var-parts (semantic-tag-type-members class)
-		    vars (semantic-find-nonterminal-by-token
+		    vars (semantic-find-tags-by-class
 			  'variable var-parts)
 		    i 0)
 
@@ -896,8 +896,8 @@ in a method; otherwise, nil."
 	  (class pos)
 	  (let* ((class-name       (semantic-tag-name class))
 		 (class-parts      (semantic-tag-type-members class))
-		 (class-subclasses (semantic-find-nonterminal-by-token 'type class-parts))
-		 (class-methods    (semantic-find-nonterminal-by-token 'function class-parts)))
+		 (class-subclasses (semantic-find-tags-by-class 'type class-parts))
+		 (class-methods    (semantic-find-tags-by-class 'function class-parts)))
 
 	    ;; Is point in a method of a subclass of this class?
 	    (loop for subclass in class-subclasses do
@@ -915,7 +915,7 @@ in a method; otherwise, nil."
 
     (let* ((pos (if position position (point)))
 	   (tokens (semantic-fetch-tags))
-	   (classes (semantic-find-nonterminal-by-token 'type tokens)))
+	   (classes (semantic-find-tags-by-class 'type tokens)))
       (catch 'found
 	(loop for class in classes
 	      do (search-class class pos))))))
@@ -1008,8 +1008,8 @@ in a method; otherwise, nil."
 	  (class)
 	  (let* ((class-name       (semantic-tag-name class))
 		 (class-parts      (semantic-tag-type-members class))
-		 (class-subclasses (semantic-find-nonterminal-by-token 'type class-parts))
-		 (class-methods    (semantic-find-nonterminal-by-token 'function class-parts)))
+		 (class-subclasses (semantic-find-tags-by-class 'type class-parts))
+		 (class-methods    (semantic-find-tags-by-class 'function class-parts)))
 
 	    ;; Add methods of subclasses
 	    (loop for subclass in class-subclasses do
@@ -1027,7 +1027,7 @@ in a method; otherwise, nil."
 		      (cons method-start method-end))))))))
 
     (let* ((tokens (semantic-fetch-tags))
-	   (classes (semantic-find-nonterminal-by-token 'type tokens)))
+	   (classes (semantic-find-tags-by-class 'type tokens)))
       (loop for class in classes do
 	    (add-methods class)))))
 
@@ -1498,8 +1498,8 @@ It uses the semantic parser table to find the 'package' and 'import'
 statements. It implicitly adds the java.lang.* package. See also
 `jde-split-import-token'."
   (let* ((tokens   (semantic-fetch-tags))
-	 (packages (semantic-find-nonterminal-by-token 'package tokens))
-	 (imports  (semantic-find-nonterminal-by-token 'include tokens))
+	 (packages (semantic-find-tags-by-class 'package tokens))
+	 (imports  (semantic-find-tags-by-class 'include tokens))
 	 lst)
     (setq lst (append
 	       (mapcar (function

lisp/jde-wiz.el

@@ -717,7 +717,7 @@ the tokens of `class-name', returns nil if no token are found"
     (if (not parts)
 	(while tokens
 	  (setq temp-parts (semantic-tag-type-members (car tokens)))
-	  (setq inner-classes (semantic-find-nonterminal-by-token 'type temp-parts))
+	  (setq inner-classes (semantic-find-tags-by-class 'type temp-parts))
 	  (setq parts (jde-wiz-get-class-parts class-name inner-classes))
 	  (if parts
 	      (setq tokens nil)
@@ -775,12 +775,12 @@ defined in the current buffer."
 	 (classes (split-string class "\\."))
 	 (class-name (nth (- (length classes) 1) classes))
 	 (tokens (semantic-fetch-tags));;buffer tokens
-	 (type (semantic-find-nonterminal-by-token 'type tokens));;class tokens
+	 (type (semantic-find-tags-by-class 'type tokens));;class tokens
 	 (parts (jde-wiz-get-class-parts class-name type))
-	 (variables (semantic-find-nonterminal-by-token 'variable parts));;declared variables
+	 (variables (semantic-find-tags-by-class 'variable parts));;declared variables
 	 ;;non public variables
 	 (non-public-variables (jde-wiz-filter-variables-by-typemodifier variables))
-	 (functions (semantic-find-nonterminal-by-token 'function parts));;functions
+	 (functions (semantic-find-tags-by-class 'function parts));;functions
 	 (set-get-functions (jde-wiz-get-get-set-methods functions));;get,set,is functions
 	 var name staticp finalp report temp pos)
 
@@ -1154,11 +1154,11 @@ If `jde-wiz-tostring-postfix' is defined, it is appended to the string. "
 	 (jde-parse-get-unqualified-name
 	  (jde-parse-get-class-at-point)))
 	(variables
-	 (semantic-find-nonterminal-by-token
+	 (semantic-find-tags-by-class
 	  'variable
 	  (jde-wiz-get-class-parts
 	   class-name
-	   (semantic-find-nonterminal-by-token
+	   (semantic-find-tags-by-class
 	    'type
 	    (semantic-fetch-tags)
 	    ))))

lisp/jde-xref.el

@@ -665,7 +665,7 @@ while. If it does, you might want to consider increasing
 		       (jde-xref-get-current-class) token))))))
     (let ((uncalled-methods
 	    (mapcan 'get-unused-string
-		    (semantic-find-nonterminal-by-token 'function
+		    (semantic-find-tags-by-class 'function
 							(current-buffer)
 							t)))
 	  (unreferenced-variables