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

[Apache]

Author: 
Date: 2004-09-09 14:43:06 -0700 (Thu, 09 Sep 2004)
New Revision: 16

Modified:
   trunk/app/GNUmakefile
   trunk/app/src/org/crosswire/common/CWClassLoader.java
   trunk/app/src/org/crosswire/flashcards/MainFrame.java
Log:
- Added -source 1.4 to the javac commmand line options
  in GNUmakefile
- Replaced assert false in the remaining files.


Modified: trunk/app/GNUmakefile
===================================================================
--- trunk/app/GNUmakefile	2004-09-09 21:15:02 UTC (rev 15)
+++ trunk/app/GNUmakefile	2004-09-09 21:43:06 UTC (rev 16)
@@ -31,7 +31,7 @@
 
 flashcards : clean
 	@$(CHECK_CLASSES_DIRECTORY)
-	$(JAVAC) -g -d $(CLASSES_DIRECTORY) `find . -type f -name '*.java'`
+	$(JAVAC) -g -source 1.4 -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/common/CWClassLoader.java
===================================================================
--- trunk/app/src/org/crosswire/common/CWClassLoader.java	2004-09-09 21:15:02 UTC (rev 15)
+++ trunk/app/src/org/crosswire/common/CWClassLoader.java	2004-09-09 21:43:06 UTC (rev 16)
@@ -241,13 +241,7 @@
         }
         catch (MalformedURLException e)
         {
-            // assert false;
-            // 
-            // The above statement fails to compile in 1.4, I'm assuming the intent is
-            // to throw an AssertionError; so, 'throw new AssertionError( );'.
-            // John Jacques, john.jacques at bigfoot.com
-            //
-            throw new AssertionError( );
+            assert false;
         }
         return home;
     }
@@ -339,16 +333,9 @@
         }
         catch (MalformedURLException ex)
         {
-            // assert false : ex;
-            // 
-            // The above statement fails to compile in 1.4, I'm assuming the intent is
-            // to throw an AssertionError( ex ); so, 'throw new AssertionError( ex );'.
-            // John Jacques, john.jacques at bigfoot.com
-            //
-            throw new AssertionError( ex );
+            assert false : ex;
 
-            //return null;
-            // unreachable!
+            return null;
         }
     }
 

Modified: trunk/app/src/org/crosswire/flashcards/MainFrame.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/MainFrame.java	2004-09-09 21:15:02 UTC (rev 15)
+++ trunk/app/src/org/crosswire/flashcards/MainFrame.java	2004-09-09 21:43:06 UTC (rev 16)
@@ -122,13 +122,7 @@
         }
         catch (MalformedURLException e1)
         {
-            // assert false;
-            // 
-            // The above statement fails to compile in 1.4, I'm assuming the intent is
-            // to throw an AssertionError; so, 'throw new AssertionError( );'.
-            // John Jacques, john.jacques at bigfoot.com
-            //
-            throw new AssertionError( );
+            assert false;
         }
 
         enableEvents(AWTEvent.WINDOW_EVENT_MASK);
@@ -243,14 +237,7 @@
       }
       catch (IOException e1)
       {
-          // assert false;
-          // 
-          // The above statement fails to compile in 1.4, I'm assuming the intent is
-          // to throw an AssertionError; so, 'throw new AssertionError( );'.
-          // John Jacques, john.jacques at bigfoot.com
-          //
-          throw new AssertionError( );
-
+          assert false;
       }
       if (connection instanceof JarURLConnection)
       {
@@ -262,13 +249,7 @@
           }
           catch (IOException e2)
           {
-              // assert false;
-              // 
-              // The above statement fails to compile in 1.4, I'm assuming the intent is
-              // to throw an AssertionError; so, 'throw new AssertionError( );'.
-              // John Jacques, john.jacques at bigfoot.com
-              //
-              throw new AssertionError( );
+              assert false;
           }
           Enumeration entries = jarFile.entries();
           Set lessonSet = null;