Index: topia/src/java/org/codelutin/topia/ui/swing/ActionEntityPanel.java diff -u topia/src/java/org/codelutin/topia/ui/swing/ActionEntityPanel.java:1.1 topia/src/java/org/codelutin/topia/ui/swing/ActionEntityPanel.java:1.2 --- topia/src/java/org/codelutin/topia/ui/swing/ActionEntityPanel.java:1.1 Thu Sep 2 15:42:54 2004 +++ topia/src/java/org/codelutin/topia/ui/swing/ActionEntityPanel.java Fri Sep 3 15:43:53 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/09/02 15:42:54 $ + * Mise a jour: $Date: 2004/09/03 15:43:53 $ * par : $Author: mazelier $ */ @@ -51,6 +51,7 @@ import org.codelutin.chorem.UIContext; import java.util.logging.Logger; import java.util.logging.Level; +import java.awt.Insets; public class ActionEntityPanel extends TopiaPanel{ // ActionEntityPanel @@ -74,11 +75,14 @@ constraint.gridx=0; constraint.gridy=0; constraint.fill=GridBagConstraints.HORIZONTAL; - constraint.gridwidth=3; + constraint.insets = new Insets(2,2,2,2); + + try{ + TopiaQuery query = ps.newQuery().orderby("_creationDate_ desc"); List listFields = ps.find(query); - + constraint.gridwidth=3; // add listFields of LinkButton to the Panel for(Iterator i = listFields.iterator(); i.hasNext();){ constraint.gridy++; @@ -88,7 +92,6 @@ add(linkButton, constraint); } - // add search constraint.gridy++; constraint.gridwidth=1; }catch(TopiaException eee){ @@ -103,19 +106,26 @@ // add the textfield constraint.gridx=1; + constraint.weightx=0.1; + constraint.ipadx=100; JTextField textfield = new JTextField(); add(textfield, constraint); // add the button Search constraint.gridx=2; - SearchAction searchAction = new SearchAction(uicontext, ps, combo, textfield); + constraint.weightx=0.0; + constraint.ipadx=10; + SearchAction searchAction = + new SearchAction(uicontext, ps, combo, textfield); JButton button = new JButton(searchAction); add(button, constraint); // add the linkbutton new + constraint.gridx=0; constraint.gridy++; constraint.gridwidth=3; + NewAction newAction = new NewAction(uicontext, ps); JLinkButton newLinkButton = new JLinkButton(newAction); add(newLinkButton, constraint); Index: topia/src/java/org/codelutin/topia/ui/swing/NewAction.java diff -u topia/src/java/org/codelutin/topia/ui/swing/NewAction.java:1.1 topia/src/java/org/codelutin/topia/ui/swing/NewAction.java:1.2 --- topia/src/java/org/codelutin/topia/ui/swing/NewAction.java:1.1 Thu Sep 2 15:42:54 2004 +++ topia/src/java/org/codelutin/topia/ui/swing/NewAction.java Fri Sep 3 15:43:53 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/09/02 15:42:54 $ + * Mise a jour: $Date: 2004/09/03 15:43:53 $ * par : $Author: mazelier $ */ @@ -60,12 +60,15 @@ try{ newEntity = ps.create(); putValue("newEntity", newEntity); + System.out.println("*******NEW-INIT*******"); }catch(TopiaException eee){ - Logger.getLogger("newAction.init").log(Level.WARNING, "Impossible de creer une nouvelle entite"); + eee.printStackTrace(); + Logger.getLogger("newAction.init").log(Level.WARNING, "Impossible de creer une nouvelle entite", eee); } } public void actionPerformed(ActionEvent e){ + System.out.println("*******NEW*******"); uicontext.edit(getValue("newEntity")); } } // NewAction Index: topia/src/java/org/codelutin/topia/ui/swing/SearchAction.java diff -u topia/src/java/org/codelutin/topia/ui/swing/SearchAction.java:1.1 topia/src/java/org/codelutin/topia/ui/swing/SearchAction.java:1.2 --- topia/src/java/org/codelutin/topia/ui/swing/SearchAction.java:1.1 Thu Sep 2 15:42:54 2004 +++ topia/src/java/org/codelutin/topia/ui/swing/SearchAction.java Fri Sep 3 15:43:53 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/09/02 15:42:54 $ + * Mise a jour: $Date: 2004/09/03 15:43:53 $ * par : $Author: mazelier $ */ @@ -67,13 +67,15 @@ } public void actionPerformed(ActionEvent e){ + System.out.println("*******SEARCH*******"); try{ String field = (String)combo.getSelectedItem(); - String condition = field + "=" + textfield.getText(); + String condition = field + "= \"" + textfield.getText() + "\""; TopiaQuery query = ps.newQuery().where(condition); List resultSearch = ps.find(query); uicontext.showList(ps, resultSearch); }catch(TopiaException eee){ + System.out.println("Exception " + eee); Logger.getLogger("SearchAction.actionPerformed").log(Level.WARNING, "Impossible de recuperer le resultat de la requete"); } } Index: topia/src/java/org/codelutin/topia/ui/swing/ShowAction.java diff -u topia/src/java/org/codelutin/topia/ui/swing/ShowAction.java:1.1 topia/src/java/org/codelutin/topia/ui/swing/ShowAction.java:1.2 --- topia/src/java/org/codelutin/topia/ui/swing/ShowAction.java:1.1 Thu Sep 2 15:42:54 2004 +++ topia/src/java/org/codelutin/topia/ui/swing/ShowAction.java Fri Sep 3 15:43:53 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/09/02 15:42:54 $ + * Mise a jour: $Date: 2004/09/03 15:43:53 $ * par : $Author: mazelier $ */ @@ -54,10 +54,12 @@ } public void init(){ + System.out.println("*******SHOW-INIT*******"); putValue("object", entity); } public void actionPerformed(ActionEvent e){ + System.out.println("*******SHOW*******"); uicontext.show(getValue("object")); }