jde-db-get-package

Len Trigg <[email protected]> Wed, 06 Jul 2005 14:35:39 +1200
Newsgroups gmane.emacs.jdee.patches
Organization Reel Two Ltd.
Message-ID <hbbr5g4q6c.wl%[email protected]>
--Multipart_Wed_Jul__6_14:35:39_2005-1
Content-Type: text/plain; charset=US-ASCII


Hi Paul,

jde-db-get-package in current cvs has changed contract recently.  It
used to return a trailing period, and there are several occurrences
through the code where the file name of the buffer sans extension is
simply appended to the returned package name.  I have attached a patch
that updates the usages to also contatenate a period.

In addition, when I try to compile against XEmacs, I get the following error:

While compiling efc-list::efc-coll-add:
  !! Wrong number of arguments ((#<compiled-function (form val type) "...(47)" [form type temp res val cl-const-expr-p cl-make-type-test cl-const-expr-val cl-expr-contains (nil 1) cl-simple-expr-p gensym let subst] 6 "
Common Lisp lambda list:
  (typep FORM VAL TYPE)

"> 2))
>>Error occurred processing efc.el:
Wrong number of arguments: #<compiled-function (form val type) "...(47)" [form type temp res val cl-const-expr-p cl-make-type-test cl-const-expr-val cl-expr-contains (nil 1) cl-simple-expr-p gensym let subst] 6 "
Common Lisp lambda list:
  (typep FORM VAL TYPE)

">, 2


Cheers,
Len.


--Multipart_Wed_Jul__6_14:35:39_2005-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="jde-db.patch"
Content-Transfer-Encoding: 7bit

Index: lisp/jde-db.el
===================================================================
RCS file: /pack/anoncvs/jde/lisp/jde-db.el,v
retrieving revision 1.133
diff -u -r1.133 jde-db.el
--- lisp/jde-db.el	2005/06/29 04:02:10	1.133
+++ lisp/jde-db.el	2005/07/06 02:32:45
@@ -1923,7 +1923,7 @@
 	 (not applet-class)
 	 (string= applet-class ""))
 	(setq applet-class
-	      (concat (jde-db-get-package)
+	      (concat (jde-db-get-package) "."
 		      (file-name-sans-extension 
 		       (file-name-nondirectory (buffer-file-name))))))
     (jde-debug-applet-init applet-class  applet-doc)))
@@ -2180,7 +2180,7 @@
 	     jde-db-breakpoint-id-counter)
      :id   jde-db-breakpoint-id-counter
      :file file 
-     :class (concat (jde-db-get-package) 
+     :class (concat (jde-db-get-package) "."
 		    (jde-db-get-class)))))
 
 
Index: lisp/jde-junit.el
===================================================================
RCS file: /pack/anoncvs/jde/lisp/jde-junit.el,v
retrieving revision 1.5
diff -u -r1.5 jde-junit.el
--- lisp/jde-junit.el	2005/01/18 04:58:35	1.5
+++ lisp/jde-junit.el	2005/07/06 02:32:45
@@ -284,7 +284,7 @@
 		  default-directory
 		(jde-normalize-path 'jde-junit-working-directory))))
 	 (oset vm :main-class jde-junit-testrunner-type )
-	 (jde-run-set-app-args (concat (jde-db-get-package)
+	 (jde-run-set-app-args (concat (jde-db-get-package) "."
 				       (file-name-sans-extension 
 					(file-name-nondirectory (buffer-file-name)))))
 	 (cd working-directory)
Index: lisp/jde-run.el
===================================================================
RCS file: /pack/anoncvs/jde/lisp/jde-run.el,v
retrieving revision 1.97
diff -u -r1.97 jde-run.el
--- lisp/jde-run.el	2005/06/28 04:47:51	1.97
+++ lisp/jde-run.el	2005/07/06 02:32:46
@@ -1185,7 +1185,7 @@
 	     (if read-main-class
 		 (read-from-minibuffer
 		  "Main class: "
-		  (concat (jde-db-get-package)
+		  (concat (jde-db-get-package) "."
 		      (file-name-sans-extension 
 		       (file-name-nondirectory (buffer-file-name)))))
 	       (jde-run-get-main-class)))
@@ -1205,7 +1205,7 @@
 	 (not main-class)
 	 (string= main-class ""))
 	(setq main-class
-	      (concat (jde-db-get-package)
+	      (concat (jde-db-get-package) "."
 		      (file-name-sans-extension 
 		       (file-name-nondirectory (buffer-file-name))))))
     main-class))


--Multipart_Wed_Jul__6_14:35:39_2005-1
Content-Type: text/plain; charset=us-ascii

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
--Multipart_Wed_Jul__6_14:35:39_2005-1--