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

r129 - in trunk/msm/src: main/java/org/nuiton/mapstoragemanager main/java/org/nuiton/mapstoragemanager/core main/java/org/nuiton/mapstoragemanager/ui main/java/org/nuiton/mapstoragemanager/ui/gui main/resources main/resources/i18n main/resources/icons test/java/org/nuiton/mapstoragemanager/core
by fgilet＠users.nuiton.org 25 Feb '10

25 Feb '10

Author: fgilet Date: 2010-02-25 17:28:09 +0100 (Thu, 25 Feb 2010) New Revision: 129 Added: trunk/msm/src/main/resources/icons/action-about.png trunk/msm/src/main/resources/icons/action-config.png trunk/msm/src/main/resources/icons/action-exit.png trunk/msm/src/main/resources/icons/action-help.png trunk/msm/src/main/resources/icons/action-i18n-fr.png trunk/msm/src/main/resources/icons/action-i18n-uk.png trunk/msm/src/main/resources/icons/action-site.png trunk/msm/src/main/resources/icons/cancel_16.png trunk/msm/src/main/resources/icons/cancel_32.png trunk/msm/src/main/resources/icons/database_16.png trunk/msm/src/main/resources/icons/database_32.png trunk/msm/src/main/resources/icons/login_16.png trunk/msm/src/main/resources/icons/login_32.png trunk/msm/src/main/resources/icons/ok_16.png trunk/msm/src/main/resources/icons/ok_32.png trunk/msm/src/main/resources/icons/password_16.png trunk/msm/src/main/resources/icons/password_32.png trunk/msm/src/main/resources/icons/warning_16.png trunk/msm/src/main/resources/icons/warning_32.png trunk/msm/src/main/resources/messages.properties trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Removed: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties trunk/msm/src/main/resources/icons/ok.png Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 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/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties trunk/msm/src/main/resources/msm.properties Log: Internationalisation fonctionelle. Am?\195?\169lioration graphique: -ajout d'images aux boutons, labels -meilleurs espacements -cr?\195?\169ation d'un panel message Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-25 16:01:41 UTC (rev 128) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-25 16:28:09 UTC (rev 129) @@ -10,7 +10,7 @@ import javax.swing.*; import java.util.Locale; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * Created: 21 janv. 2010 @@ -28,7 +28,7 @@ */ private static Log log = LogFactory.getLog(Main.class); - Locale locale = Locale.FRANCE; + public static Locale locale = Locale.FRANCE; private Main(String... args){ try{ @@ -55,8 +55,8 @@ @Override public void run() { - ui.setVisible(true); + init(); } }); @@ -69,7 +69,27 @@ public static void main(String... args) { new Main(args); + } + public static void setLocale(Locale locale){ + Main.locale = locale; + MainUI.getInstance().dispose(); + Main.main(); + } + private void init() { + MainUI ui = MainUI.getInstance(); + Locale locale = Main.locale; + if (locale.equals(Locale.FRANCE)){ + ui.getMenuFileLanguageFR().setEnabled(false); + } else if (locale.equals(Locale.UK)){ + ui.getMenuFileLanguageUK().setEnabled(false); + } + String message = n_("messageEntry"); + ui.displayMessage(message, 1); + + + } + } Deleted: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties 2010-02-25 16:01:41 UTC (rev 128) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties 2010-02-25 16:28:09 UTC (rev 129) @@ -1 +0,0 @@ -Config.url=plugins/ Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-02-25 16:01:41 UTC (rev 128) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-02-25 16:28:09 UTC (rev 129) @@ -50,12 +50,14 @@ #menuExit { text:"mapstoragemanager.action.exit"; toolTipText:"mapstoragemanager.action.exit.tip"; + actionIcon:"exit"; mnemonic:E; } #menuPreferences { text:"mapstoragemanager.action.preferences"; toolTipText:"mapstoragemanager.action.preferences.tip"; + actionIcon:"config"; mnemonic:P; } @@ -68,18 +70,21 @@ #menuHelpHelp { text:"mapstoragemanager.action.help"; toolTipText:"mapstoragemanager.action.help.tip"; + actionIcon:"help"; mnemonic:E; } #menuHelpSite { text:"mapstoragemanager.action.visitSite"; toolTipText:"mapstoragemanager.action.visitSite.tip"; + actionIcon:"site"; mnemonic:V; } #menuHelpAbout { text:"mapstoragemanager.action.aboutUs"; toolTipText:"mapstoragemanager.action.aboutUs.tip"; + actionIcon:"about"; mnemonic:A; } @@ -87,12 +92,14 @@ #menuFileLanguageFR { text:"mapstoragemanager.action.fr"; toolTipText:"mapstoragemanager.action.fr.tip"; + actionIcon:"i18n-fr"; mnemonic:F; } #menuFileLanguageUK { text:"mapstoragemanager.action.uk"; toolTipText:"mapstoragemanager.action.uk.tip"; + actionIcon:"i18n-uk"; mnemonic:U; } @@ -108,7 +115,7 @@ } JLabel.boldUnderline { - font-weight: bold; + font-weight: bold; } JSplitPane { 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-25 16:01:41 UTC (rev 128) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-25 16:28:09 UTC (rev 129) @@ -7,6 +7,7 @@ import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; import javax.swing.tree.*; import static org.nuiton.i18n.I18n.n_; + import javax.swing.JLabel; ApplicationEngine engine = ApplicationEngine.getInstance(); @@ -34,14 +35,44 @@ return engine; } + /** + * Dispose UI. + */ + public void dispose(){ + instance = null; + engine.dispose(); + this.setVisible(false); + } + /** + * Display the appropriate message. + * @param message the message to display. + * @param code code error (for images). + */ + public void displayMessage(String message, int code){ + this.getMessagesPanel().removeAll(); + JLabel label = new JLabel(message); + /* + if (code==0){ + ImageIcon = new ImageIcon("ok_16.png"); + }else if (code==1){ + ImageIcon = new ImageIcon("warning_16.png"); + }else if (code==2){ + ImageIcon = new ImageIcon("cancel_16.png"); + } + */ + //label.setIcon(icon); + this.getMessagesPanel().add(label); + } + + ]]> </script>  <style source='MainUI.css'/> -  +  <JMenuBar> <JMenu id='menuFile'> @@ -61,9 +92,9 @@ <JSeparator/> <JMenu id='menuLanguage'> <JMenuItem id='menuFileLanguageFR' + onActionPerformed='engine.setLocale("fr","FR")'/> + <JMenuItem id='menuFileLanguageUK' onActionPerformed='engine.setLocale("en","GB")'/> - <JMenuItem id='menuFileLanguageUK' - onActionPerformed='engine.setLocale("fr","FR")'/> </JMenu> </JMenu> @@ -78,31 +109,27 @@ </JMenuBar> -  - + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}' id='mainPanel'> <JToolBar constraints='BorderLayout.NORTH' opaque='true'> - <JLabel text="name base :" styleClass='boldUnderline' /> + <JLabel text="name base :" actionIcon='database_16' styleClass='boldUnderline' /> <JAXXComboBox id='nameBase' onActionPerformed='engine.doSomething()' > <item value='OurHashMap' selected='true'/> <item value='HBase'/> <item value='Cassandra'/> <item value='Other'/> </JAXXComboBox> - <JLabel text="login :" styleClass='boldUnderline'/> + <JLabel text="login :" actionIcon='login_16' styleClass='boldUnderline'/> <JTextField id='login'/> - <JLabel text="password :" styleClass='boldUnderline'/> + <JLabel text="password :" actionIcon='password_16' styleClass='boldUnderline'/> <JPasswordField id='password'/> -  - <JButton text="ok" actionIcon='ok' onActionPerformed='engine.connection()'/> + <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.connection()'/> </JToolBar> <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > <JScrollPane> <JTree id='navigation' - model='{new DefaultTreeModel(new DefaultMutableTreeNode(n_("welcome.MapStorageManager")))}' /> + model='{new DefaultTreeModel(new DefaultMutableTreeNode("Empty"))}' /> </JScrollPane> <JScrollPane > <JPanel layout='{new BorderLayout()}'> @@ -110,8 +137,10 @@ <JPanel id='tableContent' constraints='BorderLayout.CENTER'/> <JPanel id='tableTips' constraints='BorderLayout.SOUTH'/> </JPanel> - </JScrollPane> + </JScrollPane> </JSplitPane> </JPanel> + <JPanel id='messagesPanel' constraints='BorderLayout.SOUTH'/> + </JPanel> </Application> 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-25 16:01:41 UTC (rev 128) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-25 16:28:09 UTC (rev 129) @@ -5,12 +5,14 @@ import java.util.Properties; import java.util.ResourceBundle; import java.util.Set; +import javax.swing.ImageIcon; +import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.mapstoragemanager.plugins.OurHashMap; +import org.nuiton.mapstoragemanager.Main; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n.n_; @@ -46,12 +48,13 @@ */ private static ApplicationEngine instance = null; + //public ImageIcon imgOk = new ImageIcon(getClass().getResource("ok.png")); - /** * Constructor. */ private ApplicationEngine(){ + ohm = new OurHashMap2(); ohm.createTable("table1"); ohm.createTable("table2"); @@ -101,13 +104,8 @@ * @param country the country */ public void setLocale(String language, String country) { - /*Locale locale = new Locale(language,country); - System.out.println("local en "+language+"_"+country); - I18n.close(); - I18n.setUniqueBundleName("mapstoragemanager-i18n"); - I18n.init(locale); - final MainUI ui = new MainUI(); - ui.setVisible(true);*/ + Locale locale = new Locale(language,country); + Main.setLocale(locale); } /*public void setMainUI(MainUI application) { @@ -118,9 +116,10 @@ * 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(); - char[] password = MainUI.getInstance().getPassword().getPassword(); + MainUI ui = MainUI.getInstance(); + String nameBase = ui.getNameBase().getSelectedJaxxItem().getValue().toString(); + String login = ui.getLogin().getText(); + char[] password = ui.getPassword().getPassword(); //connection verification boolean goodUse = true; @@ -128,11 +127,11 @@ if(goodUse){ //update tree - MainUI.getInstance().getNavigation().setModel(new MSMModel(nameBase)); - MainUI.getInstance().getNavigation().addTreeSelectionListener(new MSMNavigationListener()); + ui.getNavigation().setModel(new MSMModel(nameBase)); + ui.getNavigation().addTreeSelectionListener(new MSMNavigationListener()); - DefaultMutableTreeNode root = (DefaultMutableTreeNode) MainUI.getInstance().getNavigation().getModel().getRoot(); - DefaultTreeModel dtm = ((DefaultTreeModel) MainUI.getInstance().getNavigation().getModel()); + DefaultMutableTreeNode root = (DefaultMutableTreeNode) ui.getNavigation().getModel().getRoot(); + DefaultTreeModel dtm = ((DefaultTreeModel) ui.getNavigation().getModel()); Set<String> tableNames = ohm.getTablesNames(); @@ -142,11 +141,11 @@ dtm.insertNodeInto(new DefaultMutableTreeNode(tableName), root, root.getChildCount()); } - MainUI.getInstance().getNavigation().repaint(); - MainUI.getInstance().getNavigation().revalidate(); + ui.getNavigation().repaint(); + ui.getNavigation().revalidate(); }else{ //display error - JOptionPane.showMessageDialog(null, n_("connectionError")); + JOptionPane.showMessageDialog(null, n_("jaxxdemo.tree.component")); } } @@ -162,6 +161,14 @@ return instance; } + /** + * Dispose engine. + */ + public void dispose(){ + instance = null; + } + + //GETTERS AND SETTERS public OurHashMap2 getOurHashMap(){ Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-02-25 16:01:41 UTC (rev 128) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-02-25 16:28:09 UTC (rev 129) @@ -1,35 +1,37 @@ -Map\ Storage\ Manager=Map Storage Manager -TABLE\ NAME\ \:\ TODO= -connectionError=The connection attempt to failed, please retry \! -login\ \:=Login -map\ Storage\ Manager= -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -name\ base\ \:=Name base -ok=Validate -password\ \:=Password -welcome.MapStorageManager=Welcome to MapStorageManager +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +connectionError=The connection attempt to failed, please retry \! +jaxxdemo.tree.component= +login\ \:=Login +map\ Storage\ Manager= +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +messageEntry=Welcome to MapStorageManager +name\ base\ \:=Name base +ok=Validate +password\ \:=Password +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-02-25 16:01:41 UTC (rev 128) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-02-25 16:28:09 UTC (rev 129) @@ -1,35 +1,37 @@ -Map\ Storage\ Manager=Map Storage Manager -TABLE\ NAME\ \:\ TODO= -connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! -login\ \:=Identifiant -map\ Storage\ Manager= -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Permet de configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -name\ base\ \:=Nom de la base -ok=Valider -password\ \:=Mot de passe -welcome.MapStorageManager=Bienvenue dans MapStorageManager +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +jaxxdemo.tree.component= +login\ \:=Identifiant +map\ Storage\ Manager= +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Permet de configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +messageEntry=Bienvenue dans MapStorageManager +name\ base\ \:=Nom de la base +ok=Valider +password\ \:=Mot de passe +welcome.MapStorageManager=Bienvenue dans MapStorageManager Added: trunk/msm/src/main/resources/icons/action-about.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/action-about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/action-config.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/action-config.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/action-exit.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/action-exit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/action-help.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/action-help.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/action-i18n-fr.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/action-i18n-fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/action-i18n-uk.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/action-i18n-uk.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/action-site.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/action-site.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/cancel_16.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/cancel_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/cancel_32.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/cancel_32.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/database_16.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/database_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/database_32.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/database_32.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/login_16.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/login_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/login_32.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/login_32.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/msm/src/main/resources/icons/ok.png =================================================================== (Binary files differ) Added: trunk/msm/src/main/resources/icons/ok_16.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/ok_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/msm/src/main/resources/icons/ok_32.png (from rev 123, trunk/msm/src/main/resources/icons/ok.png) =================================================================== (Binary files differ) Added: trunk/msm/src/main/resources/icons/password_16.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/password_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/password_32.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/password_32.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/warning_16.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/warning_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/msm/src/main/resources/icons/warning_32.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/warning_32.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/msm/src/main/resources/messages.properties (from rev 123, trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties) =================================================================== --- trunk/msm/src/main/resources/messages.properties (rev 0) +++ trunk/msm/src/main/resources/messages.properties 2010-02-25 16:28:09 UTC (rev 129) @@ -0,0 +1 @@ +Config.url=plugins/ Modified: trunk/msm/src/main/resources/msm.properties =================================================================== --- trunk/msm/src/main/resources/msm.properties 2010-02-25 16:01:41 UTC (rev 128) +++ trunk/msm/src/main/resources/msm.properties 2010-02-25 16:28:09 UTC (rev 129) @@ -1 +1,14 @@ -icon.action.ok=ok.png \ No newline at end of file +icon.action.ok_16=ok_16.png +icon.action.ok_32=ok_32.png +icon.action.database_16=database_16.png +icon.action.database_32=database_32.png +icon.action.login_16=login_16.png +icon.action.login_32=login_32.png +icon.action.password_16=password_16.png +icon.action.about=action-about.png +icon.action.help=action-help.png +icon.action.site=action-site.png +icon.action.exit=action-exit.png +icon.action.config=action-config.png +icon.action.i18n-fr=action-i18n-fr.png +icon.action.i18n-uk=action-i18n-uk.png \ No newline at end of file Copied: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java (from rev 123, trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java) =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java (rev 0) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-25 16:28:09 UTC (rev 129) @@ -0,0 +1,36 @@ +package org.nuiton.mapstoragemanager.core; + +import java.net.MalformedURLException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.core.BigTableLoader; + +/** + * @author fdesbois + * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderText instead + */ +@Deprecated +public final class TestServiceLoader { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(TestServiceLoader.class); + + private TestServiceLoader() { + try { + BigTableLoader p = + new BigTableLoader("plugins", this.getClass().getClassLoader()); + LOG.info(p.getBigTable()); + } catch (MalformedURLException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + LOG.error(e.toString(),e); + } + } + + public static void main(final String[] args) { + + new TestServiceLoader(); + } +} \ No newline at end of file

1 0

r128 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core
by gcrieloue＠users.nuiton.org 25 Feb '10

25 Feb '10

Author: gcrieloue Date: 2010-02-25 17:01:41 +0100 (Thu, 25 Feb 2010) New Revision: 128 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java Log: Ajout d'une map pour les plugins (nom du plugin - plugin) Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-02-25 14:26:32 UTC (rev 127) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-02-25 16:01:41 UTC (rev 128) @@ -4,6 +4,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; +import java.util.Collection; +import java.util.HashMap; import java.util.ServiceLoader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -12,7 +14,7 @@ /** * @author Crieloue Gilles - * + * This class loads the BigTable implementations */ public class BigTableLoader extends URLClassLoader { @@ -27,6 +29,11 @@ private ServiceLoader<BigTable> bigTableSetLoader; /** + * Map Identifiant - BigTable implementation + */ + private HashMap<String, BigTable> plugins = new HashMap<String, BigTable>(); + + /** * Class constructor. * @param pluginsFolderPath the plugins folder path * @param classLoader the parent classloader @@ -49,6 +56,17 @@ } bigTableSetLoader = ServiceLoader.load(BigTable.class, this); + + /** + * Identifiant for the plugin + */ + + //TODO: define better identifiants + int pluginNumber = 0; + for (BigTable bigTableImpl : bigTableSetLoader){ + plugins.put("BigTable"+pluginNumber, bigTableImpl); + pluginNumber++; + } } /** @@ -79,8 +97,26 @@ /** * Returns the BigTable Set Loader. * @return the BigTable Set Loader + * @deprecated Use {@link #getAllBigTable()} */ public final ServiceLoader<BigTable> getBigTableSetLoader() { return bigTableSetLoader; } + + /** + * Returns a BigTable implementation according to an identifiant. + * @param id the identifiant + * @return the BigTable + */ + public BigTable getBigTable(String id){ + return plugins.get(id); + } + + /** + * Returns all the BigTable implementations loaded. + * @return all the BigTable implementations loaded + */ + public Collection<BigTable> getAllBigTable(){ + return plugins.values(); + } }

1 0

r127 - in trunk/msm-hbase: . src/main/java/org/nuiton/mapstoragemanager/plugins/hbase src/site
by dlanglais＠users.nuiton.org 25 Feb '10

25 Feb '10

Author: dlanglais Date: 2010-02-25 15:26:32 +0100 (Thu, 25 Feb 2010) New Revision: 127 Added: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java trunk/msm-hbase/src/site/failedBuild_25.02.2010.txt Modified: trunk/msm-hbase/pom.xml trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java Log: tentative d'avancement sur le plugin HBase, je n'arrive pas ?\195?\160 lancer MyLittleHBaseClient <- classe trouv?\195?\169e sur le site de hbase, ainsi que la trace du build dans src/site/ Modified: trunk/msm-hbase/pom.xml =================================================================== --- trunk/msm-hbase/pom.xml 2010-02-25 14:12:17 UTC (rev 126) +++ trunk/msm-hbase/pom.xml 2010-02-25 14:26:32 UTC (rev 127) @@ -9,6 +9,19 @@ <id>org.nuiton</id> <url>http://maven.nuiton.org/release</url> </repository> + <repository> + <id>sharengo-maven2-repository</id> + <name>Sharengo's repository</name> + <url>http://maven2.sharengo.org</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> </repositories> <modelVersion>4.0.0</modelVersion> @@ -55,16 +68,56 @@  <dependency> - <groupId>org.apache.mahout.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>0.20.1</version> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>org.apache.mahout.hbase</groupId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.4</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>r785019-hbase-1329</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.hadoop</groupId> + <artifactId>hadoop</artifactId> + <version>0.20.0-plus4681-core</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.hadoop</groupId> <artifactId>hbase</artifactId> <version>0.20.0</version> + <scope>compile</scope> </dependency> + <dependency> + <groupId>org.hadoop</groupId> + <artifactId>hbase-test</artifactId> + <version>0.20.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>0.20.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.8</version> + </dependency> </dependencies>  @@ -147,7 +200,7 @@ <build> <!--<plugins> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -215,3 +268,4 @@ + Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-25 14:12:17 UTC (rev 126) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseNewBigTable.java 2010-02-25 14:26:32 UTC (rev 127) @@ -90,6 +90,8 @@ */ public void deleteTable(String table) { try { + // to delete a table, we have to disable it. + hBaseAdmin.disableTable(table); hBaseAdmin.deleteTable(table); LOG.trace("table " + table + " deleted."); } catch (IOException ex) { Added: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java (rev 0) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/MyLittleHBaseClient.java 2010-02-25 14:26:32 UTC (rev 127) @@ -0,0 +1,108 @@ +package org.nuiton.mapstoragemanager.plugins.hbase; + +import java.io.IOException; + +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.ResultScanner; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.util.Bytes; + + +// Class that has nothing but a main. +// Does a Put, Get and a Scan against an hbase table. +public class MyLittleHBaseClient { + public static void main(String[] args) throws IOException { + // You need a configuration object to tell the client where to connect. + // When you create a HBaseConfiguration, it reads in whatever you've set + // into your hbase-site.xml and in hbase-default.xml, as long as these can + // be found on the CLASSPATH + HBaseConfiguration config = new HBaseConfiguration(); + +// HBaseAdmin hBaseAdmin = new HBaseAdmin(config); +// { +// HTableDescriptor hTableDescriptor = new HTableDescriptor("myLittleHBaseTable2"); +// HColumnDescriptor hColumnDescriptor = new HColumnDescriptor("myLittleRow2"); +// hTableDescriptor.addFamily(hColumnDescriptor); +// hBaseAdmin.createTable(hTableDescriptor); +// } +// for (HTableDescriptor hTableDescriptor : hBaseAdmin.listTables()) { +// System.out.println(hTableDescriptor.getNameAsString()); +// for (HColumnDescriptor hColumnDescriptor : hTableDescriptor.getColumnFamilies()) { +// System.out.println("\t" + hColumnDescriptor.getNameAsString()); +// } +// } + + // This instantiates an HTable object that connects you to + // the "myLittleHBaseTable" table. + HTable table = new HTable(config, "myLittleHBaseTable"); + + // To add to a row, use Put. A Put constructor takes the name of the row + // you want to insert into as a byte array. In HBase, the Bytes class has + // utility for converting all kinds of java types to byte arrays. In the + // below, we are converting the String "myLittleRow" into a byte array to + // use as a row key for our update. Once you have a Put instance, you can + // adorn it by setting the names of columns you want to update on the row, + // the timestamp to use in your update, etc.If no timestamp, the server + // applies current time to the edits. + Put p = new Put(Bytes.toBytes("myLittleRow")); + + // To set the value you'd like to update in the row 'myLittleRow', specify + // the column family, column qualifier, and value of the table cell you'd + // like to update. The column family must already exist in your table + // schema. The qualifier can be anything. All must be specified as byte + // arrays as hbase is all about byte arrays. Lets pretend the table + // 'myLittleHBaseTable' was created with a family 'myLittleFamily'. + p.add(Bytes.toBytes("myLittleFamily"), Bytes.toBytes("someQualifier"), + Bytes.toBytes("Some Value")); + + // Once you've adorned your Put instance with all the updates you want to + // make, to commit it do the following (The HTable#put method takes the + // Put instance you've been building and pushes the changes you made into + // hbase) + table.put(p); + + // Now, to retrieve the data we just wrote. The values that come back are + // Result instances. Generally, a Result is an object that will package up + // the hbase return into the form you find most palatable. + Get g = new Get(Bytes.toBytes("myLittleRow")); + Result r = table.get(g); + byte [] value = r.getValue(Bytes.toBytes("myLittleFamily"), + Bytes.toBytes("someQualifier")); + // If we convert the value bytes, we should get back 'Some Value', the + // value we inserted at this location. + String valueStr = Bytes.toString(value); + System.out.println("GET: " + valueStr); + + // Sometimes, you won't know the row you're looking for. In this case, you + // use a Scanner. This will give you cursor-like interface to the contents + // of the table. To set up a Scanner, do like you did above making a Put + // and a Get, create a Scan. Adorn it with column names, etc. + Scan s = new Scan(); + s.addColumn(Bytes.toBytes("myLittleFamily"), Bytes.toBytes("someQualifier")); + ResultScanner scanner = table.getScanner(s); + try { + // Scanners return Result instances. + // Now, for the actual iteration. One way is to use a while loop like so: + for (Result rr = scanner.next(); rr != null; rr = scanner.next()) { + // print out the row we found and the columns we were looking for + System.out.println("Found row: " + rr); + } + + // The other approach is to use a foreach loop. Scanners are iterable! + // for (Result rr : scanner) { + // System.out.println("Found row: " + rr); + // } + } finally { + // Make sure you close your scanners when you are done! + // Thats why we have it inside a try/finally clause + scanner.close(); + } + } +} Added: trunk/msm-hbase/src/site/failedBuild_25.02.2010.txt =================================================================== --- trunk/msm-hbase/src/site/failedBuild_25.02.2010.txt (rev 0) +++ trunk/msm-hbase/src/site/failedBuild_25.02.2010.txt 2010-02-25 14:26:32 UTC (rev 127) @@ -0,0 +1,67 @@ +NetBeans: Executing 'mvn -Dexec.classpathScope=runtime -Dexec.args=-classpath %classpath org.nuiton.mapstoragemanager.plugins.hbase.MyLittleHBaseClient -Dexec.executable=/usr/java/jdk1.6.0_18/bin/java -Dnetbeans.execution=true process-classes org.codehaus.mojo:exec-maven-plugin:1.1.1:exec' +NetBeans: JAVA_HOME=/usr/java/jdk1.6.0_18 +Scanning for projects... +------------------------------------------------------------------------ +Building MSM-HBase + task-segment: [process-classes, org.codehaus.mojo:exec-maven-plugin:1.1.1:exec] +------------------------------------------------------------------------ +[enforcer:enforce] +[dependency:copy] +[resources:resources] +Using 'UTF-8' encoding to copy filtered resources. +Copying 6 resources +[compiler:compile] +Nothing to compile - all classes are up to date +[exec:exec] + INFO [main] (Environment.java:97) logEnv - Client environment:zookeeper.version=3.2.0--1, built on 05/15/2009 06:05 GMT + INFO [main] (Environment.java:97) logEnv - Client environment:host.name=devel + INFO [main] (Environment.java:97) logEnv - Client environment:java.version=1.6.0_18 + INFO [main] (Environment.java:97) logEnv - Client environment:java.vendor=Sun Microsystems Inc. + INFO [main] (Environment.java:97) logEnv - Client environment:java.home=/usr/java/jdk1.6.0_18/jre + INFO [main] (Environment.java:97) logEnv - Client environment:java.class.path=/home/langlais/devel/mapstoragemanager/msm-hbase/target/classes:/home/langlais/.m2/repository/org/nuiton/msm/0.1-SNAPSHOT/msm-0.1-SNAPSHOT.jar:/home/langlais/.m2/repository/org/nuiton/nuiton-utils/1.1.0/nuiton-utils-1.1.0.jar:/home/langlais/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/home/langlais/.m2/repository/commons-primitives/commons-primitives/1.0/commons-primitives-1.0.jar:/home/langlais/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:/home/langlais/.m2/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar:/home/langlais/.m2/repository/org/nuiton/i18n/nuiton-i18n-api/1.0.0/nuiton-i18n-api-1.0.0.jar:/home/langlais/.m2/repository/org/nuiton/jaxx/jaxx-runtime/2.0.0-beta-6-SNAPSHOT/jaxx-runtime-2.0.0-beta-6-SNAPSHOT.jar:/home/langlais/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:/home/langlais/.m2/repository/org/swinglabs/jxlayer/3.0.3/jxlayer-3.0.3.jar:/home/langlais/.m2/repository/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar:/home/langlais/.m2/repository/com/opensymphony/xwork/2.1.3/xwork-2.1.3.jar:/home/langlais/.m2/repository/opensymphony/ognl/2.6.11/ognl-2.6.11.jar:/home/langlais/.m2/repository/org/swinglabs/swingx/1.6/swingx-1.6.jar:/home/langlais/.m2/repository/com/jhlabs/filters/2.0.235/filters-2.0.235.jar:/home/langlais/.m2/repository/org/swinglabs/swing-worker/1.1/swing-worker-1.1.jar:/home/langlais/.m2/repository/org/nuiton/jaxx/jaxx-widgets/2.0.0-beta-6-SNAPSHOT/jaxx-widgets-2.0.0-beta-6-SNAPSHOT.jar:/home/langlais/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4.jar:/home/langlais/.m2/repository/log4j/log4j/1.2.4/log4j-1.2.4.jar:/home/langlais/.m2/repository/org/apache/hadoop/zookeeper/zookeeper/r785019-hbase-1329/zookeeper-r785019-hbase-1329.jar:/home/langlais/.m2/repository/org/hadoop/hadoop/0.20.0-plus4681-core/hadoop-0.20.0-plus4681-core.jar:/home/langlais/.m2/repository/org/hadoop/hbase/0.20.0/hbase-0.20.0.jar:/home/langlais/.m2/repository/org/mortbay/jetty/jetty/6.1.8/jetty-6.1.8.jar:/home/langlais/.m2/repository/org/mortbay/jetty/jetty-util/6.1.8/jetty-util-6.1.8.jar:/home/langlais/.m2/repository/org/mortbay/jetty/servlet-api-2.5/6.1.8/servlet-api-2.5-6.1.8.jar + INFO [main] (Environment.java:97) logEnv - Client environment:java.library.path=/usr/java/jdk1.6.0_18/jre/lib/amd64/server:/usr/java/jdk1.6.0_18/jre/lib/amd64:/usr/java/jdk1.6.0_18/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib + INFO [main] (Environment.java:97) logEnv - Client environment:java.io.tmpdir=/tmp + INFO [main] (Environment.java:97) logEnv - Client environment:java.compiler=<NA> + INFO [main] (Environment.java:97) logEnv - Client environment:os.name=Linux + INFO [main] (Environment.java:97) logEnv - Client environment:os.arch=amd64 + INFO [main] (Environment.java:97) logEnv - Client environment:os.version=2.6.31-19-generic + INFO [main] (Environment.java:97) logEnv - Client environment:user.name=langlais + INFO [main] (Environment.java:97) logEnv - Client environment:user.home=/home/langlais + INFO [main] (Environment.java:97) logEnv - Client environment:user.dir=/home/langlais/devel/mapstoragemanager/msm-hbase + INFO [main] (ZooKeeper.java:342) <init> - Initiating client connection, host=localhost:2181 sessionTimeout=60000 watcher=org.apache.hadoop.hbase.client.HConnectionManager$ClientZKWatcher@2aca0115 + INFO [main] (ClientCnxn.java:91) <clinit> - zookeeper.disableAutoWatchReset is false + INFO [main-SendThread] (ClientCnxn.java:821) startConnect - Attempting connection to server localhost/127.0.0.1:2181 + INFO [main-SendThread] (ClientCnxn.java:737) primeConnection - Priming connection to java.nio.channels.SocketChannel[connected local=/127.0.0.1:47211 remote=localhost/127.0.0.1:2181] + INFO [main-SendThread] (ClientCnxn.java:889) run - Server connection successful +Exception in thread "main" java.lang.reflect.UndeclaredThrowableException + at $Proxy0.getRegionInfo(Unknown Source) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRootRegion(HConnectionManager.java:931) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRegion(HConnectionManager.java:573) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRegion(HConnectionManager.java:549) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRegionInMeta(HConnectionManager.java:623) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRegion(HConnectionManager.java:582) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRegion(HConnectionManager.java:549) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRegionInMeta(HConnectionManager.java:623) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRegion(HConnectionManager.java:586) + at org.apache.hadoop.hbase.client.HConnectionManager$TableServers.locateRegion(HConnectionManager.java:549) + at org.apache.hadoop.hbase.client.HTable.<init>(HTable.java:125) + at org.apache.hadoop.hbase.client.HTable.<init>(HTable.java:103) + at org.nuiton.mapstoragemanager.plugins.hbase.MyLittleHBaseClient.main(MyLittleHBaseClient.java:44) +Caused by: org.apache.hadoop.ipc.RemoteException: java.io.IOException: java.io.IOException: Could not find requested method, the usual cause is a version mismatch between client and server. + at org.apache.hadoop.hbase.ipc.HBaseRPC$Server.call(HBaseRPC.java:648) + at org.apache.hadoop.hbase.ipc.HBaseServer$Handler.run(HBaseServer.java:915) + + at org.apache.hadoop.hbase.ipc.HBaseClient.call(HBaseClient.java:723) + at org.apache.hadoop.hbase.ipc.HBaseRPC$Invoker.invoke(HBaseRPC.java:328) + ... 13 more +------------------------------------------------------------------------ +[ERROR]BUILD ERROR +------------------------------------------------------------------------ +Result of /bin/sh -c cd /home/langlais/devel/mapstoragemanager/msm-hbase && /usr/java/jdk1.6.0_18/bin/java -classpath /home/langlais/devel/mapstoragemanager/msm-hbase/target/classes:/home/langlais/.m2/repository/org/nuiton/msm/0.1-SNAPSHOT/msm-0.1-SNAPSHOT.jar:/home/langlais/.m2/repository/org/nuiton/nuiton-utils/1.1.0/nuiton-utils-1.1.0.jar:/home/langlais/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/home/langlais/.m2/repository/commons-primitives/commons-primitives/1.0/commons-primitives-1.0.jar:/home/langlais/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:/home/langlais/.m2/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar:/home/langlais/.m2/repository/org/nuiton/i18n/nuiton-i18n-api/1.0.0/nuiton-i18n-api-1.0.0.jar:/home/langlais/.m2/repository/org/nuiton/jaxx/jaxx-runtime/2.0.0-beta-6-SNAPSHOT/jaxx-runtime-2.0.0-beta-6-SNAPSHOT.jar:/home/langlais/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:/home/langlais/.m2/repository/org/swinglabs/jxlayer/3.0.3/jxlayer-3.0.3.jar:/home/langlais/.m2/repository/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar:/home/langlais/.m2/repository/com/opensymphony/xwork/2.1.3/xwork-2.1.3.jar:/home/langlais/.m2/repository/opensymphony/ognl/2.6.11/ognl-2.6.11.jar:/home/langlais/.m2/repository/org/swinglabs/swingx/1.6/swingx-1.6.jar:/home/langlais/.m2/repository/com/jhlabs/filters/2.0.235/filters-2.0.235.jar:/home/langlais/.m2/repository/org/swinglabs/swing-worker/1.1/swing-worker-1.1.jar:/home/langlais/.m2/repository/org/nuiton/jaxx/jaxx-widgets/2.0.0-beta-6-SNAPSHOT/jaxx-widgets-2.0.0-beta-6-SNAPSHOT.jar:/home/langlais/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4.jar:/home/langlais/.m2/repository/log4j/log4j/1.2.4/log4j-1.2.4.jar:/home/langlais/.m2/repository/org/apache/hadoop/zookeeper/zookeeper/r785019-hbase-1329/zookeeper-r785019-hbase-1329.jar:/home/langlais/.m2/repository/org/hadoop/hadoop/0.20.0-plus4681-core/hadoop-0.20.0-plus4681-core.jar:/home/langlais/.m2/repository/org/hadoop/hbase/0.20.0/hbase-0.20.0.jar:/home/langlais/.m2/repository/org/mortbay/jetty/jetty/6.1.8/jetty-6.1.8.jar:/home/langlais/.m2/repository/org/mortbay/jetty/jetty-util/6.1.8/jetty-util-6.1.8.jar:/home/langlais/.m2/repository/org/mortbay/jetty/servlet-api-2.5/6.1.8/servlet-api-2.5-6.1.8.jar org.nuiton.mapstoragemanager.plugins.hbase.MyLittleHBaseClient execution is: '1'. +------------------------------------------------------------------------ +For more information, run Maven with the -e switch +------------------------------------------------------------------------ +Total time: 9 seconds +Finished at: Thu Feb 25 15:19:58 CET 2010 +Final Memory: 35M/84M +------------------------------------------------------------------------

1 0

r126 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins
by dlanglais＠users.nuiton.org 25 Feb '10

25 Feb '10

Author: dlanglais Date: 2010-02-25 15:12:17 +0100 (Thu, 25 Feb 2010) New Revision: 126 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java Log: modification mineures, j'ai un doute sur le fonctionnement de mapData, mais bon il s'agit d'une classe de test je suppose Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-02-24 15:34:36 UTC (rev 125) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-02-25 14:12:17 UTC (rev 126) @@ -53,9 +53,10 @@ @Override public void deleteColumn(String table, String column) { if(mapTable.containsKey(table)){ - ArrayList<String> list = mapTable.get(table); + /*ArrayList<String> list = mapTable.get(table); list.remove(column); - mapTable.put(table,list); + mapTable.put(table,list);*/ + mapTable.get(table).remove(column); } } @@ -69,10 +70,11 @@ public void put(String table, String column, String key, String content) { if(mapTable.containsKey(table)){ if(mapColumn.containsKey(column)){ - ArrayList<String> list; + /*ArrayList<String> list; list = mapColumn.get(column); list.add(key); - mapColumn.put(column,list); + mapColumn.put(column,list);*/ + mapColumn.get(column).add(key); mapData.put(key, content); } } @@ -80,20 +82,23 @@ @Override public String get(String table, String column, String key) { - if(mapTable.containsKey(table)){ - if(mapColumn.containsKey(column)){ - return mapData.get(key); - }else{ - return "Erreur"; + String ret = ""; + if (mapTable.containsKey(table)) { + if (mapColumn.containsKey(column)) { + ret = mapData.get(key); + } else { + ret = "Column doesn't exist"; } - }else{ - return "Erreur"; + } else { + ret = "Table doesn't exist"; } + return ret; } @Override public String get(String table, String column, String key, int version) { - throw new UnsupportedOperationException("Not supported yet."); + return get(table, column, key); + // TODO } @Override @@ -122,6 +127,4 @@ Set<String> keys = new HashSet(mapColumn.get(column)); return keys; } - - }

1 0

r125 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core
by fdesbois＠users.nuiton.org 24 Feb '10

24 Feb '10

Author: fdesbois Date: 2010-02-24 16:34:36 +0100 (Wed, 24 Feb 2010) New Revision: 125 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Log: add javadoc link Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-24 15:32:28 UTC (rev 124) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-24 15:34:36 UTC (rev 125) @@ -6,7 +6,8 @@ /** * @author fdesbois - * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderTest instead + * @deprecated Use {@link org.nuiton.mapstoragemanager.core.BigTableLoaderTest} + * instead */ @Deprecated public final class TestServiceLoader {

1 0

r124 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core
by fdesbois＠users.nuiton.org 24 Feb '10

24 Feb '10

Author: fdesbois Date: 2010-02-24 16:32:28 +0100 (Wed, 24 Feb 2010) New Revision: 124 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Log: orth mistake Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-23 13:40:26 UTC (rev 123) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-24 15:32:28 UTC (rev 124) @@ -6,7 +6,7 @@ /** * @author fdesbois - * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderText instead + * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderTest instead */ @Deprecated public final class TestServiceLoader {

1 0

r123 - in trunk: . msm
by sletellier＠users.nuiton.org 23 Feb '10

23 Feb '10

Author: sletellier Date: 2010-02-23 14:40:26 +0100 (Tue, 23 Feb 2010) New Revision: 123 Modified: trunk/msm/pom.xml trunk/pom.xml Log: Ajout du repo SNAPSHOT Modified: trunk/msm/pom.xml =================================================================== --- trunk/msm/pom.xml 2010-02-22 20:31:58 UTC (rev 122) +++ trunk/msm/pom.xml 2010-02-23 13:40:26 UTC (rev 123) @@ -3,14 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -  - <repositories> - <repository> - <id>org.nuiton</id> - <url>http://maven.nuiton.org/release</url> - </repository> - </repositories> - <modelVersion>4.0.0</modelVersion>  Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-22 20:31:58 UTC (rev 122) +++ trunk/pom.xml 2010-02-23 13:40:26 UTC (rev 123) @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - -  - <repositories> - <repository> - <id>org.nuiton</id> - <url>http://maven.nuiton.org/release</url> - </repository> - </repositories> <modelVersion>4.0.0</modelVersion> @@ -184,7 +176,7 @@ </dependencies> </dependencyManagement> - + <build> <plugins> @@ -287,4 +279,73 @@ </pluginManagement> </build> + <repositories> + +  + + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + +  + + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + + </repositories> + + <pluginRepositories> + +  + + <pluginRepository> + + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + +  + + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + </project>

1 0

r122 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager
by sletellier＠users.nuiton.org 22 Feb '10

22 Feb '10

Author: sletellier Date: 2010-02-22 21:31:58 +0100 (Mon, 22 Feb 2010) New Revision: 122 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java Log: Oups;) Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-02-22 20:17:51 UTC (rev 121) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-02-22 20:31:58 UTC (rev 122) @@ -16,7 +16,7 @@ * @author sletellier * @since 0.1-SNAPSHOT */ -public class NMsmConfig extends org.nuiton.util.ApplicationConfig { +public class MsmConfig extends org.nuiton.util.ApplicationConfig { /** * to use log facility, just put in your code: log.info(\"...\");

1 0

r121 - in trunk: . msm msm/src/main/java/org/nuiton/mapstoragemanager msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/resources msm/src/main/resources/i18n
by sletellier＠users.nuiton.org 22 Feb '10

22 Feb '10

Author: sletellier Date: 2010-02-22 21:17:51 +0100 (Mon, 22 Feb 2010) New Revision: 121 Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java trunk/msm/src/main/resources/msm.properties Modified: trunk/msm/pom.xml trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties trunk/pom.xml Log: - Utilisation de ApplicationConfig pour charger le proporties - Utilisation de actionIcon - Nettoyage du pom - Nettoyage des sources (src a la racine du pom parent) Modified: trunk/msm/pom.xml =================================================================== --- trunk/msm/pom.xml 2010-02-22 18:17:14 UTC (rev 120) +++ trunk/msm/pom.xml 2010-02-22 20:17:51 UTC (rev 121) @@ -22,7 +22,8 @@ <version>0.1-SNAPSHOT</version> </parent> - <version>0.1-SNAPSHOT</version> +  + <groupId>org.nuiton</groupId> <artifactId>msm</artifactId> <dependencies> @@ -30,26 +31,22 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${lutinutil.version}</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> </dependency>  <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> - <version>${jaxx.version}</version> </dependency>  @@ -136,6 +133,28 @@    + <properties> + <maven.test.skip>true</maven.test.skip> + +  + <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class> + +  + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> + + <jaxx.extraImportList> + static org.nuiton.i18n.I18n.n_ + </jaxx.extraImportList> + +  +  + + </properties> + <packaging>jar</packaging>  + </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-22 18:17:14 UTC (rev 120) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-02-22 20:17:51 UTC (rev 121) @@ -1,11 +1,17 @@ package org.nuiton.mapstoragemanager; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.ErrorDialogUI; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.mapstoragemanager.ui.MainUI; import javax.swing.*; import java.util.Locale; +import static org.nuiton.i18n.I18n._; + /** * Created: 21 janv. 2010 * @@ -17,25 +23,52 @@ */ public final class Main { + /** + * Logger + */ + private static Log log = LogFactory.getLog(Main.class); + Locale locale = Locale.FRANCE; - private Main(){ - I18n.setUniqueBundleName("mapstoragemanager-i18n"); - I18n.init(locale); - final MainUI ui = MainUI.getInstance(); + private Main(String... args){ + try{ + I18n.setUniqueBundleName("mapstoragemanager-i18n"); + I18n.init(locale); - SwingUtilities.invokeLater(new Runnable() { + try { + SwingUtil.initNimbusLoookAndFeel(); + } catch (Exception e) { + // could not find nimbus look-and-feel + log.warn("Could not find nimbus look-and-feel"); + } - @Override - public void run() { + // init config + MsmConfig config = new MsmConfig(); + config.parse(args); - ui.setVisible(true); - } - }); + // chargement de la configuration des uis + SwingUtil.loadUIConfig(MsmConfig.APPLICATION_PROPERTIES, null); + + final MainUI ui = MainUI.getInstance(); + + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + + ui.setVisible(true); + } + }); + + } catch (Exception e) { + ErrorDialogUI.showError(e); + log.error(e.getMessage(), e); + System.exit(1); + } } public static void main(String... args) { - new Main(); + new Main(args); } Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-02-22 20:17:51 UTC (rev 121) @@ -0,0 +1,53 @@ +package org.nuiton.mapstoragemanager; + +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; +import java.util.Properties; + +/** + * La configuration de l'application. + * <p/> + * + * @author sletellier + * @since 0.1-SNAPSHOT + */ +public class NMsmConfig extends org.nuiton.util.ApplicationConfig { + + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ + static private 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, ...) + */ + public static final String APPLICATION_PROPERTIES = "/msm.properties"; + + public MsmConfig() { + + // chargement de la configuration interne + InputStream stream = getClass().getResourceAsStream( + APPLICATION_PROPERTIES); + + Properties p = new Properties(); + try { + p.load(stream); + for (Object k : p.keySet()) { + String key = k + ""; + Object value = p.get(k); + if (log.isDebugEnabled()) { + log.debug("install properties " + k + " : " + value); + } + setDefaultOption(key, "" + value); + } + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + +} 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-22 18:17:14 UTC (rev 120) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-22 20:17:51 UTC (rev 121) @@ -96,7 +96,7 @@ <JLabel text="password :" styleClass='boldUnderline'/> <JPasswordField id='password'/>  - <JButton text="ok" icon='ok.png' onActionPerformed='engine.connection()'/> + <JButton text="ok" actionIcon='ok' onActionPerformed='engine.connection()'/> </JToolBar> <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-02-22 18:17:14 UTC (rev 120) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-02-22 20:17:51 UTC (rev 121) @@ -1,35 +1,35 @@ -Map\ Storage\ Manager=Map Storage Manager -TABLE\ NAME\ \:\ TODO= -connectionError=The connection attempt to failed, please retry \! -login\ \:=Login -map\ Storage\ Manager= -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -name\ base\ \:=Name base -ok=Validate -password\ \:=Password -welcome.MapStorageManager=Welcome to MapStorageManager +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +connectionError=The connection attempt to failed, please retry \! +login\ \:=Login +map\ Storage\ Manager= +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Name base +ok=Validate +password\ \:=Password +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-02-22 18:17:14 UTC (rev 120) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-02-22 20:17:51 UTC (rev 121) @@ -1,35 +1,35 @@ -Map\ Storage\ Manager=Map Storage Manager -TABLE\ NAME\ \:\ TODO= -connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! -login\ \:=Identifiant -map\ Storage\ Manager= -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Permet de configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -name\ base\ \:=Nom de la base -ok=Valider -password\ \:=Mot de passe -welcome.MapStorageManager=Bienvenue dans MapStorageManager +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +login\ \:=Identifiant +map\ Storage\ Manager= +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Permet de configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Nom de la base +ok=Valider +password\ \:=Mot de passe +welcome.MapStorageManager=Bienvenue dans MapStorageManager Added: trunk/msm/src/main/resources/msm.properties =================================================================== --- trunk/msm/src/main/resources/msm.properties (rev 0) +++ trunk/msm/src/main/resources/msm.properties 2010-02-22 20:17:51 UTC (rev 121) @@ -0,0 +1 @@ +icon.action.ok=ok.png \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-22 18:17:14 UTC (rev 120) +++ trunk/pom.xml 2010-02-22 20:17:51 UTC (rev 121) @@ -20,6 +20,7 @@ <version>2.0.5</version> </parent> + <groupId>org.nuiton</groupId> <version>0.1-SNAPSHOT</version> <artifactId>mapstoragemanager</artifactId> @@ -108,25 +109,87 @@ <packaging>pom</packaging> <properties> + <projectId>mapstoragemanager</projectId> + <jaxx.version>2.0.0-beta-6-SNAPSHOT</jaxx.version> + <nuitonutils.version>1.1.0</nuitonutils.version> + <i18n.version>1.0.1</i18n.version> + +   - <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.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> +  </properties> + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + +  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonutils.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + + +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxx.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + + </dependencies> + </dependencyManagement> + <build> <plugins> - <plugin> +  + <!--<plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId>

1 0

r120 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/plugins java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/gui resources resources/i18n resources/icons
by fgilet＠users.nuiton.org 22 Feb '10

22 Feb '10

Author: fgilet Date: 2010-02-22 19:17:14 +0100 (Mon, 22 Feb 2010) New Revision: 120 Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java trunk/msm/src/main/resources/icons/ trunk/msm/src/main/resources/icons/ok.png 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/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 Log: am?\195?\169lioration du contenu d'une table avec specification BigTable Erreurs encore sur les cellules. Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-02-22 18:17:14 UTC (rev 120) @@ -0,0 +1,127 @@ +package org.nuiton.mapstoragemanager.plugins; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +public class OurHashMap2 implements NewBigTable { + + 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>(); + + @Override + public boolean connect(Properties properties) { + return true; + } + + @Override + public void selectTable(String table) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void createTable(String table) { + mapTable.put(table, new ArrayList<String>()); + } + + @Override + public void deleteTable(String table) { + mapTable.remove(table); + } + + @Override + public Set<String> getTablesNames() { + return mapTable.keySet(); + } + + @Override + public void createColumn(String table, String column) { + mapColumn.put(column, new ArrayList<String>()); + if(mapTable.containsKey(table)){ + ArrayList<String> list; + list = mapTable.get(table); + list.add(column); + mapTable.put(table,list); + } + } + + @Override + public void deleteColumn(String table, String column) { + if(mapTable.containsKey(table)){ + ArrayList<String> list = mapTable.get(table); + list.remove(column); + mapTable.put(table,list); + } + } + + @Override + public Set<String> getColumnsNames(String table) { + Set<String> columnNames = new HashSet(mapTable.get(table)); + return columnNames; + } + + @Override + public void put(String table, String column, String key, String content) { + if(mapTable.containsKey(table)){ + if(mapColumn.containsKey(column)){ + ArrayList<String> list; + list = mapColumn.get(column); + list.add(key); + mapColumn.put(column,list); + mapData.put(key, content); + } + } + } + + @Override + public String get(String table, String column, String key) { + if(mapTable.containsKey(table)){ + if(mapColumn.containsKey(column)){ + return mapData.get(key); + }else{ + return "Erreur"; + } + }else{ + return "Erreur"; + } + } + + @Override + public String get(String table, String column, String key, int version) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public Map<String, String> getRow(String table, String key) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public Set<String> getKeys(String table) { + Set<String> keys = null; + Set<String> column = new HashSet(mapTable.get(table)); + Iterator i = column.iterator(); + while(i.hasNext()){ + String columnName = (String)i.next(); + System.out.println("columnName : "+columnName); + ArrayList<String> al = mapColumn.get(columnName); + for(String str : al){ + System.out.println("str : "+str); + keys.add(str); + } + } + return keys; + } + + public Set<String> getKeys(String table, String column) { + Set<String> keys = new HashSet(mapColumn.get(column)); + return keys; + } + + +} 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-22 15:31:58 UTC (rev 119) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-02-22 18:17:14 UTC (rev 120) @@ -6,8 +6,9 @@ <![CDATA[ import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; import javax.swing.tree.*; + import static org.nuiton.i18n.I18n.n_; - ApplicationEngine engine = new ApplicationEngine(); + ApplicationEngine engine = ApplicationEngine.getInstance(); /** * classe instance (singleton pattern). @@ -25,7 +26,15 @@ return instance; } + /** + * Access to the engine. + * @return instance of the class + */ + public ApplicationEngine getEngine(){ + return engine; + } + ]]> </script> @@ -69,11 +78,16 @@ </JMenuBar> +  + <JPanel layout='{new BorderLayout()}' id='mainPanel'> <JToolBar constraints='BorderLayout.NORTH' opaque='true'> <JLabel text="name base :" styleClass='boldUnderline' /> <JAXXComboBox id='nameBase' onActionPerformed='engine.doSomething()' > - <item value='HBase' selected='true' /> + <item value='OurHashMap' selected='true'/> + <item value='HBase'/> <item value='Cassandra'/> <item value='Other'/> </JAXXComboBox> @@ -81,16 +95,21 @@ <JTextField id='login'/> <JLabel text="password :" styleClass='boldUnderline'/> <JPasswordField id='password'/> - <JButton text="ok" onActionPerformed='engine.connection()'/> +  + <JButton text="ok" icon='ok.png' onActionPerformed='engine.connection()'/> </JToolBar> <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > <JScrollPane> <JTree id='navigation' - model='{new DefaultTreeModel(new DefaultMutableTreeNode("Welcome to MapStorageManager"))}' /> + model='{new DefaultTreeModel(new DefaultMutableTreeNode(n_("welcome.MapStorageManager")))}' /> </JScrollPane> - <JScrollPane> - <JPanel id='tableContent'/> + <JScrollPane > + <JPanel layout='{new BorderLayout()}'> + <JPanel id='tableName' constraints='BorderLayout.NORTH'/> + <JPanel id='tableContent' constraints='BorderLayout.CENTER'/> + <JPanel id='tableTips' constraints='BorderLayout.SOUTH'/> + </JPanel> </JScrollPane> </JSplitPane> </JPanel> 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-22 15:31:58 UTC (rev 119) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-22 18:17:14 UTC (rev 120) @@ -1,13 +1,19 @@ package org.nuiton.mapstoragemanager.ui.gui; +import java.util.Iterator; import java.util.Locale; +import java.util.Properties; import java.util.ResourceBundle; +import java.util.Set; import javax.swing.JOptionPane; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.plugins.OurHashMap; +import org.nuiton.mapstoragemanager.plugins.OurHashMap2; import org.nuiton.mapstoragemanager.ui.MainUI; +import static org.nuiton.i18n.I18n.n_; /** * Engine Class with methods for application user interface. @@ -29,11 +35,45 @@ * ResourceBundle. */ private ResourceBundle messages; - + /** + * OurHashMap2. + */ + OurHashMap2 ohm; + + /** + * classe instance (singleton pattern). + */ + private static ApplicationEngine instance = null; + + + + /** * Constructor. */ - public 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"); + + ohm.put("table1", "column1", "1", "content1"); + ohm.put("table1", "column1", "2", "content2"); + ohm.put("table1", "column2", "1", "content3"); + ohm.put("table1", "column2", "4", "content4"); + + ohm.put("table2", "column3", "5", "content1"); + ohm.put("table2", "column3", "6", "content2"); + ohm.put("table2", "column4", "7", "content3"); + ohm.put("table2", "column4", "8", "content4"); + ohm.put("table2", "column5", "9", "content3"); + ohm.put("table2", "column5", "10", "content4"); } /** @@ -84,7 +124,8 @@ //connection verification boolean goodUse = true; - //boolean goodUse = verifyConnection(nameBase, login, password); + goodUse = ohm.connect(new Properties()); + if(goodUse){ //update tree MainUI.getInstance().getNavigation().setModel(new MSMModel(nameBase)); @@ -92,19 +133,43 @@ DefaultMutableTreeNode root = (DefaultMutableTreeNode) MainUI.getInstance().getNavigation().getModel().getRoot(); DefaultTreeModel dtm = ((DefaultTreeModel) MainUI.getInstance().getNavigation().getModel()); - dtm.insertNodeInto(new DefaultMutableTreeNode("table1"), root, root.getChildCount()); - dtm.insertNodeInto(new DefaultMutableTreeNode("table2"), root, root.getChildCount()); - dtm.insertNodeInto(new DefaultMutableTreeNode("table3"), root, root.getChildCount()); + Set<String> tableNames = ohm.getTablesNames(); + + Iterator i = tableNames.iterator(); + while(i.hasNext()){ + String tableName = (String)i.next(); + dtm.insertNodeInto(new DefaultMutableTreeNode(tableName), root, root.getChildCount()); + } + MainUI.getInstance().getNavigation().repaint(); MainUI.getInstance().getNavigation().revalidate(); }else{ //display error - JOptionPane.showMessageDialog(null, "The connection attempt has failed, Please retry !"); + JOptionPane.showMessageDialog(null, n_("connectionError")); } } + /** + * getInstance method (singleton pattern). + * @return instance of the class + */ + public static ApplicationEngine getInstance() { + if (instance == null){ + instance = new ApplicationEngine(); + } + return instance; + } + //GETTERS AND SETTERS + public OurHashMap2 getOurHashMap(){ + return ohm; + } + + public void setOurHashMap(OurHashMap2 ohm){ + this.ohm = ohm; + } + } 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-02-22 15:31:58 UTC (rev 119) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-02-22 18:17:14 UTC (rev 120) @@ -5,9 +5,12 @@ package org.nuiton.mapstoragemanager.ui.gui; +import java.awt.Color; +import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; +import javax.swing.table.TableColumn; import javax.swing.tree.DefaultMutableTreeNode; import org.nuiton.mapstoragemanager.ui.MainUI; @@ -20,15 +23,16 @@ @Override public void valueChanged(TreeSelectionEvent e) { DefaultMutableTreeNode node = (DefaultMutableTreeNode)MainUI.getInstance().getNavigation().getLastSelectedPathComponent(); - MainUI.getInstance().getTableContent().removeAll() - ; + MainUI.getInstance().getTableContent().removeAll(); + MainUI.getInstance().getTableName().removeAll(); + /* if nothing is selected */ - if (node == null) { + if (node == null || node.isRoot()) { return; } else { //we create a standard model of table - TableModel exemple = new TableModel(); - JTable jTable = new JTable(exemple); + TableModel model = new TableModel(node); + JTable jTable = new JTable(model); //we check attributes and values of the select table @@ -37,6 +41,7 @@ MainUI.getInstance().getTableContent().add(jTable); } + MainUI.getInstance().getTableName().add(new JLabel("<html><b><u>"+node.toString()+"</b></u></html>")); MainUI.getInstance().getTableContent().repaint(); MainUI.getInstance().getTableContent().revalidate(); } 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-22 15:31:58 UTC (rev 119) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-02-22 18:17:14 UTC (rev 120) @@ -5,7 +5,11 @@ package org.nuiton.mapstoragemanager.ui.gui; +import java.util.Iterator; +import java.util.Set; import javax.swing.table.AbstractTableModel; +import javax.swing.tree.DefaultMutableTreeNode; +import org.nuiton.mapstoragemanager.plugins.OurHashMap2; /** * Model of a table content @@ -13,11 +17,57 @@ */ public class TableModel extends AbstractTableModel { - /** - * Constructor. - */ - public TableModel() { } + /** + * columnNames. + */ + String[] titres; + + /** + * data. + */ + String[][] data; + + /** + * Constructor. + */ + public TableModel(DefaultMutableTreeNode node) { + String table = node.toString(); + ApplicationEngine engine = ApplicationEngine.getInstance(); + OurHashMap2 testHashmap2 = engine.getOurHashMap(); + Set<String> set = testHashmap2.getColumnsNames(table); + titres = new String[set.size()]; + + //content + Iterator i = set.iterator(); + int j=0; + int k=0; + while(i.hasNext()){ + String titreTemp = (String)i.next(); + titres[j]=titreTemp; + + //content of data + Set<String> keySet = testHashmap2.getKeys(table,titres[j]); + Iterator i2 = keySet.iterator(); + + System.out.println(set.size()+" | "+keySet.size()); + if(j==0){ + data = new String[set.size()][keySet.size()]; + } + while(i2.hasNext()){ + String str = testHashmap2.get(table,titreTemp,(String)i2.next()); + data[j][k]=str; + System.out.println("data["+j+"]["+k+"] = "+data[j][k]); + k++; + }; + j++; + k=0; + } + + + + } + /** * Add data into the table. @@ -26,32 +76,7 @@ */ @Override public Object getValueAt(int rowIndex, int colIndex) { - if (rowIndex == 0) { - if (colIndex == 0) { - return "1"; - } else { - return ""; - } - } else { - if (colIndex > rowIndex) { - return ""; - } else { - if (colIndex == rowIndex) { - return "1"; - } else { - if (colIndex == 0) { - return "1"; - } else { - 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); - - } - } - } + return data[colIndex][rowIndex]; } /** @@ -60,7 +85,7 @@ */ @Override public int getColumnCount() { - return 2; + return titres.length; } /** @@ -69,7 +94,7 @@ */ @Override public int getRowCount() { - return 10; + return data[0].length; } /** @@ -79,11 +104,12 @@ */ @Override public String getColumnName(int col){ - return ""; + return titres[col]; } + /** - * Check if the cell is editable + * Check if the cell is editable. * @param row the line number * @param col the column number * @return false Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-02-22 15:31:58 UTC (rev 119) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-02-22 18:17:14 UTC (rev 120) @@ -1,32 +1,35 @@ -Map\ Storage\ Manager=Map Storage Manager -TABLE\ NAME\ \:\ TODO= -login\ \:=Login -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -name\ base\ \:=Name base -ok=Validate -password\ \:=Password +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +connectionError=The connection attempt to failed, please retry \! +login\ \:=Login +map\ Storage\ Manager= +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Name base +ok=Validate +password\ \:=Password +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-02-22 15:31:58 UTC (rev 119) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-02-22 18:17:14 UTC (rev 120) @@ -1,32 +1,35 @@ -Map\ Storage\ Manager=Map Storage Manager -TABLE\ NAME\ \:\ TODO= -login\ \:=Identifiant -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Permet de configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -name\ base\ \:=Nom de la base -ok=Valider -password\ \:=Mot de passe +Map\ Storage\ Manager=Map Storage Manager +TABLE\ NAME\ \:\ TODO= +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +login\ \:=Identifiant +map\ Storage\ Manager= +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Permet de configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +name\ base\ \:=Nom de la base +ok=Valider +password\ \:=Mot de passe +welcome.MapStorageManager=Bienvenue dans MapStorageManager Added: trunk/msm/src/main/resources/icons/ok.png =================================================================== (Binary files differ) Property changes on: trunk/msm/src/main/resources/icons/ok.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0