Author: dlanglais Date: 2010-03-04 01:33:29 +0100 (Thu, 04 Mar 2010) New Revision: 180 Removed: trunk/msm-bighashmap/src/main/resources/i18n/ trunk/msm-bighashmap/src/main/resources/log4j.properties trunk/msm-hbase/src/main/resources/i18n/ trunk/msm-hbase/src/main/resources/log4j.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: Suppression de fichiers inutiles (i18n et log4j.properties dans les modules msm-bighashmap et msm-hbase). BigTableLoader -> lors du chargement d'un plugin par son fichier oubli de l'ajouter au bigTableSetLoader... Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-03 23:30:50 UTC (rev 179) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 00:33:29 UTC (rev 180) @@ -72,6 +72,10 @@ LOG.error(e.toString(), e); } } + bigTableSetLoader = ServiceLoader.load(BigTable.class, this); + for (BigTable bigTableImpl : bigTableSetLoader) { + plugins.put(bigTableImpl.getPluginName(), bigTableImpl); + } } /** Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 23:30:50 UTC (rev 179) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 00:33:29 UTC (rev 180) @@ -90,7 +90,12 @@ JFileChooser jfc = new javax.swing.JFileChooser(msnBasedir); jfc.getSelectedFiles(); // File pluginPath = new File(msnBasedir, toPlugin); - jfc.showOpenDialog(MainUI.getFrames()[0]); + switch(jfc.showOpenDialog(MainUI.getFrames()[0])) { + case JFileChooser.CANCEL_OPTION : return; + case JFileChooser.ERROR_OPTION : return; + case JFileChooser.APPROVE_OPTION : break; + default : break; + } File pluginPath = jfc.getSelectedFile(); Deleted: trunk/msm-bighashmap/src/main/resources/log4j.properties =================================================================== --- trunk/msm-bighashmap/src/main/resources/log4j.properties 2010-03-03 23:30:50 UTC (rev 179) +++ trunk/msm-bighashmap/src/main/resources/log4j.properties 2010-03-04 00:33:29 UTC (rev 180) @@ -1,14 +0,0 @@ -# Global logging configuration -#log4j.rootLogger=ERROR, stdout, file -log4j.rootLogger=INFO, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.file=mapstoragemanager.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -log4j.logger.org.nuiton=INFO -log4j.logger.org.nuiton.mapstoragemanager=DEBUG Deleted: trunk/msm-hbase/src/main/resources/log4j.properties =================================================================== --- trunk/msm-hbase/src/main/resources/log4j.properties 2010-03-03 23:30:50 UTC (rev 179) +++ trunk/msm-hbase/src/main/resources/log4j.properties 2010-03-04 00:33:29 UTC (rev 180) @@ -1,14 +0,0 @@ -# Global logging configuration -#log4j.rootLogger=ERROR, stdout, file -log4j.rootLogger=INFO, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.file=mapstoragemanager.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -log4j.logger.org.nuiton=INFO -log4j.logger.org.nuiton.mapstoragemanager=DEBUG