From b56f399da8f6956b60c686033cd648496185c1cd Mon Sep 17 00:00:00 2001 From: Vladimir Piskarev Date: Wed, 12 Apr 2023 11:59:32 +0300 Subject: [PATCH 1/6] Fix memory leak in plugin tree views (#12353) Fixes a bug in `TreeViewExtImpl.getChildren(parentId: string)`, where newly created top-level children were added to the old root node instead of the new one. This caused a memory leak by retaining an implicit reference to the old root node from the new one and failing to properly track and, hence, dispose the top-level children. The fix ensures that old nodes get disposed and become subject to garbage collection by reusing the single root node instead of creating a new one on full refresh. See https://github.com/eclipse-theia/theia/issues/10404#issuecomment-1481293316 for more information. Fixes #10404. --- packages/plugin-ext/src/plugin/tree/tree-views.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/plugin-ext/src/plugin/tree/tree-views.ts b/packages/plugin-ext/src/plugin/tree/tree-views.ts index 74f34f7f1dccc..11715b0cee801 100644 --- a/packages/plugin-ext/src/plugin/tree/tree-views.ts +++ b/packages/plugin-ext/src/plugin/tree/tree-views.ts @@ -389,7 +389,7 @@ class TreeViewExtImpl implements Disposable { } async getChildren(parentId: string): Promise { - const parentNode = this.nodes.get(parentId); + let parentNode = this.nodes.get(parentId); const parent = parentNode?.value; if (parentId && !parent) { console.error(`No tree item with id '${parentId}' found.`); @@ -398,9 +398,10 @@ class TreeViewExtImpl implements Disposable { this.clearChildren(parentNode); // place root in the cache - if (parentId === '') { + if (parentId === '' && !parentNode) { const rootNodeDisposables = new DisposableCollection(); - this.nodes.set(parentId, { id: '', disposables: rootNodeDisposables, dispose: () => { rootNodeDisposables.dispose(); } }); + parentNode = { id: '', disposables: rootNodeDisposables, dispose: () => { rootNodeDisposables.dispose(); } }; + this.nodes.set(parentId, parentNode); } // ask data provider for children for cached element const result = await this.options.treeDataProvider.getChildren(parent); From c33553806b7dc3d17d4a820627104280bc84ab3a Mon Sep 17 00:00:00 2001 From: Philip Langer Date: Wed, 5 Apr 2023 18:13:16 +0200 Subject: [PATCH 2/6] playwright: add page object for terminal xterm uses a canvas to show the terminal contents. Thus, we use a workaround of selecting all contents and copying into the clipboard to read the output of the terminal. Contributed on behalf of STMicroelectronics Change-Id: I2840425ced9dfebf24f97b4302b44d73a6c9741c --- examples/playwright/playwright.config.ts | 5 +- .../src/tests/theia-terminal-view.test.ts | 85 +++++++++++++++++++ examples/playwright/src/theia-app.ts | 38 ++++++++- examples/playwright/src/theia-terminal.ts | 69 +++++++++++++++ 4 files changed, 194 insertions(+), 3 deletions(-) create mode 100644 examples/playwright/src/tests/theia-terminal-view.test.ts create mode 100644 examples/playwright/src/theia-terminal.ts diff --git a/examples/playwright/playwright.config.ts b/examples/playwright/playwright.config.ts index 598183b8eb747..4f4a48a3ba7da 100644 --- a/examples/playwright/playwright.config.ts +++ b/examples/playwright/playwright.config.ts @@ -1,5 +1,5 @@ // ***************************************************************************** -// Copyright (C) 2021 logi.cals GmbH, EclipseSource and others. +// Copyright (C) 2021-2023 logi.cals GmbH, EclipseSource and others. // // This program and the accompanying materials are made available under the // terms of the Eclipse Public License v. 2.0 which is available at @@ -31,7 +31,8 @@ export default defineConfig({ baseURL: 'http://localhost:3000', browserName: 'chromium', screenshot: 'only-on-failure', - viewport: { width: 1920, height: 1080 } + permissions: ['clipboard-read'], + viewport: { width: 1920, height: 1080 }, }, snapshotDir: './src/tests/snapshots', expect: { diff --git a/examples/playwright/src/tests/theia-terminal-view.test.ts b/examples/playwright/src/tests/theia-terminal-view.test.ts new file mode 100644 index 0000000000000..fce2883f9b662 --- /dev/null +++ b/examples/playwright/src/tests/theia-terminal-view.test.ts @@ -0,0 +1,85 @@ +// ***************************************************************************** +// Copyright (C) 2023 EclipseSource and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// http://www.eclipse.org/legal/epl-2.0. +// +// This Source Code may also be made available under the following Secondary +// Licenses when the conditions for such availability set forth in the Eclipse +// Public License v. 2.0 are satisfied: GNU General Public License, version 2 +// with the GNU Classpath Exception which is available at +// https://www.gnu.org/software/classpath/license.html. +// +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +// ***************************************************************************** + +import { expect } from '@playwright/test'; +import { TheiaApp } from '../theia-app'; +import { TheiaWorkspace } from '../theia-workspace'; +import test, { page } from './fixtures/theia-fixture'; +import { TheiaTerminal } from '../theia-terminal'; + +let app: TheiaApp; + +test.describe('Theia Terminal View', () => { + + test.beforeAll(async () => { + const ws = new TheiaWorkspace(['src/tests/resources/sample-files1']); + app = await TheiaApp.load(page, ws); + }); + + test('should be possible to open a new terminal', async () => { + const terminal = await app.openTerminal(TheiaTerminal); + expect(await terminal.isTabVisible()).toBe(true); + expect(await terminal.isDisplayed()).toBe(true); + expect(await terminal.isActive()).toBe(true); + }); + + test('should be possible to open two terminals, switch among them, and close them', async () => { + const terminal1 = await app.openTerminal(TheiaTerminal); + const terminal2 = await app.openTerminal(TheiaTerminal); + const allTerminals = [terminal1, terminal2]; + + // all terminal tabs should be visible + for (const terminal of allTerminals) { + expect(await terminal.isTabVisible()).toBe(true); + } + + // activate one terminal after the other and check that only this terminal is active + for (const terminal of allTerminals) { + await terminal.activate(); + expect(await terminal1.isActive()).toBe(terminal1 === terminal); + expect(await terminal2.isActive()).toBe(terminal2 === terminal); + } + + // close all terminals + for (const terminal of allTerminals) { + await terminal.close(); + } + + // check that all terminals are closed + for (const terminal of allTerminals) { + expect(await terminal.isTabVisible()).toBe(false); + } + }); + + test('should allow to write and read terminal contents', async () => { + const terminal = await app.openTerminal(TheiaTerminal); + await terminal.write('hello'); + const contents = await terminal.contents(); + expect(contents).toContain('hello'); + }); + + test('should allow to submit a command and read output', async () => { + const terminal = await app.openTerminal(TheiaTerminal); + if (process.platform === 'win32') { + await terminal.submit('dir'); + } else { + await terminal.submit('ls'); + } + const contents = await terminal.contents(); + expect(contents).toContain('sample.txt'); + }); + +}); diff --git a/examples/playwright/src/theia-app.ts b/examples/playwright/src/theia-app.ts index 00ccf3bbcc33d..5cb93716de39d 100644 --- a/examples/playwright/src/theia-app.ts +++ b/examples/playwright/src/theia-app.ts @@ -1,5 +1,5 @@ // ***************************************************************************** -// Copyright (C) 2021 logi.cals GmbH, EclipseSource and others. +// Copyright (C) 2021-2023 logi.cals GmbH, EclipseSource and others. // // This program and the accompanying materials are made available under the // terms of the Eclipse Public License v. 2.0 which is available at @@ -21,6 +21,7 @@ import { TheiaMenuBar } from './theia-main-menu'; import { TheiaPreferenceScope, TheiaPreferenceView } from './theia-preference-view'; import { TheiaQuickCommandPalette } from './theia-quick-command-palette'; import { TheiaStatusBar } from './theia-status-bar'; +import { TheiaTerminal } from './theia-terminal'; import { TheiaView } from './theia-view'; import { TheiaWorkspace } from './theia-workspace'; @@ -147,6 +148,41 @@ export class TheiaApp { return editor; } + async openTerminal(terminalFactory: { new(id: string, app: TheiaApp): T }): Promise { + const mainMenu = await this.menuBar.openMenu('Terminal'); + const menuItem = await mainMenu.menuItemByName('New Terminal'); + if (!menuItem) { + throw Error('Menu item \'New Terminal\' could not be found.'); + } + + const newTabIds = await this.runAndWaitForNewTabs(() => menuItem.click()); + if (newTabIds.length > 1) { + console.warn('More than one new tab detected after opening the terminal'); + } + + return new terminalFactory(newTabIds[0], this); + } + + protected async runAndWaitForNewTabs(command: () => Promise): Promise { + const tabIdsBefore = await this.visibleTabIds(); + await command(); + return (await this.waitForNewTabs(tabIdsBefore)).filter(item => !tabIdsBefore.includes(item)); + } + + protected async waitForNewTabs(tabIds: string[]): Promise { + let tabIdsCurrent: string[]; + while ((tabIdsCurrent = (await this.visibleTabIds())).length <= tabIds.length) { + console.debug('Awaiting a new tab to appear'); + } + return tabIdsCurrent; + } + + protected async visibleTabIds(): Promise { + const tabs = await this.page.$$('.p-TabBar-tab'); + const tabIds = (await Promise.all(tabs.map(tab => tab.getAttribute('id')))).filter(id => !!id); + return tabIds as string[]; + } + /** Specific Theia apps may add additional conditions to wait for. */ async waitForInitialized(): Promise { // empty by default diff --git a/examples/playwright/src/theia-terminal.ts b/examples/playwright/src/theia-terminal.ts new file mode 100644 index 0000000000000..18d874393ff77 --- /dev/null +++ b/examples/playwright/src/theia-terminal.ts @@ -0,0 +1,69 @@ +// ***************************************************************************** +// Copyright (C) 2023 EclipseSource and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// http://www.eclipse.org/legal/epl-2.0. +// +// This Source Code may also be made available under the following Secondary +// Licenses when the conditions for such availability set forth in the Eclipse +// Public License v. 2.0 are satisfied: GNU General Public License, version 2 +// with the GNU Classpath Exception which is available at +// https://www.gnu.org/software/classpath/license.html. +// +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +// ***************************************************************************** + +import { ElementHandle } from '@playwright/test'; +import { TheiaApp } from './theia-app'; +import { TheiaContextMenu } from './theia-context-menu'; +import { TheiaMenu } from './theia-menu'; +import { TheiaView } from './theia-view'; + +export class TheiaTerminal extends TheiaView { + + constructor(tabId: string, app: TheiaApp) { + super({ + tabSelector: `#shell-tab-terminal-${getTerminalId(tabId)}`, + viewSelector: `#terminal-${getTerminalId(tabId)}` + }, app); + } + + async submit(text: string): Promise { + await this.write(text); + const input = await this.waitForInputArea(); + await input.press('Enter'); + } + + async write(text: string): Promise { + await this.activate(); + const input = await this.waitForInputArea(); + await input.type(text); + } + + async contents(): Promise { + await this.activate(); + await (await this.openContextMenu()).clickMenuItem('Select All'); + await (await this.openContextMenu()).clickMenuItem('Copy'); + return this.page.evaluate('navigator.clipboard.readText()'); + } + + protected async openContextMenu(): Promise { + await this.activate(); + return TheiaContextMenu.open(this.app, () => this.waitForVisibleView()); + } + + protected async waitForInputArea(): Promise> { + const view = await this.waitForVisibleView(); + return view.waitForSelector('.xterm-helper-textarea'); + } + + protected async waitForVisibleView(): Promise> { + return this.page.waitForSelector(this.viewSelector, { state: 'visible' }); + } + +} + +function getTerminalId(tabId: string): string { + return tabId.substring(tabId.lastIndexOf('-') + 1); +} From 4c8f76d165acc646b28c930eb2e43bcc5b44d347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Thu, 13 Apr 2023 11:36:34 +0200 Subject: [PATCH 3/6] Introduce Dynamic Tab Resizing Strategy (#12360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Introduce dynamic tab resizing strategy Part of #12328 Contributed on behalf of STMicroelectronics Signed-off-by: Thomas Mäder --- CHANGELOG.md | 5 ++ packages/core/src/browser/core-preferences.ts | 20 +++++ .../src/browser/shell/application-shell.ts | 22 ++++- packages/core/src/browser/shell/tab-bars.ts | 89 +++++++++++++++++-- packages/core/src/browser/style/tabs.css | 9 ++ 5 files changed, 135 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45b18af58b9cb..2f7e5301e7605 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ ## History - [Previous Changelogs](https://github.com/eclipse-theia/theia/tree/master/doc/changelogs/) +## v1.37.0 0 - + +[Breaking Changes:](#breaking_changes_1.37.0) +- [core] Inject core preference into `DockPanelRenderer` constructor [12360](https://github.com/eclipse-theia/theia/pull/12360) +- [core] Introduced `ScrollableTabBar.updateTabs()` to fully render tabs [12360](https://github.com/eclipse-theia/theia/pull/12360) ## v1.36.0 0 - 03/30/2023 diff --git a/packages/core/src/browser/core-preferences.ts b/packages/core/src/browser/core-preferences.ts index f6b77dcbc42ef..526e94eba4292 100644 --- a/packages/core/src/browser/core-preferences.ts +++ b/packages/core/src/browser/core-preferences.ts @@ -232,6 +232,23 @@ export const corePreferenceSchema: PreferenceSchema = { type: 'boolean', default: false, description: nls.localize('theia/core/tabMaximize', 'Controls whether to maximize tabs on double click.') + }, + 'workbench.tab.shrinkToFit.enabled': { + type: 'boolean', + default: false, + description: nls.localize('theia/core/tabShrinkToFit', 'Shrink tabs to fit available space.') + }, + 'workbench.tab.shrinkToFit.minimumSize': { + type: 'number', + default: 50, + minimum: 10, + description: nls.localize('theia/core/tabMinimumSize', 'Specifies the minimum size for tabs.') + }, + 'workbench.tab.shrinkToFit.defaultSize': { + type: 'number', + default: 200, + minimum: 10, + description: nls.localize('theia/core/tabDefaultSize', 'Specifies the default size for tabs.') } } }; @@ -259,6 +276,9 @@ export interface CoreConfiguration { 'workbench.sash.hoverDelay': number; 'workbench.sash.size': number; 'workbench.tab.maximize': boolean; + 'workbench.tab.shrinkToFit.enabled': boolean; + 'workbench.tab.shrinkToFit.minimumSize': number; + 'workbench.tab.shrinkToFit.defaultSize': number; } export const CorePreferenceContribution = Symbol('CorePreferenceContribution'); diff --git a/packages/core/src/browser/shell/application-shell.ts b/packages/core/src/browser/shell/application-shell.ts index bb58e2ad4ed7d..4139e23a842d7 100644 --- a/packages/core/src/browser/shell/application-shell.ts +++ b/packages/core/src/browser/shell/application-shell.ts @@ -96,6 +96,7 @@ export class DockPanelRenderer implements DockLayout.IRenderer { @inject(TabBarToolbarRegistry) protected readonly tabBarToolbarRegistry: TabBarToolbarRegistry, @inject(TabBarToolbarFactory) protected readonly tabBarToolbarFactory: TabBarToolbarFactory, @inject(BreadcrumbsRendererFactory) protected readonly breadcrumbsRendererFactory: BreadcrumbsRendererFactory, + @inject(CorePreferences) protected readonly corePreferences: CorePreferences ) { } get onDidCreateTabBar(): CommonEvent> { @@ -103,6 +104,17 @@ export class DockPanelRenderer implements DockLayout.IRenderer { } createTabBar(): TabBar { + const getDynamicTabOptions: () => ScrollableTabBar.Options | undefined = () => { + if (this.corePreferences.get('workbench.tab.shrinkToFit.enabled')) { + return { + minimumTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.minimumSize'), + defaultTabSize: this.corePreferences.get('workbench.tab.shrinkToFit.defaultSize') + }; + } else { + return undefined; + } + }; + const renderer = this.tabBarRendererFactory(); const tabBar = new ToolbarAwareTabBar( this.tabBarToolbarRegistry, @@ -115,12 +127,20 @@ export class DockPanelRenderer implements DockLayout.IRenderer { useBothWheelAxes: true, scrollXMarginOffset: 4, suppressScrollY: true - }); + }, + getDynamicTabOptions()); this.tabBarClasses.forEach(c => tabBar.addClass(c)); renderer.tabBar = tabBar; tabBar.disposed.connect(() => renderer.dispose()); renderer.contextMenuPath = SHELL_TABBAR_CONTEXT_MENU; tabBar.currentChanged.connect(this.onCurrentTabChanged, this); + this.corePreferences.onPreferenceChanged(change => { + if (change.preferenceName === 'workbench.tab.shrinkToFit.enabled' || + change.preferenceName === 'workbench.tab.shrinkToFit.minimumSize' || + change.preferenceName === 'workbench.tab.shrinkToFit.defaultSize') { + tabBar.dynamicTabOptions = getDynamicTabOptions(); + } + }); this.onDidCreateTabBarEmitter.fire(tabBar); return tabBar; } diff --git a/packages/core/src/browser/shell/tab-bars.ts b/packages/core/src/browser/shell/tab-bars.ts index 6d3faade9659c..6c5695584c6b2 100644 --- a/packages/core/src/browser/shell/tab-bars.ts +++ b/packages/core/src/browser/shell/tab-bars.ts @@ -67,6 +67,10 @@ export interface SideBarRenderData extends TabBar.IRenderData { paddingBottom?: number; } +export interface ScrollableRenderData extends TabBar.IRenderData { + tabWidth?: number; +} + /** * A tab bar renderer that offers a context menu. In addition, this renderer is able to * set an explicit position and size on the icon and label of each tab in a side bar. @@ -204,11 +208,12 @@ export class TabBarRenderer extends TabBar.Renderer { * If size information is available for the label and icon, set an explicit height on the tab. * The height value also considers padding, which should be derived from CSS settings. */ - override createTabStyle(data: SideBarRenderData): ElementInlineStyle { + override createTabStyle(data: SideBarRenderData & ScrollableRenderData): ElementInlineStyle { const zIndex = `${data.zIndex}`; const labelSize = data.labelSize; const iconSize = data.iconSize; let height: string | undefined; + let width: string | undefined; if (labelSize || iconSize) { const labelHeight = labelSize ? (this.tabBar && this.tabBar.orientation === 'horizontal' ? labelSize.height : labelSize.width) : 0; const iconHeight = iconSize ? iconSize.height : 0; @@ -220,7 +225,12 @@ export class TabBarRenderer extends TabBar.Renderer { const paddingBottom = data.paddingBottom || 0; height = `${labelHeight + iconHeight + paddingTop + paddingBottom}px`; } - return { zIndex, height }; + if (data.tabWidth) { + width = `${data.tabWidth}px`; + } else { + width = ''; + } + return { zIndex, height, width }; } /** @@ -542,6 +552,13 @@ export class TabBarRenderer extends TabBar.Renderer { } +export namespace ScrollableTabBar { + export interface Options { + minimumTabSize: number; + defaultTabSize: number; + } +} + /** * A specialized tab bar for the main and bottom areas. */ @@ -551,12 +568,26 @@ export class ScrollableTabBar extends TabBar { private scrollBarFactory: () => PerfectScrollbar; private pendingReveal?: Promise; + private isMouseOver = false; + protected needsRecompute = false; + protected tabSize = 0; + private _dynamicTabOptions?: ScrollableTabBar.Options; protected readonly toDispose = new DisposableCollection(); - constructor(options?: TabBar.IOptions & PerfectScrollbar.Options) { + constructor(options?: TabBar.IOptions & PerfectScrollbar.Options, dynamicTabOptions?: ScrollableTabBar.Options) { super(options); this.scrollBarFactory = () => new PerfectScrollbar(this.scrollbarHost, options); + this._dynamicTabOptions = dynamicTabOptions; + } + + set dynamicTabOptions(options: ScrollableTabBar.Options | undefined) { + this._dynamicTabOptions = options; + this.updateTabs(); + } + + get dynamicTabOptions(): ScrollableTabBar.Options | undefined { + return this._dynamicTabOptions; } override dispose(): void { @@ -571,6 +602,14 @@ export class ScrollableTabBar extends TabBar { if (!this.scrollBar) { this.scrollBar = this.scrollBarFactory(); } + this.node.addEventListener('mouseenter', () => { this.isMouseOver = true; }); + this.node.addEventListener('mouseleave', () => { + this.isMouseOver = false; + if (this.needsRecompute) { + this.updateTabs(); + } + }); + super.onAfterAttach(msg); } @@ -583,7 +622,34 @@ export class ScrollableTabBar extends TabBar { } protected override onUpdateRequest(msg: Message): void { - super.onUpdateRequest(msg); + this.updateTabs(); + } + + protected updateTabs(): void { + + const content = []; + if (this.dynamicTabOptions) { + if (this.isMouseOver) { + this.needsRecompute = true; + } else { + this.needsRecompute = false; + if (this.orientation === 'horizontal') { + this.tabSize = Math.max(Math.min(this.scrollbarHost.clientWidth / this.titles.length, + this.dynamicTabOptions.defaultTabSize), this.dynamicTabOptions.minimumTabSize); + } + } + } + for (let i = 0, n = this.titles.length; i < n; ++i) { + const title = this.titles[i]; + const current = title === this.currentTitle; + const zIndex = current ? n : n - i - 1; + const renderData: ScrollableRenderData = { title: title, current: current, zIndex: zIndex }; + if (this.dynamicTabOptions && this.orientation === 'horizontal') { + renderData.tabWidth = this.tabSize; + } + content[i] = this.renderer.renderTab(renderData); + } + VirtualDOM.render(content, this.contentNode); if (this.scrollBar) { this.scrollBar.update(); } @@ -591,6 +657,9 @@ export class ScrollableTabBar extends TabBar { protected override onResize(msg: Widget.ResizeMessage): void { super.onResize(msg); + if (this.dynamicTabOptions) { + this.updateTabs(); + } if (this.scrollBar) { if (this.currentIndex >= 0) { this.revealTab(this.currentIndex); @@ -680,9 +749,10 @@ export class ToolbarAwareTabBar extends ScrollableTabBar { protected readonly tabBarToolbarRegistry: TabBarToolbarRegistry, protected readonly tabBarToolbarFactory: () => TabBarToolbar, protected readonly breadcrumbsRendererFactory: BreadcrumbsRendererFactory, - protected readonly options?: TabBar.IOptions & PerfectScrollbar.Options, + options?: TabBar.IOptions & PerfectScrollbar.Options, + dynamicTabOptions?: ScrollableTabBar.Options ) { - super(options); + super(options, dynamicTabOptions); this.breadcrumbsRenderer = this.breadcrumbsRendererFactory(); this.rewireDOM(); this.toDispose.push(this.tabBarToolbarRegistry.onDidChange(() => this.update())); @@ -756,6 +826,7 @@ export class ToolbarAwareTabBar extends ScrollableTabBar { } const widget = this.currentTitle?.owner ?? undefined; this.toolbar.updateTarget(widget); + this.updateTabs(); } override handleEvent(event: Event): void { @@ -859,7 +930,7 @@ export class SideTabBar extends ScrollableTabBar { protected override onAfterAttach(msg: Message): void { super.onAfterAttach(msg); - this.renderTabBar(); + this.updateTabs(); this.node.addEventListener('p-dragenter', this); this.node.addEventListener('p-dragover', this); this.node.addEventListener('p-dragleave', this); @@ -875,7 +946,7 @@ export class SideTabBar extends ScrollableTabBar { } protected override onUpdateRequest(msg: Message): void { - this.renderTabBar(); + this.updateTabs(); if (this.scrollBar) { this.scrollBar.update(); } @@ -885,7 +956,7 @@ export class SideTabBar extends ScrollableTabBar { * Render the tab bar in the _hidden content node_ (see `hiddenContentNode` for explanation), * then gather size information for labels and render it again in the proper content node. */ - protected renderTabBar(): void { + protected override updateTabs(): void { if (this.isAttached) { // Render into the invisible node this.renderTabs(this.hiddenContentNode); diff --git a/packages/core/src/browser/style/tabs.css b/packages/core/src/browser/style/tabs.css index 20db8bc4eef11..deb4d36a61cc0 100644 --- a/packages/core/src/browser/style/tabs.css +++ b/packages/core/src/browser/style/tabs.css @@ -410,3 +410,12 @@ flex-flow: row nowrap; min-width: 100%; } + +.p-TabBar-tab .theia-tab-icon-label { + flex: 1; +} + +.p-TabBar[data-orientation='horizontal'] .p-TabBar-tab.p-mod-closable:hover .theia-tab-icon-label, +.p-TabBar[data-orientation='horizontal'] .p-TabBar-tab.p-mod-current .theia-tab-icon-label { + overflow: hidden; +} From 6c7f3b1b3428d85a52da73973443da58dd276f85 Mon Sep 17 00:00:00 2001 From: Simon Graband Date: Thu, 13 Apr 2023 16:17:12 +0200 Subject: [PATCH 4/6] Add extended tab bar preview option (#12350) * Add extended tab bar preview option Add functionality to render more information on tab bar hover. Also makes sure the feedback is styled be using the hoverService. This currently applies to horizontal tab bars. Right now the title and the caption will be rendered. To not remove the old behavior this feature is enabled via the setting `window.extendedTabBarPreview`. Also added possibility to specify cssClasses to be added to a hover, when requesting it from the HoverService. This way special hovers, like the extended tab bar preview, can easily be styled with CSS. Contributed on behalf of STMicroelectronics * Localize preference and address review feedback Remove css classes after hover is disposed. Update tab bars after preference has been changed. Contributed on behalf of STMicroelectronics * Rename setting to `window.tabbar.enhancedPreview` Also fix potential unnecessary remove class for cssClasses. Contributed on behalf of STMicroelectronics --- packages/core/src/browser/core-preferences.ts | 6 +++ packages/core/src/browser/hover-service.ts | 13 ++++++- .../src/browser/shell/application-shell.ts | 8 ++++ packages/core/src/browser/shell/tab-bars.ts | 39 +++++++++++++++---- .../core/src/browser/style/hover-service.css | 4 ++ packages/core/src/browser/style/tabs.css | 16 ++++++++ 6 files changed, 77 insertions(+), 9 deletions(-) diff --git a/packages/core/src/browser/core-preferences.ts b/packages/core/src/browser/core-preferences.ts index 526e94eba4292..6628a928e8905 100644 --- a/packages/core/src/browser/core-preferences.ts +++ b/packages/core/src/browser/core-preferences.ts @@ -80,6 +80,11 @@ export const corePreferenceSchema: PreferenceSchema = { default: 'code', markdownDescription: nls.localizeByDefault('Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`.') }, + 'window.tabbar.enhancedPreview': { + type: 'boolean', + default: false, + description: nls.localize('theia/core/enhancedPreview', 'Controls whether more information about the tab should be displayed in horizontal tab bars.') + }, 'window.menuBarVisibility': { type: 'string', enum: ['classic', 'visible', 'hidden', 'compact'], @@ -258,6 +263,7 @@ export interface CoreConfiguration { 'breadcrumbs.enabled': boolean; 'files.encoding': string; 'keyboard.dispatch': 'code' | 'keyCode'; + 'window.tabbar.enhancedPreview': boolean; 'window.menuBarVisibility': 'classic' | 'visible' | 'hidden' | 'compact'; 'window.title': string; 'window.titleSeparator': string; diff --git a/packages/core/src/browser/hover-service.ts b/packages/core/src/browser/hover-service.ts index 1747dfeadd11f..789a506d4b277 100644 --- a/packages/core/src/browser/hover-service.ts +++ b/packages/core/src/browser/hover-service.ts @@ -57,6 +57,11 @@ export interface HoverRequest { * if the specified content does not fit in the window next to the target element */ position: HoverPosition + /** + * Additional css classes that should be added to the hover box. + * Used to style certain boxes different e.g. for the extended tab preview. + */ + cssClasses?: string [] } @injectable() @@ -101,7 +106,10 @@ export class HoverService { protected async renderHover(request: HoverRequest): Promise { const host = this.hoverHost; - const { target, content, position } = request; + const { target, content, position, cssClasses } = request; + if (cssClasses) { + host.classList.add(...cssClasses); + } this.hoverTarget = target; if (content instanceof HTMLElement) { host.appendChild(content); @@ -124,6 +132,9 @@ export class HoverService { dispose: () => { this.lastHidHover = Date.now(); host.classList.remove(updatedPosition); + if (cssClasses) { + host.classList.remove(...cssClasses); + } } }); diff --git a/packages/core/src/browser/shell/application-shell.ts b/packages/core/src/browser/shell/application-shell.ts index 4139e23a842d7..5f33b65657ad2 100644 --- a/packages/core/src/browser/shell/application-shell.ts +++ b/packages/core/src/browser/shell/application-shell.ts @@ -286,6 +286,14 @@ export class ApplicationShell extends Widget { } }); } + + this.corePreferences.onPreferenceChanged(preference => { + if (preference.preferenceName === 'window.tabbar.enhancedPreview') { + this.allTabBars.forEach(tabBar => { + tabBar.update(); + }); + } + }); } protected initializeShell(): void { diff --git a/packages/core/src/browser/shell/tab-bars.ts b/packages/core/src/browser/shell/tab-bars.ts index 6c5695584c6b2..812b091374640 100644 --- a/packages/core/src/browser/shell/tab-bars.ts +++ b/packages/core/src/browser/shell/tab-bars.ts @@ -161,9 +161,7 @@ export class TabBarRenderer extends TabBar.Renderer { ? nls.localizeByDefault('Unpin') : nls.localizeByDefault('Close'); - const hover = this.tabBar && this.tabBar.orientation === 'horizontal' ? { - title: title.caption - } : { + const hover = this.tabBar && (this.tabBar.orientation === 'horizontal' && !this.corePreferences?.['window.tabbar.enhancedPreview']) ? { title: title.caption } : { onmouseenter: this.handleMouseEnterEvent }; @@ -484,16 +482,41 @@ export class TabBarRenderer extends TabBar.Renderer { return h.div({ className: baseClassName, style }, data.title.iconLabel); } + protected renderEnhancedPreview = (title: Title) => { + const hoverBox = document.createElement('div'); + hoverBox.classList.add('theia-horizontal-tabBar-hover-div'); + const labelElement = document.createElement('p'); + labelElement.classList.add('theia-horizontal-tabBar-hover-title'); + labelElement.textContent = title.label; + hoverBox.append(labelElement); + if (title.caption) { + const captionElement = document.createElement('p'); + captionElement.classList.add('theia-horizontal-tabBar-hover-caption'); + captionElement.textContent = title.caption; + hoverBox.appendChild(captionElement); + } + return hoverBox; + }; + protected handleMouseEnterEvent = (event: MouseEvent) => { if (this.tabBar && this.hoverService && event.currentTarget instanceof HTMLElement) { const id = event.currentTarget.id; const title = this.tabBar.titles.find(t => this.createTabId(t) === id); if (title) { - this.hoverService.requestHover({ - content: title.caption, - target: event.currentTarget, - position: 'right' - }); + if (this.tabBar.orientation === 'horizontal') { + this.hoverService.requestHover({ + content: this.renderEnhancedPreview(title), + target: event.currentTarget, + position: 'bottom', + cssClasses: ['extended-tab-preview'] + }); + } else { + this.hoverService.requestHover({ + content: title.caption, + target: event.currentTarget, + position: 'right' + }); + } } } }; diff --git a/packages/core/src/browser/style/hover-service.css b/packages/core/src/browser/style/hover-service.css index 8ed6a774418e5..86ba955b654b0 100644 --- a/packages/core/src/browser/style/hover-service.css +++ b/packages/core/src/browser/style/hover-service.css @@ -93,3 +93,7 @@ border-top: 5px solid transparent; border-bottom: 5px solid transparent; } + +.theia-hover.extended-tab-preview { + border-radius: 10px; +} diff --git a/packages/core/src/browser/style/tabs.css b/packages/core/src/browser/style/tabs.css index deb4d36a61cc0..05569f1cd786b 100644 --- a/packages/core/src/browser/style/tabs.css +++ b/packages/core/src/browser/style/tabs.css @@ -419,3 +419,19 @@ .p-TabBar[data-orientation='horizontal'] .p-TabBar-tab.p-mod-current .theia-tab-icon-label { overflow: hidden; } + +.theia-horizontal-tabBar-hover-div { + margin: 0px 4px; +} + +.theia-horizontal-tabBar-hover-title { + font-weight: bolder; + font-size: medium; + margin: 0px 0px; +} + +.theia-horizontal-tabBar-hover-caption { + font-size: small; + margin: 0px 0px; + margin-top: 4px; +} From b1c9e43ecf33d80a67e16115a167ade8378733da Mon Sep 17 00:00:00 2001 From: colin-grant-work Date: Fri, 14 Apr 2023 13:33:10 -0600 Subject: [PATCH 5/6] In MonacoEditorModel, use value for snapshot (#12418) --- packages/monaco/src/browser/monaco-editor-model.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/monaco/src/browser/monaco-editor-model.ts b/packages/monaco/src/browser/monaco-editor-model.ts index cd0f4b36e0e48..88a113bf372b7 100644 --- a/packages/monaco/src/browser/monaco-editor-model.ts +++ b/packages/monaco/src/browser/monaco-editor-model.ts @@ -550,7 +550,7 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo } const contentLength = this.model.getValueLength(); - const content = this.model.createSnapshot() || this.model.getValue(); + const content = this.model.getValue(); try { const encoding = this.getEncoding(); const version = this.resourceVersion; @@ -656,7 +656,7 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo } createSnapshot(preserveBOM?: boolean): ITextSnapshot { - return this.model.createSnapshot(preserveBOM); + return { read: () => this.model.getValue(undefined, preserveBOM) }; } applySnapshot(snapshot: Saveable.Snapshot): void { From 1334898adc96fec93da469d39c7256e8b0bb0882 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Mon, 17 Apr 2023 16:12:40 +0200 Subject: [PATCH 6/6] Split license files for better recognition (#12424) --- LICENSE | 642 ---------------------------------------------------- LICENSE-EPL | 277 +++++++++++++++++++++++ LICENSE-GPL | 362 +++++++++++++++++++++++++++++ README.md | 4 +- 4 files changed, 641 insertions(+), 644 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE-EPL create mode 100644 LICENSE-GPL diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 4ee1e0a498ff9..0000000000000 --- a/LICENSE +++ /dev/null @@ -1,642 +0,0 @@ -This program and the accompanying materials are made available under the -terms of the Eclipse Public License v. 2.0 which is available at -https://www.eclipse.org/legal/epl-2.0, or GNU General Public License, version 2 -with the GNU Classpath Exception which is available at https://www.gnu.org/software/classpath/license.html. - -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the General Public License from time to time. Such new - versions will be similar in spirit to the present version, but may - differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/LICENSE-EPL b/LICENSE-EPL new file mode 100644 index 0000000000000..e48e0963459bf --- /dev/null +++ b/LICENSE-EPL @@ -0,0 +1,277 @@ +Eclipse Public License - v 2.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + +3. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. diff --git a/LICENSE-GPL b/LICENSE-GPL new file mode 100644 index 0000000000000..b45e3cd5429ce --- /dev/null +++ b/LICENSE-GPL @@ -0,0 +1,362 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + +"CLASSPATH" EXCEPTION TO THE GPL + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." + + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. diff --git a/README.md b/README.md index b902c43b9cd56..d2a24137c3b1d 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,8 @@ Read below how to engage with Theia community: ## License -- [Eclipse Public License 2.0](LICENSE) -- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](LICENSE) +- [Eclipse Public License 2.0](LICENSE-EPL) +- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](LICENSE-GPL) ## Trademark