Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 f839a5677 -> ea3a06b5b


Removed some deprecated methods...


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/70dff094
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/70dff094
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/70dff094

Branch: refs/heads/3
Commit: 70dff09474359ca205be80a3aa4efa88cc7b3f89
Parents: f839a56
Author: ddekany <[email protected]>
Authored: Mon Feb 20 19:43:04 2017 +0100
Committer: ddekany <[email protected]>
Committed: Mon Feb 20 19:43:04 2017 +0100

----------------------------------------------------------------------
 .../freemarker/core/model/impl/beans/BeansWrapper.java  | 12 ------------
 1 file changed, 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/70dff094/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java 
b/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java
index 182e27f..8182797 100644
--- 
a/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java
+++ 
b/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java
@@ -762,18 +762,6 @@ public class BeansWrapper implements RichObjectWrapper, 
WriteProtectable {
         return new APIModel(obj, this);
     }
 
-    /**
-     * @deprecated override {@link #getModelFactory(Class)} instead. Using this
-     * method will now bypass wrapper caching (if it's enabled) and always 
-     * result in creation of a new wrapper. This method will be removed in 2.4
-     * @param object The object to wrap
-     * @param factory The factory that wraps the object
-     */
-    @Deprecated
-    protected TemplateModel getInstance(Object object, ModelFactory factory) {
-        return factory.create(object, this);
-    }
-
     private final ModelFactory BOOLEAN_FACTORY = new ModelFactory() {
         @Override
         public TemplateModel create(Object object, ObjectWrapper wrapper) {

Reply via email to