Author: dlanglais Date: 2010-03-19 12:53:50 +0100 (Fri, 19 Mar 2010) New Revision: 265 Log: Correction concernant la qualit?\195?\169 du code. Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 18:07:59 UTC (rev 264) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-19 11:53:50 UTC (rev 265) @@ -48,7 +48,7 @@ /** Load properties file of the folder. */ final Properties properties = new Properties(); - final File propertiesFile = new File(ApplicationEngine.getInstance().getMSM_PLUGINS_DIR(), ".properties"); + final File propertiesFile = new File(ApplicationEngine.getInstance().getMSMPLUGINSDIR(), ".properties"); try { FileInputStream fis = new FileInputStream(propertiesFile); properties.load(fis); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 18:07:59 UTC (rev 264) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-19 11:53:50 UTC (rev 265) @@ -86,7 +86,7 @@ * Getter for MSM_BASEDIR. * @return MSM_BASEDIR */ - public static File getMSM_BASEDIR() { + public static File getMSMBASEDIR() { return MSM_BASEDIR; } @@ -94,7 +94,7 @@ * Getter for MSM_PLUGINS_DIR. * @return MSM_PLUGINS_DIR */ - public static File getMSM_PLUGINS_DIR() { + public static File getMSMPLUGINSDIR() { return MSM_PLUGINS_DIR; } @@ -160,7 +160,7 @@ * Save plugin for next application reload. */ public void savePlugin() { - PluginLoader pluginLoaderTemp = getPluginLoader(); + final JPanel buttonDisplay = new JPanel(new GridLayout(20,3)); final JPanel content = new JPanel(new BorderLayout()); @@ -177,7 +177,7 @@ Set<Object> props = properties.keySet(); for (Object property : props) { String nomPlugin = property.toString(); - nomPlugin = nomPlugin.substring(nomPlugin.lastIndexOf("/")+1); + nomPlugin = nomPlugin.substring(nomPlugin.lastIndexOf('/')+1); nomPlugins.add(nomPlugin); mapPlugins.put(nomPlugin, property.toString()); } @@ -188,12 +188,12 @@ LOG.fatal(ioe, ioe); } - + final int buttonWidth = 100; + final int buttonHeight = 20; - for(final String nomPlugin : nomPlugins) { - + for (final String nomPlugin : nomPlugins) { JCheckBox pluginButton = new JCheckBox(nomPlugin); - pluginButton.setSize(100, 20); + pluginButton.setSize(buttonWidth, buttonHeight); buttonDisplay.add(pluginButton); } @@ -205,17 +205,16 @@ @Override public void actionPerformed(ActionEvent e) { Component[] components = buttonDisplay.getComponents(); - for(final Component comp : components){ + for (final Component comp : components) { JCheckBox buttonTemp = (JCheckBox) comp; //if disable, write false into .properties - if(!buttonTemp.isSelected()){ + if (!buttonTemp.isSelected()) { properties.put(mapPlugins.get(buttonTemp.getText()), "false"); try { - properties.store(new FileOutputStream(propertiesFile), null); - - } catch (IOException ex) { - LOG.error(ex, ex); - } + properties.store(new FileOutputStream(propertiesFile), null); + } catch (IOException ex) { + LOG.error(ex, ex); + } } } frameTemp.dispose(); Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java =================================================================== --- trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 18:07:59 UTC (rev 264) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-19 11:53:50 UTC (rev 265) @@ -26,17 +26,7 @@ * Number for division byte -> Mb -> Gb. */ private static final int DIV = 1024; - -// /** -// * Width of the frame. -// */ -// private static final int FRAME_WIDTH = 300; - -// /** -// * Height of the frame. -// */ -// private static final int FRAME_HEIGHT = 300; - + /** * MenuItemBigTable. */ @@ -69,7 +59,7 @@ JPanel content = new JPanel(); File f = new File(new File("").getAbsolutePath()).getParentFile(); if (f.exists()) { - + //show free disk space final long freeSpaceByte = f.getFreeSpace(); final long totalSpaceByte = f.getTotalSpace();