diff --git a/vscode-wpilib/resources/webviews/alphaerror.html b/vscode-wpilib/resources/webviews/alphaerror.html deleted file mode 100644 index ad2fa32f..00000000 --- a/vscode-wpilib/resources/webviews/alphaerror.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - WPILib Alpha Installed Error - - - - - - -

- You still have the WPILib Alpha installed. - The alpha install cannot work side by side with this release. - Please uninstall the Alpha from the extensions tab. - This extension is disabled until that is removed. -

- - - - diff --git a/vscode-wpilib/src/extension.ts b/vscode-wpilib/src/extension.ts index 43b6ad50..b7104170 100644 --- a/vscode-wpilib/src/extension.ts +++ b/vscode-wpilib/src/extension.ts @@ -31,7 +31,6 @@ import { ToolAPI } from './toolapi'; import { existsAsync, mkdirpAsync, setExtensionContext, setJavaHome } from './utilities'; import { fireVendorDepsChanged, VendorLibraries } from './vendorlibraries'; import { createVsCommands } from './vscommands'; -import { AlphaError } from './webviews/alphaerror'; import { Gradle2020Import } from './webviews/gradle2020import'; import { Help } from './webviews/help'; import { ProjectCreator } from './webviews/projectcreator'; @@ -325,13 +324,6 @@ export async function activate(context: vscode.ExtensionContext) { // Resources folder is used for gradle template along with HTML files const extensionResourceLocation = path.join(context.extensionPath, 'resources'); - if (vscode.extensions.getExtension('wpifirst.vscode-wpilib') !== undefined) { - const alphaError = await AlphaError.Create(extensionResourceLocation); - alphaError.displayPage(); - context.subscriptions.push(alphaError); - return; - } - // The external API can be used by other extensions that want to use our // functionality. Its definition is provided in shared/externalapi.ts. // That file can be copied to another project. diff --git a/vscode-wpilib/src/webviews/alphaerror.ts b/vscode-wpilib/src/webviews/alphaerror.ts deleted file mode 100644 index 38010567..00000000 --- a/vscode-wpilib/src/webviews/alphaerror.ts +++ /dev/null @@ -1,25 +0,0 @@ -'use strict'; -import * as path from 'path'; -import * as vscode from 'vscode'; -import { extensionContext } from '../utilities'; -import { WebViewBase } from './webviewbase'; - -export class AlphaError extends WebViewBase { - public static async Create(resourceRoot: string): Promise { - const help = new AlphaError(resourceRoot); - await help.asyncInitialize(); - return help; - } - - private constructor(resourceRoot: string) { - super('alphaerror', 'WPILib Alpha Error', resourceRoot); - } - - public displayPage() { - this.displayWebView(vscode.ViewColumn.Active); - } - - private async asyncInitialize() { - await this.loadWebpage(path.join(extensionContext.extensionPath, 'resources', 'webviews', 'alphaerror.html')); - } -}