Bug 13 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>();
@@ -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/gui/swing/actions/file/AbstractExportAction.java

@@ -1,7 +1,7 @@
 /*
  * jMemorize - Learning made easy (and fun) - A Leitner flashcards tool
  * Copyright(C) 2004-2008 Riad Djemili and contributors
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 1, or (at your option)
@@ -41,81 +41,78 @@ public abstract class AbstractExportAction extends AbstractSessionDisabledAction
     /**
      * Displays a Save As or Export dialog, and to confirm overwrites,
      * and to attach specified file extension.
-     * 
+     *
      * @return the file path or <code>null</code> if the dialog was cancelled.
-     * 
+     *
      * @author Perry (elsapo)
      * @author djemili
      */
-    public static File showSaveDialog(JFrame frame, ExtensionFileFilter fileFilter)
-    {
+    public static File showSaveDialog(JFrame frame, ExtensionFileFilter fileFilter) {
         JFileChooser chooser = new JFileChooser();
-
-        try 
-        {
+
+        try {
             chooser.setCurrentDirectory(Settings.loadLastDirectory());
-        }
-        catch (Exception ioe)
-        {
+        } catch (Exception ioe) {
             Main.logThrowable("Could not load last directory", ioe);
             chooser.setCurrentDirectory(null);
-        }                
-        
+        }
+
         chooser.setFileFilter(fileFilter);
-
+        File file = null;
+        boolean confirmed = false;
         // Loop so we can prompt again if they choose not to overwrite
-        while (true)
-        {
+        while (!confirmed) {
             // Do the actual Save As prompt
             int choice = chooser.showSaveDialog(frame);
             if (choice != JFileChooser.APPROVE_OPTION)
-                return null;
+                break;
 
-            File file = chooser.getSelectedFile();
+            file = chooser.getSelectedFile();
 
             // Attach desired extension, if supplied
             String extension = fileFilter.getExtension();
-            if (extension.length() > 0 && !file.getName().endsWith(extension))
-            {
+            if (extension.length() > 0 && !file.getName().endsWith(extension)) {
                 file = new File(file.getAbsolutePath() + '.' + extension);
                 chooser.setSelectedFile(file);
             }
-
-            if (file.exists())
-            {
+
+            if (file.exists()) {
                 // Prompt to confirm they actually want to overwrite existing file
                 String text = Localization.get("MainFrame.CONFIRM_OVERWRITE");
                 String title = Localization.get("MainFrame.CONFIRM_OVERWRITE_TITLE");
-                
-                int act = JOptionPane.showConfirmDialog(frame, 
-                    text + " " + file.toString(), 
-                    title,
-                    JOptionPane.YES_NO_OPTION);
-                
+
+                int act = JOptionPane.showConfirmDialog(frame,
+                        text + " " + file.toString(),
+                        title,
+                        JOptionPane.YES_NO_OPTION);
+
                 if (act == JOptionPane.NO_OPTION)
                     continue;
             }
-
+            confirmed = true;
+        }
+
+        if (confirmed) {
             Settings.storeLastDirectory(file);
             return file;
+        } else {
+            return null;
         }
     }
-
-
     /* (non-Javadoc)
      * @see java.awt.event.ActionListener
      */
     public void actionPerformed(ActionEvent event)
     {
         Main main = Main.getInstance();
-        
-        File file = null;
+
+         File file = null;
         try
         {
             file = showSaveDialog(main.getFrame(), getFileFilter());
             if (file != null)
                 doExport(main.getLesson(), file);
-            
+
         }
         catch (IOException e)
         {
@@ -128,7 +125,7 @@ public void actionPerformed(ActionEvent event)
             new ErrorDialog(main.getFrame(), msg, e).setVisible(true);
         }
     }
-    
+
     abstract protected void doExport(Lesson lesson, File file) throws IOException;
     abstract protected ExtensionFileFilter getFileFilter();
 }