Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 32571200C69 for ; Sat, 22 Apr 2017 08:08:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 31386160BB5; Sat, 22 Apr 2017 06:08:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4804A160BAF for ; Sat, 22 Apr 2017 08:08:50 +0200 (CEST) Received: (qmail 85406 invoked by uid 500); 22 Apr 2017 06:08:49 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 85372 invoked by uid 99); 22 Apr 2017 06:08:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Apr 2017 06:08:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5E387F49F5; Sat, 22 Apr 2017 06:08:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulk@apache.org To: commits@groovy.apache.org Date: Sat, 22 Apr 2017 06:08:50 -0000 Message-Id: <82620dd485ae4239b8ed3e5cab3eabfa@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/6] groovy git commit: minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map} instead of Hash{Set|Map} archived-at: Sat, 22 Apr 2017 06:08:51 -0000 minor refactor: groovydoc will be more reproducible using LinkedHash{Set|Map} instead of Hash{Set|Map} Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8d0cf4e9 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8d0cf4e9 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8d0cf4e9 Branch: refs/heads/GROOVY_2_5_X Commit: 8d0cf4e90e0e4a3c24d4e4f7df61eb2fb24329d3 Parents: e802f6f Author: paulk Authored: Sat Apr 22 07:28:26 2017 +1000 Committer: paulk Committed: Sat Apr 22 16:08:27 2017 +1000 ---------------------------------------------------------------------- .../tools/groovydoc/GroovyDocTemplateEngine.java | 14 +++++++------- .../groovy/tools/groovydoc/MockOutputTool.java | 8 ++++---- .../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 14 +++++++------- .../groovydoc/SimpleGroovyClassDocAssembler.java | 8 ++++---- .../groovy/tools/groovydoc/SimpleGroovyRootDoc.java | 8 ++++---- 5 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/8d0cf4e9/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java index 07f7119..ce63ed5 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java @@ -32,8 +32,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Arrays; -import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Properties; @@ -66,9 +66,9 @@ public class GroovyDocTemplateEngine { this.docTemplatePaths = Arrays.asList(docTemplates); this.packageTemplatePaths = Arrays.asList(packageTemplates); this.classTemplatePaths = Arrays.asList(classTemplates); - this.docTemplates = new HashMap(); - this.packageTemplates = new HashMap(); - this.classTemplates = new HashMap(); + this.docTemplates = new LinkedHashMap(); + this.packageTemplates = new LinkedHashMap(); + this.classTemplates = new LinkedHashMap(); engine = new GStringTemplateEngine(); } @@ -82,7 +82,7 @@ public class GroovyDocTemplateEngine { t = engine.createTemplate(resourceManager.getReader(templatePath)); classTemplates.put(templatePath, t); } - Map binding = new HashMap(); + Map binding = new LinkedHashMap(); binding.put("classDoc", classDoc); binding.put("props", properties); templateWithBindingApplied = t.make(binding).toString(); @@ -101,7 +101,7 @@ public class GroovyDocTemplateEngine { t = engine.createTemplate(resourceManager.getReader(template)); packageTemplates.put(template, t); } - Map binding = new HashMap(); + Map binding = new LinkedHashMap(); binding.put("packageDoc", packageDoc); binding.put("props", properties); templateWithBindingApplied = t.make(binding).toString(); @@ -120,7 +120,7 @@ public class GroovyDocTemplateEngine { t = engine.createTemplate(resourceManager.getReader(template)); docTemplates.put(template, t); } - Map binding = new HashMap(); + Map binding = new LinkedHashMap(); binding.put("rootDoc", rootDoc); binding.put("props", properties); templateWithBindingApplied = t.make(binding).toString(); http://git-wip-us.apache.org/repos/asf/groovy/blob/8d0cf4e9/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java index 0a384cf..260485d 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java @@ -18,8 +18,8 @@ */ package org.codehaus.groovy.tools.groovydoc; -import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -28,8 +28,8 @@ public class MockOutputTool implements OutputTool { Map output; public MockOutputTool() { - outputAreas = new HashSet(); - output = new HashMap(); + outputAreas = new LinkedHashSet(); + output = new LinkedHashMap(); } public void makeOutputArea(String filename) { http://git-wip-us.apache.org/repos/asf/groovy/blob/8d0cf4e9/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java index a55aae8..f81f08e 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java @@ -40,7 +40,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp public static final Pattern NAME_ARGS_REGEX = Pattern.compile("([^(]+)\\(([^)]*)\\)"); public static final Pattern SPLIT_ARGS_REGEX = Pattern.compile(",\\s*"); private static final List PRIMITIVES = Arrays.asList("void", "boolean", "byte", "short", "char", "int", "long", "float", "double"); - private static final Map TAG_TEXT = new HashMap(); + private static final Map TAG_TEXT = new LinkedHashMap(); static { TAG_TEXT.put("see", "See Also"); TAG_TEXT.put("param", "Parameters"); @@ -91,7 +91,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp } public SimpleGroovyClassDoc(List importedClassesAndPackages, String name) { - this(importedClassesAndPackages, new HashMap(), name, new ArrayList()); + this(importedClassesAndPackages, new LinkedHashMap(), name, new ArrayList()); } /** @@ -249,13 +249,13 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp } public Set getParentInterfaces() { - Set result = new HashSet(); + Set result = new LinkedHashSet(); result.add(this); - Set next = new HashSet(); + Set next = new LinkedHashSet(); next.addAll(Arrays.asList(this.interfaces())); while (!next.isEmpty()) { Set temp = next; - next = new HashSet(); + next = new LinkedHashSet(); for (GroovyClassDoc t : temp) { if (t instanceof SimpleGroovyClassDoc) { next.addAll(((SimpleGroovyClassDoc)t).getParentInterfaces()); @@ -271,7 +271,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp } private Set getJavaInterfaces(ExternalGroovyClassDoc d) { - Set result = new HashSet(); + Set result = new LinkedHashSet(); Class[] interfaces = d.externalClass().getInterfaces(); if (interfaces != null) { for (Class i : interfaces) { @@ -858,7 +858,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp Matcher matcher = regex.matcher(self + "@endMarker"); if (matcher.find()) { matcher.reset(); - Map> savedTags = new HashMap>(); + Map> savedTags = new LinkedHashMap>(); StringBuffer sb = new StringBuffer(); while (matcher.find()) { String tagname = matcher.group(1); http://git-wip-us.apache.org/repos/asf/groovy/blob/8d0cf4e9/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java index 7439ea7..678f2e3 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java @@ -59,7 +59,7 @@ public class SimpleGroovyClassDocAssembler extends VisitorAdapter implements Gro this.isGroovy = isGroovy; stack = new Stack(); - classDocs = new HashMap(); + classDocs = new LinkedHashMap(); if (file != null) { // todo: replace this simple idea of default class name int idx = file.lastIndexOf("."); @@ -70,7 +70,7 @@ public class SimpleGroovyClassDocAssembler extends VisitorAdapter implements Gro deferSetup = packagePath.equals("DefaultPackage"); importedClassesAndPackages = new ArrayList(); - aliases = new HashMap(); + aliases = new LinkedHashMap(); if (!deferSetup) setUpImports(packagePath, links, isGroovy, className); lastLineCol = new LineColumn(1, 1); } @@ -128,7 +128,7 @@ public class SimpleGroovyClassDocAssembler extends VisitorAdapter implements Gro if (parent != null && isNested() && !insideAnonymousInnerClass()) { className = parent.name() + "." + className; } else { - foundClasses = new HashMap(); + foundClasses = new LinkedHashMap(); } SimpleGroovyClassDoc current = (SimpleGroovyClassDoc) classDocs.get(packagePath + FS + className); if (current == null) { @@ -273,7 +273,7 @@ public class SimpleGroovyClassDocAssembler extends VisitorAdapter implements Gro } classDocs.put(currentClassDoc.getFullPathName(), currentClassDoc); if (foundClasses == null) { - foundClasses = new HashMap(); + foundClasses = new LinkedHashMap(); } foundClasses.put(className, currentClassDoc); } http://git-wip-us.apache.org/repos/asf/groovy/blob/8d0cf4e9/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java index 9ba010f..7c9c172 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java @@ -24,7 +24,7 @@ import org.codehaus.groovy.groovydoc.GroovyRootDoc; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -37,8 +37,8 @@ public class SimpleGroovyRootDoc extends SimpleGroovyDoc implements GroovyRootDo public SimpleGroovyRootDoc(String name) { super(name); - packageDocs = new HashMap(); - classDocs = new HashMap(); + packageDocs = new LinkedHashMap(); + classDocs = new LinkedHashMap(); } public GroovyClassDoc classNamed(GroovyClassDoc groovyClassDoc, String name) { @@ -119,7 +119,7 @@ public class SimpleGroovyRootDoc extends SimpleGroovyDoc implements GroovyRootDo } public Map getVisibleClasses(List importedClassesAndPackages) { - Map visibleClasses = new HashMap(); + Map visibleClasses = new LinkedHashMap(); for (String fullClassName : classDocs.keySet()) { String equivalentPackageImport = fullClassName.replaceAll("[^/]+$", "*"); if (importedClassesAndPackages.contains(fullClassName) ||