diff --git a/images/dark/classfile.svg b/images/dark/classfile.svg deleted file mode 100644 index f391ced7..00000000 --- a/images/dark/classfile.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - diff --git a/images/dark/folder-open.svg b/images/dark/folder-open.svg deleted file mode 100644 index 6365721e..00000000 --- a/images/dark/folder-open.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/images/dark/folder.svg b/images/dark/folder.svg deleted file mode 100644 index e63998df..00000000 --- a/images/dark/folder.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/dark/jar.svg b/images/dark/jar.svg deleted file mode 100644 index 3451f7fe..00000000 --- a/images/dark/jar.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/dark/library.svg b/images/dark/library.svg deleted file mode 100644 index 0994dfae..00000000 --- a/images/dark/library.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/images/dark/package.svg b/images/dark/package.svg deleted file mode 100644 index 144fb8fa..00000000 --- a/images/dark/package.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/dark/packagefolder-open.svg b/images/dark/packagefolder-open.svg deleted file mode 100644 index 9ebfac44..00000000 --- a/images/dark/packagefolder-open.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/images/dark/packagefolder.svg b/images/dark/packagefolder.svg deleted file mode 100644 index 83c15f01..00000000 --- a/images/dark/packagefolder.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/dark/project-open.svg b/images/dark/project-open.svg deleted file mode 100644 index aeffcdd2..00000000 --- a/images/dark/project-open.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - diff --git a/images/dark/project.svg b/images/dark/project.svg deleted file mode 100644 index 9c002c4b..00000000 --- a/images/dark/project.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/file-type-java.svg b/images/file-type-java.svg deleted file mode 100644 index 14121c58..00000000 --- a/images/file-type-java.svg +++ /dev/null @@ -1 +0,0 @@ -file_type_java \ No newline at end of file diff --git a/images/jar_src.png b/images/jar_src.png deleted file mode 100644 index c4b8c12b..00000000 Binary files a/images/jar_src.png and /dev/null differ diff --git a/images/light/classfile.svg b/images/light/classfile.svg deleted file mode 100644 index 030e9967..00000000 --- a/images/light/classfile.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - diff --git a/images/light/folder-open.svg b/images/light/folder-open.svg deleted file mode 100644 index d95bc063..00000000 --- a/images/light/folder-open.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/images/light/folder.svg b/images/light/folder.svg deleted file mode 100644 index 4ab8c359..00000000 --- a/images/light/folder.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/light/jar.svg b/images/light/jar.svg deleted file mode 100644 index 6ef32768..00000000 --- a/images/light/jar.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/light/library.svg b/images/light/library.svg deleted file mode 100644 index decac049..00000000 --- a/images/light/library.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/images/light/package.svg b/images/light/package.svg deleted file mode 100644 index ef5c5d1c..00000000 --- a/images/light/package.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/light/packagefolder-open.svg b/images/light/packagefolder-open.svg deleted file mode 100644 index 56654a9c..00000000 --- a/images/light/packagefolder-open.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/images/light/packagefolder.svg b/images/light/packagefolder.svg deleted file mode 100644 index 3b7e8e12..00000000 --- a/images/light/packagefolder.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/light/project-open.svg b/images/light/project-open.svg deleted file mode 100644 index 7fcab644..00000000 --- a/images/light/project-open.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - diff --git a/images/light/project.svg b/images/light/project.svg deleted file mode 100644 index f620fba6..00000000 --- a/images/light/project.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/root-folder.svg b/images/root-folder.svg deleted file mode 100644 index 0c5b2d53..00000000 --- a/images/root-folder.svg +++ /dev/null @@ -1 +0,0 @@ -default_root_folder \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a186562f..e7ff7d31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1039,7 +1039,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -2451,7 +2452,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -4401,7 +4403,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true }, "liftoff": { @@ -7736,7 +7739,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -9501,7 +9505,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true }, "lcid": { diff --git a/src/extension.ts b/src/extension.ts index 250b4c13..6e5ae1fc 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -3,10 +3,8 @@ import { commands, Extension, ExtensionContext, extensions } from "vscode"; import { dispose as disposeTelemetryWrapper, initializeFromJsonFile, instrumentOperation } from "vscode-extension-telemetry-wrapper"; -import { Commands } from "./commands"; import { LibraryController } from "./controllers/libraryController"; import { ProjectController } from "./controllers/projectController"; -import { Services } from "./services"; import { Settings } from "./settings"; import { DependencyExplorer } from "./views/dependencyExplorer"; @@ -18,7 +16,6 @@ export async function activate(context: ExtensionContext): Promise { function activateExtension(operationId: string, context: ExtensionContext) { commands.executeCommand("setContext", "extensionActivated", true); - Services.initialize(context); Settings.initialize(context); setMavenEnabledContext(); diff --git a/src/services.ts b/src/services.ts deleted file mode 100644 index b79c5745..00000000 --- a/src/services.ts +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT license. - -import { ExtensionContext } from "vscode"; - -export class Services { - public static initialize(context: ExtensionContext) { - this._context = context; - } - - private static _context: ExtensionContext; - - static get context() { - return this._context; - } -} diff --git a/src/views/baseSymbolNode.ts b/src/views/baseSymbolNode.ts index 3308bb8d..8ee30451 100644 --- a/src/views/baseSymbolNode.ts +++ b/src/views/baseSymbolNode.ts @@ -3,14 +3,13 @@ import { Command, DocumentSymbol, Range, SymbolInformation, SymbolKind, ThemeIcon } from "vscode"; import { Commands } from "../commands"; -import { Services } from "../services"; import { ExplorerNode } from "./explorerNode"; import { PrimaryTypeNode } from "./PrimaryTypeNode"; export abstract class BaseSymbolNode extends ExplorerNode { private static _iconMap: Map = new Map([ - [SymbolKind.Package, "namespace"], + [SymbolKind.Package, "package"], [SymbolKind.Class, "class"], [SymbolKind.Interface, "interface"], [SymbolKind.Enum, "enum"], diff --git a/src/views/containerNode.ts b/src/views/containerNode.ts index 27839527..75a8da8d 100644 --- a/src/views/containerNode.ts +++ b/src/views/containerNode.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -import { Uri } from "vscode"; +import { ThemeIcon, Uri } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData, NodeKind } from "../java/nodeData"; import { DataNode } from "./dataNode"; @@ -36,7 +36,7 @@ export class ContainerNode extends DataNode { return `container/${this.name}`; } - protected get iconPath(): { light: string, dark: string } { - return ExplorerNode.resolveIconPath("library"); + protected get iconPath(): ThemeIcon { + return new ThemeIcon("files"); } } diff --git a/src/views/explorerNode.ts b/src/views/explorerNode.ts index da849ab5..a1187d48 100644 --- a/src/views/explorerNode.ts +++ b/src/views/explorerNode.ts @@ -2,17 +2,9 @@ // Licensed under the MIT license. import { Command, ProviderResult, TreeItem } from "vscode"; -import { Services } from "../services"; export abstract class ExplorerNode { - public static resolveIconPath(fileName: string): { light: string; dark: string } { - return { - light: Services.context.asAbsolutePath(`./images/light/${fileName}.svg`), - dark: Services.context.asAbsolutePath(`./images/dark/${fileName}.svg`), - }; - } - constructor(private _parent: ExplorerNode) { } diff --git a/src/views/folderNode.ts b/src/views/folderNode.ts index 504ec533..12605bf1 100644 --- a/src/views/folderNode.ts +++ b/src/views/folderNode.ts @@ -33,6 +33,6 @@ export class FolderNode extends DataNode { } protected get iconPath(): ThemeIcon { - return ExplorerNode.resolveIconPath("folder"); + return new ThemeIcon("folder"); } } diff --git a/src/views/packageNode.ts b/src/views/packageNode.ts index 5d549658..978cf65f 100644 --- a/src/views/packageNode.ts +++ b/src/views/packageNode.ts @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. +import { ThemeIcon } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData, NodeKind } from "../java/nodeData"; import { DataNode } from "./dataNode"; @@ -39,7 +40,7 @@ export class PackageNode extends DataNode { return result; } - protected get iconPath(): { light: string; dark: string } { - return ExplorerNode.resolveIconPath("package"); + protected get iconPath(): ThemeIcon { + return new ThemeIcon("symbol-package"); } } diff --git a/src/views/packageRootNode.ts b/src/views/packageRootNode.ts index 36f6d847..6823faea 100644 --- a/src/views/packageRootNode.ts +++ b/src/views/packageRootNode.ts @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. +import { ThemeIcon } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData, NodeKind } from "../java/nodeData"; import { IPackageRootNodeData, PackageRootKind } from "../java/packageRootNodeData"; @@ -63,12 +64,12 @@ export class PackageRootNode extends DataNode { } } - protected get iconPath(): { light: string; dark: string } { + protected get iconPath(): ThemeIcon { const data = this.nodeData; if (data.entryKind === PackageRootKind.K_BINARY) { - return ExplorerNode.resolveIconPath("jar"); + return new ThemeIcon("file-zip"); } else { - return ExplorerNode.resolveIconPath("packagefolder"); + return new ThemeIcon("file-submodule"); } } } diff --git a/src/views/projectNode.ts b/src/views/projectNode.ts index 01298b0e..4511d133 100644 --- a/src/views/projectNode.ts +++ b/src/views/projectNode.ts @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. +import { ThemeIcon } from "vscode"; import { ContainerEntryKind, IContainerNodeData } from "../java/containerNodeData"; import { Jdtls } from "../java/jdtls"; import { INodeData, NodeKind } from "../java/nodeData"; @@ -65,7 +66,7 @@ export class ProjectNode extends DataNode { return result; } - protected get iconPath(): { light: string; dark: string } { - return ExplorerNode.resolveIconPath("project"); + protected get iconPath(): ThemeIcon { + return new ThemeIcon("project"); } } diff --git a/src/views/workspaceNode.ts b/src/views/workspaceNode.ts index 40a9f191..78fd1085 100644 --- a/src/views/workspaceNode.ts +++ b/src/views/workspaceNode.ts @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. +import { ThemeIcon } from "vscode"; import { Jdtls } from "../java/jdtls"; import { INodeData } from "../java/nodeData"; -import { Services } from "../services"; import { DataNode } from "./dataNode"; import { ExplorerNode } from "./explorerNode"; import { ProjectNode } from "./projectNode"; @@ -27,7 +27,7 @@ export class WorkspaceNode extends DataNode { return result; } - protected get iconPath(): string { - return Services.context.asAbsolutePath("./images/root-folder.svg"); + protected get iconPath(): ThemeIcon { + return new ThemeIcon("root-folder"); } }