From 46a1fa669b0720d0a560241ca5be3a8fff73aaed Mon Sep 17 00:00:00 2001
From: brianjlowe <brianjlowe@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 7 Dec 2011 19:45:17 +0000
Subject: [PATCH] minor source formatting tweaks

---
 .../setup/JenaDataSourceSetupBase.java        | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
index a9f61f239..06962b753 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
@@ -181,7 +181,8 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
     * Sets up a BasicDataSource using values from
     * a properties file.
     */
-    public final BasicDataSource makeDataSourceFromConfigurationProperties(ServletContext ctx){
+    public final BasicDataSource makeDataSourceFromConfigurationProperties(
+            ServletContext ctx) {
         String dbDriverClassname = ConfigurationProperties.getBean(ctx)
                 .getProperty("VitroConnection.DataSource.driver",
                         getDbDriverClassName(ctx));
@@ -291,8 +292,8 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
            String jenaDbModelName, 
            OntModelSpec jenaDbOntModelSpec, 
            TripleStoreType storeType, ServletContext ctx) {
-       return makeDBModel (
-               ds, jenaDbModelName, jenaDbOntModelSpec, storeType, getDbType(ctx), ctx);
+       return makeDBModel (ds, jenaDbModelName, jenaDbOntModelSpec, storeType, 
+               getDbType(ctx), ctx);
    }
    
    public static Model makeDBModel(BasicDataSource ds, 
@@ -351,7 +352,9 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
         }
     }
    
-    public static void readOntologyFileFromPath(String p, Model model, ServletContext ctx) {
+    public static void readOntologyFileFromPath(String p, 
+                                                Model model, 
+                                                ServletContext ctx) {
         //Check that this is a file and not a directory
         File f = new File(ctx.getRealPath(p));
         if(f.exists() && f.isFile()){
@@ -371,7 +374,8 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
                 log.debug("File for path " + p + " does not exist");
             }
             else if(f.isDirectory()) {
-                log.debug("Path " + p + " corresponds to directory and not file so was not read in");
+                log.debug("Path " + p + 
+                        " corresponds to directory and not file so was not read in");
             }
         }
    }
@@ -393,9 +397,11 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
     private static final String sdbModelMaker = "vitroJenaSDBModelMaker";
     private static final String rdbModelMaker = "vitroJenaModelMaker";
     
-    protected void makeModelMakerFromConnectionProperties(TripleStoreType type, ServletContext ctx){
+    protected void makeModelMakerFromConnectionProperties(TripleStoreType type, 
+                                                          ServletContext ctx) {
         String jdbcUrl = getJdbcUrl(ctx);
-      String dbtypeStr = ConfigurationProperties.getBean(ctx).getProperty("VitroConnection.DataSource.dbtype","MySQL");
+        String dbtypeStr = ConfigurationProperties.getBean(ctx).getProperty(
+                "VitroConnection.DataSource.dbtype","MySQL");
         String username = ConfigurationProperties.getBean(ctx).getProperty(
                 "VitroConnection.DataSource.username");
         String password = ConfigurationProperties.getBean(ctx).getProperty(
@@ -432,10 +438,12 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
         if( dir == null )
             throw new IllegalStateException("Must pass a File to getModelFromDir()");
         if( !dir.isDirectory() )
-            throw new IllegalStateException("Directory must be a File object for a directory");
+            throw new IllegalStateException(
+                    "Directory must be a File object for a directory");
         if( !dir.canRead() )
             throw new IllegalStateException("getModelFromDir(): Directory " +
-                    " must be readable, check premissions on " + dir.getAbsolutePath());
+                    " must be readable, check premissions on " 
+                    + dir.getAbsolutePath());
         
         OntModel model = ModelFactory.createOntologyModel();
         for( File file : dir.listFiles()){