Author: fgilet Date: 2010-02-18 12:41:10 +0100 (Thu, 18 Feb 2010) New Revision: 102 Added: trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst trunk/src/site/reports/CompteRendu_18-02-2010.rst Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java trunk/src/site/reports/CompteRendu_08-02-2010.rst Log: Ajout des comptes rendus (A completer avant d'envoyer sur la liste devel). Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-18 09:19:26 UTC (rev 101) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-18 11:41:10 UTC (rev 102) @@ -7,7 +7,7 @@ import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; import javax.swing.tree.*; - ApplicationEngine engine = new ApplicationEngine(this); + ApplicationEngine engine = new ApplicationEngine(); /** * classe instance (singleton pattern). @@ -84,13 +84,11 @@ <JButton text="ok" onActionPerformed='engine.connection()'/> </JToolBar> - <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='300' > - <JScrollPane> - <JPanel> - <JTree id='navigation' - model='{new DefaultTreeModel(new DefaultMutableTreeNode("Welcome to MapStorageManager"))}' /> - </JPanel> - </JScrollPane> + <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > + <JScrollPane> + <JTree id='navigation' + model='{new DefaultTreeModel(new DefaultMutableTreeNode("Welcome to MapStorageManager"))}' /> + </JScrollPane> <JScrollPane> <JPanel id='tableContent'/> </JScrollPane> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-18 09:19:26 UTC (rev 101) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-18 11:41:10 UTC (rev 102) @@ -3,21 +3,15 @@ import java.util.Locale; import java.util.ResourceBundle; import javax.swing.JOptionPane; -import javax.swing.SwingUtilities; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.MutableTreeNode; -import javax.swing.tree.TreeModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.mapstoragemanager.Main; import org.nuiton.mapstoragemanager.ui.MainUI; /** * Engine Class with methods for application user interface. - * @author E054030D - * + * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian */ public class ApplicationEngine { @@ -26,21 +20,27 @@ */ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); + /** + * current Locale. + */ private Locale currentLocale; + + /** + * ResourceBundle. + */ private ResourceBundle messages; - - public MainUI application; - - public ApplicationEngine(MainUI application){ - this.application = application; + + /** + * Constructor. + */ + public ApplicationEngine(){ } /** * Show the developers. - * // TODO */ public final void showGreeting() { - JOptionPane.showMessageDialog(null, "hi"); + JOptionPane.showMessageDialog(null, "CODE LUTIN"); } /** @@ -74,6 +74,9 @@ this.application = application; }*/ + /** + * Try to connect the user to a database. + */ public void connection(){ String nameBase = MainUI.getInstance().getNameBase().getSelectedJaxxItem().getValue().toString(); String login = MainUI.getInstance().getLogin().getText(); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-02-18 09:19:26 UTC (rev 101) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-02-18 11:41:10 UTC (rev 102) @@ -1,21 +1,10 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - package org.nuiton.mapstoragemanager.ui.gui; -import java.awt.*; -import javax.swing.*; -import javax.swing.event.TreeModelListener; import javax.swing.tree.*; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXComboBox; -import org.nuiton.mapstoragemanager.ui.MainUI; /** - * - * @author E045231P + * Model of the navigation tree. + * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian */ public class MSMModel extends DefaultTreeModel { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-18 09:19:26 UTC (rev 101) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-18 11:41:10 UTC (rev 102) @@ -8,38 +8,81 @@ import javax.swing.table.AbstractTableModel; /** - * + * Model of a table content * @author E045231P */ public class TableModel extends AbstractTableModel { + /** + * Constructor. + */ public TableModel() { } - public int getColumnCount() { - return 10; - } - - public Object getValueAt(int parm1, int parm2) { - if(parm1==0) - if( parm2==0) return "1"; else return ""; + + /** + * Add data into the table. + * @param rowIndex the rox index + * @param colIndex the column index + */ + @Override + public Object getValueAt(int rowIndex, int colIndex) { + if(rowIndex==0) + if( colIndex==0) return "1"; else return ""; else - if(parm2>parm1) return ""; + if(colIndex>rowIndex) return ""; else - if (parm2==parm1) return "1"; + if (colIndex==rowIndex) return "1"; else - if (parm2==0) return "1"; + if (colIndex==0) return "1"; else{ - int i = Integer.parseInt((String)getValueAt(parm1-1, parm2-1)); - int j = Integer.parseInt((String)getValueAt(parm1-1, parm2)); + int i = Integer.parseInt((String)getValueAt(rowIndex-1, colIndex-1)); + int j = Integer.parseInt((String)getValueAt(rowIndex-1, colIndex)); return Integer.toString(i+j); } + + //return data(rowIndex,colIndex); + + } + + /** + * count the number of column. + * @return the column count + */ + @Override + public int getColumnCount() { + return 2; + } + /** + * count the number of line. + * @return the line count + */ + @Override public int getRowCount() { return 10; } + /** + * count the number of column. + * @param col the column number + * @return the name of the column col + */ + @Override public String getColumnName(int col){ return ""; } + + /** + * Check if the cell is editable + * @param row the line number + * @param col the column number + * @return false + */ + @Override + public boolean isCellEditable(int row, int col) { + return false; + } + + } Added: trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst =================================================================== --- trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst (rev 0) +++ trunk/src/site/reports/CompteRenduReunion_18-02-2010.rst 2010-02-18 11:41:10 UTC (rev 102) @@ -0,0 +1,4 @@ +Discussion avec Benjamin Poussin sur l'avancée du projet (analyse + architecture + ihm). +Plus particulièrement, sur la description des cas d'utilisation et les familles, tables, colonnes dans HBase. + +Mise en place de la prochaine réunion le jeudi 04 mars 2010 à 11h00 \ No newline at end of file Modified: trunk/src/site/reports/CompteRendu_08-02-2010.rst =================================================================== --- trunk/src/site/reports/CompteRendu_08-02-2010.rst 2010-02-18 09:19:26 UTC (rev 101) +++ trunk/src/site/reports/CompteRendu_08-02-2010.rst 2010-02-18 11:41:10 UTC (rev 102) @@ -22,5 +22,5 @@ RAF (Reste à faire) ------------------ -- Diag. de classes du modèle [pending] -- Implémentation plus complexe de l'interface graphique [pending] \ No newline at end of file +- Diag. de classes du modèle +- Implémentation plus complexe de l'interface graphique \ No newline at end of file Added: trunk/src/site/reports/CompteRendu_18-02-2010.rst =================================================================== --- trunk/src/site/reports/CompteRendu_18-02-2010.rst (rev 0) +++ trunk/src/site/reports/CompteRendu_18-02-2010.rst 2010-02-18 11:41:10 UTC (rev 102) @@ -0,0 +1,31 @@ +semaine du 18 janvier 2010 +========================== + +Architecture à plugins +---------------------- +- + +HBase +---- +- + +JAXX +---- +- Arbre de navigation et visualisation d'une contenu d'une table (version baasique en codage dur). + + +Objectifs des deux semaines prochaines +----------------------------------- +- Récuperer les éléments réels d'une base pour affichage dans l'UI. +- Amélioration graphique sur tous les points (arbre, menu, boutons,...). +- Réalisation des "Cockburn" des cas d'utilisations. +- Test sous shell HBase sur le retour des méthodes et faire l'analogie avec l'API. + + +RAF (Reste à faire) +------------------ + +- Diagramme de classe. +- Décrire les actions du diagramme du cas d'utilisation. +- Schéma général de l'application (architecture, action entre les entités, dépendances,...). +- Implémentation plus complexe de l'interface graphique. \ No newline at end of file