Changeset 25915

Show
Ignore:
Timestamp:
10.07.2012 13:58:38 (7 years ago)
Author:
sjm84
Message:

Some tidying

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

    r25718 r25915  
    1919package org.greenstone.util; 
    2020 
    21 import java.util.Properties; 
    2221import java.io.File; 
    2322import java.io.InputStream; 
     23import java.util.Properties; 
    2424 
    25 import org.apache.log4j.*; 
     25import org.apache.log4j.Logger; 
    2626 
    2727/** 
     
    8080            if (in != null) 
    8181            { 
    82                     logger.debug("loading global properties"); 
     82                logger.debug("loading global properties"); 
    8383                properties.load(in); 
    8484                in.close(); 
     
    9797            // make sure the path separators are correct 
    9898            // gsdl3_home may be null, eg when we are loading properties from Server3 
    99             if (gsdl3_home != null) { 
    100               File gs3_file = new File(gsdl3_home); 
    101               gsdl3_home = gs3_file.getPath(); 
     99            if (gsdl3_home != null) 
     100            { 
     101                File gs3_file = new File(gsdl3_home); 
     102                gsdl3_home = gs3_file.getPath(); 
    102103            } 
    103104            //build the gsdl3 web address, in a way resilient to errors and ommisions in global.properties, simplifying where possible