From 0b18650ac41a91cf393c717608e9f315f0763056 Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 22 Feb 2012 20:33:52 +0000 Subject: [PATCH] NIHVIVO-3628 Minor tweaks. --- .../individual/ObjectPropertyTemplateModel.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java index 1c25ca2b3..c22831ae0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java @@ -368,7 +368,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel configFilePath = getConfigFilePath(DEFAULT_CONFIG_FILE_NAME); // Should we test for the existence of the default, and throw an error if it doesn't exist? } - setValuesFromConfigFile(configFilePath, op, vreq.getWebappDaoFactory(), editing); + setValuesFromConfigFile(configFilePath, vreq.getWebappDaoFactory(), editing); } catch (Exception e) { log.error("Error processing config file " + configFilePath + " for object property " + op.getURI(), e); @@ -388,7 +388,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel " in " + configFilePath + ":\n" + configError + " Using default config instead."); configFilePath = getConfigFilePath(DEFAULT_CONFIG_FILE_NAME); - setValuesFromConfigFile(configFilePath, op, vreq.getWebappDaoFactory(), editing); + setValuesFromConfigFile(configFilePath, vreq.getWebappDaoFactory(), editing); } } @@ -427,12 +427,12 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel return null; } - private void setValuesFromConfigFile(String configFilePath, ObjectProperty op, WebappDaoFactory wdf, + private void setValuesFromConfigFile(String configFilePath, WebappDaoFactory wdf, boolean editing) { - try { FileReader reader = new FileReader(configFilePath); CustomListViewConfigFile configFileContents = new CustomListViewConfigFile(reader); + boolean collated = ObjectPropertyTemplateModel.this instanceof CollatedObjectPropertyTemplateModel; selectQuery = configFileContents.getSelectQuery(collated, editing); @@ -459,25 +459,25 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel Constructor constructor = clazz.getConstructor(ObjectPropertyTemplateModel.class, WebappDaoFactory.class); return (ObjectPropertyDataPostProcessor) constructor.newInstance(optm, wdf); } catch (ClassNotFoundException e) { - log.error("Error processing config file '" + configFilePath + log.warn("Error processing config file '" + configFilePath + "': can't load postprocessor class '" + className + "'. " + "Using default postprocessor.", e); return new DefaultObjectPropertyDataPostProcessor(optm, wdf); } catch (NoSuchMethodException e) { - log.error("Error processing config file '" + configFilePath + log.warn("Error processing config file '" + configFilePath + "': postprocessor class '" + className + "' does not have a constructor that takes " + "ObjectPropertyTemplateModel and WebappDaoFactory. " + "Using default postprocessor.", e); return new DefaultObjectPropertyDataPostProcessor(optm, wdf); } catch (ClassCastException e) { - log.error("Error processing config file '" + configFilePath + log.warn("Error processing config file '" + configFilePath + "': postprocessor class '" + className + "' does " + "not implement ObjectPropertyDataPostProcessor. " + "Using default postprocessor.", e); return new DefaultObjectPropertyDataPostProcessor(optm, wdf); } catch (Exception e) { - log.error("Error processing config file '" + configFilePath + log.warn("Error processing config file '" + configFilePath + "': can't create postprocessor instance of class '" + className + "'. " + "Using default postprocessor.", e); return new DefaultObjectPropertyDataPostProcessor(optm, wdf);