From b41bb83a9b48e2d6b4b38179738f1f2cdb7ee392 Mon Sep 17 00:00:00 2001 From: Baas-hub Date: Wed, 27 Jul 2022 20:08:31 +1200 Subject: [PATCH 1/6] Added extra typekinds --- .../tools/apiview/processor/analysers/JavaASTAnalyser.java | 6 +++--- .../com/azure/tools/apiview/processor/model/TypeKind.java | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/analysers/JavaASTAnalyser.java b/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/analysers/JavaASTAnalyser.java index 209d01a54fb..a55fe3a68ef 100644 --- a/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/analysers/JavaASTAnalyser.java +++ b/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/analysers/JavaASTAnalyser.java @@ -278,7 +278,7 @@ private void processSingleFile(ScanClass scanClass) { } private void tokeniseMavenPom(Pom mavenPom) { - apiListing.addChildItem(new ChildItem(MAVEN_KEY, MAVEN_KEY, TypeKind.ASSEMBLY)); + apiListing.addChildItem(new ChildItem(MAVEN_KEY, MAVEN_KEY, TypeKind.MAVEN)); addToken(makeWhitespace()); addToken(new Token(KEYWORD, "maven", MAVEN_KEY), SPACE); @@ -653,7 +653,7 @@ private void getTypeDeclaration(TypeDeclaration typeDeclaration) { } else if (typeDeclaration.isEnumDeclaration()) { typeKind = TypeKind.ENUM; } else if (typeDeclaration.isAnnotationDeclaration()) { - typeKind = TypeKind.INTERFACE; + typeKind = TypeKind.ANNOTATION; } else { typeKind = TypeKind.UNKNOWN; } @@ -1322,7 +1322,7 @@ private class ScanForClassTypeVisitor extends VoidVisitorAdapter arg) { compilationUnit.getModule().ifPresent(moduleDeclaration -> - apiListing.addChildItem(new ChildItem(MODULE_INFO_KEY, MODULE_INFO_KEY, TypeKind.CLASS))); + apiListing.addChildItem(new ChildItem(MODULE_INFO_KEY, MODULE_INFO_KEY, TypeKind.JAVA_MODULE))); for (final TypeDeclaration typeDeclaration : compilationUnit.getTypes()) { buildTypeHierarchyForNavigation(typeDeclaration); diff --git a/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/TypeKind.java b/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/TypeKind.java index 95082b171fa..bd2a9b1feb8 100644 --- a/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/TypeKind.java +++ b/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/TypeKind.java @@ -8,6 +8,10 @@ public enum TypeKind { CLASS("class"), INTERFACE("interface"), ENUM("enum"), + ANNOTATION("annotation"), + JAVA_MODULE("java_module"), + MAVEN("maven"), + GRADLE("gradle"), UNKNOWN("unknown"); private final String name; From 9b2f85693d2ec21b283f54e57514284995ee6c8b Mon Sep 17 00:00:00 2001 From: Baas-hub Date: Sun, 31 Jul 2022 13:06:30 +1200 Subject: [PATCH 2/6] Adding Java-specific typekind icons (#3463) --- .../APIView/APIViewWeb/Client/css/java.scss | 47 ++++++++++++++ .../APIView/APIViewWeb/Client/css/kotlin.scss | 64 +++++++++++++++++++ .../wwwroot/icons/java/common/assembly.svg | 8 +++ .../wwwroot/icons/java/common/gradle.svg | 3 + .../wwwroot/icons/java/common/gradle_dark.svg | 3 + .../wwwroot/icons/java/common/maven.svg | 3 + .../wwwroot/icons/java/common/maven_dark.svg | 3 + .../wwwroot/icons/java/common/module.svg | 12 ++++ .../wwwroot/icons/java/common/module_dark.svg | 12 ++++ .../wwwroot/icons/java/common/package.svg | 9 +++ .../wwwroot/icons/java/common/spring.svg | 3 + .../wwwroot/icons/java/common/unknown.svg | 6 ++ .../icons/java/common/xamarinAndroid.svg | 6 ++ .../wwwroot/icons/java/java/annotation.svg | 6 ++ .../wwwroot/icons/java/java/class.svg | 6 ++ .../wwwroot/icons/java/java/enum.svg | 6 ++ .../wwwroot/icons/java/java/interface.svg | 6 ++ .../wwwroot/icons/java/kotlin/annotation.svg | 9 +++ .../wwwroot/icons/java/kotlin/class.svg | 9 +++ .../wwwroot/icons/java/kotlin/enum.svg | 9 +++ .../wwwroot/icons/java/kotlin/function.svg | 6 ++ .../wwwroot/icons/java/kotlin/interface.svg | 9 +++ .../icons/java/kotlin/kotlinLanguage.svg | 17 +++++ .../wwwroot/icons/java/kotlin/object.svg | 9 +++ .../wwwroot/icons/java/kotlin/property.svg | 7 ++ 25 files changed, 278 insertions(+) create mode 100644 src/dotnet/APIView/APIViewWeb/Client/css/java.scss create mode 100644 src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/assembly.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/gradle.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/gradle_dark.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/maven.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/maven_dark.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/module.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/module_dark.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/package.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/spring.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/unknown.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/xamarinAndroid.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/annotation.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/class.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/enum.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/interface.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/annotation.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/class.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/enum.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/function.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/interface.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/kotlinLanguage.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/object.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/property.svg diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/java.scss b/src/dotnet/APIView/APIViewWeb/Client/css/java.scss new file mode 100644 index 00000000000..9ef3d567de6 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/Client/css/java.scss @@ -0,0 +1,47 @@ +.icon-assembly { + background: url(icons/java/common/assembly.svg) center left no-repeat !important; +} + +.icon-gradle { + background: url(icons/java/common/gradle.svg) center left no-repeat !important; +} + +.icon-maven { + background: url(icons/java/common/maven.svg) center left no-repeat !important; +} + +.icon-package { + background: url(icons/java/common/package.svg) center left no-repeat !important; +} + +.icon-spring { + background: url(icons/java/common/spring.svg) center left no-repeat !important; +} + +.icon-unknown { + background: url(icons/java/common/unknown.svg) center left no-repeat !important; +} + +.icon-xamarinAndroid { + background: url(icons/java/common/xamarinAndroid.svg) center left no-repeat !important; +} + +.icon-annotation { + background: url(icons/java/java/annotation.svg) center left no-repeat !important; +} + +.icon-class { + background: url(icons/java/java/class.svg) center left no-repeat !important; +} + +.icon-enum { + background: url(icons/java/java/enum.svg) center left no-repeat !important; +} + +.icon-interface { + background: url(icons/java/java/interface.svg) center left no-repeat !important; +} + +.icon-java_module { + background: url(icons/java/common/module.svg) center left no-repeat !important; +} diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss b/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss new file mode 100644 index 00000000000..513a249ae24 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss @@ -0,0 +1,64 @@ +.icon-assembly { + background: url(icons/java/common/assembly.svg) center left no-repeat !important; +} + +.icon-gradle { + background: url(icons/java/common/gradle.svg) center left no-repeat !important; +} + +.icon-maven { + background: url(icons/java/common/maven.svg) center left no-repeat !important; +} + +.icon-package { + background: url(icons/java/common/package.svg) center left no-repeat !important; +} + +.icon-spring { + background: url(icons/java/common/spring.svg) center left no-repeat !important; +} + +.icon-unknown { + background: url(icons/java/common/unknown.svg) center left no-repeat !important; +} + +.icon-xamarinAndroid { + background: url(icons/java/common/xamarinAndroid.svg) center left no-repeat !important; +} + +.icon-annotation { + background: url(icons/java/kotlin/annotation.svg) center left no-repeat !important; +} + +.icon-class { + background: url(icons/java/kotlin/class.svg) center left no-repeat !important; +} + +.icon-enum { + background: url(icons/java/kotlin/enum.svg) center left no-repeat !important; +} + +.icon-interface { + background: url(icons/java/kotlin/interface.svg) center left no-repeat !important; +} + +.icon-function { + background: url(icons/java/kotlin/function.svg) center left no-repeat !important; +} + +.icon-kotlinLanguage { + background: url(icons/java/kotlin/kotlinLanguage.svg) center left no-repeat !important; +} + +.icon-object { + background: url(icons/java/kotlin/object.svg) center left no-repeat !important; +} + +.icon-property { + background: url(icons/java/kotlin/property.svg) center left no-repeat !important; +} + +.icon-java_module { + background: url(icons/java/common/module.svg) center left no-repeat !important; +} + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/assembly.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/assembly.svg new file mode 100644 index 00000000000..e873a8efcc1 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/assembly.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/gradle.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/gradle.svg new file mode 100644 index 00000000000..13894b82bd0 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/gradle.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/gradle_dark.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/gradle_dark.svg new file mode 100644 index 00000000000..5f544f95f19 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/gradle_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/maven.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/maven.svg new file mode 100644 index 00000000000..64b06288fac --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/maven.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/maven_dark.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/maven_dark.svg new file mode 100644 index 00000000000..5609dab5fd5 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/maven_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/module.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/module.svg new file mode 100644 index 00000000000..655616d948e --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/module.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/module_dark.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/module_dark.svg new file mode 100644 index 00000000000..559408ecc33 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/module_dark.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/package.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/package.svg new file mode 100644 index 00000000000..624112498a1 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/package.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/spring.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/spring.svg new file mode 100644 index 00000000000..6c09c55e048 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/spring.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/unknown.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/unknown.svg new file mode 100644 index 00000000000..cdcad6ffc40 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/unknown.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/xamarinAndroid.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/xamarinAndroid.svg new file mode 100644 index 00000000000..15c51fc76a2 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/xamarinAndroid.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/annotation.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/annotation.svg new file mode 100644 index 00000000000..ce03c7e5875 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/annotation.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/class.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/class.svg new file mode 100644 index 00000000000..07384f2e1d8 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/class.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/enum.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/enum.svg new file mode 100644 index 00000000000..cccd249eac6 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/enum.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/interface.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/interface.svg new file mode 100644 index 00000000000..5be2baa47db --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/java/interface.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/annotation.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/annotation.svg new file mode 100644 index 00000000000..932f1d3de45 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/annotation.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/class.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/class.svg new file mode 100644 index 00000000000..46a21f65a09 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/class.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/enum.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/enum.svg new file mode 100644 index 00000000000..4a85459683d --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/enum.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/function.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/function.svg new file mode 100644 index 00000000000..954bb48cf0c --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/function.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/interface.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/interface.svg new file mode 100644 index 00000000000..bf07a1488eb --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/interface.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/kotlinLanguage.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/kotlinLanguage.svg new file mode 100644 index 00000000000..baa4493d28e --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/kotlinLanguage.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/object.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/object.svg new file mode 100644 index 00000000000..9f427de413c --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/object.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/property.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/property.svg new file mode 100644 index 00000000000..6287dad8fba --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/kotlin/property.svg @@ -0,0 +1,7 @@ + + + + + + + From d74ac17690f58ec74f68eb03a6fa07ecc054989c Mon Sep 17 00:00:00 2001 From: Baas-hub Date: Mon, 22 Aug 2022 07:59:59 +1200 Subject: [PATCH 3/6] Fixing path issue in scss files --- .../APIView/APIViewWeb/Client/css/java.scss | 24 +++++++------- .../APIView/APIViewWeb/Client/css/kotlin.scss | 32 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/java.scss b/src/dotnet/APIView/APIViewWeb/Client/css/java.scss index 9ef3d567de6..1de3fb98f70 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/java.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/java.scss @@ -1,47 +1,47 @@ .icon-assembly { - background: url(icons/java/common/assembly.svg) center left no-repeat !important; + background: url(/icons/java/common/assembly.svg) center left no-repeat !important; } .icon-gradle { - background: url(icons/java/common/gradle.svg) center left no-repeat !important; + background: url(/icons/java/common/gradle.svg) center left no-repeat !important; } .icon-maven { - background: url(icons/java/common/maven.svg) center left no-repeat !important; + background: url(/icons/java/common/maven.svg) center left no-repeat !important; } .icon-package { - background: url(icons/java/common/package.svg) center left no-repeat !important; + background: url(/icons/java/common/package.svg) center left no-repeat !important; } .icon-spring { - background: url(icons/java/common/spring.svg) center left no-repeat !important; + background: url(/icons/java/common/spring.svg) center left no-repeat !important; } .icon-unknown { - background: url(icons/java/common/unknown.svg) center left no-repeat !important; + background: url(/icons/java/common/unknown.svg) center left no-repeat !important; } .icon-xamarinAndroid { - background: url(icons/java/common/xamarinAndroid.svg) center left no-repeat !important; + background: url(/icons/java/common/xamarinAndroid.svg) center left no-repeat !important; } .icon-annotation { - background: url(icons/java/java/annotation.svg) center left no-repeat !important; + background: url(/icons/java/java/annotation.svg) center left no-repeat !important; } .icon-class { - background: url(icons/java/java/class.svg) center left no-repeat !important; + background: url(/icons/java/java/class.svg) center left no-repeat !important; } .icon-enum { - background: url(icons/java/java/enum.svg) center left no-repeat !important; + background: url(/icons/java/java/enum.svg) center left no-repeat !important; } .icon-interface { - background: url(icons/java/java/interface.svg) center left no-repeat !important; + background: url(/icons/java/java/interface.svg) center left no-repeat !important; } .icon-java_module { - background: url(icons/java/common/module.svg) center left no-repeat !important; + background: url(/icons/java/common/module.svg) center left no-repeat !important; } diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss b/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss index 513a249ae24..f1d1f076578 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss @@ -1,64 +1,64 @@ .icon-assembly { - background: url(icons/java/common/assembly.svg) center left no-repeat !important; + background: url(/icons/java/common/assembly.svg) center left no-repeat !important; } .icon-gradle { - background: url(icons/java/common/gradle.svg) center left no-repeat !important; + background: url(/icons/java/common/gradle.svg) center left no-repeat !important; } .icon-maven { - background: url(icons/java/common/maven.svg) center left no-repeat !important; + background: url(/icons/java/common/maven.svg) center left no-repeat !important; } .icon-package { - background: url(icons/java/common/package.svg) center left no-repeat !important; + background: url(/icons/java/common/package.svg) center left no-repeat !important; } .icon-spring { - background: url(icons/java/common/spring.svg) center left no-repeat !important; + background: url(/icons/java/common/spring.svg) center left no-repeat !important; } .icon-unknown { - background: url(icons/java/common/unknown.svg) center left no-repeat !important; + background: url(/icons/java/common/unknown.svg) center left no-repeat !important; } .icon-xamarinAndroid { - background: url(icons/java/common/xamarinAndroid.svg) center left no-repeat !important; + background: url(/icons/java/common/xamarinAndroid.svg) center left no-repeat !important; } .icon-annotation { - background: url(icons/java/kotlin/annotation.svg) center left no-repeat !important; + background: url(/icons/java/kotlin/annotation.svg) center left no-repeat !important; } .icon-class { - background: url(icons/java/kotlin/class.svg) center left no-repeat !important; + background: url(/icons/java/kotlin/class.svg) center left no-repeat !important; } .icon-enum { - background: url(icons/java/kotlin/enum.svg) center left no-repeat !important; + background: url(/icons/java/kotlin/enum.svg) center left no-repeat !important; } .icon-interface { - background: url(icons/java/kotlin/interface.svg) center left no-repeat !important; + background: url(/icons/java/kotlin/interface.svg) center left no-repeat !important; } .icon-function { - background: url(icons/java/kotlin/function.svg) center left no-repeat !important; + background: url(/icons/java/kotlin/function.svg) center left no-repeat !important; } .icon-kotlinLanguage { - background: url(icons/java/kotlin/kotlinLanguage.svg) center left no-repeat !important; + background: url(/icons/java/kotlin/kotlinLanguage.svg) center left no-repeat !important; } .icon-object { - background: url(icons/java/kotlin/object.svg) center left no-repeat !important; + background: url(/icons/java/kotlin/object.svg) center left no-repeat !important; } .icon-property { - background: url(icons/java/kotlin/property.svg) center left no-repeat !important; + background: url(/icons/java/kotlin/property.svg) center left no-repeat !important; } .icon-java_module { - background: url(icons/java/common/module.svg) center left no-repeat !important; + background: url(/icons/java/common/module.svg) center left no-repeat !important; } From cbcd1aeb95af97dd350dbbf394ae56c94fbd123b Mon Sep 17 00:00:00 2001 From: Baas-hub Date: Mon, 22 Aug 2022 09:35:42 +1200 Subject: [PATCH 4/6] Changes java_module to module and xamarinAndroid to android --- src/dotnet/APIView/APIViewWeb/Client/css/java.scss | 6 +++--- src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss | 6 +++--- .../com/azure/tools/apiview/processor/model/TypeKind.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/java.scss b/src/dotnet/APIView/APIViewWeb/Client/css/java.scss index 1de3fb98f70..e665a52c7ee 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/java.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/java.scss @@ -22,8 +22,8 @@ background: url(/icons/java/common/unknown.svg) center left no-repeat !important; } -.icon-xamarinAndroid { - background: url(/icons/java/common/xamarinAndroid.svg) center left no-repeat !important; +.icon-android { + background: url(/icons/java/common/android.svg) center left no-repeat !important; } .icon-annotation { @@ -42,6 +42,6 @@ background: url(/icons/java/java/interface.svg) center left no-repeat !important; } -.icon-java_module { +.icon-module { background: url(/icons/java/common/module.svg) center left no-repeat !important; } diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss b/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss index f1d1f076578..68b6f721634 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss @@ -22,8 +22,8 @@ background: url(/icons/java/common/unknown.svg) center left no-repeat !important; } -.icon-xamarinAndroid { - background: url(/icons/java/common/xamarinAndroid.svg) center left no-repeat !important; +.icon-android { + background: url(/icons/java/common/android.svg) center left no-repeat !important; } .icon-annotation { @@ -58,7 +58,7 @@ background: url(/icons/java/kotlin/property.svg) center left no-repeat !important; } -.icon-java_module { +.icon-module { background: url(/icons/java/common/module.svg) center left no-repeat !important; } diff --git a/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/TypeKind.java b/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/TypeKind.java index bd2a9b1feb8..c26ee1b1412 100644 --- a/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/TypeKind.java +++ b/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/TypeKind.java @@ -9,7 +9,7 @@ public enum TypeKind { INTERFACE("interface"), ENUM("enum"), ANNOTATION("annotation"), - JAVA_MODULE("java_module"), + MODULE("module"), MAVEN("maven"), GRADLE("gradle"), UNKNOWN("unknown"); From 643fdfdfb51921f1c5c705d37c0a8d63e3090f50 Mon Sep 17 00:00:00 2001 From: Baas-hub Date: Mon, 22 Aug 2022 11:20:15 +1200 Subject: [PATCH 5/6] Remvoing reference to JAVA_MODULE that was missed --- .../tools/apiview/processor/analysers/JavaASTAnalyser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/analysers/JavaASTAnalyser.java b/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/analysers/JavaASTAnalyser.java index a55fe3a68ef..202778ddc7a 100644 --- a/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/analysers/JavaASTAnalyser.java +++ b/src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/analysers/JavaASTAnalyser.java @@ -1322,7 +1322,7 @@ private class ScanForClassTypeVisitor extends VoidVisitorAdapter arg) { compilationUnit.getModule().ifPresent(moduleDeclaration -> - apiListing.addChildItem(new ChildItem(MODULE_INFO_KEY, MODULE_INFO_KEY, TypeKind.JAVA_MODULE))); + apiListing.addChildItem(new ChildItem(MODULE_INFO_KEY, MODULE_INFO_KEY, TypeKind.MODULE))); for (final TypeDeclaration typeDeclaration : compilationUnit.getTypes()) { buildTypeHierarchyForNavigation(typeDeclaration); From 38359309a48f3b6ac23d6922dfc5dee144893b68 Mon Sep 17 00:00:00 2001 From: Baas-hub Date: Mon, 22 Aug 2022 11:36:16 +1200 Subject: [PATCH 6/6] Changing package to namepsace for #3463 --- src/dotnet/APIView/APIViewWeb/Client/css/java.scss | 4 ++-- src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss | 4 ++-- .../APIViewWeb/wwwroot/icons/java/common/android.svg | 6 ++++++ .../APIViewWeb/wwwroot/icons/java/common/namespace.svg | 9 +++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/android.svg create mode 100644 src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/namespace.svg diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/java.scss b/src/dotnet/APIView/APIViewWeb/Client/css/java.scss index e665a52c7ee..8c8cb50a877 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/java.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/java.scss @@ -10,8 +10,8 @@ background: url(/icons/java/common/maven.svg) center left no-repeat !important; } -.icon-package { - background: url(/icons/java/common/package.svg) center left no-repeat !important; +.icon-namespace { + background: url(/icons/java/common/namespace.svg) center left no-repeat !important; } .icon-spring { diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss b/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss index 68b6f721634..7fb601db96c 100644 --- a/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss +++ b/src/dotnet/APIView/APIViewWeb/Client/css/kotlin.scss @@ -10,8 +10,8 @@ background: url(/icons/java/common/maven.svg) center left no-repeat !important; } -.icon-package { - background: url(/icons/java/common/package.svg) center left no-repeat !important; +.icon-namespace { + background: url(/icons/java/common/namespace.svg) center left no-repeat !important; } .icon-spring { diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/android.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/android.svg new file mode 100644 index 00000000000..15c51fc76a2 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/android.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/namespace.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/namespace.svg new file mode 100644 index 00000000000..624112498a1 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/java/common/namespace.svg @@ -0,0 +1,9 @@ + + + + + + + + +