[sword-cvs] r14 - in trunk/app: . src/org/crosswire/flashcards

[Apache]

Author: 
Date: 2004-09-09 12:02:02 -0700 (Thu, 09 Sep 2004)
New Revision: 14

Modified:
   trunk/app/GNUmakefile
   trunk/app/src/org/crosswire/flashcards/MainFrame.java
Log:
Fixed 1.5.0 compile error (enum is reserved word now)
Added recognition of JAVA_HOME to GNUmakefile


Modified: trunk/app/GNUmakefile
===================================================================
--- trunk/app/GNUmakefile	2004-09-08 21:51:22 UTC (rev 13)
+++ trunk/app/GNUmakefile	2004-09-09 19:02:02 UTC (rev 14)
@@ -7,6 +7,11 @@
 ######################################################################
 # Macros
 
+JAVAC=$(JAVA_HOME)/bin/javac
+if [ ! -f $(JAVAC) ] ; then \
+	JAVAC=javac ; \
+fi
+
 CLASSES_DIRECTORY = $(shell pwd)/classes
 
 CHECK_CLASSES_DIRECTORY = \
@@ -26,7 +31,7 @@
 
 flashcards :
 	@$(CHECK_CLASSES_DIRECTORY)
-	javac -g -d $(CLASSES_DIRECTORY) `find . -type f -name '*.java'`
+	$(JAVAC) -g -d $(CLASSES_DIRECTORY) `find . -type f -name '*.java'`
 	cd src ; \
 	tar cf - `find . -type f | egrep -v '\.svn'` | ( cd $(CLASSES_DIRECTORY) ; tar xvf - )
 	cd .. ; \

Modified: trunk/app/src/org/crosswire/flashcards/MainFrame.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/MainFrame.java	2004-09-08 21:51:22 UTC (rev 13)
+++ trunk/app/src/org/crosswire/flashcards/MainFrame.java	2004-09-09 19:02:02 UTC (rev 14)
@@ -270,11 +270,11 @@
               //
               throw new AssertionError( );
           }
-          Enumeration enum = jarFile.entries();
+          Enumeration entries = jarFile.entries();
           Set lessonSet = null;
-          while (enum.hasMoreElements())
+          while (entries.hasMoreElements())
           {
-              JarEntry jarEntry = (JarEntry) enum.nextElement();
+              JarEntry jarEntry = (JarEntry) entries.nextElement();
               String entryName = jarEntry.getName();
               if (entryName.startsWith(directoryPath))
               {