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

[Apache]

Author: 
Date: 2004-09-09 15:20:42 -0700 (Thu, 09 Sep 2004)
New Revision: 17

Modified:
   trunk/app/src/org/crosswire/flashcards/MainMenu.java
   trunk/build.xml
Log:
Added png images to jar

Modified: trunk/app/src/org/crosswire/flashcards/MainMenu.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/MainMenu.java	2004-09-09 21:43:06 UTC (rev 16)
+++ trunk/app/src/org/crosswire/flashcards/MainMenu.java	2004-09-09 22:20:42 UTC (rev 17)
@@ -10,12 +10,17 @@
 
 package org.crosswire.flashcards;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.util.*;
-import javax.swing.*;
+import java.awt.event.ActionEvent;
 
+import javax.swing.AbstractAction;
+import javax.swing.ButtonGroup;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JRadioButtonMenuItem;
+
 class MainMenu extends JMenuBar {
 
     //
@@ -36,7 +41,6 @@
 
         JMenu menu1, menu2;
         JMenuItem item;
-        ButtonGroup buttonGroup;
 
         // Application Menu
 

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2004-09-09 21:43:06 UTC (rev 16)
+++ trunk/build.xml	2004-09-09 22:20:42 UTC (rev 17)
@@ -28,6 +28,17 @@
   </path>
 
   <!--=======================================================================
+    == These are the non-java resource files
+    == that may appear along side of java files.
+    =========================================================================-->
+  <patternset id="java.non.compile">
+    <include name="**/*"/>
+    <exclude name="**/*.html"/>
+    <exclude name="**/*.java"/>
+    <exclude name="**/*.class"/>
+  </patternset>
+
+  <!--=======================================================================
     == Mark this build with the current timestamp
     =========================================================================-->
   <target name="init" description="Prepare for other tasks">
@@ -99,6 +110,16 @@
            source="1.4">
       <src refid="source.path"/>
     </javac>
+    <!-- Copy the resources to the proper org/crosswire directory.
+      == The path separator could be either / or \
+      -->
+    <copy todir="${target.classes}" includeEmptyDirs="false" >
+<!--      <mapper type="regexp" from=".*[\\/](org[\\/].*)" to="\1"/>
+-->      <fileset dir="${source.java}">
+        <patternset refid="java.non.compile"/>
+        <exclude name="**/*Test*"/>
+      </fileset>
+    </copy>
   </target>
 
   <!--=======================================================================