revert back method to static. Fix calls to deprecated '_' method, rep…

…laced by __loadClass because '_' is a reserved keyword from jdk9
playframework · Aug 7, 2018 · b6cf1f0 · b6cf1f0
1 parent 056285d
commit b6cf1f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/src/play/templates/GroovyTemplate.java b/framework/src/play/templates/GroovyTemplate.java
@@ -508,7 +508,7 @@ public String __reverseWithCheck_absolute_false(String action) {
             return __reverseWithCheck(action, false);
         }
 
-        private static String __reverseWithCheck(String action, boolean absolute) {
+        private String __reverseWithCheck(String action, boolean absolute) {
             return Router.reverseWithCheck(action, Play.getVirtualFile(action), absolute);
         }
 

diff --git a/modules/crud/app/views/tags/crud/form.html b/modules/crud/app/views/tags/crud/form.html
@@ -1,10 +1,10 @@
 %{
     if(_object) {
         currentObject = _object
-        currentType = _('controllers.CRUD$ObjectType').forClass(_object.getClass().getName())
+        currentType = __loadClass('controllers.CRUD$ObjectType').forClass(_object.getClass().getName())
     } else if(_class) {
         currentObject = null;
-        currentType = _('controllers.CRUD$ObjectType').forClass(_class)
+        currentType = __loadClass('controllers.CRUD$ObjectType').forClass(_class)
     } else {
         currentObject = _caller.object
         currentType = _caller.type