Correct license information for kotlin icon/grammar

spirosbatzio · May 3, 2019 · 672ec8d · 672ec8d
1 parent e9ecefd
commit 672ec8d
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 5 deletions.
diff --git a/java/kotlin.editor/licenseinfo.xml b/java/kotlin.editor/licenseinfo.xml
@@ -23,9 +23,17 @@
 
 <licenseinfo>
     <fileset>
-        <file>src/org/netbeans/modules/kotlin/editor/kotlin16.png</file>
         <file>src/org/netbeans/modules/kotlin/editor/Kotlin.tmLanguage.json</file>
-        <license ref="Apache-2.0-ASF" />
-        <comment type="COMMENT_UNSUPPORTED" />
+        <license ref="Apache-2.0" />
+        <comment type="COMMENT_UNSUPPORTED">Source: https://github.com/vkostyukov/kotlin-sublime-package/blob/ce599a846ac9f86d4671a024d21220ca08e50f66/Kotlin.JSON-tmLanguage</comment>
+    </fileset>
+    <fileset>
+        <file>src/org/netbeans/modules/kotlin/editor/kotlin_file.svg</file>
+        <file>src/org/netbeans/modules/kotlin/editor/kotlin_file.png</file>
+        <file>src/org/netbeans/modules/kotlin/editor/[email protected]</file>
+        <license ref="Apache-2.0" />
+        <comment type="COMMENT_UNSUPPORTED">Source: https://github.com/JetBrains/kotlin/tree/4c674ae27a9b4f53acbf84bda0127c52696d258b/idea/resources/org/jetbrains/kotlin/idea/icons</comment>
+        <notice>Kotlin Compiler
+Copyright 2010-2019 JetBrains s.r.o and respective authors and developers</notice>
     </fileset>
 </licenseinfo>
diff --git a/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/KtDataObject.java b/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/KtDataObject.java
@@ -49,7 +49,7 @@
 )
 @DataObject.Registration(
         mimeType = "text/x-kotlin",
-        iconBase = "org/netbeans/modules/kotlin/editor/kotlin16.png",
+        iconBase = "org/netbeans/modules/kotlin/editor/kotlin_file.png",
         displayName = "#LBL_Kt_LOADER",
         position = 300
 )
@@ -119,7 +119,7 @@ protected int associateLookup() {
 
     @MultiViewElement.Registration(
             displayName = "#LBL_Kt_EDITOR",
-            iconBase = "org/netbeans/modules/kotlin/editor/kotlin16.png",
+            iconBase = "org/netbeans/modules/kotlin/editor/kotlin_file.png",
             mimeType = "text/x-kotlin",
             persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED,
             preferredID = "Kt",

diff --git a/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/kotlin16.png b/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/kotlin16.png
diff --git a/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/kotlin_file.png b/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/kotlin_file.png
diff --git a/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/kotlin_file.svg b/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/kotlin_file.svg
diff --git a/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/[email protected] b/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/[email protected]