Author: tchemit Date: 2010-11-26 18:24:18 +0100 (Fri, 26 Nov 2010) New Revision: 1001 Url: http://nuiton.org/repositories/revision/eugene/1001 Log: fix tag value detection at model level Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-25 18:40:54 UTC (rev 1000) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-26 17:24:18 UTC (rev 1001) @@ -98,7 +98,7 @@ * @since 2.2.1 */ protected Pattern modelTagValuePattern = Pattern - .compile("model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)+)"); + .compile("^model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)(?:\\.[_a-zA-Z0-9]+)*)$"); public static final String MODEL = "model"; @@ -190,7 +190,7 @@ return result; } - protected Properties loadModelPropertiesFile(File propFile, ObjectModel model) { + public Properties loadModelPropertiesFile(File propFile, ObjectModel model) { Properties prop = new RecursiveProperties(); try { FileInputStream inStream = new FileInputStream(propFile);