You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2017/09/21 18:08:54 UTC
[09/12] incubator-netbeans-tools git commit: Fixing re-write by
extension.
Fixing re-write by extension.
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-tools/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-tools/commit/7a55d15e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-tools/tree/7a55d15e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans-tools/diff/7a55d15e
Branch: refs/heads/master
Commit: 7a55d15e14e0aa7f06837aab12b44039aafea4b5
Parents: 97838d6
Author: Jan Lahoda <jl...@netbeans.org>
Authored: Sun Sep 17 09:51:15 2017 +0200
Committer: Jan Lahoda <jl...@netbeans.org>
Committed: Sun Sep 17 09:51:15 2017 +0200
----------------------------------------------------------------------
convert/src/convert/CategorizeLicenses.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans-tools/blob/7a55d15e/convert/src/convert/CategorizeLicenses.java
----------------------------------------------------------------------
diff --git a/convert/src/convert/CategorizeLicenses.java b/convert/src/convert/CategorizeLicenses.java
index 42b57cf..9c29d31 100644
--- a/convert/src/convert/CategorizeLicenses.java
+++ b/convert/src/convert/CategorizeLicenses.java
@@ -145,7 +145,7 @@ public class CategorizeLicenses {
String fn = file.getFileName().toString();
String ext = fn.substring(fn.lastIndexOf('.') + 1);
Function<String, Description> preferredConvertor = extension2Convertor.get(ext);
- Description desc = preferredConvertor != null ? preferredConvertor.apply(ext) : null;
+ Description desc = preferredConvertor != null ? preferredConvertor.apply(code) : null;
if (desc == null) {
for (Function<String, Description> convertor : extension2Convertor.values()) {
@@ -157,7 +157,7 @@ public class CategorizeLicenses {
}
}
- return null;
+ return desc;
}
private static Description snipLicense(String code, String commentStart, String commentEnd, String normalizeLines, CommentType commentType) {