r762 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
Author: mfortun Date: 2011-04-06 16:01:47 +0200 (Wed, 06 Apr 2011) New Revision: 762 Url: http://nuiton.org/repositories/revision/wikitty/762 Log: correction of the File uses, correct code convention, add method that harvest file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-06 12:57:32 UTC (rev 761) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-06 14:01:47 UTC (rev 762) @@ -1,12 +1,11 @@ package org.nuiton.wikitty.publication; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; +import java.util.ArrayList; import java.util.List; import java.util.Properties; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -36,7 +35,7 @@ public static String HESSIAN_PROTOCOL_KEY = "hessian"; public static String PROPERTY_DIRECTORY = ".wp"; - public static String WIKITTYPUBLICATION_PROPERTIES_FILE = ""; + public static String WIKITTYPUBLICATION_PROPERTIES_FILE = "ws.properties"; /** * @param args @@ -143,9 +142,9 @@ */ System.out.println("import :\n"); for (File child : dir.listFiles()) { - if (child.isDirectory() && false == noRecur) { + if (child.isDirectory() && !noRecur) { printDirectory(child); - } else if (false == child.isDirectory()) { + } else if (child.isDirectory()) { System.out.println(child.getAbsolutePath()); } @@ -169,6 +168,31 @@ } /** + * Method that create the list of file needed to commit, delete, update + * import. It harvest file in order to transform them into wikitties + * + * @param starts + * harvested directory + * @param recursivly + * boolean id the directory have to be harvest + * @return + * list of harvested file + */ + protected static List<File> listFile(File starts, boolean recursivly) { + ArrayList<File> result = new ArrayList<File>(); + result.add(starts); + for (File child : starts.listFiles()) { + if (child.isDirectory() && recursivly) { + result.add(child); + result.addAll(listFile(child, recursivly)); + } else if (!child.isDirectory()) { + result.add(child); + } + } + return result; + } + + /** * Method that checkout a label recursivly or not into a local directory * from a wikitty service */ @@ -196,7 +220,7 @@ // write the proper properties file! Properties props = new Properties(); props.put(WITTY_SERVICE_KEY, wikittyService); - if (true == hessianProtocole) { + if (hessianProtocole) { props.put("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); } else { @@ -235,17 +259,17 @@ System.out .println("search the directory of .wp file to write new properties file"); // search for the home directory - if (null == dir || false == dir.exists()) { + if (null == dir || !dir.exists()) { wpHomeDir = searchWikittyPublicationHomeDir(new File(".")); } else { - wpHomeDir = new File(dir.getCanonicalFile() + File.pathSeparator + wpHomeDir = new File(dir.getCanonicalFile() + File.separator + PROPERTY_DIRECTORY); } Properties oldProperties = new Properties(); // TODO mfortun-2011-04-06 catch exception instead of throws - File propertiesFile = new File(wpHomeDir + File propertiesFile = new File(wpHomeDir + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); // load the old file just for loggin oldProperties.load(new FileReader(propertiesFile)); @@ -258,7 +282,7 @@ // Creation of the new properties file Properties props = new Properties(); props.put(WITTY_SERVICE_KEY, wikittyService); - if (true == hessianProtocole) { + if (hessianProtocole) { props.put("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); } else { @@ -291,7 +315,7 @@ File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); File wpHomeDir; - if (null == dir || false == dir.exists()) { + if (null == dir || !dir.exists()) { /* * si pas de dir on commit le dossier courant */ @@ -305,7 +329,7 @@ // TODO mfortun-2011-04-06 catch exception instead of throws File propertiesFile = new File(wpHomeDir.getCanonicalPath() - + File.pathSeparator + WIKITTYPUBLICATION_PROPERTIES_FILE); + + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); // load the old file just for loggin properties.load(new FileReader(propertiesFile)); @@ -319,7 +343,7 @@ boolean hessianProtocole = applicationConfig .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); - if (true == hessianProtocole) { + if (hessianProtocole) { applicationConfig.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); } else { @@ -354,7 +378,7 @@ public static void deleteFromWikitty(File toDelete) throws Exception { // check args - if (null == toDelete || false == toDelete.exists()) { + if (null == toDelete || !toDelete.exists()) { // Exception } else { @@ -375,7 +399,7 @@ // TODO mfortun-2011-04-06 catch exception instead of throws File propertiesFile = new File(wpHomeDir.getCanonicalPath() - + File.pathSeparator + WIKITTYPUBLICATION_PROPERTIES_FILE); + + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); // load the old file just for loggin properties.load(new FileReader(propertiesFile)); @@ -387,7 +411,7 @@ boolean hessianProtocole = applicationConfig .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); - if (true == hessianProtocole) { + if (hessianProtocole) { applicationConfig .setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); @@ -423,7 +447,7 @@ File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); File wpHomeDir; - if (null == dir || false == dir.exists()) { + if (null == dir || !dir.exists()) { /* * si pas de dir on commit le dossier courant */ @@ -437,7 +461,7 @@ // TODO mfortun-2011-04-06 catch exception instead of throws File propertiesFile = new File(wpHomeDir.getCanonicalPath() - + File.pathSeparator + WIKITTYPUBLICATION_PROPERTIES_FILE); + + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); // load the old file just for loggin properties.load(new FileReader(propertiesFile)); @@ -451,7 +475,7 @@ boolean hessianProtocole = applicationConfig .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); - if (true == hessianProtocole) { + if (hessianProtocole) { applicationConfig.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); } else { @@ -481,18 +505,18 @@ protected static File searchWikittyPublicationHomeDir(File start) throws Exception { - if (start.exists() && true == start.isDirectory()) { + if (start.exists() && start.isDirectory()) { // on va retourner le dossier .wp home // method récursiv qui remonte dans les parents pour retrouver. - File temp = new File(start.getAbsolutePath() + PROPERTY_DIRECTORY); - if (true == temp.exists()) { - File propertie = new File(temp.getCanonicalPath() - + File.pathSeparator - + WIKITTYPUBLICATION_PROPERTIES_FILE); - if (true == propertie.exists()) { - return temp; + File propertyDirectory = new File(start.getCanonicalPath() + + File.separator + PROPERTY_DIRECTORY); + if (propertyDirectory.exists()) { + File propertie = new File(propertyDirectory.getCanonicalPath() + + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); + if (propertie.exists()) { + return propertyDirectory; } } return searchWikittyPublicationHomeDir(start.getParentFile());
participants (1)
-
mfortun@users.nuiton.org