March 2010 - Mapstoragemanager-commits - mailman.cloud.codelutin.com

r303 - trunk
by tchemit＠users.nuiton.org 27 Mar '10

27 Mar '10

Author: tchemit Date: 2010-03-27 21:04:12 +0100 (Sat, 27 Mar 2010) New Revision: 303 Log: Utilisation de mavenpom4redmine 2.0.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-26 02:52:02 UTC (rev 302) +++ trunk/pom.xml 2010-03-27 20:04:12 UTC (rev 303) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.6</version> + <version>2.0.7</version> </parent> <groupId>org.nuiton</groupId>

1 0

r302 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine msm/src/main/resources/i18n msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager src/site/doc/soutenance
by dlanglais＠users.nuiton.org 26 Mar '10

26 Mar '10

Author: dlanglais Date: 2010-03-26 03:52:02 +0100 (Fri, 26 Mar 2010) New Revision: 302 Log: Corrections mineures (qualit?\195?\169). Ajout de "chiffres" sur la soutenance. Ajout de cl?\195?\169 i18n oubli?\195?\169es... Suppression class Main du PluginManager qui ne servait qu'?\195?\160 tester celui-ci tout seul. Removed: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties trunk/src/site/doc/soutenance/conclusion.tex Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-26 01:04:59 UTC (rev 301) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-26 02:52:02 UTC (rev 302) @@ -133,7 +133,7 @@ new DeleteColumnListener(tableName, columnName)); JMenuItem addRowItem = new JMenuItem(_("add.row")); addRowItem.addActionListener( - new AddRowListener(tableName, columnName)); + new AddRowListener()); // JMenuItem delRowItem = new JMenuItem(_("del.row")); // delRowItem.addActionListener( // new DeleteRowListener(tableName, columnName)); @@ -356,20 +356,9 @@ class AddRowListener implements ActionListener { /** - * Current TableName. - */ - private String tableName; - /** - * Current ColumnName. - */ - private String columnName; - - /** * Default Constructor. */ - public AddRowListener(final String tableName, final String columnName) { - this.tableName = tableName; - this.columnName = columnName; + public AddRowListener() { } /** Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-26 01:04:59 UTC (rev 301) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-26 02:52:02 UTC (rev 302) @@ -1,6 +1,8 @@ add.table=Add a table +del.table=Remove the table add.column=Add a column -del.table=Remove the table +del.column=Remove the column +add.row=Add a row Empty=Empty Export\ Database= Exporter\ \:= @@ -84,4 +86,7 @@ deleteTableListener.JOptionPaneMessage=Please confirme the suppression of the table : deleteTableListener.JOptionPaneTitle=Delete a table deleteColumnListener.JOptionPaneMessage=Please confirme the suppression of the column : -deleteColumnListener.JOptionPaneTitle=Delete a column \ No newline at end of file +deleteColumnListener.JOptionPaneTitle=Delete a column +addRowListener.JOptionPaneMessage=Please Enter the keys of the row to create. +addRowListener.JOptionPaneTitle=Create a new row +addRowListener.JOptionPaneDefault=row's key \ No newline at end of file Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-26 01:04:59 UTC (rev 301) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-26 02:52:02 UTC (rev 302) @@ -1,6 +1,8 @@ add.table=Ajouter une table +del.table=Supprimer la table add.column=Ajouter une colonne -del.table=Supprimer la table +del.table=Supprimer la colonne +add.row=Ajouter une ligne Empty=Vide Export\ Database= Exporter\ \:= @@ -84,4 +86,7 @@ deleteTableListener.JOptionPaneMessage=Veuillez confirmer la suppression de la table : deleteTableListener.JOptionPaneTitle=Supprimer une table deleteColumnListener.JOptionPaneMessage=Veuillez confirmer la suppression de la colonne : -deleteColumnListener.JOptionPaneTitle=Supprimer une colonne \ No newline at end of file +deleteColumnListener.JOptionPaneTitle=Supprimer une colonne +addRowListener.JOptionPaneMessage=Veuillez saisir la cl\u00E9 de la ligne. +addRowListener.JOptionPaneTitle=Cr\u00E9er une nouvelle ligne +addRowListener.JOptionPaneDefault=Cl\u00E9 de la ligne \ No newline at end of file Deleted: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-26 01:04:59 UTC (rev 301) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-26 02:52:02 UTC (rev 302) @@ -1,69 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.nuiton.mapstoragemanager.plugins.pluginmanager; - -import java.util.Locale; - -import javax.swing.SwingUtilities; -import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.DefaultI18nInitializer; - -/** - * Main. - * - * @author Copyright CodeLutin - * @since 0.1-SNAPSHOT - */ -public final class Main { - - /** - * Logger. - */ - private static final Log LOG = LogFactory.getLog(Main.class); - - /** - * Locale. - */ - private static Locale locale = Locale.FRANCE; - - /** - * Private constructor. - */ - private Main() { - - I18n.setInitializer(new DefaultI18nInitializer("msm-pluginmanager-i18n")); - I18n.init(locale); - - try { - SwingUtil.initNimbusLoookAndFeel(); - } catch (Exception e) { - // could not find nimbus look-and-feel - LOG.warn("Could not find nimbus look-and-feel"); - } - - final PluginManager pluginManager = PluginManager.getInstance(); - pluginManager.setVisible(true); - - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - pluginManager.setVisible(true); - } - }); - } - - /** - * Main to test the PluginManager alone. - * @param args args. - */ - public static void main(String ... args) { - new Main(); - } -} Modified: trunk/src/site/doc/soutenance/conclusion.tex =================================================================== --- trunk/src/site/doc/soutenance/conclusion.tex 2010-03-26 01:04:59 UTC (rev 301) +++ trunk/src/site/doc/soutenance/conclusion.tex 2010-03-26 02:52:02 UTC (rev 302) @@ -30,10 +30,12 @@ \frame { \frametitle{MSM en quelques chiffres} -Nombre de lignes de code : 6000 \\ -Nombre de classes : 47 \\ -Nombre de méthodes : 332 \\ -Nombre de "commit" : ~300 \\ +Nombre de lignes de code : 6300 \\ +Nombre de classes : 50 \\ +Nombre de méthodes : 350 \\ +Nombre de "commit" : 300 \\ +Respect des normes de codage : >99 % \\ +Couverture de code des test : ~30 % \\ Litres de café : 10 \\ }

1 0

r301 - trunk/src/site/doc/soutenance
by dlanglais＠users.nuiton.org 26 Mar '10

26 Mar '10

Author: dlanglais Date: 2010-03-26 02:04:59 +0100 (Fri, 26 Mar 2010) New Revision: 301 Log: corrections mineures sur Soutenance. Modified: trunk/src/site/doc/soutenance/Analyse.tex trunk/src/site/doc/soutenance/conclusion.tex Modified: trunk/src/site/doc/soutenance/Analyse.tex =================================================================== --- trunk/src/site/doc/soutenance/Analyse.tex 2010-03-26 00:41:21 UTC (rev 300) +++ trunk/src/site/doc/soutenance/Analyse.tex 2010-03-26 01:04:59 UTC (rev 301) @@ -33,7 +33,7 @@ \vspace{0.5cm} -Notion : +Notions : \begin{itemize} \item Tables. \item Colonnes / familles. Modified: trunk/src/site/doc/soutenance/conclusion.tex =================================================================== --- trunk/src/site/doc/soutenance/conclusion.tex 2010-03-26 00:41:21 UTC (rev 300) +++ trunk/src/site/doc/soutenance/conclusion.tex 2010-03-26 01:04:59 UTC (rev 301) @@ -10,7 +10,7 @@ \begin{itemize} \item Architecture à plugins. \item Plugins fonctionnels (monitoring, import, export, etc). - \item Interface graphique de base complète (internationalisation, arbre de navigation, visualisation du contenu d'une table,...). + \item Interface graphique de base complète (internationalisation, arbre de navigation, visualisation du contenu d'une table...). \end{itemize} @@ -20,7 +20,7 @@ \frametitle{Évolutions possibles} \begin{itemize} - \item Plugin HBase à complèter, plugins des autres bases à implémenter. + \item Plugin HBase à compléter, plugins des autres bases à implémenter. \item Fonctions optionnelles dans l'interface (préférences,...). \item Ajouts de fonctionnalités (ajout, suppression, edition, etc). \end{itemize} @@ -33,7 +33,7 @@ Nombre de lignes de code : 6000 \\ Nombre de classes : 47 \\ Nombre de méthodes : 332 \\ -Nombre de "commit" : +270 \\ +Nombre de "commit" : ~300 \\ Litres de café : 10 \\ }

1 0

r300 - trunk/src/site/doc/soutenance
by afages＠users.nuiton.org 26 Mar '10

26 Mar '10

Author: afages Date: 2010-03-26 01:41:21 +0100 (Fri, 26 Mar 2010) New Revision: 300 Log: Modif ordre d'apparition Modified: trunk/src/site/doc/soutenance/SlidsAttribution.txt Modified: trunk/src/site/doc/soutenance/SlidsAttribution.txt =================================================================== --- trunk/src/site/doc/soutenance/SlidsAttribution.txt 2010-03-26 00:28:02 UTC (rev 299) +++ trunk/src/site/doc/soutenance/SlidsAttribution.txt 2010-03-26 00:41:21 UTC (rev 300) @@ -1,7 +1,7 @@ Soutenance : attribution des slids. =================================== -Amaury : 1, 2, 3, 7, 8, 9, 26, 27 +Amaury : 1, 2, 3, 7, 8, 9, 26, 27, 28 Dorian : 10, 11, 12, 24, 25, 28, 30

1 0

r299 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine
by dlanglais＠users.nuiton.org 26 Mar '10

26 Mar '10

Author: dlanglais Date: 2010-03-26 01:28:02 +0100 (Fri, 26 Mar 2010) New Revision: 299 Log: Correction : l'ajout de lignes marche maintenant (il y avait un bug assez ?\195?\169trange...). Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-25 23:42:44 UTC (rev 298) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-26 00:28:02 UTC (rev 299) @@ -88,7 +88,6 @@ */ @Override public final Object getValueAt(final int rowIndex, final int colIndex) { - LOG.debug(rowIndex + " " + colIndex); return data.get(colIndex).get(rowIndex); } @@ -129,15 +128,16 @@ * {@inheritDoc} */ @Override - public final void setValueAt(final Object content, final int rowIndex, final int colIndex) { - List<String> column = data.get(colIndex); - if (column.size() < rowIndex) { + public final void setValueAt(final Object content, final int rowIndex, + final int colIndex) { + if (colIndex == 1) { data.get(colIndex).add(rowIndex, content.toString()); fireTableCellUpdated(rowIndex, colIndex); } else { data.get(0).add(rowIndex, content.toString()); data.get(1).add(rowIndex, ""); - fireTableRowsInserted(rowIndex, rowIndex); + fireTableCellUpdated(rowIndex, 0); + fireTableCellUpdated(rowIndex, 1); } } @@ -145,7 +145,7 @@ * {@inheritDoc} */ @Override - public void tableChanged(TableModelEvent e) { + public void tableChanged(final TableModelEvent e) { /** row and column */ final int row = e.getFirstRow(); final int column = e.getColumn(); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-25 23:42:44 UTC (rev 298) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-26 00:28:02 UTC (rev 299) @@ -134,10 +134,14 @@ JMenuItem addRowItem = new JMenuItem(_("add.row")); addRowItem.addActionListener( new AddRowListener(tableName, columnName)); +// JMenuItem delRowItem = new JMenuItem(_("del.row")); +// delRowItem.addActionListener( +// new DeleteRowListener(tableName, columnName)); /** Add item to menu */ menu.add(delColumnItem); menu.add(addRowItem); +// menu.add(delRowItem); menu.show(e.getComponent(), e.getX(), e.getY()); } @@ -396,10 +400,69 @@ final JViewport viewPort = (JViewport) scrollPane.getComponent(0); final JTable jTable = (JTable) viewPort.getView(); final int rowNum = jTable.getRowCount(); - - jTable.setValueAt(rowKey, rowNum, 1); + jTable.setValueAt(rowKey, rowNum, 0); + /** upatate Navigation Tree. */ engine.uptableNavigationTree(navigation, bigTable.getPluginName()); } -} \ No newline at end of file +} + +///** +// * Listener to add a new row with his key. +// */ +//class DeleteRowListener implements ActionListener { +// +// /** +// * Current TableName. +// */ +// private String tableName; +// /** +// * Current ColumnName. +// */ +// private String columnName; +// +// /** +// * Default Constructor. +// */ +// public DeleteRowListener(final String tableName, final String columnName) { +// this.tableName = tableName; +// this.columnName = columnName; +// } +// +// /** +// * Open a JOptionPane to ask the wanted table name and create it. +// */ +// @Override +// public void actionPerformed(ActionEvent e) { +// +// /** Get MainUI et ApplicationEngine instances. */ +// final MainUI ui = MainUI.getInstance(); +// final ApplicationEngine engine = ApplicationEngine.getInstance(); +// final JTree navigation = ui.getNavigation(); +// final BigTable bigTable = engine.getBigTable(); +// +// /** Ask key of the row to delete. */ +// final String rowKey = (String) JOptionPane.showInputDialog( +// ui, +// _("delRowListener.JOptionPaneMessage"), +// _("delRowListener.JOptionPaneTitle"), +// JOptionPane.PLAIN_MESSAGE, +// null, +// null, +// _("delRowListener.JOptionPaneDefault")); +// +// +//// /** Search to row to delete... */ +//// final JScrollPane scrollPane = +//// (JScrollPane) ui.getTableContent().getComponent(0); +//// final JViewport viewPort = (JViewport) scrollPane.getComponent(0); +//// final JTable jTable = (JTable) viewPort.getView(); +//// final int rowNum = jTable.getRowCount(); +// +//// jTable.removeRowSelectionInterval(0, 1); +// +// /** upatate Navigation Tree. */ +// engine.uptableNavigationTree(navigation, bigTable.getPluginName()); +// } +//} \ No newline at end of file

1 0

r298 - in trunk: . msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine
by dlanglais＠users.nuiton.org 25 Mar '10

25 Mar '10

Author: dlanglais Date: 2010-03-26 00:42:44 +0100 (Fri, 26 Mar 2010) New Revision: 298 Log: Insertion de nouvelles lignes OK ! Modified: trunk/VCardsXPP3.xml trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java Modified: trunk/VCardsXPP3.xml =================================================================== --- trunk/VCardsXPP3.xml 2010-03-25 22:14:48 UTC (rev 297) +++ trunk/VCardsXPP3.xml 2010-03-25 23:42:44 UTC (rev 298) @@ -6,13 +6,13 @@ <column columnName="name"/> <column columnName="firstname"/> <column columnName="birthdate"/> - <column columnName="addressID"/> </table> <table tableName="Addresses"> <column columnName="number"/> <column columnName="street"/> <column columnName="postalcode"/> <column columnName="city"/> + <column columnName="memberID"/> </table> </describe> @@ -34,19 +34,19 @@  <element table="Members" column="birthdate" key="3" version="1" value="07/09/1986" /> <element table="Members" column="birthdate" key="4" version="1" value="07/08/1987" /> - - <element table="Members" column="addressID" key="1" version="1" value="1" /> - <element table="Members" column="addressID" key="2" version="1" value="2" /> - <element table="Members" column="addressID" key="3" version="1" value="3" /> - <element table="Members" column="addressID" key="4" version="1" value="4" />  <element table="Addresses" column="number" key="1" version="1" value="1" /> <element table="Addresses" column="number" key="2" version="1" value="2" /> <element table="Addresses" column="number" key="3" version="1" value="3" /> - <element table="Addresses" column="number" key="4" version="1" value="4" /> + <element table="Addresses" column="number" key="4" version="1" value="4" /> + <element table="Addresses" column="memberID" key="1" version="1" value="1" /> + <element table="Addresses" column="memberID" key="2" version="1" value="2" /> + <element table="Addresses" column="memberID" key="3" version="1" value="3" /> + <element table="Addresses" column="memberID" key="4" version="1" value="4" /> + <element table="Addresses" column="street" key="1" version="1" value="rue de la Paix" /> <element table="Addresses" column="street" key="2" version="1" value="avenue des Champs Élysées" /> <element table="Addresses" column="street" key="3" version="1" value="place de la Bourse" /> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-25 22:14:48 UTC (rev 297) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-25 23:42:44 UTC (rev 298) @@ -88,6 +88,7 @@ */ @Override public final Object getValueAt(final int rowIndex, final int colIndex) { + LOG.debug(rowIndex + " " + colIndex); return data.get(colIndex).get(rowIndex); } @@ -129,8 +130,15 @@ */ @Override public final void setValueAt(final Object content, final int rowIndex, final int colIndex) { - data.get(rowIndex).set(colIndex, content.toString()); - fireTableCellUpdated(rowIndex, colIndex); + List<String> column = data.get(colIndex); + if (column.size() < rowIndex) { + data.get(colIndex).add(rowIndex, content.toString()); + fireTableCellUpdated(rowIndex, colIndex); + } else { + data.get(0).add(rowIndex, content.toString()); + data.get(1).add(rowIndex, ""); + fireTableRowsInserted(rowIndex, rowIndex); + } } /** @@ -141,7 +149,7 @@ /** row and column */ final int row = e.getFirstRow(); final int column = e.getColumn(); - final TableModel model = (TableModel)e.getSource(); + final ColumnModel model = (ColumnModel)e.getSource(); /** Get Engine and BigTable instance */ final ApplicationEngine engine = ApplicationEngine.getInstance(); @@ -155,4 +163,4 @@ bigTable.put(tableName, columnName, key, content); } -} +} \ No newline at end of file Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-25 22:14:48 UTC (rev 297) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-25 23:42:44 UTC (rev 298) @@ -12,6 +12,7 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JTree; +import javax.swing.JViewport; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultMutableTreeNode; import org.nuiton.mapstoragemanager.plugins.BigTable; @@ -130,9 +131,13 @@ JMenuItem delColumnItem = new JMenuItem(_("del.column")); delColumnItem.addActionListener( new DeleteColumnListener(tableName, columnName)); + JMenuItem addRowItem = new JMenuItem(_("add.row")); + addRowItem.addActionListener( + new AddRowListener(tableName, columnName)); /** Add item to menu */ menu.add(delColumnItem); + menu.add(addRowItem); menu.show(e.getComponent(), e.getX(), e.getY()); } @@ -342,54 +347,59 @@ /** - * Listener to modify datas from the selected cell. + * Listener to add a new row with his key. */ -//class ModifyCellListener implements ActionListener { -// -// /** -// * Current columnName. -// */ -// private String columnName; -// -// /** -// * Current columnName. -// */ -// private String tableName; -// -// /** -// * Default Constructor. -// */ -// public AddCellListener(String tableName, String columnName) { -// this.tableName = tableName; -// this.columnName = columnName; -// } -// -// /** -// * Open a JOptionPane to ask the wanted table name and create it. -// */ -// @Override -// public void actionPerformed(ActionEvent e) { -// -// /** Get MainUI et ApplicationEngine instances. */ -// final MainUI ui = MainUI.getInstance(); -// final ApplicationEngine engine = ApplicationEngine.getInstance(); -// final JTree navigation = ui.getNavigation(); -// final BigTable bigTable = engine.getBigTable(); -// -// /** Ask wanted key / value. */ -// final String key = (String) JOptionPane.showInputDialog( -// ui, -// _("KeyListener.question"), -// _("KeyListener.title"), -// JOptionPane.PLAIN_MESSAGE, -// null, -// null, -// _("KeyTableListener.default")); -// -// /** Create the Table in the BigTable */ -// bigTable.put(tableName, columnName, key, value); -// -// /** upatate Navigation Tree. */ -// engine.uptableNavigationTree(navigation, bigTable.getPluginName()); -// } -//} \ No newline at end of file +class AddRowListener implements ActionListener { + + /** + * Current TableName. + */ + private String tableName; + /** + * Current ColumnName. + */ + private String columnName; + + /** + * Default Constructor. + */ + public AddRowListener(final String tableName, final String columnName) { + this.tableName = tableName; + this.columnName = columnName; + } + + /** + * Open a JOptionPane to ask the wanted table name and create it. + */ + @Override + public void actionPerformed(ActionEvent e) { + + /** Get MainUI et ApplicationEngine instances. */ + final MainUI ui = MainUI.getInstance(); + final ApplicationEngine engine = ApplicationEngine.getInstance(); + final JTree navigation = ui.getNavigation(); + final BigTable bigTable = engine.getBigTable(); + + /** Ask key of the new row. */ + final String rowKey = (String) JOptionPane.showInputDialog( + ui, + _("addRowListener.JOptionPaneMessage"), + _("addRowListener.JOptionPaneTitle"), + JOptionPane.PLAIN_MESSAGE, + null, + null, + _("addRowListener.JOptionPaneDefault")); + + /** Create the Table in the BigTable */ + final JScrollPane scrollPane = + (JScrollPane) ui.getTableContent().getComponent(0); + final JViewport viewPort = (JViewport) scrollPane.getComponent(0); + final JTable jTable = (JTable) viewPort.getView(); + final int rowNum = jTable.getRowCount(); + + jTable.setValueAt(rowKey, rowNum, 1); + + /** upatate Navigation Tree. */ + engine.uptableNavigationTree(navigation, bigTable.getPluginName()); + } +} \ No newline at end of file

1 0

r297 - trunk/src/site/doc/soutenance
by afages＠users.nuiton.org 25 Mar '10

25 Mar '10

Author: afages Date: 2010-03-25 23:14:48 +0100 (Thu, 25 Mar 2010) New Revision: 297 Log: Modif soutenance Modified: trunk/src/site/doc/soutenance/Analyse.tex trunk/src/site/doc/soutenance/architecture.tex trunk/src/site/doc/soutenance/presentation.tex trunk/src/site/doc/soutenance/soutenance.pdf Modified: trunk/src/site/doc/soutenance/Analyse.tex =================================================================== --- trunk/src/site/doc/soutenance/Analyse.tex 2010-03-25 21:44:04 UTC (rev 296) +++ trunk/src/site/doc/soutenance/Analyse.tex 2010-03-25 22:14:48 UTC (rev 297) @@ -12,7 +12,7 @@ \vspace{0.5cm} BigTable est la spécification Google d'un système de stockage distribué. -Conçu pour s'adapter fiablement à de gros volume de données. +Conçu pour s'adapter fiablement à de gros volumes de données. \vspace{0.5cm} Modified: trunk/src/site/doc/soutenance/architecture.tex =================================================================== --- trunk/src/site/doc/soutenance/architecture.tex 2010-03-25 21:44:04 UTC (rev 296) +++ trunk/src/site/doc/soutenance/architecture.tex 2010-03-25 22:14:48 UTC (rev 297) @@ -28,16 +28,18 @@ \item Possibilité d'ajouter un plugin en dehors du dossier plugin. \end{itemize} -Séléction : +Sélection : \begin{itemize} \item Cocher / Décocher les plugins que l'on souhaite charger. - \item Séléction sauvegardée et plugins chargée au démarrage de l'application. + \item Sélection sauvegardée et plugins chargés au démarrage de l'application. \end{itemize} Développement : \begin{itemize} - \item Création d'un jar contenant les classes implémentant l'interface Plugin. - \item Ajout d'un fichier du nom de l'interface implémentée et contenant le nom de la classe l'implémentant dans le dossier META-INF/services. + \item Création d'un jar contenant les classes implémentant l'interface +Plugin. + \item Ajout d'un fichier du nom de l'interface implémentée et contenant le +nom de la classe l'implémentant dans le dossier META-INF/services. \end{itemize} } Modified: trunk/src/site/doc/soutenance/presentation.tex =================================================================== --- trunk/src/site/doc/soutenance/presentation.tex 2010-03-25 21:44:04 UTC (rev 296) +++ trunk/src/site/doc/soutenance/presentation.tex 2010-03-25 22:14:48 UTC (rev 297) @@ -12,7 +12,7 @@ Spécialisée autour des technologies Java JEE et UML. \begin{itemize} - \item du développement de logiciel (forfait ou régi). + \item du développement de logiciel (forfait ou régie). \item de l’intégration et de la maintenance de systèmes clés en main. \item du support. \item du conseil et de la veille technologique. @@ -23,6 +23,7 @@ \begin{itemize} \item Libre Entreprise. \item Alliance Libre. + \item April \end{itemize} } @@ -37,7 +38,7 @@ \vspace{0.3cm} Des systèmes en ligne de commande existent. Code Lutin souhaite -une application graphique, extensible permettant de visualiser +une application graphique, extensible, permettant de visualiser et manipuler les données au sein de telles bases, principalement HBase. } Modified: trunk/src/site/doc/soutenance/soutenance.pdf =================================================================== (Binary files differ)

1 0

r296 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine
by dlanglais＠users.nuiton.org 25 Mar '10

25 Mar '10

Author: dlanglais Date: 2010-03-25 22:44:04 +0100 (Thu, 25 Mar 2010) New Revision: 296 Log: Modifier le contenu d'une cellule dans TableModel et ColumnModel Fonctionnel. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-25 21:24:59 UTC (rev 295) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-25 21:44:04 UTC (rev 296) @@ -128,6 +128,15 @@ * {@inheritDoc} */ @Override + public final void setValueAt(final Object content, final int rowIndex, final int colIndex) { + data.get(rowIndex).set(colIndex, content.toString()); + fireTableCellUpdated(rowIndex, colIndex); + } + + /** + * {@inheritDoc} + */ + @Override public void tableChanged(TableModelEvent e) { /** row and column */ final int row = e.getFirstRow(); @@ -138,9 +147,7 @@ final ApplicationEngine engine = ApplicationEngine.getInstance(); final BigTable bigTable = engine.getBigTable(); - /** Get table Name, ColumnName... to put them in the bigTable */ - final String tableName = ""; - final String columnName = model.getColumnName(column); + /** Get "content" to put them in the bigTable */ final String key = (String) model.getValueAt(row, 0); final String content = (String) model.getValueAt(row, column); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-25 21:24:59 UTC (rev 295) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-25 21:44:04 UTC (rev 296) @@ -54,12 +54,14 @@ return; } else if (node.isLeaf()) { //we create a standard model of column - ColumnModel model = new ColumnModel(node.getParent(), node); - jTable = new JTable(model); + ColumnModel columnModel = new ColumnModel(node.getParent(), node); + columnModel.addTableModelListener(columnModel); + jTable = new JTable(columnModel); } else { //we create a standard model of table - TableModel model = new TableModel(node); - jTable = new JTable(model); + TableModel tableModel = new TableModel(node); + tableModel.addTableModelListener(tableModel); + jTable = new JTable(tableModel); } JScrollPane scrollPane = new JScrollPane(jTable); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java 2010-03-25 21:24:59 UTC (rev 295) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java 2010-03-25 21:44:04 UTC (rev 296) @@ -1,8 +1,12 @@ package org.nuiton.mapstoragemanager.ui.engine; import java.util.Set; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; import javax.swing.table.AbstractTableModel; import javax.swing.tree.DefaultMutableTreeNode; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.plugins.BigTable; import static org.nuiton.i18n.I18n._; @@ -12,15 +16,21 @@ * @author Copyright CodeLutin * @since 0.1-SNAPSHOT */ -public class TableModel extends AbstractTableModel { +public class TableModel extends AbstractTableModel + implements TableModelListener { + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); + /** The table's name. */ private String tableName; /** * columnNames. */ - private String[] titles; + private String[] columnNames; /** * data. @@ -54,19 +64,19 @@ int rowindex = 0; if (showTableKeys) { - titles = new String[columnsNames.size() + 1]; - titles[0] = _("table.keys"); + columnNames = new String[columnsNames.size() + 1]; + columnNames[0] = _("table.keys"); data = new String[columnsNames.size() + 1][tableKeys.size()]; colIndex++; } else { - titles = new String[columnsNames.size()]; + columnNames = new String[columnsNames.size()]; data = new String[columnsNames.size()][tableKeys.size()]; } for (String columnName : columnsNames) { - titles[colIndex] = columnName; + columnNames[colIndex] = columnName; rowindex = 0; for (String key : tableKeys) { @@ -94,7 +104,7 @@ */ @Override public final int getColumnCount() { - return titles.length; + return columnNames.length; } /** @@ -110,7 +120,7 @@ */ @Override public final String getColumnName(final int col) { - return titles[col]; + return columnNames[col]; } /** @@ -122,5 +132,36 @@ return (col == 0 ? false : true); } + /** + * {@inheritDoc} + */ + @Override + public final void setValueAt(final Object content, final int rowIndex, final int colIndex) { + data[colIndex][rowIndex] = content.toString(); + fireTableCellUpdated(rowIndex, colIndex); + } + /** + * {@inheritDoc} + */ + @Override + public void tableChanged(TableModelEvent e) { + /** row and column */ + final int row = e.getFirstRow(); + final int column = e.getColumn(); + final TableModel model = (TableModel)e.getSource(); + + /** Get Engine and BigTable instance */ + final ApplicationEngine engine = ApplicationEngine.getInstance(); + final BigTable bigTable = engine.getBigTable(); + + /** Get "content" to put them in the bigTable */ + final String columnName = model.getColumnName(column); + final String key = (String) model.getValueAt(row, 0); + final String content = (String) model.getValueAt(row, column); + + LOG.info(tableName + ":" + columnName + ":" + key + "=>" + content); + + bigTable.put(tableName, columnName, key, content); + } }

1 0

r295 - trunk/msm/src/main/resources/i18n
by afages＠users.nuiton.org 25 Mar '10

25 Mar '10

Author: afages Date: 2010-03-25 22:24:59 +0100 (Thu, 25 Mar 2010) New Revision: 295 Log: Traduction cl?\195?\169 del.table dns I18N Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-25 20:57:50 UTC (rev 294) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-25 21:24:59 UTC (rev 295) @@ -1,5 +1,6 @@ add.table=Add a table add.column=Add a column +del.table=Remove the table Empty=Empty Export\ Database= Exporter\ \:= Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-25 20:57:50 UTC (rev 294) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-25 21:24:59 UTC (rev 295) @@ -1,5 +1,6 @@ add.table=Ajouter une table add.column=Ajouter une colonne +del.table=Supprimer la table Empty=Vide Export\ Database= Exporter\ \:=

1 0

r294 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine
by dlanglais＠users.nuiton.org 25 Mar '10

25 Mar '10

Author: dlanglais Date: 2010-03-25 21:57:50 +0100 (Thu, 25 Mar 2010) New Revision: 294 Log: Am?\195?\169lioration des ColumnModel et TableModel en vue de pouvoir effectuer des modifications sur une BigTable. cell editable si ce n'est pas une cellule de cl?\195?\169s. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-25 20:51:53 UTC (rev 293) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-25 20:57:50 UTC (rev 294) @@ -5,9 +5,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; import javax.swing.table.AbstractTableModel; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.plugins.BigTable; import static org.nuiton.i18n.I18n._; @@ -17,9 +21,20 @@ * @author Copyright CodeLutin * @since 0.1-SNAPSHOT */ -public class ColumnModel extends AbstractTableModel { +public class ColumnModel extends AbstractTableModel + implements TableModelListener { + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); + /** The table's name. */ + private String tableName; + + /** The column's name. */ + private String columnName; + /** * columnNames. */ @@ -38,8 +53,8 @@ public ColumnModel(final TreeNode parent, final DefaultMutableTreeNode node) { // table and column names. - String tableName = parent.toString(); - String columnName = node.toString(); + tableName = parent.toString(); + columnName = node.toString(); ApplicationEngine engine = ApplicationEngine.getInstance(); BigTable bigTable = engine.getBigTable(); @@ -105,8 +120,32 @@ */ @Override public final boolean isCellEditable(final int row, final int col) { - return false; + /** If column is the key column, it's impossible to edit it */ + return (col == 0 ? false : true); } + /** + * {@inheritDoc} + */ + @Override + public void tableChanged(TableModelEvent e) { + /** row and column */ + final int row = e.getFirstRow(); + final int column = e.getColumn(); + final TableModel model = (TableModel)e.getSource(); + /** Get Engine and BigTable instance */ + final ApplicationEngine engine = ApplicationEngine.getInstance(); + final BigTable bigTable = engine.getBigTable(); + + /** Get table Name, ColumnName... to put them in the bigTable */ + final String tableName = ""; + final String columnName = model.getColumnName(column); + final String key = (String) model.getValueAt(row, 0); + final String content = (String) model.getValueAt(row, column); + + LOG.info(tableName + ":" + columnName + ":" + key + "=>" + content); + + bigTable.put(tableName, columnName, key, content); + } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java 2010-03-25 20:51:53 UTC (rev 293) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java 2010-03-25 20:57:50 UTC (rev 294) @@ -14,7 +14,9 @@ */ public class TableModel extends AbstractTableModel { - + /** The table's name. */ + private String tableName; + /** * columnNames. */ @@ -35,14 +37,14 @@ * @param node the selected node. */ public TableModel(final DefaultMutableTreeNode node) { - String table = node.toString(); + tableName = node.toString(); ApplicationEngine engine = ApplicationEngine.getInstance(); BigTable bigTable = engine.getBigTable(); - Set<String> columnsNames = bigTable.getColumnsNames(table); + Set<String> columnsNames = bigTable.getColumnsNames(tableName); //content - Set<String> tableKeys = bigTable.getKeys(table); + Set<String> tableKeys = bigTable.getKeys(tableName); // Iterator<String> columnName = columnsNames.iterator(); /** @@ -68,7 +70,7 @@ rowindex = 0; for (String key : tableKeys) { - String str = bigTable.get(table, columnName, key); + String str = bigTable.get(tableName, columnName, key); if (showTableKeys) { data[0][rowindex] = key; } @@ -116,7 +118,8 @@ */ @Override public final boolean isCellEditable(final int row, final int col) { - return false; + /** If column is the key column, it's impossible to edit it */ + return (col == 0 ? false : true); }

1 0