I'm using jdee with the current Emacs master (from Emacs git). It throws
errors when `oref' is passed a class rather than an object. The fix is
to use `oref-default' in those cases instead.
Attached is a patch against jdee svn head (as of yesterday).
There are other warnings reported by the byte-compiler as well; I have
not attempted to fix those.
--
-- Stephe
Index: lisp/beanshell.el
===================================================================
--- lisp/beanshell.el (revision 302)
+++ lisp/beanshell.el (working copy)
@@ -224,7 +224,7 @@
(oset this process (get-buffer-process (oref this buffer)))
(oset this filter (process-filter (oref this process)))
- ;; moved to `process-query-on-exit-flag' per compile warning hint:
+ ;; moved to `process-query-on-exit-flag' per compile warning hint:
;; `process-kill-without-query' is an obsolete function (as of Emacs 22.1);
;; use `process-query-on-exit-flag' or `set-process-query-on-exit-flag'.
;;
@@ -865,7 +865,7 @@
(interactive)
(let ((bsh
(if (slot-boundp 'bsh-standalone-bsh 'the-bsh)
- (oref 'bsh-standalone-bsh the-bsh))))
+ (oref-default 'bsh-standalone-bsh the-bsh))))
(if (and bsh (bsh-running-p bsh))
(bsh-kill-process bsh)
(message "The beanshell is not running"))))
Index: lisp/jcomplete.el
===================================================================
--- lisp/jcomplete.el (revision 302)
+++ lisp/jcomplete.el (working copy)
@@ -161,11 +161,11 @@
(let ((guessed (prf2-guess-type-of name)) result)
(if (stringp guessed)
(setq result (bsh-eval
- (oref 'jde-bsh the-bsh)
+ (oref-default 'jde-bsh the-bsh)
(concat "jde.util.Completion.getClassInfo(\"" guessed "\");")))
(if (not (null name))
(setq result (bsh-eval
- (oref 'jde-bsh the-bsh)
+ (oref-default 'jde-bsh the-bsh)
(prf2-get-classinfo-javacode name guessed)))))
(if (not (null result))
(eval (read result))
Index: lisp/jde-ant.el
===================================================================
--- lisp/jde-ant.el (revision 302)
+++ lisp/jde-ant.el (working copy)
@@ -535,9 +535,9 @@
;; Clear out the compilation buffer and make it writable.
(if (not (jde-bsh-running-p))
(progn
- (bsh-launch (oref 'jde-bsh the-bsh))
- (bsh-eval (oref 'jde-bsh the-bsh) (jde-create-prj-values-str))))
- (setq proc (bsh-get-process (oref 'jde-bsh the-bsh)))
+ (bsh-launch (oref-default 'jde-bsh the-bsh))
+ (bsh-eval (oref-default 'jde-bsh the-bsh) (jde-create-prj-values-str))))
+ (setq proc (bsh-get-process (oref-default 'jde-bsh the-bsh)))
(set-buffer outbuf)
(compilation-mode)
(setq buffer-read-only nil)
Index: lisp/jde-bsh.el
===================================================================
--- lisp/jde-bsh.el (revision 302)
+++ lisp/jde-bsh.el (working copy)
@@ -158,7 +158,7 @@
(defun jde-bsh-running-p ()
"Returns t if the JDEE's BeanShell instance is running."
- (bsh-running-p (oref 'jde-bsh the-bsh)))
+ (bsh-running-p (oref-default 'jde-bsh the-bsh)))
(defvar java-bsh-read-java-expression-history nil)
@@ -210,7 +210,7 @@
(insert (if (stringp msg) msg (prin1-to-string msg)))
(insert ">")
(newline)))))
- (let ((the-bsh (oref 'jde-bsh the-bsh)))
+ (let ((the-bsh (oref-default 'jde-bsh the-bsh)))
(when (not (bsh-running-p the-bsh))
(bsh-launch the-bsh)
(bsh-eval the-bsh (jde-create-prj-values-str)))
@@ -232,7 +232,7 @@
(log java-statement 'request)
(let ((output (bsh-eval the-bsh java-statement eval-return))
len)
- (when (stringp output)
+ (when (stringp output)
(when (> (length output) 0)
(setq len (length output))
(if (eq ?\n (elt output (1- len)))
@@ -312,12 +312,12 @@
(if (not (jde-bsh-running-p))
(progn
- (bsh-launch (oref 'jde-bsh the-bsh))
- (bsh-eval (oref 'jde-bsh the-bsh) (jde-create-prj-values-str))))
+ (bsh-launch (oref-default 'jde-bsh the-bsh))
+ (bsh-eval (oref-default 'jde-bsh the-bsh) (jde-create-prj-values-str))))
(bsh-buffer-eval
- (oref 'jde-bsh the-bsh)
+ (oref-default 'jde-bsh the-bsh)
java-expr
buffer-obj)
@@ -328,13 +328,13 @@
(defun jde-bsh-run()
"*Starts the JDEE version of the BeanShell."
(interactive)
- (bsh-launch (oref 'jde-bsh the-bsh) t))
+ (bsh-launch (oref-default 'jde-bsh the-bsh) t))
(defun jde-bsh-exit ()
"Closes the existing beanshell process"
(interactive)
(if (jde-bsh-running-p)
- (let ((process (bsh-get-process (oref 'jde-bsh the-bsh))))
+ (let ((process (bsh-get-process (oref-default 'jde-bsh the-bsh))))
(if (and
(boundp 'jde-ant-invocation-method) ;; ant package may not be loaded.
(string= (car (symbol-value 'jde-ant-invocation-method)) "Ant Server"))
Index: lisp/jde-compile.el
===================================================================
--- lisp/jde-compile.el (revision 302)
+++ lisp/jde-compile.el (working copy)
@@ -144,7 +144,7 @@
2 3 nil 2 1 (6 compilation-error-face)
)
compilation-error-regexp-alist))
-
+
(setq compilation-error-regexp-alist
(cons '("----------\n\\([0-9]+. WARNING in \\(.*\\)\n (at line \\([0-9]+\\))\n\\(\\(.*\n\\)+?\\).*^+\n\\(.*\n\\)\\)"
2 3 nil 1 1 (6 compilation-warning-face)
@@ -623,7 +623,7 @@
:type 'boolean)
(defcustom jde-compile-enable-kill-buffer -1
- "* Time in seconds to display the compilation buffer before
+ "* Time in seconds to display the compilation buffer before
`jde-compile-finish-kill-buffer' will kill the compilation buffer.
If less than zero (or nil), do not kill the compilation buffer.
@@ -971,11 +971,11 @@
(if (not (jde-bsh-running-p))
(progn
- (bsh-launch (oref 'jde-bsh the-bsh))
- (bsh-eval (oref 'jde-bsh the-bsh) (jde-create-prj-values-str))))
+ (bsh-launch (oref-default 'jde-bsh the-bsh))
+ (bsh-eval (oref-default 'jde-bsh the-bsh) (jde-create-prj-values-str))))
(bsh-buffer-eval
- (oref 'jde-bsh the-bsh)
+ (oref-default 'jde-bsh the-bsh)
(concat
(format
"jde.util.CompileServer.compile(%s);"
@@ -1289,7 +1289,7 @@
(source-path
(jde-normalize-path buffer-file-name))
(arg-array (concat "new String[] {\"" source-path "\"")))
-
+
(if args
(setq arg-array
(concat
@@ -1302,7 +1302,7 @@
","))))
(setq arg-array (concat arg-array "}"))
-
+
(with-current-buffer (oref (oref this buffer) buffer)
(insert "CompileServer output:\n\n")
@@ -1327,12 +1327,12 @@
(if (not (jde-bsh-running-p))
(progn
- (bsh-launch (oref 'jde-bsh the-bsh))
- (bsh-eval (oref 'jde-bsh the-bsh) (jde-create-prj-values-str))))
- (bsh-eval (oref 'jde-bsh the-bsh)
+ (bsh-launch (oref-default 'jde-bsh the-bsh))
+ (bsh-eval (oref-default 'jde-bsh the-bsh) (jde-create-prj-values-str))))
+ (bsh-eval (oref-default 'jde-bsh the-bsh)
(format "addClassPath(\"%s\");" (oref this :path)))
(bsh-buffer-eval
- (oref 'jde-bsh the-bsh)
+ (oref-default 'jde-bsh the-bsh)
(concat
(format
"if ((new org.eclipse.jdt.internal.compiler.batch.Main(new java.io.PrintWriter(System.out), new java.io.PrintWriter(System.out), true, null, null)).compile(%s)) { print (\"0\");} else {print (\"1\");};"
Index: lisp/jde-db.el
===================================================================
--- lisp/jde-db.el (revision 302)
+++ lisp/jde-db.el (working copy)
@@ -291,7 +291,7 @@
(eq major-mode 'jde-mode)
(and (slot-boundp 'jde-db-debugger 'the-debugger)
(eq (current-buffer)
- (oref (oref 'jde-db-debugger the-debugger) buffer))))
+ (oref (oref-default 'jde-db-debugger the-debugger) buffer))))
nil
"This command works only in a Java source or debug buffer."))
@@ -315,7 +315,7 @@
"Get the`jde-db-debuggee-status' of the
current debuggee process."
(if (slot-boundp 'jde-db-debugger 'the-debugger)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee)))
(oref debuggee status))))
@@ -662,7 +662,7 @@
(find-file-other-window
(widget-get widget :file))
(goto-char (point-min))
- (forward-line
+ (forward-line
(1- (widget-get widget :line)))))
:button-face
@@ -698,7 +698,7 @@
"Deletes all the breakpoints found in `jde-db-bp-list'"
(if jde-db-bp-list
(if (jde-db-debuggee-running-p)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(bp-cmd (oref (oref debugger cmd-set) clear-bp)))
(oset
bp-cmd
@@ -1253,7 +1253,7 @@
(oref this process)
(lambda (process output)
(jde-db-process-debugger-output
- (oref 'jde-db-debugger the-debugger) output))))
+ (oref-default 'jde-db-debugger the-debugger) output))))
(defmethod jde-db-notify-process-exit ((this jde-db-debugger) msg)
"The default debugger process sentinel invokes this method
@@ -1305,7 +1305,7 @@
(oref this process)
(lambda (process msg)
(jde-db-notify-process-status-change
- (oref 'jde-db-debugger the-debugger) msg))))
+ (oref-default 'jde-db-debugger the-debugger) msg))))
(defmethod jde-db-exec-next-cmd ((this jde-db-debugger))
"Executes the next command on the debugger's pending
@@ -1713,7 +1713,7 @@
"Start the current debuggee application."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1733,7 +1733,7 @@
stopping point."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1753,7 +1753,7 @@
"Quit debugging the current application."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1768,7 +1768,7 @@
"Step to the next line in the current stack frame."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1784,7 +1784,7 @@
"Step to the next line in the current program."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1800,7 +1800,7 @@
"Continue execution to the end of the current method."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1817,7 +1817,7 @@
"Move up the stack."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1832,7 +1832,7 @@
"Move down the stack."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1847,7 +1847,7 @@
"Show current stopping point."
(interactive)
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1887,7 +1887,7 @@
(oset bp line line)
(jde-db-breakpoints-add bp)
(if (jde-db-debuggee-running-p)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(bp-cmd (oref (oref debugger cmd-set) set-bp)))
(oset bp-cmd breakpoints (list bp))
(jde-db-exec-cmd debugger bp-cmd))))))
@@ -1901,7 +1901,7 @@
(bp (jde-db-find-breakpoint file line)))
(if bp
(if (jde-db-debuggee-running-p)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(bp-cmd (oref (oref debugger cmd-set) clear-bp)))
(oset bp-cmd breakpoints (list bp))
(jde-db-exec-cmd debugger bp-cmd))
@@ -1926,7 +1926,7 @@
(interactive)
(if jde-db-breakpoints
(if (jde-db-debuggee-running-p)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(bp-cmd (oref (oref debugger cmd-set) clear-bp)))
(oset
bp-cmd
Index: lisp/jde-ecj-flymake.el
===================================================================
--- lisp/jde-ecj-flymake.el (revision 302)
+++ lisp/jde-ecj-flymake.el (working copy)
@@ -27,7 +27,7 @@
;;; Commentary:
-;;
+;;
;; * Eclipse java compiler
;;
;; This library adds support for using flymake when the eclipse java
@@ -58,9 +58,9 @@
;; 1) jde-ecj-flymake-init : This is the simple, robust and painfully slow
;; method, in which flymake forks a new jvm process each time it
;; decides to error check the buffer.
-;;
+;;
;; To use this funtion set the java line in
-;; `flymake-allowed-file-name-masks' to
+;; `flymake-allowed-file-name-masks' to
;; (\"\\.java\\'\" jde-ecj-flymake-init jde-ecj-flymake-cleanup)"
;; 2) jde-ecj-server-flymake-init: This method involves flymake
@@ -86,7 +86,7 @@
;; the faces `flymake-errline' and `flymake-warnline' to change this
;; behavior. Red and yellow underlines for errors and warnings work
;; well:
-;;
+;;
;; (custom-set-faces
;; ...
;; '(flymake-errline ((((class color)) (:underline "OrangeRed"))))
@@ -98,7 +98,7 @@
;;
;; NOW - Integrated directly into jdee
;; 0.3 - bug fixes from James Ahlborn <jahlb...@healthmarketscience.com>
-;; deleted unnecessary \n at the end of a bsh-eval string that was causing bsh-buffer-eval to fail occasionally.
+;; deleted unnecessary \n at the end of a bsh-eval string that was causing bsh-buffer-eval to fail occasionally.
;; 0.2 - Eclipse 3.2 and later support the -Xemacs option which makes
;; it possible to the hook eclipse compiler into flymake.
;; 0.1 - Initial version
@@ -178,7 +178,7 @@
(let* ((true-dir-name (file-truename dir-name))
(true-tmp-dir (file-truename (flymake-get-temp-dir))))
(when (equal true-tmp-dir (substring true-dir-name 0 (length true-tmp-dir)))
- (while (not (equal true-tmp-dir true-dir-name))
+ (while (not (equal true-tmp-dir true-dir-name))
(mapc 'jde-ecj-safe-delete-file (directory-files true-dir-name t))
(flymake-safe-delete-directory true-dir-name)
(setq true-dir-name (file-name-directory (directory-file-name true-dir-name)))))))
@@ -237,8 +237,8 @@
",")))
(setq arg-array (concat arg-array "\"" temp-file "\"}"))
-
+
(list (cons bsh-process ;; server process
"jde-eclipse-compiler-server-done") ;; output end marker
;; compile command
@@ -266,7 +266,7 @@
(let* ((source-buffer (process-buffer process))
(cleanup-f (flymake-get-cleanup-function (buffer-file-name source-buffer)))
(flymake-err-line-patterns jde-ecj-compiler-error-regexps))
-
+
(flymake-log 2 "server process %d \"exited\" with output %s" (process-id process) output)
(condition-case err
(progn
@@ -278,7 +278,7 @@
(setq flymake-processes (delq process flymake-processes))
(set-process-buffer process flymake-server-process-saved-buffer)
(set-process-filter process flymake-server-process-saved-filter)
-
+
(when (buffer-live-p source-buffer)
(with-current-buffer source-buffer
@@ -294,7 +294,7 @@
;;
;; flymake modifications to allow it to converse with a running
;; process instead of always starting a new "make" process
-;;
+;;
(defun jde-ecj-flymake-start-syntax-check-process (cmd args dir)
"Start syntax check process."
(let* ((process nil))
@@ -388,7 +388,7 @@
(jde-ecj-bsh "ecj BeanShell")
(defun jde-ecj-get-bsh ()
- (oref 'jde-ecj-bsh the-ecj-bsh))
+ (oref-default 'jde-ecj-bsh the-ecj-bsh))
(defun jde-ecj-bsh-running-p ()
(bsh-running-p (jde-ecj-get-bsh)))
Index: lisp/jde-jdb.el
===================================================================
--- lisp/jde-jdb.el (revision 302)
+++ lisp/jde-jdb.el (working copy)
@@ -409,7 +409,7 @@
(jde-db-delete-breakpoint bp)
(if (string-match "Unable to set deferred breakpoint" output)
(if (jde-db-debuggee-running-p)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(bp-cmd
(oref (oref debugger cmd-set) clear-bp)))
(oset bp-cmd breakpoints (list bp))
@@ -1441,7 +1441,7 @@
"Print expression at point."
(interactive "sExpression: ")
(jde-assert-source-or-debug-buffer)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(if (and (oref debugger running-p)
@@ -1525,7 +1525,7 @@
jde-debug-run
:active (and
(slot-boundp 'jde-db-debugger 'the-debugger)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(and (oref debugger running-p)
@@ -1533,7 +1533,7 @@
:included (or
(not (slot-boundp 'jde-db-debugger 'the-debugger))
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(or (not (oref debugger running-p))
@@ -1610,7 +1610,7 @@
jde-debug-down
:active (and
(jde-db-debuggee-stopped-p)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee)))
(> (jde-jdb-string-to-int
(oref debuggee :stack-depth)) 1)))
@@ -1682,7 +1682,7 @@
jde-debug-run
:active (and
(slot-boundp 'jde-db-debugger 'the-debugger)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(and (oref debugger running-p)
@@ -1690,7 +1690,7 @@
:included (or
(not (slot-boundp 'jde-db-debugger 'the-debugger))
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee))
(debuggee-status (oref debuggee status)))
(or (not (oref debugger running-p))
@@ -1755,7 +1755,7 @@
jde-debug-down
:active (and
(jde-db-debuggee-stopped-p)
- (let* ((debugger (oref 'jde-db-debugger the-debugger))
+ (let* ((debugger (oref-default 'jde-db-debugger the-debugger))
(debuggee (oref debugger debuggee)))
(> (jde-jdb-string-to-int
(oref debuggee :stack-depth)) 1)))]
Index: lisp/jde-plugins.el
===================================================================
--- lisp/jde-plugins.el (revision 302)
+++ lisp/jde-plugins.el (working copy)
@@ -54,7 +54,7 @@
(oset-default
'jde-plugin
plugins
- (cons plugin (oref 'jde-plugin plugins))))
+ (cons plugin (oref-default 'jde-plugin plugins))))
(defun jde-pi-get-plugin-dir (plugin)
@@ -107,7 +107,7 @@
(defun jde-pi-get-bsh-classpath ()
"Get the plugin directories and jar files to include in the Beanshell classpath."
- (let ((plugins (oref 'jde-plugin plugins))
+ (let ((plugins (oref-default 'jde-plugin plugins))
classpath)
(loop for plugin in plugins do
(setq classpath (append classpath (oref plugin bsh-cp))))
@@ -147,7 +147,7 @@
(defun jde-plugin-make-menu-spec ()
- (if (oref 'jde-plugin plugins)
+ (if (oref-default 'jde-plugin plugins)
(append
(list "JDEpi")
(delq
@@ -155,7 +155,7 @@
(mapcan
(lambda (plugin)
(oref plugin menu-spec))
- (oref 'jde-plugin plugins))))))
+ (oref-default 'jde-plugin plugins))))))
(defvar jde-plugin-mode-map
(let ((km (make-sparse-keymap))
Index: lisp/jde-wiz.el
===================================================================
--- lisp/jde-wiz.el (revision 302)
+++ lisp/jde-wiz.el (working copy)
@@ -125,10 +125,10 @@
(forward-char))
(insert (concat " " keyword " " interface " "))))))))
-(defun jde-dollar-name (name)
+(defun jde-dollar-name (name)
"Convert pkg[.Outer].Inner[$Inner] to pkg[.Outer]$Inner[$Inner]"
;; change last '.' to '$'
- (jde-replace-in-string name "[.]\\([^.]+$\\)" "$\\1"))
+ (jde-replace-in-string name "[.]\\([^.]+$\\)" "$\\1"))
(defun jde-jeval-classname (fmt interface-name &optional eval-return)
"Try jde-jeval on the command derived from (format FMT INTERFACE-NAME),
@@ -152,7 +152,7 @@
(defun jde-wiz-generate-interface (interface-name)
"*Generate a skeleton implementation of a specified interface."
(let* ((code
- (jde-jeval-classname
+ (jde-jeval-classname
"jde.wizards.InterfaceFactory.makeInterfaceExpression(\"%s\",true);"
interface-name)))
(if code
@@ -496,7 +496,7 @@
(jde-parse-select-qualified-class-name class)))
(if fq-class-name
(bsh-eval
- (oref 'jde-bsh the-bsh)
+ (oref-default 'jde-bsh the-bsh)
(format "browseClass(\"%s\");" fq-class-name)))))
(defun jde-wiz-delegate (delegee)
Index: lisp/jde.el
===================================================================
--- lisp/jde.el (revision 302)
+++ lisp/jde.el (working copy)
@@ -107,7 +107,7 @@
(require 'jde-annotations)
(require 'regress)
-(defconst jde-emacs-cedet-p
+(defconst jde-emacs-cedet-p
(and jde-emacs23p
(fboundp 'semantic-mode)
(boundp 'semantic-new-buffer-setup-functions))
@@ -116,7 +116,7 @@
(unless jde-emacs-cedet-p
;; Use the full Java 1.5 grammar to parse Java files
;; (legacy code I moved down here (shyamalprasad))
- (autoload 'wisent-java-default-setup "wisent-java"
+ (autoload 'wisent-java-default-setup "wisent-java"
"Hook run to setup Semantic in `java-mode'."
nil nil))
@@ -998,7 +998,7 @@
(if (and
(not jde-launch-beanshell-on-demand-p)
(not (jde-bsh-running-p)))
- (bsh-launch (oref 'jde-bsh the-bsh)))
+ (bsh-launch (oref-default 'jde-bsh the-bsh)))
(jde-wiz-set-bsh-project)
@@ -2395,9 +2395,9 @@
(interactive)
(let ((dialog
(progn
- (if (not (oref 'jde-find-dialog the-dialog))
+ (if (not (oref-default 'jde-find-dialog the-dialog))
(oset-default 'jde-find-dialog the-dialog (jde-find-dialog "find dialog")))
- (oref 'jde-find-dialog the-dialog))))
+ (oref-default 'jde-find-dialog the-dialog))))
(efc-dialog-show dialog)
(when (oref dialog ok)
(jde-find-grep-internal
@@ -2455,7 +2455,7 @@
(if (and class-to-open (stringp class-to-open))
(progn
(bsh-eval
- (oref 'jde-bsh the-bsh)
+ (oref-default 'jde-bsh the-bsh)
(concat "exploreClass(\"" class-to-open "\");")))
(error "Can not parse the thing at point!")))
(message "You need JDE >= 2.2.6 and Senator for using this feature!")))
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
jdee-devel mailing list
jdee-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jdee-devel
