Changeset 6972

Timestamp:

Sep 19, 2010, 11:40:53 PM (14 years ago)

Author:

mlg

Message:

New feature : research
Add a research functionnality : it's juste a field on the bottom right of the main frame. To make a research, the user have to type text in that field and press enter. It opens a new tab. A new tab is opened for each research. The tab contains the query string.

Location:

extensions/jiwigo/trunk/src/main

Files:

• java/fr/mael/jiwigo/dao/ImageDao.java (modified) (4 diffs)
• java/fr/mael/jiwigo/dao/TagDao.java (modified) (1 diff)
• java/fr/mael/jiwigo/service/ImageService.java (modified) (1 diff)
• java/fr/mael/jiwigo/transverse/enumeration/MethodsEnum.java (modified) (1 diff)
• java/fr/mael/jiwigo/transverse/enumeration/TagEnum.java (added)
• java/fr/mael/jiwigo/ui/field (added)
• java/fr/mael/jiwigo/ui/field/HintTextField.java (added)
• java/fr/mael/jiwigo/ui/mainframe/IThumbnailPanel.java (added)
• java/fr/mael/jiwigo/ui/mainframe/MainFrame.java (modified) (8 diffs)
• java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java (modified) (1 diff)
• java/fr/mael/jiwigo/ui/mainframe/ThumbnailSearchPanel.java (added)
• resources/fr/mael/jiwigo/trad/messages.properties (modified) (1 diff)
• resources/fr/mael/jiwigo/trad/messages_en.properties (modified) (1 diff)
• resources/fr/mael/jiwigo/trad/messages_fr.properties (modified) (1 diff)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/dao/ImageDao.java

@@ -63 +63 @@
      * cache
      */
-    private HashMap<Integer, ArrayList<Image>> cache;
+    private HashMap<Integer, List<Image>> cache;
 
     /**
@@ -74 +74 @@
      */
     private ImageDao() {
-        cache = new HashMap<Integer, ArrayList<Image>>();
+        cache = new HashMap<Integer, List<Image>>();
     }
 
@@ -112 +112 @@
             }
             Element element = doc.getRootElement().getChild("images");
-            List<Element> listElement = (List<Element>) element.getChildren("image");
-            ArrayList<Image> images = new ArrayList<Image>();
-            for (Element im : listElement) {
-                Image myImage = new Image();
-                myImage.setMiniature(im.getAttributeValue("tn_url"));
-                myImage.setUrl(im.getAttributeValue("element_url"));
-                myImage.setWidth(Integer.valueOf(im.getAttributeValue("width")));
-                myImage.setHeight(Integer.valueOf(im.getAttributeValue("height")));
-                myImage.setFile(im.getAttributeValue("file"));
-                myImage.setVue(Integer.valueOf(im.getAttributeValue("hit")));
-                myImage.setIdentifiant(Integer.valueOf(im.getAttributeValue("id")));
-                myImage.setName(im.getChildText("name"));
-                if (myImage.getName() == null) {
-                    myImage.setName(myImage.getFile());
-                }
-                images.add(myImage);
-
-            }
+            List<Image> images = getImagesFromElement(element);
             cache.remove(categoryId);
             cache.put(categoryId, images);
@@ -217 +200 @@
     }
 
+    /**
+     * parse an element to find images
+     * @param element the element to parse
+     * @return the list of images
+     */
+    private List<Image> getImagesFromElement(Element element) {
+        List<Element> listElement = (List<Element>) element.getChildren("image");
+        ArrayList<Image> images = new ArrayList<Image>();
+        for (Element im : listElement) {
+            Image myImage = new Image();
+            myImage.setMiniature(im.getAttributeValue("tn_url"));
+            myImage.setUrl(im.getAttributeValue("element_url"));
+            myImage.setWidth(Integer.valueOf(im.getAttributeValue("width")));
+            myImage.setHeight(Integer.valueOf(im.getAttributeValue("height")));
+            myImage.setFile(im.getAttributeValue("file"));
+            myImage.setVue(Integer.valueOf(im.getAttributeValue("hit")));
+            myImage.setIdentifiant(Integer.valueOf(im.getAttributeValue("id")));
+            myImage.setName(im.getChildText("name"));
+            if (myImage.getName() == null) {
+                myImage.setName(myImage.getFile());
+            }
+            images.add(myImage);
+
+        }
+        return images;
+    }
+
+    /**
+     * Search images
+     * @param searchString the string to search
+     * @return the list of images matching the string
+     * @throws IOException 
+     */
+    public List<Image> search(String searchString) throws IOException {
+        Document doc = Main.sessionManager.executerReturnDocument(MethodsEnum.SEARCH.getLabel(), "query", searchString);
+        LOG.debug(doc);
+        Element element = doc.getRootElement().getChild("images");
+        return getImagesFromElement(element);
+
+    }
+
     private void suppressionFichierTemporaires() {
         File file = new File(System.getProperty("java.io.tmpdir") + "/originale.jpg");

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/dao/TagDao.java

@@ -77 +77 @@
      */
     public List<Tag> lister() throws IOException {
-        Document doc = Main.sessionManager.executerReturnDocument(MethodsEnum.LISTER_TAGS.getLabel());
+        Document doc = Main.sessionManager.executerReturnDocument(MethodsEnum.TAGS_ADMIN_LIST.getLabel());
         //      System.out.println(Outil.documentToString(doc));
         return getTagsFromDocument(doc.getRootElement().getChild("tags"));

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/ImageService.java

@@ -120 +120 @@
     }
 
+    /**
+     * Add tags to an existing image
+     * @param image the image
+     * @param tagId the ids of the tags
+     * @return true if successful
+     * @throws IOException
+     */
     public boolean addTags(Image image, String tagId) throws IOException {
         return ImageDao.getInstance().addTags(image.getIdentifiant(), tagId);
+    }
+
+    /**
+     * Search images from a string
+     * @param queryString the string
+     * @return images matching the string
+     * @throws IOException
+     */
+    public List<Image> search(String queryString) throws IOException {
+        return ImageDao.getInstance().search(queryString);
     }
 

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/enumeration/MethodsEnum.java

@@ -39 +39 @@
             "pwg.images.getInfo"), AJOUTER_CATEGORIE("pwg.categories.add"), AJOUTER_COMMENTAIRE("pwg.images.addComment"), LISTER_TAGS(
             "pwg.tags.getList"), TAGS_ADMIN_LIST("pwg.tags.getAdminList"), ADD_TAG("pwg.tags.add"), SET_INFO(
-            "pwg.images.setInfo");
+            "pwg.images.setInfo"), SEARCH("pwg.images.search");
 
     protected String label;

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.util.HashMap;
 
@@ -22 +24 @@
 import fr.mael.jiwigo.transverse.util.Messages;
 import fr.mael.jiwigo.transverse.util.Outil;
+import fr.mael.jiwigo.ui.field.HintTextField;
 import fr.mael.jiwigo.ui.mainframe.tab.JTabbedPaneWithCloseIcons;
 
@@ -53 +56 @@
  * Frame principale
  */
-public class MainFrame extends JFrame implements ActionListener {
+public class MainFrame extends JFrame implements ActionListener, KeyListener {
     /**
      * Logger
@@ -106 +109 @@
 
     private HashMap<Integer, Integer> mapsIdPos = new HashMap<Integer, Integer>();
+
+    private HintTextField fieldSearch;
 
     /**
@@ -129 +134 @@
         categoriesTree = new CategoriesTree();
         splitPane.setLeftComponent(categoriesTree);
-        //      imagesPanel = new ThumbnailCategoryPanel(null);
-        //      reduceSizeOfComponent(imagesPanel);
-        //      scrollPaneImagesPanel = new JScrollPane(imagesPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-        //              JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        //      scrollPaneImagesPanel.setPreferredSize(new Dimension(900, 600));
 
         tabbedPane = new JTabbedPaneWithCloseIcons();
-        //      tabbedPane.add(scrollPaneImagesPanel);
         splitPane.setRightComponent(tabbedPane);
 
         this.add(splitPane, BorderLayout.CENTER);
+        JPanel panelBas = new JPanel(new BorderLayout());
         JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
         progressBar = new JProgressBar(0, 100);
         panel.add(progressBar);
         panel.add(labelMessage);
+        panelBas.add(panel, BorderLayout.WEST);
+
+        fieldSearch = new HintTextField(Messages.getMessage("mainFrame_recherche"));
+        fieldSearch.setPreferredSize(new Dimension(150, 25));
+        fieldSearch.addKeyListener(this);
+        panelBas.add(fieldSearch, BorderLayout.EAST);
 
         jMenuEdition = new JMenu(Messages.getMessage("mainFrame_editionMenu"));
@@ -152 +158 @@
 
         this.setJMenuBar(jMenuBar);
-        this.add(panel, BorderLayout.SOUTH);
-        //      this.pack();
+        this.add(panelBas, BorderLayout.SOUTH);
         this.setSize(900, 600);
         this.setLocationRelativeTo(null);
@@ -160 +165 @@
     }
 
-    public void addTabb(ThumbnailCategoryPanel panel) {
-        JScrollPane scrollPaneImagesPanel = new JScrollPane(panel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+    public void addTabb(IThumbnailPanel panel) {
+        JScrollPane scrollPaneImagesPanel = new JScrollPane((JPanel) panel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                 JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         scrollPaneImagesPanel.setPreferredSize(new Dimension(900, 600));
         boolean found = false;
+        boolean isSearch = false;
+        if (panel instanceof ThumbnailSearchPanel) {
+            isSearch = true;
+        }
         for (int i = 0; i < tabbedPane.getTabCount(); i++) {
             JScrollPane scroll = (JScrollPane) tabbedPane.getComponentAt(i);
-            ThumbnailCategoryPanel thumbPan = (ThumbnailCategoryPanel) scroll.getViewport().getComponents()[0];
+            IThumbnailPanel thumbPan = (IThumbnailPanel) scroll.getViewport().getComponents()[0];
             if (thumbPan.getCategory().getIdentifiant().equals(panel.getCategory().getIdentifiant())) {
-                tabbedPane.setSelectedIndex(i);
-                found = true;
-                break;
+                //only if it's not for a re
+                if (!(panel instanceof ThumbnailSearchPanel)) {
+                    tabbedPane.setSelectedIndex(i);
+                    found = true;
+                    break;
+                }
             }
         }
-        if (!found) {
+        //if it's not for a research, the title of the tab
+        //is the name of the category
+        if (!found && !isSearch) {
             tabbedPane.addTab(panel.getCategory().getNom(), scrollPaneImagesPanel, new ImageIcon(Outil
                     .getURL("fr/mael/jiwigo/img/closetab.png")));
-        }
-
-        //      if (mapsIdPos.get(panel.getCategory().getIdentifiant()) == null) {
-        //          tabbedPane.addTab(panel.getCategory().getNom(), scrollPaneImagesPanel);
-        //          mapsIdPos.put(panel.getCategory().getIdentifiant(), tabbedPane.getTabCount() - 1);
-        //      } else {
-        //          tabbedPane.setSelectedIndex(mapsIdPos.get(panel.getCategory().getIdentifiant()));
-        //      }
+            //if it's for a research, the title of the tab
+            //if the query string
+        } else if (!found && isSearch) {
+            String queryString = ((ThumbnailSearchPanel) panel).getQueryString();
+            tabbedPane.addTab(Messages.getMessage("mainFrame_search") + queryString, scrollPaneImagesPanel,
+                    new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/closetab.png")));
+        }
 
     }
@@ -237 +250 @@
     }
 
+    @Override
+    public void keyPressed(KeyEvent paramKeyEvent) {
+        if (paramKeyEvent.getKeyCode() == KeyEvent.VK_ENTER) {
+            String queryString = fieldSearch.getText();
+            ThumbnailSearchPanel searchPanel = new ThumbnailSearchPanel(queryString);
+            addTabb(searchPanel);
+        }
+    }
+
+    @Override
+    public void keyReleased(KeyEvent paramKeyEvent) {
+    }
+
+    @Override
+    public void keyTyped(KeyEvent paramKeyEvent) {
+    }
+
 }

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java

@@ -45 +45 @@
  * Classe qui affiche toutes les miniatures d'une catégorie
  */
-public class ThumbnailCategoryPanel extends JPanel {
+public class ThumbnailCategoryPanel extends JPanel implements IThumbnailPanel {
     /**
      * Logger

extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages.properties

@@ -21 +21 @@
 mainFrame_addMetadata=Adding metadata for
 mainFrame_sendingFiles=Sending files for
+mainFrame_recherche=Search...
+mainFrame_search=Research for 
 
 #####################################################

extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_en.properties

@@ -21 +21 @@
 mainFrame_addMetadata=Adding metadata for
 mainFrame_sendingFiles=Sending files for
+mainFrame_recherche=Search...
+mainFrame_search=Research for 
 
 #####################################################

extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_fr.properties

@@ -21 +21 @@
 mainFrame_addMetadata=Ajout des métadonnées pour
 mainFrame_sendingFiles=Envoi des fichiers pour
+mainFrame_recherche=Recherche...
+mainFrame_search=Recherche de 
 
 #####################################################