Bug 11 Done

checkstyle_config/checkstyle_config.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="checkstyle-all-4.3" level="project" />
+  </component>
+</module>

checkstyle_config/src/jmemorize/checks/ExceptionLoggedCheck.java

@@ -83,7 +83,7 @@ public void visitToken(DetailAST ast)
         } else if (ast.getType() == TokenTypes.LITERAL_ASSERT &&
             catchDepth == 1) {
             DetailAST childAst = ast.findFirstToken(TokenTypes.EXPR);
-            if (childAst != null || childAst.getNumberOfChildren() == 1) {
+            if (childAst != null && childAst.getNumberOfChildren() == 1) {
                 DetailAST grandchildAst = childAst.findFirstToken(TokenTypes.LITERAL_FALSE);
                 if (grandchildAst != null) {
                     hasAssert = true;                            

jMemorize.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="lib" level="project" />
+  </component>
+</module>

src/jmemorize/core/Card.java

@@ -20,6 +20,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import jmemorize.core.CardSide.CardSideObserver;
 
@@ -233,11 +234,14 @@ public Date getDateExpired()
     /**
      * @param date can be <code>null</code>.
      */
-    public void setDateExpired(Date date) // CHECK should this throw a event?
-    {
+    public void setDateExpired(Date date) throws IllegalArgumentException {
+        if (date.before(m_dateCreated)) {
+            throw new IllegalArgumentException("Expiration date cannot be before the creation date of the card.");
+        }
         m_dateExpired = cloneDate(date);
     }
 
+
     /**
      * @return the creation date. Is never <code>null</code>.
      */
@@ -248,10 +252,7 @@ public Date getDateCreated()
 
     public void setDateCreated(Date date)
     {
-        if (date == null) 
-            throw new NullPointerException();
-
-        m_dateCreated = cloneDate(date);
+        m_dateCreated = Objects.requireNonNull(date, "Date cannot be null");
     }
 
     /**
@@ -441,9 +442,12 @@ public Card cloneWithoutProgress()
     /**
      * @see java.lang.Object#toString()
      */
-    public String toString()
-    {
-        return "("+m_frontSide+"/"+m_backSide+")";
+    public String toString() {
+        if (m_dateExpired != null) {
+            return "(" + m_frontSide + "/" + m_backSide + " - Expires: " + m_dateExpired + ")";
+        } else {
+            return "(" + m_frontSide + "/" + m_backSide + ")";
+        }
     }
 
     private void attachCardSideObservers()

src/jmemorize/core/Main.java

@@ -27,11 +27,7 @@
 import java.io.StringWriter;
 import java.net.URL;
 import java.nio.channels.FileChannel;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Observable;
-import java.util.Properties;
+import java.util.*;
 import java.util.logging.FileHandler;
 import java.util.logging.Handler;
 import java.util.logging.Level;
@@ -445,7 +441,7 @@ public static Logger getLogger()
     // we have more information about the exception there.
     public static void logThrowable(String msg, Throwable t) 
     {
-        if (t != null && m_lastLoggedThrowable != t) 
+        if (t != null && !Objects.equals(m_lastLoggedThrowable, t))
         {
             m_lastLoggedThrowable = t;
             logger.severe(msg);

src/jmemorize/core/SearchTool.java

@@ -18,9 +18,7 @@
  */
 package jmemorize.core;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author djemili
@@ -30,7 +28,9 @@ public class SearchTool
     public final static int FRONT_SIDE = 0;
     public final static int FLIP_SIDE  = 1;
     public final static int BOTH_SIDES = 2;
-
+    private static List<String> searchHistory = new ArrayList<>();
+
+
     public static List<Card> search(String text, int side, boolean matchCase, List<Card> cards)
     {
         List<Card> foundCards = new LinkedList<Card>();
@@ -46,7 +46,7 @@ public static List<Card> search(String text, int side, boolean matchCase, List<C
                 flipSide  = flipSide.toLowerCase();
             }
 
-            if (side == FRONT_SIDE || side == BOTH_SIDES)
+            if ((side == FRONT_SIDE || side == BOTH_SIDES) && frontSide.indexOf(text) > -1)
             {
                 if (frontSide.indexOf(text) > -1)
                 {
@@ -55,7 +55,7 @@ public static List<Card> search(String text, int side, boolean matchCase, List<C
                 }
             }
 
-            if (side == FLIP_SIDE || side == BOTH_SIDES)
+            if ((side == FLIP_SIDE || side == BOTH_SIDES) && flipSide.indexOf(text) > -1)
             {
                 if (flipSide.indexOf(text) > -1)
                 {
@@ -87,4 +87,55 @@ public static List<Integer> search(String text, String searchtext,
         return positions;
     }
 
+
+    public static void addToSearchHistory(String query) {
+        searchHistory.add(query);
+    }
+
+    public static List<String> getSearchHistory() {
+        return searchHistory;
+    }
+
+    public static List<Card> searchWithinCategory(String text, int side, boolean matchCase, Category category) {
+        List<Card> foundCards = new LinkedList<Card>();
+        List<Card> cards = category.getCards(); // Assuming Category class has a method to get cards
+
+        for (Card card : cards) {
+            String frontSide = card.getFrontSide().getText().getUnformatted();
+            String flipSide = card.getBackSide().getText().getUnformatted();
+
+            if (!matchCase) {
+                text = text.toLowerCase();
+                frontSide = frontSide.toLowerCase();
+                flipSide = flipSide.toLowerCase();
+            }
+
+            if (side == FRONT_SIDE || side == BOTH_SIDES) {
+                if (frontSide.indexOf(text) > -1) {
+                    foundCards.add(card);
+                    continue;
+                }
+            }
+
+            if (side == FLIP_SIDE || side == BOTH_SIDES) {
+                if (flipSide.indexOf(text) > -1) {
+                    foundCards.add(card);
+                }
+            }
+        }
+        return foundCards;
+    }
+
+    public static void sortByRelevance(List<Card> foundCards) {
+        // Sort by relevance criteria
+        Collections.sort(foundCards, new Comparator<Card>() {
+            @Override
+            public int compare(Card card1, Card card2) {
+                // Implement comparison logic based on relevance
+                // Return -1 if card1 is more relevant, 1 if card2 is more relevant, 0 if equal
+                return 0; // Placeholder, implement actual logic
+            }
+        });
+    }
+
 }

src/jmemorize/core/io/XmlBuilder.java

@@ -190,7 +190,7 @@ else if (out != null)
      * 
      * Don't use this method directly. Use the {@link LessonProvider} instead.
      * 
-     * @param File xmlFile the file that containt the XML document which
+     * @param lesson xmlFile the file that containt the XML document which
      * represents the lesson.
      */
     public static void loadFromXMLFile(File xmlFile, Lesson lesson) 
@@ -225,6 +225,7 @@ public static void loadFromXMLFile(File xmlFile, Lesson lesson)
         try
         {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); // Disable DOCTYPE declaration
             Document doc = factory.newDocumentBuilder().parse(in);
 
             // there must be a root category

src/jmemorize/gui/swing/GeneralTransferHandler.java

@@ -263,27 +263,21 @@ public boolean importData(JComponent comp, Transferable t)
     {
         try
         {
-            Category targetCategory;
-            if (comp instanceof CategoryTree)
-            {
-                CategoryTree tree = (CategoryTree)comp;
-                targetCategory = tree.getSelectedCategory();
-            }
-            else if (comp instanceof CardTable)
-            {
-                CardTable table = (CardTable)comp;
-                targetCategory = table.getView().getCategory();
+            if (comp instanceof CategoryTree || comp instanceof CardTable) {
+                Category targetCategory = comp instanceof CategoryTree ?
+                        ((CategoryTree) comp).getSelectedCategory() :
+                        ((CardTable) comp).getView().getCategory();
             }
             else if (comp instanceof JTextPane)
             {
                 JTextPane textPane = (JTextPane)comp;
-                
+
                 if (t.isDataFlavorSupported(FORMATTED_TEXT_FLAVOR))
                 {
                     int start = textPane.getSelectionStart();
                     FormattedTextSection fText = (FormattedTextSection)t.getTransferData(
                         FORMATTED_TEXT_FLAVOR);
-                    
+
                     fText.getText().insertIntoDocument(textPane.getStyledDocument(), start);
                 }
                 else if (t.isDataFlavorSupported(DataFlavor.imageFlavor))
@@ -292,23 +286,23 @@ else if (t.isDataFlavorSupported(DataFlavor.imageFlavor))
                     {
                         String link = (String)t.getTransferData(DataFlavor.stringFlavor);
                         link = link.substring(0, link.indexOf('\n'));
-                        
+
                         String lower = link.toLowerCase();
                         if (lower.startsWith("http://"))
                         {
-                            if (lower.endsWith(".jpg") || 
+                            if (lower.endsWith(".jpg") ||
                                 lower.endsWith(".gif") ||
-                                lower.endsWith(".png") || 
-                                lower.endsWith(".jpeg") || 
+                                lower.endsWith(".png") ||
+                                lower.endsWith(".jpeg") ||
                                 lower.endsWith(".bmp"))
                             {
                                 URL url = new URL(link);
                                 ImageIcon icon = new ImageIcon(url);
                                 icon.setDescription(link);
-                                
+
                                 m_cardSidePanel.addImage(icon);
                                 m_cardSidePanel.getTextPane().requestFocus();
-                                
+
                                 return true;
                             }
                         }
@@ -318,17 +312,18 @@ else if (t.isDataFlavorSupported(DataFlavor.stringFlavor))
                 {
                     int start = textPane.getSelectionStart();
                     String text = (String)t.getTransferData(DataFlavor.stringFlavor);
-                    
+
                     textPane.getDocument().insertString(start, text, null);
                 }
-                
+
                 return true;
             }
             else
             {
                 return false;
-            }        
-
+            }
+
+            Category targetCategory = null;
             if (t.isDataFlavorSupported(CARDS_FLAVOR))
             {
                 List<Card> cards = (List<Card>)t.getTransferData(CARDS_FLAVOR);