Author: fgilet Date: 2010-03-02 14:15:33 +0100 (Tue, 02 Mar 2010) New Revision: 161 Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/package-info.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/package-info.java Modified: trunk/msm/pom.xml trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 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/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties trunk/msm/src/main/resources/msm.properties trunk/pom.xml Log: CheckStyle fait! Modified: trunk/msm/pom.xml =================================================================== --- trunk/msm/pom.xml 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/pom.xml 2010-03-02 13:15:33 UTC (rev 161) @@ -146,19 +146,19 @@ <jaxx.helpTarget>src/main/help</jaxx.helpTarget--> </properties> - + <packaging>jar</packaging> <!--<properties> - main class in jar + main class in jar <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class> <jaxx.version>2.0.0-beta-3</jaxx.version> <lutinutil.version>1.1.2</lutinutil.version> <i18n.version>1.0.1</i18n.version> - jaxx + jaxx <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> @@ -183,7 +183,7 @@ </includes> </resource> </resources> - + <plugins> <plugin> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-02 13:15:33 UTC (rev 161) @@ -7,31 +7,39 @@ import org.nuiton.i18n.I18n; import org.nuiton.mapstoragemanager.ui.MainUI; -import javax.swing.*; import java.util.Locale; +import javax.swing.SwingUtilities; import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; /** * Created: 21 janv. 2010 * * @author Tony Chemit <chemit@codelutin.com> Copyright Code Lutin * @version $Revision: 4 $ - * <p/> - * Mise a jour: $Date: 2010-01-21 15:24:35 +0100 (jeu., 21 janv. 2010) $ par : - * $Author: tchemit $ + * <p/> + * Mise a jour: $Date: 2010-01-21 15:24:35 +0100 (jeu., 21 janv. 2010) $ par : + * $Author: tchemit $ */ public final class Main { /** - * Logger + * Logger. */ - private static Log log = LogFactory.getLog(Main.class); + private static final Log LOG = LogFactory.getLog(Main.class); - public static Locale locale = Locale.FRANCE; + /** + * Locale. + */ + private static Locale locale = Locale.FRANCE; - private Main(String... args){ - try{ + /** + * Main private. + * @param args arguments. + */ + private Main(final String... args) { + try { I18n.setUniqueBundleName("mapstoragemanager-i18n"); I18n.init(locale); @@ -39,7 +47,7 @@ SwingUtil.initNimbusLoookAndFeel(); } catch (Exception e) { // could not find nimbus look-and-feel - log.warn("Could not find nimbus look-and-feel"); + LOG.warn("Could not find nimbus look-and-feel"); } // init config @@ -48,7 +56,7 @@ // chargement de la configuration des uis SwingUtil.loadUIConfig(MsmConfig.APPLICATION_PROPERTIES, null); - + final MainUI ui = MainUI.getInstance(); SwingUtilities.invokeLater(new Runnable() { @@ -62,34 +70,51 @@ } catch (Exception e) { ErrorDialogUI.showError(e); - log.error(e.getMessage(), e); + LOG.error(e.getMessage(), e); System.exit(1); } } - - public static void main(String... args) { + + /** + * Main. + * @param args arguments. + */ + public static void main(final String... args) { new Main(args); - } - public static void setLocale(Locale locale){ - Main.locale = locale; - MainUI.getInstance().dispose(); - Main.main(); - } - + /** + * Init ui. + */ private void init() { MainUI ui = MainUI.getInstance(); Locale localeTemp = Main.locale; - if (localeTemp.equals(Locale.FRANCE)){ + if (localeTemp.equals(Locale.FRANCE)) { ui.getMenuFileLanguageFR().setEnabled(false); - } else if (localeTemp.equals(Locale.UK)){ + } else if (localeTemp.equals(Locale.UK)) { ui.getMenuFileLanguageUK().setEnabled(false); } - String message = n_("messageEntry"); + n_("messageEntry"); + String message = _("messageEntry"); ui.displayMessage(message, 1); + } + /** + * Setter locale. + * @param newlocale the new locale. + */ + public static void setLocale(final Locale newlocale) { + Main.locale = newlocale; + MainUI.getInstance().dispose(); + Main.main(); + } + /** + * Getter locale. + * @return locale the current locale. + */ + public Locale getLocale() { + return locale; } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-02 13:15:33 UTC (rev 161) @@ -2,8 +2,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; import java.io.IOException; import java.io.InputStream; @@ -19,16 +17,19 @@ public class MsmConfig extends org.nuiton.util.ApplicationConfig { /** - * to use log facility, just put in your code: log.info(\"...\"); + * to use log facility, just put in your code: log.info(\"...\"). */ - static private Log log = LogFactory.getLog(MsmConfig.class); - + private static final Log LOG = LogFactory.getLog(MsmConfig.class); + /** - * le fichier de configuration de l'application avec les informations sur - * le projet (version, license,...) et la configuration des ui (icons, ...) + * configuration's file with information on project (version, licence, ...). + * and the ui's configuration (icons, ...). */ public static final String APPLICATION_PROPERTIES = "/msm.properties"; + /** + * Constructor. + */ public MsmConfig() { //setConfigFileName(APPLICATION_PROPERTIES); @@ -43,8 +44,8 @@ for (Object k : p.keySet()) { String key = k + ""; Object value = p.get(k); - if (log.isDebugEnabled()) { - log.debug("install properties " + k + " : " + value); + if (LOG.isDebugEnabled()) { + LOG.debug("install properties " + k + " : " + value); } setDefaultOption(key, "" + value); } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-02 13:15:33 UTC (rev 161) @@ -15,8 +15,8 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; /** - * @author Crieloue Gilles - * This class loads the BigTable implementations + * @author Crieloue Gilles. + * This class loads the BigTable implementations. */ public class BigTableLoader extends URLClassLoader { @@ -31,7 +31,7 @@ private ServiceLoader<BigTable> bigTableSetLoader; /** - * Map Identifiant - BigTable implementation + * Map Identifiant - BigTable implementation. */ private HashMap<String, BigTable> plugins = new HashMap<String, BigTable>(); @@ -52,7 +52,7 @@ try { this.addURL(file.toURI().toURL()); } catch (MalformedURLException e) { - LOG.error(e.toString(),e); + LOG.error(e.toString(), e); } } } @@ -63,10 +63,10 @@ * Identifiant for the plugin */ - //TODO: define better identifiants + //define better identifiants int pluginNumber = 0; - for (BigTable bigTableImpl : bigTableSetLoader){ - plugins.put("BigTable"+pluginNumber, bigTableImpl); + for (BigTable bigTableImpl : bigTableSetLoader) { + plugins.put("BigTable" + pluginNumber, bigTableImpl); pluginNumber++; } } @@ -110,7 +110,7 @@ * @param id the identifiant * @return the BigTable */ - public BigTable getBigTable(String id){ + public final BigTable getBigTable(final String id) { return plugins.get(id); } @@ -118,15 +118,15 @@ * Returns all the BigTable implementations loaded. * @return all the BigTable implementations loaded */ - public Collection<BigTable> getAllBigTable(){ + public final Collection<BigTable> getAllBigTable() { return plugins.values(); } - + /** * Returns all the BigTable implementations names. * @return all the BigTable implementations names */ - public Set<String> getAllBigTableNames(){ - return plugins.keySet(); + public final Set<String> getAllBigTableNames() { + return plugins.keySet(); } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-02 13:15:33 UTC (rev 161) @@ -17,20 +17,27 @@ */ private static final Log LOG = LogFactory.getLog(TestServiceLoader.class); + /** + * Constructor. + */ private TestServiceLoader() { try { BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); LOG.info(p.getBigTable()); } catch (MalformedURLException e) { - // TODO Auto-generated catch block + //Auto-generated catch block //e.printStackTrace(); - LOG.error(e.toString(),e); + LOG.error(e.toString(), e); } } + /** + * Main. + * @param args arguments + */ public static void main(final String[] args) { new TestServiceLoader(); } -} \ No newline at end of file +} Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/package-info.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/package-info.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/package-info.java 2010-03-02 13:15:33 UTC (rev 161) @@ -0,0 +1,5 @@ +/** + * Package org.nuiton.mapstoragemanager. + * contains main class and application's configuration. + */ +package org.nuiton.mapstoragemanager; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-03-02 13:15:33 UTC (rev 161) @@ -104,16 +104,16 @@ * -> get the content with the version <b>version</b>. * @param table the table name. * @param column the column name. - * @param key the key - * @param version + * @param key the key. + * @param version the version. * @return the content */ String get(String table, String column, String key, int version); /** - * Get the row identified by the key <b>key<b> from the table <b>table</b> - * @param table the table name - * @param key the key + * Get the row identified by the key <b>key</b> from the table <b>table</b>. + * @param table the table name. + * @param key the key. * @return a Map with key is column's name and value is content's value. */ Map<String, String> getRow(String table, String key); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java 2010-03-02 13:15:33 UTC (rev 161) @@ -13,5 +13,5 @@ * @param bigTable the bigTable plugin. * @param file the file in which export the content of the base. */ - void exportTo (final BigTable bigTable, final File file); -} \ No newline at end of file + void exportTo(final BigTable bigTable, final File file); +} Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java 2010-03-02 13:15:33 UTC (rev 161) @@ -13,5 +13,6 @@ * @param bigTable the bigTable plugin. * @param file the file in which export the content of the base. */ - void importFrom (final BigTable bigTable, final File file); -} \ No newline at end of file + void importFrom(final BigTable bigTable, final File file); +} + Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-02 13:15:33 UTC (rev 161) @@ -8,39 +8,57 @@ import java.util.Properties; import java.util.Set; + +/** + * Class OurHashMap2. + * @author E045231P + */ public class OurHashMap2 implements BigTable { - private Map<String, ArrayList<String>> mapTable = new HashMap<String,ArrayList<String>>(); - private Map<String, ArrayList<String>> mapColumn = new HashMap<String, ArrayList<String>>(); - private Map<String, String> mapData = new HashMap<String,String>(); + /** + * map table. + */ + private Map<String, ArrayList<String>> mapTable = + new HashMap<String, ArrayList<String>>(); + /** + * map column. + */ + private Map<String, ArrayList<String>> mapColumn = + new HashMap<String, ArrayList<String>>(); + + /** + * map data. + */ + private Map<String, String> mapData = new HashMap<String, String>(); + @Override - public boolean connect(Properties properties) { + public final boolean connect(final Properties properties) { return true; } @Override - public void selectTable(String table) { + public final void selectTable(final String table) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public void createTable(String table) { + public final void createTable(final String table) { mapTable.put(table, new ArrayList<String>()); } @Override - public void deleteTable(String table) { + public final void deleteTable(final String table) { mapTable.remove(table); } @Override - public Set<String> getTablesNames() { + public final Set<String> getTablesNames() { return mapTable.keySet(); } @Override - public void createColumn(String table, String column) { + public final void createColumn(final String table, final String column) { // if the table exist and only if the column doesn't exist. if (mapTable.containsKey(table) && !mapColumn.containsKey(column)) { mapColumn.put(column, new ArrayList<String>()); @@ -49,31 +67,33 @@ } @Override - public void deleteColumn(String table, String column) { + public final void deleteColumn(final String table, final String column) { // if the table exist and only if the column exist. - if (mapTable.containsKey(table) && - mapTable.get(table).contains(column)) { + if (mapTable.containsKey(table) + && mapTable.get(table).contains(column)) { mapTable.get(table).remove(column); } } @Override - public Set<String> getColumnsNames(String table) { + public final Set<String> getColumnsNames(final String table) { Set<String> columnNames = new HashSet(mapTable.get(table)); return columnNames; } @Override - public void put(String table, String column, String key, String content) { + public final void put(final String table, final String column, + final String key, final String content) { // If the table and the column exist. - if(mapTable.containsKey(table) && mapColumn.containsKey(column)) { + if (mapTable.containsKey(table) && mapColumn.containsKey(column)) { mapColumn.get(column).add(key); mapData.put(key, content); } } @Override - public String get(String table, String column, String key) { + public final String get(final String table, final String column, + final String key) { String ret = ""; if (mapTable.containsKey(table)) { if (mapColumn.containsKey(column)) { @@ -88,23 +108,24 @@ } @Override - public String get(String table, String column, String key, int version) { + public final String get(final String table, final String column, + final String key, final int version) { return get(table, column, key); - // TODO } @Override - public Map<String, String> getRow(String table, String key) { + public final Map<String, String> getRow(final String table, + final String key) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public Set<String> getKeys(String table) { + public final Set<String> getKeys(final String table) { Set<String> tableKeys = new HashSet(); Set<String> tableColumns = new HashSet(mapTable.get(table)); Iterator<String> i = tableColumns.iterator(); // we get and add all the keys of the column to the keys of the table - while(i.hasNext()){ + while (i.hasNext()) { String columnName = i.next(); ArrayList<String> columnKeys = mapColumn.get(columnName); tableKeys.addAll(columnKeys); @@ -112,7 +133,13 @@ return tableKeys; } - public Set<String> getKeys(String table, String column) { + /** + * getKeys. + * @param table the table. + * @param column the column. + * @return the set of key into a table. + */ + public final Set<String> getKeys(final String table, final String column) { Set<String> keys = new HashSet(mapColumn.get(column)); return keys; } @@ -120,8 +147,7 @@ /** * {@inheritDoc} */ - @Override - public String getPluginName() { + public final String getPluginName() { return this.getClass().getSimpleName(); } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java 2010-03-02 13:15:33 UTC (rev 161) @@ -1,11 +1,14 @@ package org.nuiton.mapstoragemanager.plugins; +/** + * Interface plugin. + * @author E045231P + */ public interface Plugin { - /** - * Returns the plugin name. - * @return the plugin name - */ - public String getPluginName(); - + /** + * Returns the plugin name. + * @return the plugin name + */ + String getPluginName(); } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-03-02 13:15:33 UTC (rev 161) @@ -1,5 +1,4 @@ -package org.nuiton.mapstoragemanager.plugins; /** * The plugins interfaces. */ - +package org.nuiton.mapstoragemanager.plugins; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-02 13:15:33 UTC (rev 161) @@ -7,6 +7,7 @@ import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; import javax.swing.tree.*; import static org.nuiton.i18n.I18n.n_; + import static org.nuiton.i18n.I18n._; import javax.swing.JLabel; import org.nuiton.mapstoragemanager.MsmConfig; @@ -75,7 +76,15 @@ this.getMessagesPanel().add(label); } + /** + * Test. + */ + public DefaultTreeModel getModelTree(){ + n_("Empty"); + return new DefaultTreeModel(new DefaultMutableTreeNode(_("Empty"))); + } + ]]> </script> @@ -138,7 +147,7 @@ <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > <JScrollPane> <JTree id='navigation' - model='{new DefaultTreeModel(new DefaultMutableTreeNode(n_("Empty")))}' /> + model='{getModelTree()}' /> </JScrollPane> <JScrollPane> <JPanel layout='{new BorderLayout()}'> 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-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-02 13:15:33 UTC (rev 161) @@ -8,34 +8,36 @@ import java.util.ResourceBundle; import java.util.Set; import javax.swing.JOptionPane; +import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeModel; import jaxx.runtime.swing.ErrorDialogUI; +import jaxx.runtime.swing.Item; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.Main; import org.nuiton.mapstoragemanager.MsmConfig; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; import org.nuiton.mapstoragemanager.ui.MainUI; -import static org.nuiton.i18n.I18n.n_; import static org.nuiton.i18n.I18n._; /** * Engine Class with methods for application user interface. - * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian + * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian */ -public class ApplicationEngine { +public final class ApplicationEngine { /** * Logger. */ - private static final Log log = LogFactory.getLog(ApplicationEngine.class); + private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); /** * current Locale. */ private Locale currentLocale; - + /** * ResourceBundle. */ @@ -54,15 +56,13 @@ /** * Constructor. */ - private ApplicationEngine(){ - + private ApplicationEngine() { + ohm = new OurHashMap2(); ohm.createTable("table1"); ohm.createTable("table2"); - ohm.createColumn("table1", "column1"); ohm.createColumn("table1", "column2"); - ohm.createColumn("table2", "column3"); ohm.createColumn("table2", "column4"); ohm.createColumn("table2", "column5"); @@ -81,35 +81,32 @@ } /** - * Method to close the application. + * do nothing. */ - public final void close() { - System.exit(0); + public void doSomething() { } /** - * do nothing (for tests). + * Method to close the application. */ - public void doSomething() { } + public void close() { + System.exit(0); + } /** * Change language for internationalization. * @param language the language * @param country the country */ - public void setLocale(String language, String country) { - Locale locale = new Locale(language,country); + public void setLocale(final String language, final String country) { + Locale locale = new Locale(language, country); Main.setLocale(locale); } - /*public void setMainUI(MainUI application) { - this.application = application; - }*/ - /** * Show toolBar in order to connect. */ - public void showToolBar(){ + public void showToolBar() { MainUI ui = MainUI.getInstance(); ui.getToolBar().setVisible(true); } @@ -117,7 +114,7 @@ /** * Hide toolBar in order to disconnect. */ - public void disposeToolBar(){ + public void disposeToolBar() { MainUI ui = MainUI.getInstance(); ui.getToolBar().setVisible(false); clean(ui); @@ -125,8 +122,9 @@ /** * Clean the application. + * @param ui application's ui */ - public void clean(MainUI ui){ + public void clean(final MainUI ui) { ui.getNavigation().setVisible(false); ui.getTableContent().setVisible(false); ui.getTableName().setVisible(false); @@ -136,13 +134,16 @@ /** * Try to connect the user to a database. */ - public void connection(){ + public void connection() { MainUI ui = MainUI.getInstance(); //update menu ui.getMenuDisconnect().setEnabled(true); - String nameBase = ui.getNameBase().getSelectedJaxxItem().getValue().toString(); + + + Item selectedItems = ui.getNameBase().getSelectedJaxxItem(); + String nameBase = selectedItems.getValue().toString(); String login = ui.getLogin().getText(); char[] password = ui.getPassword().getPassword(); @@ -150,32 +151,35 @@ boolean goodUse = true; goodUse = ohm.connect(new Properties()); - if(goodUse){ + if (goodUse) { //update tree - ui.getNavigation().setModel(new MSMModel(nameBase)); - ui.getNavigation().addTreeSelectionListener(new MSMNavigationListener()); + JTree tree = ui.getNavigation(); + tree.setModel(new MSMModel(nameBase)); + tree.addTreeSelectionListener(new MSMNavigationListener()); - DefaultMutableTreeNode root = (DefaultMutableTreeNode) ui.getNavigation().getModel().getRoot(); - DefaultTreeModel dtm = ((DefaultTreeModel) ui.getNavigation().getModel()); - + TreeModel model = tree.getModel(); + DefaultMutableTreeNode root; + root = (DefaultMutableTreeNode) model.getRoot(); + DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); Set<String> tableNames = ohm.getTablesNames(); - - Iterator i = tableNames.iterator(); - while(i.hasNext()){ + while (i.hasNext()) { - //display the node table - String tableName = (String)i.next(); - DefaultMutableTreeNode tableNameToInsert = new DefaultMutableTreeNode(tableName); - dtm.insertNodeInto(tableNameToInsert, root, root.getChildCount()); + //display the node table + String tableName = (String) i.next(); + DefaultMutableTreeNode tableNameInsert; + tableNameInsert = new DefaultMutableTreeNode(tableName); + dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); //display the node column Set<String> columnNames = ohm.getColumnsNames(tableName); Iterator i2 = columnNames.iterator(); - while(i2.hasNext()){ - String columnName = (String)i2.next(); - DefaultMutableTreeNode columnNameToInsert = new DefaultMutableTreeNode(columnName); - dtm.insertNodeInto(columnNameToInsert, tableNameToInsert, tableNameToInsert.getChildCount()); + while (i2.hasNext()) { + String columnName = (String) i2.next(); + DefaultMutableTreeNode columnNameToInsert; + columnNameToInsert = new DefaultMutableTreeNode(columnName); + dtm.insertNodeInto(columnNameToInsert, tableNameInsert, + tableNameInsert.getChildCount()); } @@ -183,9 +187,9 @@ ui.getNavigation().repaint(); ui.getNavigation().revalidate(); - }else{ + } else { //display error - JOptionPane.showMessageDialog(null, n_("connectionError")); + JOptionPane.showMessageDialog(null, _("connectionError")); } } @@ -195,7 +199,7 @@ * @return instance of the class */ public static ApplicationEngine getInstance() { - if (instance == null){ + if (instance == null) { instance = new ApplicationEngine(); } return instance; @@ -204,7 +208,7 @@ /** * Dispose engine. */ - public void dispose(){ + public void dispose() { instance = null; } @@ -212,7 +216,7 @@ * Show help. */ public void showHelp() { - String message = n_("No help today, sorry !"); + String message = _("no.help"); JOptionPane.showMessageDialog(null, message); } @@ -220,21 +224,24 @@ * Redirection to site. */ public void gotoSite() { + MainUI ui = MainUI.getInstance(); MsmConfig config = ui.getConfig(); URL siteURL = config.getOptionAsURL("application.site.url"); - - log.info(_("jaxxdemo.message.goto.site", siteURL)); - if (log.isDebugEnabled()) { - log.debug("goto " + siteURL); + LOG.info(_("jaxxdemo.message.goto.site", siteURL)); + + if (LOG.isDebugEnabled()) { + LOG.debug("goto " + siteURL); } - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + + if (Desktop.isDesktopSupported() + && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { try { Desktop.getDesktop().browse(siteURL.toURI()); } catch (Exception ex) { - log.error(ex.getMessage(), ex); + LOG.error(ex.getMessage(), ex); ErrorDialogUI.showError(ex); } } @@ -257,19 +264,19 @@ //GETTERS AND SETTERS /** - * - * @return + * Getter OurHashMap. + * @return ohm our hash map */ - public OurHashMap2 getOurHashMap(){ + public OurHashMap2 getOurHashMap() { return ohm; } /** - * - * @param ohm + * Setter OurHashMap. + * @param ourhashmap our hash map */ - public void setOurHashMap(OurHashMap2 ohm){ - this.ohm = ohm; + public void setOurHashMap(final OurHashMap2 ourhashmap) { + this.ohm = ourhashmap; } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-02 13:15:33 UTC (rev 161) @@ -9,8 +9,8 @@ import static org.nuiton.i18n.I18n._; /** - * Model of a table content - * @author E045231P + * Model of a table content. + * @author E045231P. */ public class ColumnModel extends AbstractTableModel { @@ -27,8 +27,11 @@ /** * Constructor. + * @param parent node's parent. + * @param node the selected node. */ - public ColumnModel(TreeNode parent, DefaultMutableTreeNode node) { + public ColumnModel(final TreeNode parent, + final DefaultMutableTreeNode node) { String table = parent.toString(); String column = node.toString(); ApplicationEngine engine = ApplicationEngine.getInstance(); @@ -38,15 +41,15 @@ titres[1] = _("table.values"); //content - Set<String> keySetTable = testHashmap2.getKeys(table,column); + Set<String> keySetTable = testHashmap2.getKeys(table, column); Iterator i = keySetTable.iterator(); data = new String[2][keySetTable.size()]; - int j=0; - while(i.hasNext()){ - String key = (String)i.next(); + int j = 0; + while (i.hasNext()) { + String key = (String) i.next(); String value = testHashmap2.get(table, column, key); - data[0][j]=key; - data[1][j]=value; + data[0][j] = key; + data[1][j] = value; j++; } } @@ -55,7 +58,7 @@ * {@inheritDoc} */ @Override - public Object getValueAt(int rowIndex, int colIndex) { + public final Object getValueAt(final int rowIndex, final int colIndex) { return data[colIndex][rowIndex]; } @@ -63,7 +66,7 @@ * {@inheritDoc} */ @Override - public int getColumnCount() { + public final int getColumnCount() { return titres.length; } @@ -71,7 +74,7 @@ * {@inheritDoc} */ @Override - public int getRowCount() { + public final int getRowCount() { return data[0].length; } @@ -79,7 +82,7 @@ * {@inheritDoc} */ @Override - public String getColumnName(int col){ + public final String getColumnName(final int col) { return titres[col]; } @@ -87,7 +90,7 @@ * {@inheritDoc} */ @Override - public boolean isCellEditable(int row, int col) { + public final boolean isCellEditable(final int row, final int col) { return false; } 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-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-03-02 13:15:33 UTC (rev 161) @@ -9,12 +9,13 @@ */ public class MSMModel extends DefaultTreeModel { - public MSMModel(String value){ + /** + * Constructor. + * @param name name of the root + */ + public MSMModel(final String name) { super(null); - DefaultMutableTreeNode racine = new DefaultMutableTreeNode(value); + DefaultMutableTreeNode racine = new DefaultMutableTreeNode(name); setRoot(racine); } - - - } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-02 13:15:33 UTC (rev 161) @@ -14,25 +14,30 @@ */ public class MSMNavigationListener implements TreeSelectionListener { + /** + * {@inheritDoc} + */ @Override - public void valueChanged(TreeSelectionEvent e) { + public final void valueChanged(final TreeSelectionEvent e) { MainUI ui = MainUI.getInstance(); - DefaultMutableTreeNode node = (DefaultMutableTreeNode)ui.getNavigation().getLastSelectedPathComponent(); + DefaultMutableTreeNode node; + node = (DefaultMutableTreeNode) ui.getNavigation(). + getLastSelectedPathComponent(); ui.getTableContent().removeAll(); ui.getTableName().removeAll(); - + /* if nothing is selected */ if (node == null || node.isRoot()) { return; - } else if (node.isLeaf()){ + } else if (node.isLeaf()) { //we create a standard model of column - ColumnModel model = new ColumnModel(node.getParent(),node); + ColumnModel model = new ColumnModel(node.getParent(), node); JTable jTable = new JTable(model); JScrollPane scrollPane = new JScrollPane(jTable); jTable.setFillsViewportHeight(true); - + //we check attributes and values of the select table @@ -46,7 +51,7 @@ JScrollPane scrollPane = new JScrollPane(jTable); jTable.setFillsViewportHeight(true); - + //we check attributes and values of the select table @@ -54,7 +59,8 @@ ui.getTableContent().add(scrollPane); } - ui.getTableName().add(new JLabel("<html><b><u>"+node.toString()+"</b></u></html>")); + ui.getTableName().add(new JLabel("<html><b><u>" + node.toString() + + "</b></u></html>")); ui.getTableContent().repaint(); ui.getTableContent().revalidate(); ui.getTableName().repaint(); 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-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-02 13:15:33 UTC (rev 161) @@ -8,7 +8,7 @@ import static org.nuiton.i18n.I18n._; /** - * Model of a table content + * Model of a table content. * @author E045231P */ public class TableModel extends AbstractTableModel { @@ -31,8 +31,9 @@ /** * Constructor. + * @param node the selected node. */ - public TableModel(DefaultMutableTreeNode node) { + public TableModel(final DefaultMutableTreeNode node) { String table = node.toString(); ApplicationEngine engine = ApplicationEngine.getInstance(); @@ -42,14 +43,14 @@ //content Set<String> keySetTable = hashmap.getKeys(table); Iterator<String> columnName = columnsNames.iterator(); - + /** * indexes */ - int colIndex=0; - int rowindex=0; + int colIndex = 0; + int rowindex = 0; - if(showTableKeys) { + if (showTableKeys) { titles = new String[columnsNames.size() + 1]; titles[0] = _("table.keys"); data = new String[columnsNames.size() + 1][keySetTable.size()]; @@ -60,16 +61,16 @@ } - while(columnName.hasNext()){ + while (columnName.hasNext()) { String titreTemp = columnName.next(); titles[colIndex] = titreTemp; Set<String> columnKeys = hashmap.getKeys(table, titles[colIndex]); Iterator<String> columnKey = columnKeys.iterator(); - while(columnKey.hasNext()){ + while (columnKey.hasNext()) { String key = columnKey.next(); String str = hashmap.get(table, titreTemp, key); - if(showTableKeys) { + if (showTableKeys) { data[0][rowindex] = key; } data[colIndex][rowindex] = str; @@ -83,7 +84,7 @@ * {@inheritDoc} */ @Override - public Object getValueAt(int rowIndex, int colIndex) { + public final Object getValueAt(final int rowIndex, final int colIndex) { return data[colIndex][rowIndex]; } @@ -91,7 +92,7 @@ * {@inheritDoc} */ @Override - public int getColumnCount() { + public final int getColumnCount() { return titles.length; } @@ -99,7 +100,7 @@ * {@inheritDoc} */ @Override - public int getRowCount() { + public final int getRowCount() { return data[0].length; } @@ -107,7 +108,7 @@ * {@inheritDoc} */ @Override - public String getColumnName(int col){ + public final String getColumnName(final int col) { return titles[col]; } @@ -115,7 +116,7 @@ * {@inheritDoc} */ @Override - public boolean isCellEditable(int row, int col) { + public final boolean isCellEditable(final int row, final int col) { return false; } Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java 2010-03-02 13:15:33 UTC (rev 161) @@ -0,0 +1,5 @@ +/** + * Package org.nuiton.mapstoragemanager.ui.gui + * contains all java files for actions on ui. + */ +package org.nuiton.mapstoragemanager.ui.gui; Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/package-info.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/package-info.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/package-info.java 2010-03-02 13:15:33 UTC (rev 161) @@ -0,0 +1,5 @@ +/** + * Package org.nuiton.mapstoragemanager.ui. + * describe ui of MapStorageManager (css and jaxx files). + */ +package org.nuiton.mapstoragemanager.ui; Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-02 13:15:33 UTC (rev 161) @@ -1,10 +1,7 @@ -Empty= +Empty=Empty Map\ Storage\ Manager=Map Storage Manager -No\ help\ today,\ sorry\ \!=No help today, sorry \! connectionError=The connection attempt to failed, please retry \! jaxxdemo.message.goto.site=Visit site -jaxxdemo.tree.component= -keys= login\ \:=Login mapstoragemanager.action.aboutUs=About us mapstoragemanager.action.aboutUs.tip=About Code Lutin @@ -34,6 +31,7 @@ mapstoragemanager.action.visitSite.tip= messageEntry=Welcome to MapStorageManager name\ base\ \:=Name base +no.help=No help today, sorry \! ok=Validate password\ \:=Password table.keys=Keys Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-02 13:15:33 UTC (rev 161) @@ -1,10 +1,7 @@ Empty=Vide Map\ Storage\ Manager=Map Storage Manager -No\ help\ today,\ sorry\ \!=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! jaxxdemo.message.goto.site=Visitez le site -jaxxdemo.tree.component= -keys= login\ \:=Identifiant mapstoragemanager.action.aboutUs=A propos mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin @@ -34,6 +31,7 @@ mapstoragemanager.action.visitSite.tip= messageEntry=Bienvenue dans MapStorageManager name\ base\ \:=Nom de la base +no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! ok=Valider password\ \:=Mot de passe table.keys=Cl\u00E9s Modified: trunk/msm/src/main/resources/msm.properties =================================================================== --- trunk/msm/src/main/resources/msm.properties 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/msm/src/main/resources/msm.properties 2010-03-02 13:15:33 UTC (rev 161) @@ -14,4 +14,4 @@ icon.action.i18n-uk=action-i18n-uk.png icon.action.connect=action-connect.png icon.action.disconnect=action-disconnect.png -application.site.url=http\://www.nuiton.org/projects/show/mapstoragemanager \ No newline at end of file +application.site.url=http://www.nuiton.org/projects/show/mapstoragemanager \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-02 12:38:58 UTC (rev 160) +++ trunk/pom.xml 2010-03-02 13:15:33 UTC (rev 161) @@ -348,5 +348,15 @@ </pluginRepository> </pluginRepositories> - + + <!--<reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + </plugins> + </reporting>--> + + </project>