Author: dgolovin Date: 2011-07-27 15:01:06 -0400 (Wed, 27 Jul 2011) New Revision: 33267 Added: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.18.jar Removed: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.8.jar Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.classpath trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/build.properties trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/BuiltInFragment.java Log: https://issues.jboss.org/browse/JBIDE-8519 (?floor, ?ceiling and ?round are not recognized by FreeMarker IDE) fixed by updating included fremarker jar with version 2.3.18 Content assist is updates as well Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.classpath =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.classpath 2011-07-27 19:00:16 UTC (rev 33266) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.classpath 2011-07-27 19:01:06 UTC (rev 33267) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry exported="true" kind="lib" path="freemarker-2.3.18.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="lib" path="freemarker-2.3.8.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF 2011-07-27 19:00:16 UTC (rev 33266) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF 2011-07-27 19:01:06 UTC (rev 33267) @@ -22,7 +22,7 @@ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-ClassPath: freemarker-ide.jar, - freemarker-2.3.8.jar + freemarker-2.3.18.jar Bundle-Vendor: %providerName Export-Package: freemarker.core, freemarker.template, Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/build.properties =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/build.properties 2011-07-27 19:00:16 UTC (rev 33266) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/build.properties 2011-07-27 19:01:06 UTC (rev 33267) @@ -1,13 +1,13 @@ source.freemarker-ide.jar = src/ output.freemarker-ide.jar = bin/ -jars.compile.order = freemarker-ide.jar +jars.compile.order = freemarker-2.3.18.jar bin.includes = plugin.*,\ - freemarker-ide.jar,\ + freemarker-2.3.18.jar,\ META-INF/,\ .,\ icons/,\ License.txt,\ - freemarker-2.3.8.jar,\ + freemarker-2.3.18.jar,\ about.*,\ jboss_about.png src.includes = src/,\ @@ -15,4 +15,4 @@ icons/,\ META-INF/,\ License.txt,\ - freemarker-2.3.8.jar + freemarker-2.3.18.jar Copied: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.18.jar (from rev 33184, trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.8.jar) =================================================================== (Binary files differ) Property changes on: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.18.jar ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Deleted: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.8.jar =================================================================== (Binary files differ) Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/BuiltInFragment.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/BuiltInFragment.java 2011-07-27 19:00:16 UTC (rev 33266) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/BuiltInFragment.java 2011-07-27 19:01:06 UTC (rev 33267) @@ -70,6 +70,9 @@ "if_exists", Boolean.class, null, //$NON-NLS-1$ "has_content", Boolean.class, null, //$NON-NLS-1$ "is_method", Boolean.class, null, //$NON-NLS-1$ + "round", String.class, null, //$NON-NLS-1$ + "floor", String.class, null, //$NON-NLS-1$ + "ceiling", String.class, null, //$NON-NLS-1$ }); addToMap (STRING_BUILT_INS, new Object[]{