1.1 --- a/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java	Sat Aug 02 12:59:31 2014 +0200
     1.2 +++ b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java	Tue Aug 26 18:13:30 2014 +0200
     1.3 @@ -52,7 +52,7 @@
     1.4  import java.util.List;
     1.5  import net.java.html.js.JavaScriptBody;
     1.6  import net.java.html.js.JavaScriptResource;
     1.7 -import org.apidesign.html.boot.spi.Fn;
     1.8 +import org.netbeans.html.boot.spi.Fn;
     1.9  import org.objectweb.asm.AnnotationVisitor;
    1.10  import org.objectweb.asm.ClassReader;
    1.11  import org.objectweb.asm.ClassVisitor;
    1.12 @@ -292,13 +292,13 @@
    1.13                  super.visitFieldInsn(
    1.14                          Opcodes.GETSTATIC, FindInClass.this.name,
    1.15                          "$$fn$$" + name + "_" + found,
    1.16 -                        "Lorg/apidesign/html/boot/spi/Fn;"
    1.17 +                        "Lorg/netbeans/html/boot/spi/Fn;"
    1.18                  );
    1.19                  super.visitInsn(Opcodes.DUP);
    1.20                  super.visitMethodInsn(
    1.21                          Opcodes.INVOKESTATIC,
    1.22 -                        "org/apidesign/html/boot/spi/Fn", "isValid",
    1.23 -                        "(Lorg/apidesign/html/boot/spi/Fn;)Z"
    1.24 +                        "org/netbeans/html/boot/spi/Fn", "isValid",
    1.25 +                        "(Lorg/netbeans/html/boot/spi/Fn;)Z"
    1.26                  );
    1.27                  Label ifNotNull = new Label();
    1.28                  super.visitJumpInsn(Opcodes.IFNE, ifNotNull);
    1.29 @@ -320,8 +320,8 @@
    1.30                      super.visitInsn(Opcodes.AASTORE);
    1.31                  }
    1.32                  super.visitMethodInsn(Opcodes.INVOKESTATIC,
    1.33 -                        "org/apidesign/html/boot/spi/Fn", "define",
    1.34 -                        "(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/String;)Lorg/apidesign/html/boot/spi/Fn;"
    1.35 +                        "org/netbeans/html/boot/spi/Fn", "define",
    1.36 +                        "(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/String;)Lorg/netbeans/html/boot/spi/Fn;"
    1.37                  );
    1.38                  Label noPresenter = new Label();
    1.39                  if (hasCode) {
    1.40 @@ -332,15 +332,15 @@
    1.41                      super.visitLdcInsn(Type.getObjectType(FindInClass.this.name));
    1.42                      super.visitLdcInsn(resource);
    1.43                      super.visitMethodInsn(Opcodes.INVOKESTATIC,
    1.44 -                            "org/apidesign/html/boot/spi/Fn", "preload",
    1.45 -                            "(Lorg/apidesign/html/boot/spi/Fn;Ljava/lang/Class;Ljava/lang/String;)Lorg/apidesign/html/boot/spi/Fn;"
    1.46 +                            "org/netbeans/html/boot/spi/Fn", "preload",
    1.47 +                            "(Lorg/netbeans/html/boot/spi/Fn;Ljava/lang/Class;Ljava/lang/String;)Lorg/netbeans/html/boot/spi/Fn;"
    1.48                      );
    1.49                  }
    1.50                  super.visitInsn(Opcodes.DUP);
    1.51                  super.visitFieldInsn(
    1.52                          Opcodes.PUTSTATIC, FindInClass.this.name,
    1.53                          "$$fn$$" + name + "_" + found,
    1.54 -                        "Lorg/apidesign/html/boot/spi/Fn;"
    1.55 +                        "Lorg/netbeans/html/boot/spi/Fn;"
    1.56                  );
    1.57                  // end of Fn init
    1.58  
    1.59 @@ -469,7 +469,7 @@
    1.60  
    1.61                  if (fia.wait4js) {
    1.62                      super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
    1.63 -                            "org/apidesign/html/boot/spi/Fn", "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"
    1.64 +                            "org/netbeans/html/boot/spi/Fn", "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"
    1.65                      );
    1.66                      switch (sv.returnType.getSort()) {
    1.67                          case Type.VOID:
    1.68 @@ -496,7 +496,7 @@
    1.69                      }
    1.70                  } else {
    1.71                      super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
    1.72 -                            "org/apidesign/html/boot/spi/Fn", "invokeLater", "(Ljava/lang/Object;[Ljava/lang/Object;)V"
    1.73 +                            "org/netbeans/html/boot/spi/Fn", "invokeLater", "(Ljava/lang/Object;[Ljava/lang/Object;)V"
    1.74                      );
    1.75                      super.visitInsn(Opcodes.RETURN);
    1.76                  }
    1.77 @@ -518,7 +518,7 @@
    1.78                      FindInClass.this.visitField(
    1.79                              Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC,
    1.80                              "$$fn$$" + name + "_" + found,
    1.81 -                            "Lorg/apidesign/html/boot/spi/Fn;",
    1.82 +                            "Lorg/netbeans/html/boot/spi/Fn;",
    1.83                              null, null
    1.84                      );
    1.85                  }