Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico FudaaDodicoSearchPanel.java,1.1,1.2 FudaaDodicoTacheConnexion.java,1.1,1.2 FudaaDodicoMonitor.java,1.4,1.5 FudaaDodicoSelectionFirstPanel.java,1.1,1.2 FudaaDodicoSelectionServeur.java,1.7,1.8
|
From: Frederic D. <de...@us...> - 2004-04-30 13:52:53
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15346/src/org/fudaa/fudaa/commun/dodico Modified Files: FudaaDodicoSearchPanel.java FudaaDodicoTacheConnexion.java FudaaDodicoMonitor.java FudaaDodicoSelectionFirstPanel.java FudaaDodicoSelectionServeur.java Log Message: Simplification des classes de démarrage Index: FudaaDodicoMonitor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoMonitor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FudaaDodicoMonitor.java 30 Apr 2004 07:33:19 -0000 1.4 --- FudaaDodicoMonitor.java 30 Apr 2004 13:52:13 -0000 1.5 *************** *** 29,32 **** --- 29,35 ---- public class FudaaDodicoMonitor extends JComponent implements Runnable { protected int[] actu_; + /** + * Le constructeur par def. + */ public FudaaDodicoMonitor() { super(); *************** *** 42,45 **** --- 45,51 ---- monitor.start(); } + /** + * @see javax.swing.JComponent#getToolTipLocation(java.awt.event.MouseEvent) + */ public Point getToolTipLocation(MouseEvent _evt) { Point r= super.getToolTipLocation(_evt); *************** *** 51,54 **** --- 57,63 ---- return r; } + /** + * @see java.awt.Component#paint(java.awt.Graphics) + */ public void paint(Graphics _g) { Dimension size= getSize(); Index: FudaaDodicoSearchPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSearchPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaDodicoSearchPanel.java 30 Apr 2004 07:33:19 -0000 1.1 --- FudaaDodicoSearchPanel.java 30 Apr 2004 13:52:13 -0000 1.2 *************** *** 18,22 **** import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButton; - import com.memoire.bu.BuEmptyList; import com.memoire.bu.BuGlassPaneStop; import com.memoire.bu.BuScrollPane; --- 18,21 ---- *************** *** 28,31 **** --- 27,31 ---- /** + * Un panneau de recherche pour des objet corba * @author Fred Deniger * @version $Id$ *************** *** 45,49 **** /** ! * */ public FudaaDodicoSearchPanel(String _srvName, boolean local) { --- 45,50 ---- /** ! * @param _srvName le nom du serveur a cherche ! * @param local true si objet local autorise */ public FudaaDodicoSearchPanel(String _srvName, boolean local) { *************** *** 66,77 **** } public boolean isLocal() { ! return list_.getSelectedIndex() == 0; } public String getSelectedElt() { return (String) list_.getSelectedValue(); } public void setDialog(JDialog _d) { if (isSearch_) { --- 67,88 ---- } + /** + * @return true si objet local autorise et si objet local choisi + */ public boolean isLocal() { ! return localAuthorized_ && (list_.getSelectedIndex() == 0); } + /** + * @return le nom du serveur choisi. + */ public String getSelectedElt() { return (String) list_.getSelectedValue(); } + /** + * Cette methode sert a initialise un glasspane sur le dialogue parent. + * @param _d le dialogue contenant ce panneau + */ public void setDialog(JDialog _d) { if (isSearch_) { Index: FudaaDodicoSelectionFirstPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSelectionFirstPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaDodicoSelectionFirstPanel.java 30 Apr 2004 07:33:19 -0000 1.1 --- FudaaDodicoSelectionFirstPanel.java 30 Apr 2004 13:52:13 -0000 1.2 *************** *** 9,13 **** --- 9,16 ---- package org.fudaa.fudaa.commun.dodico; + import java.awt.Component; import java.awt.event.ActionEvent; + import java.util.HashMap; + import java.util.Map; import javax.swing.BorderFactory; *************** *** 18,22 **** import com.memoire.bu.BuCheckBox; import com.memoire.bu.BuScrollPane; - import com.memoire.bu.BuTable; import com.memoire.bu.BuVerticalLayout; --- 21,24 ---- *************** *** 24,30 **** --- 26,34 ---- import org.fudaa.ebli.tableau.EbliCellBooleanEditor; import org.fudaa.ebli.tableau.EbliCellBooleanRenderer; + import org.fudaa.ebli.tableau.EbliCellTextRenderer; import org.fudaa.fudaa.ressource.FudaaResource; /** + * Le panneau permettant de choisir le mode de connexion pour chaque serveur. * @author Fred Deniger * @version $Id$ *************** *** 33,43 **** FudaaDodicoSelectionServeur srv_; ! boolean[] distant_; ! BuCheckBox allLocal_; ! BuCheckBox doNotAsk_; ! JTable t; /** ! * */ public FudaaDodicoSelectionFirstPanel(FudaaDodicoSelectionServeur _s) { --- 37,47 ---- FudaaDodicoSelectionServeur srv_; ! boolean[] distant_; ! BuCheckBox allLocal_; ! BuCheckBox doNotAsk_; ! JTable t; /** ! * @param _s le coeur */ public FudaaDodicoSelectionFirstPanel(FudaaDodicoSelectionServeur _s) { *************** *** 50,58 **** doNotAsk_ = new BuCheckBox(FudaaResource.getS("Toujours se connecter localement")); doNotAsk_.setBorder(BorderFactory.createEmptyBorder(0, 10, 15, 0)); add(doNotAsk_); doNotAsk_.setEnabled(false); add(doNotAsk_); t = new JTable(new ServeurTypeTableModel()); ! t.getColumnModel().getColumn(0).setCellRenderer(srv_.getServeurCellRenderer()); TableColumn c2 = t.getColumnModel().getColumn(1); c2.setCellEditor(new EbliCellBooleanEditor()); --- 54,63 ---- doNotAsk_ = new BuCheckBox(FudaaResource.getS("Toujours se connecter localement")); doNotAsk_.setBorder(BorderFactory.createEmptyBorder(0, 10, 15, 0)); + doNotAsk_.setSelected(_s.getAllLocalPref()); add(doNotAsk_); doNotAsk_.setEnabled(false); add(doNotAsk_); t = new JTable(new ServeurTypeTableModel()); ! t.getColumnModel().getColumn(0).setCellRenderer(new ServeurCellRenderer()); TableColumn c2 = t.getColumnModel().getColumn(1); c2.setCellEditor(new EbliCellBooleanEditor()); *************** *** 68,75 **** --- 73,87 ---- } + /** + * @return true si l'utilisateur n'a choisi que des connexions locales + */ public boolean isAllLocalSet() { return allLocal_.isSelected(); } + /** + * @return le tableau des connexions a distance dans le meme ordre que les getClass de + * FudaaDodicoSelectionServeur + */ public boolean[] getResults() { return distant_; *************** *** 141,148 **** --- 153,166 ---- } + /** + * @return true si la case "ne plus demander" est activée. + */ public boolean isDoNotAskEnable() { return doNotAsk_.isEnabled(); } + /** + * @return l'état de la case "ne plus demander" + */ public boolean getDoNotAskValue() { return doNotAsk_.isSelected(); *************** *** 166,171 **** else super.actionPerformed(_evt); } ! /** ! * @see org.fudaa.ebli.dialog.EbliSimpleDialogPanel#apply() ! */ } \ No newline at end of file --- 184,214 ---- else super.actionPerformed(_evt); } ! ! private class ServeurCellRenderer extends EbliCellTextRenderer { ! ! Map classNameMap = new HashMap(); ! ! /** ! * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, ! * java.lang.Object, boolean, boolean, int, int) ! */ ! public Component getTableCellRendererComponent(JTable _table, Object _value, ! boolean _isSelected, boolean _hasFocus, int _row, int _column) { ! super.getTableCellRendererComponent(_table, _value, _isSelected, _hasFocus, _row, _column); ! String s = (String) classNameMap.get(_value); ! if (s == null) { ! String className = ((Class) _value).getName(); ! s = className.substring(className.lastIndexOf('.') + 1); ! String dcal = "DCalcul"; ! if (s.startsWith(dcal)) s = s.substring(dcal.length()); ! else { ! dcal = "DService"; ! if (s.startsWith(dcal)) s = s.substring(dcal.length()); ! } ! classNameMap.put(_value, s); ! } ! setText(s); ! return this; ! } ! } } \ No newline at end of file Index: FudaaDodicoSelectionServeur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSelectionServeur.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FudaaDodicoSelectionServeur.java 30 Apr 2004 07:33:19 -0000 1.7 --- FudaaDodicoSelectionServeur.java 30 Apr 2004 13:52:13 -0000 1.8 *************** *** 9,13 **** package org.fudaa.fudaa.commun.dodico; - import java.awt.Component; import java.util.ArrayList; import java.util.HashMap; --- 9,12 ---- *************** *** 18,29 **** import javax.swing.JFrame; import javax.swing.JOptionPane; - import javax.swing.JTable; - import javax.swing.table.TableCellRenderer; - import com.memoire.bu.BuCommonImplementation; import com.memoire.bu.BuGlassPaneStop; import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.corba.objet.IConnexion; import org.fudaa.dodico.corba.objet.IPersonne; import org.fudaa.dodico.corba.objet.IPersonneHelper; --- 17,24 ---- *************** *** 33,39 **** import org.fudaa.dodico.objet.UsineLib; import org.fudaa.ebli.dialog.EbliSimpleDialog; - import org.fudaa.ebli.tableau.EbliCellTextRenderer; import org.fudaa.fudaa.commun.FudaaCommonImplementation; - import org.fudaa.fudaa.commun.FudaaImplementation; import org.fudaa.fudaa.ressource.FudaaResource; --- 28,32 ---- *************** *** 47,55 **** private FudaaCommonImplementation impl_; BuGlassPaneStop glasspane_; public static boolean forceCorba_ = false; public static boolean forceNoCorba_ = false; /** ! * */ public FudaaDodicoSelectionServeur(FudaaCommonImplementation _impl, Class[] serviceClass) { --- 40,55 ---- private FudaaCommonImplementation impl_; BuGlassPaneStop glasspane_; + /** + * Si true, la fenetre de connexion corba sera activee. Ce champ est prioritaire + */ public static boolean forceCorba_ = false; + /** + * si true, les connexions seront locales. + */ public static boolean forceNoCorba_ = false; /** ! * @param _impl l'impl parente ! * @param serviceClass les classes des DTache */ public FudaaDodicoSelectionServeur(FudaaCommonImplementation _impl, Class[] serviceClass) { *************** *** 59,82 **** } public Map findServer() { boolean allLocal = false; Map r = null; ! if (UsineLib.isUsinePolicySet()) {} ! if (forceCorba_) { if (CtuluLib.DEBUG) CtuluLib.debug("distant par parametres"); allLocal = false; } else if (forceNoCorba_) { if (CtuluLib.DEBUG) CtuluLib.debug("local par parametres"); allLocal = true; } else { allLocal = getAllLocalPref(); if (CtuluLib.DEBUG) CtuluLib.debug("local par pref=" + allLocal); } if (allLocal) { r = doLocal(); } else { FudaaDodicoSelectionFirstPanel firstPn = new FudaaDodicoSelectionFirstPanel(this); --- 59,89 ---- } + /** + * Renvoie la table des connexions :(DTache.class,FudaaDodicoTacheConnexion). + * @return null si probleme. + */ public Map findServer() { boolean allLocal = false; Map r = null; ! //si force corba, fenetre de connexion if (forceCorba_) { if (CtuluLib.DEBUG) CtuluLib.debug("distant par parametres"); allLocal = false; } + //si force no corba, pas de fenetre else if (forceNoCorba_) { if (CtuluLib.DEBUG) CtuluLib.debug("local par parametres"); allLocal = true; } + //prise en compte des prefs else { allLocal = getAllLocalPref(); if (CtuluLib.DEBUG) CtuluLib.debug("local par pref=" + allLocal); } + //si tout local, on établit automatiquement les connexions locale if (allLocal) { r = doLocal(); } + //la fenetre de connexions else { FudaaDodicoSelectionFirstPanel firstPn = new FudaaDodicoSelectionFirstPanel(this); *************** *** 186,247 **** } - TableCellRenderer srvCellRenderer_; - - public TableCellRenderer getServeurCellRenderer() { - if (srvCellRenderer_ == null) { - srvCellRenderer_ = new ServeurCellRenderer(); - } - return srvCellRenderer_; - - } - - public static class ServeurCellRenderer extends EbliCellTextRenderer { - - Map classNameMap = new HashMap(); - - /** - * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, - * java.lang.Object, boolean, boolean, int, int) - */ - public Component getTableCellRendererComponent(JTable _table, Object _value, - boolean _isSelected, boolean _hasFocus, int _row, int _column) { - super.getTableCellRendererComponent(_table, _value, _isSelected, _hasFocus, _row, _column); - String s = (String) classNameMap.get(_value); - if (s == null) { - String className = ((Class) _value).getName(); - s = className.substring(className.lastIndexOf('.') + 1); - String dcal = "DCalcul"; - if (s.startsWith(dcal)) s = s.substring(dcal.length()); - else{ - dcal = "DService"; - if (s.startsWith(dcal)) s = s.substring(dcal.length()); - } - classNameMap.put(_value, s); - } - setText(s); - return this; - } - } public final boolean getAllLocalPref() { return impl_.getApplicationPreferences().getBooleanProperty("dodico.local.only", false); } public final void setAllLocalPref(boolean _b) { impl_.getApplicationPreferences().putBooleanProperty("dodico.local.only", _b); } public int getNbServeur() { return serviceClass_.length; } public Class getServeurClass(int _i) { return serviceClass_[_i]; } public static void setForceCorba() { forceCorba_ = true; } public static void setForceNoCorba() { if (forceCorba_) { --- 193,236 ---- } + /** + * @return l'etat de la preference pour dodico + */ public final boolean getAllLocalPref() { return impl_.getApplicationPreferences().getBooleanProperty("dodico.local.only", false); } + /** + * @param _b nouvelle valeur pour la pref. + */ public final void setAllLocalPref(boolean _b) { impl_.getApplicationPreferences().putBooleanProperty("dodico.local.only", _b); } + /** + * @return le nombre de serveur a connecter + */ public int getNbServeur() { return serviceClass_.length; } + /** + * @param _i l'index compris entre 0 et getNbServeur + * @return la classe de la DTache + */ public Class getServeurClass(int _i) { return serviceClass_[_i]; } + /** + * Force l'affichage du panneau de connexion ( quelles que soient les preferences) + */ public static void setForceCorba() { forceCorba_ = true; } + /** + * Force les connexions locales ( quelles que soient les preferences) + */ public static void setForceNoCorba() { if (forceCorba_) { Index: FudaaDodicoTacheConnexion.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoTacheConnexion.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaDodicoTacheConnexion.java 30 Apr 2004 07:33:19 -0000 1.1 --- FudaaDodicoTacheConnexion.java 30 Apr 2004 13:52:13 -0000 1.2 *************** *** 13,16 **** --- 13,21 ---- + /** + * Une classe permettant de stocker la tache et la connexion associee. + * @author Fred Deniger + * @version $Id$ + */ public class FudaaDodicoTacheConnexion { *************** *** 18,21 **** --- 23,30 ---- private IConnexion connexion_; + /** + * @param _t la tache + * @param _c la connexion associe + */ public FudaaDodicoTacheConnexion(ITache _t,IConnexion _c){ tache_=_t; *************** *** 23,31 **** } public boolean isAllSet(){ return (tache_!=null) && (connexion_!=null); } ! public boolean isConnecte(){ return (connexion_!=null) && (connexion_.connecte()); } --- 32,46 ---- } + /** + * @return true si la tache et la connexion ne sont pas nul + */ public boolean isAllSet(){ return (tache_!=null) && (connexion_!=null); } ! /** ! * @return true si la connexion n'est pas nul et s'il est réellement connectee. ! */ ! public boolean isConnected(){ return (connexion_!=null) && (connexion_.connecte()); } *************** *** 33,37 **** * @return Returns the personne. */ ! public IConnexion getPersonne() { return connexion_; } --- 48,52 ---- * @return Returns the personne. */ ! public IConnexion getConnexion() { return connexion_; } *************** *** 43,50 **** } public boolean isAllSetAndConnected(){ ! return isAllSet() && isConnecte(); } public void deconnecte(){ if(isAllSet()) tache_.deconnexion(connexion_); --- 58,71 ---- } + /** + * @return true si isAllSet et isConnected + */ public boolean isAllSetAndConnected(){ ! return isAllSet() && isConnected(); } + /** + * Deconnecte. + */ public void deconnecte(){ if(isAllSet()) tache_.deconnexion(connexion_); |
