diff --git a/MineTweaker3-API/build.gradle b/MineTweaker3-API/build.gradle index b66de55..b98ca70 100644 --- a/MineTweaker3-API/build.gradle +++ b/MineTweaker3-API/build.gradle @@ -22,3 +22,12 @@ dependencies { compile project(':ZenScript') } } + +/*task zendoc(type: Javadoc) { + source = sourceSets.main.allJava + destinationDir = reporting.file("zendocs") + // classpath = files(project.sourceSets*.main*.compileClasspath) + //options.docletpath = configurations.main.files.asType(List) + options.doclet = 'stanhebben.zenscript.docs.ZenScriptDoclet' + options.classpath sourceSets.main.classes +}*/ diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCCraftingInventory.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCCraftingInventory.java index 7c09486..c09ab3b 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCCraftingInventory.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCCraftingInventory.java @@ -72,11 +72,16 @@ public class MCCraftingInventory implements ICraftingInventory { update(); Container container = MineTweakerHacks.getCraftingContainer(inventory); - List slots = container.inventorySlots; - if (!slots.isEmpty() && slots.get(0) instanceof SlotCrafting) { - SlotCrafting slotCrafting = (SlotCrafting) slots.get(0); - playerOrig = MineTweakerHacks.getCraftingSlotPlayer(slotCrafting); - player = new MCPlayer(playerOrig); + if (container != null) { + List slots = container.inventorySlots; + if (!slots.isEmpty() && slots.get(0) instanceof SlotCrafting) { + SlotCrafting slotCrafting = (SlotCrafting) slots.get(0); + playerOrig = MineTweakerHacks.getCraftingSlotPlayer(slotCrafting); + player = new MCPlayer(playerOrig); + } else { + playerOrig = null; + player = null; + } } else { playerOrig = null; player = null; diff --git a/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Canner.java b/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Canner.java index ac29efa..a6a666c 100644 --- a/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Canner.java +++ b/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Canner.java @@ -13,6 +13,7 @@ import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; /** * @@ -21,10 +22,12 @@ import stanhebben.zenscript.annotations.ZenClass; @ZenClass("mods.gregtech.Canner") @ModOnly("gregtech_addon") public class Canner { + @ZenMethod public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int duration, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, null, input1, input2, duration, euPerTick)); } + @ZenMethod public static void addRecipe(IItemStack[] output, IItemStack input1, IItemStack input2, int duration, int euPerTick) { if (output.length == 0) { MineTweakerAPI.logError("canner requires at least 1 output"); diff --git a/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Centrifuge.java b/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Centrifuge.java index 054779c..0154f6e 100644 --- a/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Centrifuge.java +++ b/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Centrifuge.java @@ -14,6 +14,7 @@ import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; /** * @@ -22,6 +23,7 @@ import stanhebben.zenscript.annotations.ZenClass; @ZenClass("mods.gregtech.Centrifuge") @ModOnly("gregtech_addon") public class Centrifuge { + @ZenMethod public static void addRecipe(IItemStack[] outputs, IItemStack input, int cells, int duration) { if (outputs.length < 1) { MineTweakerAPI.logError("centrifuge must have at least 1 output"); @@ -30,6 +32,7 @@ public class Centrifuge { } } + @ZenMethod public static void addRecipeFuelCan(IItemStack[] outputs, IItemStack input, int duration) { if (outputs.length < 1) { MineTweakerAPI.logError("centrifuge must have at least 1 output"); diff --git a/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Extruder.java b/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Extruder.java index 011b596..7f673d0 100644 --- a/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Extruder.java +++ b/MineTweaker3-MC164-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Extruder.java @@ -13,6 +13,7 @@ import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; /** * @@ -21,6 +22,7 @@ import stanhebben.zenscript.annotations.ZenClass; @ZenClass("mods.gregtech.Extruder") @ModOnly("gregtech_addon") public class Extruder { + @ZenMethod public static void addRecipe(IItemStack output, IItemStack input, IItemStack shape, int duration, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, shape, duration, euPerTick)); } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java index 432dff1..8344cfd 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java @@ -74,11 +74,16 @@ public class MCCraftingInventory implements ICraftingInventory { update(); Container container = MineTweakerHacks.getCraftingContainer(inventory); - List slots = container.inventorySlots; - if (!slots.isEmpty() && slots.get(0) instanceof SlotCrafting) { - SlotCrafting slotCrafting = (SlotCrafting) slots.get(0); - playerOrig = MineTweakerHacks.getCraftingSlotPlayer(slotCrafting); - player = getIPlayer(playerOrig); + if (container != null) { + List slots = container.inventorySlots; + if (!slots.isEmpty() && slots.get(0) instanceof SlotCrafting) { + SlotCrafting slotCrafting = (SlotCrafting) slots.get(0); + playerOrig = MineTweakerHacks.getCraftingSlotPlayer(slotCrafting); + player = getIPlayer(playerOrig); + } else { + playerOrig = null; + player = null; + } } else { playerOrig = null; player = null; diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/recipes/MCCraftingInventory.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/recipes/MCCraftingInventory.java index 9ff14c9..cc12df2 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/recipes/MCCraftingInventory.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/recipes/MCCraftingInventory.java @@ -73,11 +73,16 @@ public class MCCraftingInventory implements ICraftingInventory { update(); Container container = MineTweakerHacks.getCraftingContainer(inventory); - List slots = container.inventorySlots; - if (!slots.isEmpty() && slots.get(0) instanceof SlotCrafting) { - SlotCrafting slotCrafting = (SlotCrafting) slots.get(0); - playerOrig = MineTweakerHacks.getCraftingSlotPlayer(slotCrafting); - player = getIPlayer(playerOrig); + if (container != null) { + List slots = container.inventorySlots; + if (!slots.isEmpty() && slots.get(0) instanceof SlotCrafting) { + SlotCrafting slotCrafting = (SlotCrafting) slots.get(0); + playerOrig = MineTweakerHacks.getCraftingSlotPlayer(slotCrafting); + player = getIPlayer(playerOrig); + } else { + playerOrig = null; + player = null; + } } else { playerOrig = null; player = null; diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java index 7d31610..30ed17c 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java @@ -292,12 +292,17 @@ public class ZenTypeNative extends ZenType { } } if (member2 == null) { - return binary( - position, - environment, - value.eval(environment), - new ExpressionString(position, name), - OperatorType.MEMBERGETTER); + if (hasBinary(STRING, OperatorType.MEMBERGETTER)) { + return binary( + position, + environment, + value.eval(environment), + new ExpressionString(position, name), + OperatorType.MEMBERGETTER); + } else { + environment.error(position, "No such member in " + getName() + ": " + name); + return new ExpressionInvalid(position); + } } else { return member2; } @@ -876,6 +881,16 @@ public class ZenTypeNative extends ZenType { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } + private boolean hasBinary(ZenType type, OperatorType operator) { + for (ZenNativeOperator binaryOperator : binaryOperators) { + if (binaryOperator.getOperator() == operator) { + return true; + } + } + + return false; + } + private void compileAnyUnary(String anySignature, OperatorType operator, IEnvironmentMethod environment) { List operators = new ArrayList(); for (ZenNativeOperator unary : this.unaryOperators) { diff --git a/build.gradle b/build.gradle index 04fa11c..1d816c2 100644 --- a/build.gradle +++ b/build.gradle @@ -65,3 +65,48 @@ task assembleMC164(type: Jar, dependsOn: [\ from zipTree(project(':MineTweaker3-MC164-Mod-NEI').jar.archivePath) from zipTree(project(':MineTweaker3-MC164-Mod-GregTech').jar.archivePath) } + +task zendoc164(type: Javadoc) { + source = files(\ + 'MineTweaker3-API/src/main/java', + 'MineTweaker3-MC164-Main/src/main/java', + 'MineTweaker3-MC164-Mod-IC2/src/main/java', + 'MineTweaker3-MC164-Mod-NEI/src/main/java', + 'MineTweaker3-MC164-Mod-GregTech/src/main/java') + destinationDir = file("build/zendoc164") + options.docletpath = [file('buildSrc/build/libs/buildSrc.jar')].asList() + options.doclet = 'stanhebben.zenscript.docs.ZenScriptDoclet' + + def classpathList = [ + project(":ZenScript").jar.archivePath, + project(':MineTweaker3-MC164-Main').jar.archivePath + ] + + for (file in project(':MineTweaker3-MC164-Main').configurations.compile) { + classpathList += file + } + for (file in project(':MineTweaker3-MC164-Mod-IC2').configurations.compile) { + classpathList += file + } + for (file in project(':MineTweaker3-MC164-Mod-GregTech').configurations.compile) { + classpathList += file + } + for (file in project(':MineTweaker3-MC164-Mod-NEI').configurations.compile) { + classpathList += file + } + + options.classpath = classpathList.asList() + //options.baseurl = '/doc/mc164' + options.addStringOption("baseurl", "/doc/mc164/") +} + +task experiment << { + def files = [project(":ZenScript").jar.archivePath] + for (file in project(':MineTweaker3-MC164-Main').configurations.compile) { + files += file + } + + for (file in files) { + print file.toString() + '\n' + } +} diff --git a/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenOperatorDoc.java b/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenOperatorDoc.java index da2dc84..bd50326 100644 --- a/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenOperatorDoc.java +++ b/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenOperatorDoc.java @@ -7,12 +7,32 @@ package stanhebben.zenscript.docs; import com.sun.javadoc.MethodDoc; +import java.util.HashMap; +import java.util.Map; +import static stanhebben.zenscript.docs.ZenOperatorDocType.*; /** * * @author Stan */ public class ZenOperatorDoc { + private static Map TYPES; + + static { + TYPES = new HashMap(); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + TYPES.put("stanhebben.zenscript.annotations.OperatorType.MUL", MUL); + } + private final String operator; private final MethodDoc method; diff --git a/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenOperatorDocType.java b/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenOperatorDocType.java new file mode 100644 index 0000000..29881c6 --- /dev/null +++ b/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenOperatorDocType.java @@ -0,0 +1,43 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +package stanhebben.zenscript.docs; + +/** + * + * @author Stan + */ +public enum ZenOperatorDocType { + ADD("+ %s"), + SUB("- %s"), + MUL("* %s"), + DIV("/ %s"), + MOD("%% %s"), + CAT("~ %s"), + OR("| %s"), + AND("& %s"), + XOR("^ %s"), + NEG("-"), + NOT("~"), + INDEXSET("[%s] = %s"), + INDEXGET("[%s]"), + RANGE(".. %s"), + CONTAINS("%s in"), + COMPARE("compareTo(%s)"), + MEMBERGETTER(".member"), + MEMBERSETTER(".member = %s"), + EQUALS("== %s"); + + private final String pattern; + + private ZenOperatorDocType(String pattern) { + this.pattern = pattern; + } + + public String fill(String... contents) { + return String.format(pattern, (Object[]) contents); + } +} diff --git a/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenScriptDoclet.java b/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenScriptDoclet.java index 84c04e0..ba56afb 100644 --- a/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenScriptDoclet.java +++ b/buildSrc/src/main/java/stanhebben/zenscript/docs/ZenScriptDoclet.java @@ -10,11 +10,13 @@ package stanhebben.zenscript.docs; import com.sun.javadoc.AnnotationDesc; import com.sun.javadoc.ClassDoc; +import com.sun.javadoc.DocErrorReporter; import com.sun.javadoc.LanguageVersion; import com.sun.javadoc.MethodDoc; import com.sun.javadoc.Parameter; import com.sun.javadoc.RootDoc; import com.sun.javadoc.Type; +import com.sun.tools.doclets.standard.Standard; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -37,8 +39,31 @@ import stanhebben.zenscript.util.StringUtil; * * @author Stan Hebben */ -public class ZenScriptDoclet { +public class ZenScriptDoclet extends Standard { + public static boolean validOptions(String[][] strings, DocErrorReporter der) { + return true; + } + + public static int optionLength(String option) { + if(option.equals("-baseurl")) { + return 2; + } + + return Standard.optionLength(option); + } + public static boolean start(RootDoc root) { + File output = new File("zendoc"); + String baseUrl = "/doc/"; + for (String[] options : root.options()) { + //System.out.println(Arrays.toString(options)); + if (options[0].equals("-d")) { + output = new File(options[1]); + } else if (options[0].equals("-baseurl")) { + baseUrl = options[1]; + } + } + ClassDoc[] classes = root.classes(); List documentedClasses = new ArrayList(); List expansionClasses = new ArrayList(); @@ -78,10 +103,10 @@ public class ZenScriptDoclet { } System.out.println("Number of classes to document: " + classesByName.size()); - File output = new File("../../../build/zendoc"); + System.out.println("Output directory: " + output); if (!output.exists()) output.mkdirs(); - String packageList = buildPackageList(documentedClasses); + String packageList = buildPackageList(documentedClasses, baseUrl); for (ZenClassDoc doc : classesByName.values()) { try { @@ -128,7 +153,7 @@ public class ZenScriptDoclet { writer.append(", "); } - outputType(writer, itype, classesByJavaName); + outputType(writer, itype, classesByJavaName, baseUrl); } writer.append(""); } @@ -163,10 +188,10 @@ public class ZenScriptDoclet { ZenParameterDoc paramdoc = new ZenParameterDoc(parameter); writer.append(paramdoc.getName()); writer.append(" as "); - outputType(writer, paramdoc.getType(), classesByJavaName); + outputType(writer, paramdoc.getType(), classesByJavaName, baseUrl); } writer.append(") as "); - outputType(writer, method.returnType(), classesByJavaName); + outputType(writer, method.returnType(), classesByJavaName, baseUrl); writer.append(""); String[] comment = StringUtil.splitParagraphs(method.commentText()); @@ -289,7 +314,106 @@ public class ZenScriptDoclet { } for (ZenExpansionDoc expansion : doc.getExpansions()) { - // TODO + for (MethodDoc method : expansion.getDoc().methods()) { + for (AnnotationDesc annotation : method.annotations()) { + String fullName = annotation.annotationType().qualifiedName(); + + if (fullName.equals("stanhebben.zenscript.annotations.ZenMethod") + || fullName.equals("stanhebben.zenscript.annotations.ZenMethodStatic")) { + String name = annotation.elementValues().length > 0 + ? (String) (annotation.elementValues()[0].value().value()) + : ""; + + if (name.length() == 0) { + name = method.name(); + } + + List parameters = new ArrayList(); + for (Parameter parameter : method.parameters()) { + parameters.add(new ZenParameterDoc(parameter)); + } + + if (fullName.equals("stanhebben.zenscript.annotations.ZenMethodStatic")) { + staticMethods.add(new ZenMethodDoc(name, method, parameters)); + } else { + instanceMethods.add(new ZenMethodDoc(name, method, parameters.subList(1, parameters.size()))); + } + } else if (fullName.equals("stanhebben.zenscript.annotations.ZenGetter")) { + String name = annotation.elementValues().length > 0 + ? (String) (annotation.elementValues()[0].value().value()) + : ""; + + if (name.length() == 0) { + name = method.name(); + } + + Type type = method.returnType(); + String[] comment = StringUtil.splitParagraphs(method.commentText()); + + if (!method.isStatic()) { + if (instanceProperties.containsKey(name)) { + ZenPropertyDoc property = instanceProperties.get(name); + property.setCanGet(true); + property.setComment(comment); + } else { + ZenPropertyDoc property = new ZenPropertyDoc(name, type); + property.setCanGet(true); + property.setComment(comment); + instanceProperties.put(name, property); + } + } else { + if (staticProperties.containsKey(name)) { + ZenPropertyDoc property = staticProperties.get(name); + property.setCanGet(true); + property.setComment(comment); + } else { + ZenPropertyDoc property = new ZenPropertyDoc(name, type); + property.setCanGet(true); + property.setComment(comment); + staticProperties.put(name, property); + } + } + } else if (fullName.equals("stanhebben.zenscript.annotations.ZenSetter")) { + String name = annotation.elementValues().length > 0 + ? (String) (annotation.elementValues()[0].value().value()) + : ""; + + if (name.length() == 0) { + name = method.name(); + } + + Type type = method.parameters()[1].type(); + String[] comment = StringUtil.splitParagraphs(method.commentText()); + + if (!method.isStatic()) { + if (instanceProperties.containsKey(name)) { + ZenPropertyDoc property = instanceProperties.get(name); + property.setCanSet(true); + } else { + ZenPropertyDoc property = new ZenPropertyDoc(name, type); + property.setCanGet(true); + property.setComment(comment); + instanceProperties.put(name, property); + } + } else { + if (staticProperties.containsKey(name)) { + ZenPropertyDoc property = staticProperties.get(name); + property.setCanSet(true); + } else { + ZenPropertyDoc property = new ZenPropertyDoc(name, type); + property.setCanGet(true); + property.setComment(comment); + staticProperties.put(name, property); + } + } + } else if (fullName.equals("stanhebben.zenscript.annotations.ZenOperator")) { + String operator = annotation.elementValues()[0].value().value().toString(); + operators.add(new ZenOperatorDoc(operator, method)); + } else if (fullName.equals("stanhebben.zenscript.annotations.ZenCaster")) { + casters.add(new ZenCasterDoc(method)); + } + } + } } if (!staticProperties.isEmpty()) { @@ -310,7 +434,7 @@ public class ZenScriptDoclet { writer.append(""); writer.append(""); - outputType(writer, property.getType(), classesByJavaName); + outputType(writer, property.getType(), classesByJavaName, baseUrl); writer.append(""); writer.append(""); writer.append("
"); @@ -347,7 +471,7 @@ public class ZenScriptDoclet { writer.append(""); writer.append(""); - outputType(writer, property.getType(), classesByJavaName); + outputType(writer, property.getType(), classesByJavaName, baseUrl); writer.append(""); writer.append(""); writer.append("
"); @@ -375,7 +499,7 @@ public class ZenScriptDoclet { for (ZenMethodDoc method : staticMethods) { writer.append(""); writer.append(""); - outputType(writer, method.getDoc().returnType(), classesByJavaName); + outputType(writer, method.getDoc().returnType(), classesByJavaName, baseUrl); writer.append(""); writer.append(""); writer.append("
"); @@ -393,7 +517,7 @@ public class ZenScriptDoclet { } writer.append(param.getName()); writer.append(" as "); - outputType(writer, param.getType(), classesByJavaName); + outputType(writer, param.getType(), classesByJavaName, baseUrl); } writer.append(")
"); @@ -418,7 +542,7 @@ public class ZenScriptDoclet { for (ZenMethodDoc method : instanceMethods) { writer.append(""); writer.append(""); - outputType(writer, method.getDoc().returnType(), classesByJavaName); + outputType(writer, method.getDoc().returnType(), classesByJavaName, baseUrl); writer.append(""); writer.append(""); writer.append("
"); @@ -436,7 +560,7 @@ public class ZenScriptDoclet { } writer.append(param.getName()); writer.append(" as "); - outputType(writer, param.getType(), classesByJavaName); + outputType(writer, param.getType(), classesByJavaName, baseUrl); } writer.append(")
"); @@ -453,7 +577,31 @@ public class ZenScriptDoclet { } if (!operators.isEmpty()) { - // TODO + writer.append("
"); + writer.append("
Casters
"); + writer.append("
"); + writer.append(""); + + for (ZenOperatorDoc operator : operators) { + writer.append(""); + writer.append(""); + } + + writer.append("
"); + writer.append("");*/ + + writer.append(operator.getOperator()); + + String[] comment = StringUtil.splitParagraphs(operator.getMethod().commentText()); + if (comment.length > 0) { + writer.append("
") + .append(comment[0]) + .append("
"); + } + writer.append("
"); } if (!casters.isEmpty()) { @@ -510,7 +658,7 @@ public class ZenScriptDoclet { return LanguageVersion.JAVA_1_5; } - private static String buildPackageList(List classes) { + private static String buildPackageList(List classes, String baseurl) { // collect package list Map> packages = new HashMap>(); for (ZenClassDoc cls : classes) { @@ -540,7 +688,7 @@ public class ZenScriptDoclet { for (int i = 0; i < packageSorted.length; i++) { String pkgId = extractId(packageSorted[i]); - String pkgDir = "/doc/" + packageSorted[i].replace('.', '/'); + String pkgDir = baseurl + packageSorted[i].replace('.', '/'); output.append("
"); output.append("

"); @@ -612,30 +760,32 @@ public class ZenScriptDoclet { return pkg.replace('.', '-'); } - private static void outputType(Writer output, Type type, Map javaClasses) throws IOException { + private static void outputType(Writer output, Type type, Map javaClasses, String baseUrl) throws IOException { if (javaClasses.containsKey(type.qualifiedTypeName())) { ZenClassDoc doc = javaClasses.get(type.qualifiedTypeName()); output.append(""); output.append(doc.getName().substring(doc.getName().lastIndexOf('.') + 1)); output.append(""); } else if (type.qualifiedTypeName().equals("java.util.List")) { Type base = type.asParameterizedType().typeArguments()[0]; - outputType(output, base, javaClasses); + outputType(output, base, javaClasses, baseUrl); output.append("[]"); } else if (type.qualifiedTypeName().equals("java.util.Map")) { Type key = type.asParameterizedType().typeArguments()[0]; Type value = type.asParameterizedType().typeArguments()[1]; - outputType(output, value, javaClasses); + outputType(output, value, javaClasses, baseUrl); output.append('['); - outputType(output, key, javaClasses); + outputType(output, key, javaClasses, baseUrl); output.append(']'); } else if (type.qualifiedTypeName().equals("java.lang.String")) { output.append("string"); } else { output.append(type.qualifiedTypeName()); } + + output.append(type.dimension()); } private static void outputTypeRaw(Writer output, Type type, Map javaClasses) throws IOException { @@ -660,7 +810,7 @@ public class ZenScriptDoclet { } } - private static String makeLink(String className) { - return "/doc/" + className.replace('.', '/') + ".html"; + private static String makeLink(String className, String baseUrl) { + return baseUrl + className.replace('.', '/') + ".html"; } }