Justin Koke avatar Justin Koke committed cfe6c21 Merge with conflicts

Merge branch 'master' into maven_build

Conflicts:
build.properties

Comments (0)

Files changed (4)

providers/hibernate3/src/main/java/com/opensymphony/module/propertyset/hibernate3/HibernateConfigurationProvider.java

     //~ Methods ////////////////////////////////////////////////////////////////
 
     /**
-* Get a Hibernate configuration object
-*/
+    * Get a Hibernate configuration object
+    */
     public Configuration getConfiguration();
 
     HibernatePropertySetDAO getPropertySetDAO();
 
     /**
-* Setup a Hibernate configuration object with the given properties.
-*
-* This will always be called before getConfiguration().
-*/
+    * Setup a Hibernate configuration object with the given properties.
+    *
+    * This will always be called before getConfiguration().
+    */
     void setupConfiguration(Map properties);
 }

providers/hibernate3/src/main/java/com/opensymphony/module/propertyset/hibernate3/HibernatePropertySetDAO.java

     //~ Methods ////////////////////////////////////////////////////////////////
 
     /**
- * Save the implementation of a PropertySetItem.
- *
- * @param item
- * @param isUpdate Boolean indicating whether or not this item already exists
- */
+    * Save the implementation of a PropertySetItem.
+    *
+    * @param item
+    * @param isUpdate Boolean indicating whether or not this item already exists
+    */
     void setImpl(PropertySetItem item, boolean isUpdate);
 
     Collection getKeys(String entityName, Long entityId, String prefix, int type);

providers/hibernate3/src/main/java/com/opensymphony/module/propertyset/hibernate3/HibernatePropertySetDAOUtils.java

     }
 
     /**
- * This is the body of the getKeys() method, so that you can reuse it
- * wrapped by your own session management.
- */
+    * This is the body of the getKeys() method, so that you can reuse it
+    * wrapped by your own session management.
+    */
     public static List getKeysImpl(Session session, String entityName, Long entityId, String prefix, int type) throws HibernateException {
         Query query;
 

providers/ofbiz2/src/main/java/com/opensymphony/module/propertyset/ofbiz/OFBizPropertySet.java

 
     // Constructors --------------------------------------------------
     public void init(Map config, Map args) {
-        delegatorName = (String) config.get("delegator.name");
+        delegatorName = (String) args.get("delegator.name");
 
         if (delegatorName == null) {
             delegatorName = "default";
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.