/trunk/src/org/tela_botanica/client/modeles/ListeImageAsynchroneDAO.java |
---|
120,7 → 120,7 |
} |
HTTPRequest.asyncPost("jrest/inventoryImageList/"+iMediateur.getIdentifiant()+"/"+uid, postData, new ResponseTextHandler() { |
HTTPRequest.asyncPost("jrest/inventoryImageList/0/"+uid, postData, new ResponseTextHandler() { |
public void onCompletion(String responseText) { |
iMediateur.rafraichirToutesVues() ; |
/trunk/src/org/tela_botanica/client/modeles/MotsClesAsynchroneDAO.java |
---|
1,112 → 1,5 |
package org.tela_botanica.client.modeles; |
import java.util.HashMap; |
import java.util.Iterator; |
import org.tela_botanica.client.image.ImageMediateur; |
import org.tela_botanica.client.interfaces.Rafraichissable; |
import com.google.gwt.user.client.HTTPRequest; |
import com.google.gwt.user.client.ResponseTextHandler; |
import com.google.gwt.user.client.Window; |
import com.gwtext.client.widgets.tree.TreeNode; |
public class MotsClesAsynchroneDAO { |
private ImageMediateur iMediateur = null ; |
public void setIMediateur(ImageMediateur im) |
{ |
iMediateur = im ; |
} |
public void obtenirListeMotsCles(Rafraichissable r) |
{ |
HTTPRequest.asyncGet("jrest/InventoryKeyWordList/"+iMediateur.getIdentifiant(), new ResponseTextHandler() { |
public void onCompletion(String responseText) { |
// TODO Auto-generated method stub |
} |
}); |
} |
public void ajouterBaseDeDonnees(String motcle) |
{ |
if(!motcle.equals("")) |
{ |
String postData = motcle ; |
HTTPRequest.asyncPost("jrest/InventoryKeyWordList/","&identifiant="+iMediateur.getIdentifiant()+postData, new ResponseTextHandler() { |
public void onCompletion(String responseText) { |
} |
}) ; |
} |
} |
public void supprimerBaseDeDonnees(String motcle) |
{ |
if(!motcle.equals("")) |
{ |
String postData = "" ; |
postData += "&action=DELETE" ; |
HTTPRequest.asyncPost("jrest/InventoryKeyWordList/"+iMediateur.getIdentifiant()+"/"+motcle,postData, new ResponseTextHandler() { |
public void onCompletion(String responseText) { |
} |
}) ; |
} |
} |
public void modifierBaseDeDonnees(String motcle) { |
if(!motcle.equals("")) |
{ |
String postData = "" ; |
postData += "&action=modification"+motcle ; |
HTTPRequest.asyncPost("jrest/InventoryKeyWordList/"+iMediateur.getIdentifiant() ,postData, new ResponseTextHandler() { |
public void onCompletion(String responseText) { |
Window.alert(responseText) ; |
} |
}) ; |
} |
} |
public void deplacerBaseDeDonnees(String motcle) { |
if(!motcle.equals("")) |
{ |
String postData = "" ; |
postData += "&action=deplacement"+motcle ; |
HTTPRequest.asyncPost("jrest/InventoryKeyWordList/"+iMediateur.getIdentifiant() ,postData, new ResponseTextHandler() { |
public void onCompletion(String responseText) { |
Window.alert(responseText) ; |
} |
}) ; |
} |
} |
} |
/trunk/src/org/tela_botanica/client/image/ImageModele.java |
---|
9,18 → 9,16 |
import org.tela_botanica.client.modeles.ImageUploaderAsynchroneDAO; |
import org.tela_botanica.client.modeles.ListeImageCarnet; |
import org.tela_botanica.client.modeles.ListeImageAsynchroneDAO; |
import org.tela_botanica.client.modeles.MotsClesAsynchroneDAO; |
import com.google.gwt.user.client.ui.Tree; |
import com.gwtext.client.data.ArrayReader; |
import com.gwtext.client.data.FieldDef; |
import com.gwtext.client.data.IntegerFieldDef; |
import com.gwtext.client.data.MemoryProxy; |
import com.gwtext.client.data.Node; |
import com.gwtext.client.data.NodeTraversalCallback; |
import com.gwtext.client.data.RecordDef; |
import com.gwtext.client.data.Store; |
import com.gwtext.client.data.StringFieldDef; |
import com.gwtext.client.data.Tree; |
import com.gwtext.client.widgets.tree.TreeNode; |
/** |
37,14 → 35,12 |
private ListeImageCarnet cacheImage = new ListeImageCarnet(0) ; |
private HashMap motsCles = new HashMap(0) ; |
private HashMap motcles = new HashMap(0) ; |
private Store st = null ; |
private com.gwtext.client.data.Tree arbreMotsCles = null ; |
private Tree arbreMotsCles = null ; |
private String arbreAplati = "" ; |
static ImageModele Instance(ImageMediateur im) |
{ |
if(!estInstancie) |
87,12 → 83,12 |
public void rafraichirArbreMotsCles(Object o) |
{ |
arbreMotsCles = (com.gwtext.client.data.Tree)o ; |
arbreMotsCles = (Tree)o ; |
} |
public void rafraichirMotsCles(Object o) |
{ |
motsCles = (HashMap)o ; |
motcles = (HashMap)o ; |
} |
public void obtenirMetadonnees(Rafraichissable r, String id) |
125,22 → 121,17 |
String key = ids[i] ; |
ImageCarnet ic = (ImageCarnet)cacheImage.get(key) ; |
ic.miseAJourInfoGenerales(commentaires, date) ; |
mettreAjourBaseDeDonneesImageCarnet(ic) ; |
mettreAjourImageCarnet(ic) ; |
} |
} |
public void mettreAjourMotsClesId(String text, String id) |
{ |
motsCles.put(id, text) ; |
motcles.put(id, text) ; |
} |
public void mettreAjourBaseDeDonneesMotsClesId() |
public void mettreAJourBaseDeDonnees() |
{ |
} |
public void mettreAJourBaseDeDonneesListeImageCarnet() |
{ |
ListeImageAsynchroneDAO liDaO = new ListeImageAsynchroneDAO(); |
liDaO.setIMediateur(iMediateur); |
147,7 → 138,7 |
liDaO.SynchroniserBaseDeDonnees(cacheImage); |
} |
public void mettreAjourBaseDeDonneesImageCarnet(ImageCarnet ic) |
public void mettreAjourImageCarnet(ImageCarnet ic) |
{ |
ImageAsynchroneDAO iaDaO = new ImageAsynchroneDAO(); |
iaDaO.setIMediateur(iMediateur); |
225,15 → 216,15 |
public void afficherMotsCles() |
{ |
for(Iterator it = motsCles.keySet().iterator() ; it.hasNext() ;) |
for(Iterator it = motcles.keySet().iterator() ; it.hasNext() ;) |
{ |
String key = (String)it.next() ; |
String valeur = (String)motsCles.get(key) ; |
String valeur = (String)motcles.get(key) ; |
System.out.println("clé : "+key+" valeur : "+valeur); |
} |
} |
public void mettreAjourMotsCles(String[] ids, String motsClesEnCours, com.gwtext.client.data.Tree arbreMC) { |
public void mettreAjourMotsCles(String[] ids, String motsClesEnCours) { |
for (int i = 0; i < ids.length; i++) { |
244,105 → 235,5 |
} |
} |
rafraichirArbreMotsCles(arbreMC) ; |
} |
public void ajouterMotCleDansArbre(TreeNode n, com.gwtext.client.data.Tree arbreMC) { |
MotsClesAsynchroneDAO MCDao = new MotsClesAsynchroneDAO() ; |
MCDao.setIMediateur(getIMediateur()) ; |
String[] usObj = (String[])n.getUserObject() ; |
String motCle = usObj[0] ; |
String id = usObj[1] ; |
String parentId = "" |
; |
if(!id.equals("racine")) |
{ |
String[] parentUsObj = (String[])n.getParentNode().getUserObject() ; |
parentId = parentUsObj[1] ; |
} |
else |
{ |
parentId = "racine" ; |
} |
rafraichirArbreMotsCles(arbreMC) ; |
String nouveauMotCle = "&motcle="+motCle+"&id="+id+"&parent="+parentId ; |
MCDao.ajouterBaseDeDonnees(nouveauMotCle) ; |
} |
public void supprimerMotCleDansArbre(TreeNode n, Tree arbreMC) { |
MotsClesAsynchroneDAO MCDao = new MotsClesAsynchroneDAO() ; |
MCDao.setIMediateur(getIMediateur()) ; |
String[] usObj = (String[])n.getUserObject() ; |
String motCle = usObj[0] ; |
String id = usObj[1] ; |
String motCleASupprimer = id ; |
MCDao.supprimerBaseDeDonnees(id) ; |
} |
public void modifierMotCleDansArbre(TreeNode n, Tree arbreMC) { |
MotsClesAsynchroneDAO MCDao = new MotsClesAsynchroneDAO() ; |
MCDao.setIMediateur(getIMediateur()) ; |
String[] usObj = (String[])n.getUserObject() ; |
String motCle = usObj[0] ; |
String id = usObj[1] ; |
String parentId = "" |
; |
if(!id.equals("racine")) |
{ |
String[] parentUsObj = (String[])n.getParentNode().getUserObject() ; |
parentId = parentUsObj[1] ; |
} |
else |
{ |
parentId = "racine" ; |
} |
rafraichirArbreMotsCles(arbreMC) ; |
String motCleModifie = "&motcle="+motCle+"&id="+id+"&parent="+parentId ; |
MCDao.modifierBaseDeDonnees(motCleModifie) ; |
} |
public void deplacerMotCleDansArbre(TreeNode n, Tree arbreMC) |
{ |
MotsClesAsynchroneDAO MCDao = new MotsClesAsynchroneDAO() ; |
MCDao.setIMediateur(getIMediateur()) ; |
String[] usObj = (String[])n.getUserObject() ; |
String motCle = usObj[0] ; |
String id = usObj[1] ; |
String parentId = "" |
; |
if(!id.equals("racine")) |
{ |
String[] parentUsObj = (String[])n.getParentNode().getUserObject() ; |
parentId = parentUsObj[1] ; |
} |
else |
{ |
parentId = "racine" ; |
} |
rafraichirArbreMotsCles(arbreMC) ; |
String motCleModifie = "&motcle="+motCle+"&id="+id+"&parent="+parentId ; |
MCDao.deplacerBaseDeDonnees(motCleModifie) ; |
} |
} |
/trunk/src/org/tela_botanica/client/image/ImageMediateur.java |
---|
18,7 → 18,6 |
import com.gwtext.client.core.RegionPosition; |
import com.gwtext.client.data.Record; |
import com.gwtext.client.data.Store; |
import com.gwtext.client.data.Tree; |
import com.gwtext.client.widgets.DataView; |
import com.gwtext.client.widgets.Panel; |
import com.gwtext.client.widgets.TabPanel; |
693,35 → 692,13 |
} |
public void mettreAjourMotsCles(String motsClesEnCours, Tree arbreMC) { |
public void mettreAjourMotsCles(String motsClesEnCours) { |
String[] ids = getGalerieImage().getIdSelectionnees() ; |
getIModele().mettreAjourMotsCles(ids,motsClesEnCours,arbreMC) ; |
getIModele().mettreAjourMotsCles(ids,motsClesEnCours) ; |
} |
public void ajouterMotCleDansArbre(TreeNode n,Tree arbreMC) |
{ |
getIModele().ajouterMotCleDansArbre(n, arbreMC) ; |
} |
public void supprimerMotCleDansArbre(TreeNode n, Tree arbreMC) { |
getIModele().supprimerMotCleDansArbre(n,arbreMC) ; |
} |
public void modifierMotCleDansArbre(TreeNode n , Tree arbreMC) { |
getIModele().modifierMotCleDansArbre(n,arbreMC) ; |
} |
public void deplacerMotCleDansArbre(TreeNode n , Tree arbreMC) { |
getIModele().deplacerMotCleDansArbre(n, arbreMC) ; |
} |
} |
/trunk/src/org/tela_botanica/client/vues/ListeImageVue.java |
---|
156,7 → 156,6 |
public void onRowContextMenu(GridPanel grid, int rowIndex, |
EventObject e) { |
e.stopEvent() ; |
getIMediateur().montrerContextMenu(e); |
} |
/trunk/src/org/tela_botanica/client/vues/ArbreMotsClesVue.java |
---|
9,7 → 9,6 |
import com.google.gwt.core.client.JavaScriptObject; |
import com.google.gwt.user.client.Window; |
import com.gwtext.client.core.EventObject; |
import com.gwtext.client.core.ExtElement; |
import com.gwtext.client.data.Node; |
import com.gwtext.client.data.NodeTraversalCallback; |
import com.gwtext.client.data.Tree; |
20,13 → 19,10 |
import com.gwtext.client.widgets.Button; |
import com.gwtext.client.widgets.Component; |
import com.gwtext.client.widgets.Container; |
import com.gwtext.client.widgets.Editor; |
import com.gwtext.client.widgets.Panel; |
import com.gwtext.client.widgets.event.ButtonListener; |
import com.gwtext.client.widgets.event.ButtonListenerAdapter; |
import com.gwtext.client.widgets.event.EditorListener; |
import com.gwtext.client.widgets.event.EditorListenerAdapter; |
import com.gwtext.client.widgets.form.Field; |
import com.gwtext.client.widgets.form.TextField; |
import com.gwtext.client.widgets.layout.RowLayout; |
import com.gwtext.client.widgets.layout.RowLayoutData; |
47,8 → 43,6 |
private TextField tfEdit = null ; |
private Button valider = null ; |
private String motsClesEnCours = "" ; |
private boolean ajoutNoeud = false ; |
private boolean modifNoeud = false ; |
public ArbreMotsClesVue(ImageMediateur im) |
{ |
70,7 → 64,7 |
tfEdit = new TextField() ; |
te = new TreeEditor(arbreMotsCles,tfEdit) ; |
valider = new Button("Appliquer") ; |
valider = new Button("OK") ; |
arbreMotsCles.add(te) ; |
this.add(arbreMotsCles,new RowLayoutData("90%")) ; |
this.add(valider,new RowLayoutData("10%")) ; |
111,7 → 105,6 |
public void onClick(TreeNode node, EventObject e) { |
e.stopEvent() ; |
gererClicNoeud(node); |
} |
125,39 → 118,18 |
public void onDblClick(TreeNode node, EventObject e) { |
modifNoeud = true ; |
te.startEdit(node); |
} |
public void onTextChange(TreeNode node, String text, String oldText) { |
TreeNode nd = node ; |
String[] usObject = new String[2] ; |
usObject[0] = text ; |
usObject[1] = ((String[])nd.getUserObject())[1] ; |
nd.setUserObject(usObject) ; |
usObject[1] = ((String[])node.getUserObject())[1] ; |
node.setUserObject(usObject) ; |
if(ajoutNoeud) |
{ |
GetIMediateur().ajouterMotCleDansArbre(nd,getArbreMotsCles().getTree()) ; |
ajoutNoeud = false ; |
} |
else |
{ |
modifNoeud = false ; |
GetIMediateur().modifierMotCleDansArbre(nd,getArbreMotsCles().getTree()) ; |
} |
} |
public void onMoveNode(Tree tree, TreeNode node, TreeNode oldParent, TreeNode newParent,int index) |
{ |
GetIMediateur().deplacerMotCleDansArbre(node, getArbreMotsCles().getTree()) ; |
} |
public void onCheckChange(TreeNode node, boolean checked) { |
if(checked) |
176,7 → 148,6 |
} |
}) ; |
valider.addListener(new ButtonListenerAdapter() { |
public void onClick(Button button, EventObject e) { |
201,7 → 172,7 |
}); |
GetIMediateur().mettreAjourMotsCles(motsClesEnCours,arbreMotsCles.getTree()) ; |
GetIMediateur().mettreAjourMotsCles(motsClesEnCours) ; |
} |
}) ; |
211,13 → 182,10 |
{ |
n.getParentNode().removeChild(n); |
n.destroy() ; |
GetIMediateur().supprimerMotCleDansArbre(n, arbreMotsCles.getTree()) ; |
} |
public void ajouterNoeud(TreeNode parent) |
{ |
ajoutNoeud = true ; |
TreeNode nd = new TreeNode(""); |
nd.setIcon("tela.png") ; |
nd.setChecked(true); |
235,11 → 203,11 |
{ |
if(node.getUI().isChecked()) |
{ |
node.getUI().toggleCheck(false) ; |
node.setChecked(false) ; |
} |
else |
{ |
node.getUI().toggleCheck(true) ; |
node.setChecked(true) ; |
} |
} |
269,7 → 237,7 |
} |
public void rafraichir(Object nouvelleDonnees, |
boolean repandreRafraichissement) { |
boolean repandreRaffraichissement) { |
if(nouvelleDonnees instanceof Tree) |
{ |
/trunk/src/org/tela_botanica/client/vues/ZoomImageVue.java |
---|
44,8 → 44,8 |
this.setLayout(new BorderLayout()); |
prev.setWidth("60px"); |
suiv.setWidth("60px"); |
prev.setWidth("5%"); |
suiv.setWidth("5%"); |
this.add(prev,new BorderLayoutData(RegionPosition.WEST)); |
this.add(image,new BorderLayoutData(RegionPosition.CENTER)); |