define内部类生成错误$

[gyk001]

配置

import.packages = xx.xx, com.google.common.collect

模板

<!-- #define(Map<String, MapDifference.ValueDifference<ColInfo>> differing) -->

生成的java源码

  @Override
  public void render(final JetPageContext $ctx) throws Throwable {
    final JetContext context = $ctx.getContext();
    final JetWriter $out = $ctx.getWriter();
    Map<String,com.google.common.collect.MapDifference$ValueDifference<xx.xx.ColInfo>> differing = (Map<String,com.google.common.collect.MapDifference$ValueDifference<xx.xx.ColInfo>>) context.get("differing"); // line: 1
    $out.print($txt_2, $txt_2_bytes);
    $out.flush();
  }

应该生成 com.google.common.collect.MapDifference.ValueDifference而不是com.google.common.collect.MapDifference$ValueDifference

[subchen]

ClassUtils.getShortClassName() 有问题，修复如下：

public static String getShortClassName(Class<?> klass) {
    if (klass.isPrimitive()) {
        return klass.getName();
    } else {
        String pkg = klass.getPackage().getName();
        if (default_package_set.contains(pkg)) {
            if (klass.isMemberClass()) {
                // 内部类
                return klass.getEnclosingClass().getSimpleName() + "." + klass.getSimpleName();
            } else {
                return klass.getSimpleName();
            }
        } else {
            if (klass.isMemberClass()) {
                // 内部类
                return klass.getEnclosingClass().getName() + "." + klass.getSimpleName();
            } else {
                return klass.getName();
            }
        }
    }
}