From 695a0cae4f2b23e98d3103a3625acf1ce8a57212 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 7 Dec 2006 11:03:13 +0000 Subject: [PATCH] [cleanup] fix terminal copyright headers and beautify --- .../build.properties | 32 +++++----- .../plugin.properties | 16 ++++- .../org.eclipse.tm.terminal.view/plugin.xml | 16 +++++ .../internal/actions/ActionMessages.java | 13 ++-- .../actions/ActionMessages.properties | 13 ++-- .../internal/actions/TerminalAction.java | 15 +++-- .../actions/TerminalActionClearAll.java | 16 ++--- .../actions/TerminalActionConnect.java | 15 +++-- .../internal/actions/TerminalActionCopy.java | 14 +++-- .../internal/actions/TerminalActionCut.java | 14 +++-- .../actions/TerminalActionDisconnect.java | 14 +++-- .../actions/TerminalActionNewTerminal.java | 14 +++-- .../internal/actions/TerminalActionPaste.java | 14 +++-- .../actions/TerminalActionSelectAll.java | 14 +++-- .../actions/TerminalActionSettings.java | 14 +++-- .../terminal/internal/view/ITerminalView.java | 6 +- .../terminal/internal/view/ImageConsts.java | 14 +++-- .../tm/terminal/internal/view/PageBook.java | 49 ++++++++------- .../view/SettingStorePrefixDecorator.java | 6 +- .../terminal/internal/view/SettingsStore.java | 6 +- .../internal/view/TerminalPreferencePage.java | 14 +++-- .../internal/view/TerminalSettingsDlg.java | 14 +++-- .../terminal/internal/view/TerminalView.java | 14 +++-- .../internal/view/TerminalViewPlugin.java | 18 +++--- .../terminal/internal/view/ViewMessages.java | 14 +++-- .../internal/view/ViewMessages.properties | 14 +++-- .../eclipse/tm/terminal/view/Activator.java | 61 ------------------- 27 files changed, 252 insertions(+), 212 deletions(-) delete mode 100644 terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/view/Activator.java diff --git a/terminal/org.eclipse.tm.terminal.view/build.properties b/terminal/org.eclipse.tm.terminal.view/build.properties index 8e9e767c507..84f7972adee 100644 --- a/terminal/org.eclipse.tm.terminal.view/build.properties +++ b/terminal/org.eclipse.tm.terminal.view/build.properties @@ -1,12 +1,18 @@ ################################################################################ -# Copyright (c) 2006 Wind River Systems, Inc. and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Michael Scharf (Wind River) - initial API and implementation +# Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Initial Contributors: +# The following Wind River employees contributed to the Terminal component +# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, +# Helmut Haigermoser and Ted Williams. +# +# Contributors: +# Michael Scharf (Wind River) - split into core, view and connector plugins +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified ################################################################################ source.. = src/ output.. = bin/ @@ -14,14 +20,4 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ icons/,\ - .settings/,\ plugin.properties -src.includes = .classpath,\ - .project,\ - .settings/,\ - META-INF/,\ - build.properties,\ - icons/,\ - plugin.properties,\ - plugin.xml,\ - src/ diff --git a/terminal/org.eclipse.tm.terminal.view/plugin.properties b/terminal/org.eclipse.tm.terminal.view/plugin.properties index 4c668735b62..a7294adac2a 100644 --- a/terminal/org.eclipse.tm.terminal.view/plugin.properties +++ b/terminal/org.eclipse.tm.terminal.view/plugin.properties @@ -1,7 +1,19 @@ ########################################################################## -# Copyright 2004 Wind River Systems, Inc. All rights reserved. +# Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Initial Contributors: +# The following Wind River employees contributed to the Terminal component +# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, +# Helmut Haigermoser and Ted Williams. +# +# Contributors: +# Michael Scharf (Wind River) - split into core, view and connector plugins +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified ########################################################################## - pluginName = Terminal View providerName = Eclipse.org terminal.views.category.name = Terminal diff --git a/terminal/org.eclipse.tm.terminal.view/plugin.xml b/terminal/org.eclipse.tm.terminal.view/plugin.xml index ca523016721..abc4f75035f 100644 --- a/terminal/org.eclipse.tm.terminal.view/plugin.xml +++ b/terminal/org.eclipse.tm.terminal.view/plugin.xml @@ -1,5 +1,21 @@ + diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/ActionMessages.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/ActionMessages.java index 193de4170a5..9105892da20 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/ActionMessages.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/ActionMessages.java @@ -1,13 +1,18 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal.internal.actions; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/ActionMessages.properties b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/ActionMessages.properties index faad8ee0e33..b475440f688 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/ActionMessages.properties +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/ActionMessages.properties @@ -1,13 +1,18 @@ ############################################################################### -# Copyright (c) 2006 Wind River Systems, Inc. and others. +# Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -# +# +# Initial Contributors: +# The following Wind River employees contributed to the Terminal component +# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, +# Helmut Haigermoser and Ted Williams. +# # Contributors: -# Wind River Systems, Inc. - initial implementation -# +# Michael Scharf (Wind River) - split into core, view and connector plugins +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified ############################################################################### NEW_TERMINAL = New Terminal CONNECT = Connect diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalAction.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalAction.java index cd8fe30110f..e3084958b1f 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalAction.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalAction.java @@ -1,16 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.jface.action.Action; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionClearAll.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionClearAll.java index 508e9791b8c..c86a9597400 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionClearAll.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionClearAll.java @@ -1,17 +1,19 @@ - /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.tm.terminal.internal.view.ITerminalView; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionConnect.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionConnect.java index a892612a673..cbd451045ed 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionConnect.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionConnect.java @@ -1,16 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.tm.terminal.internal.view.ITerminalView; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCopy.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCopy.java index 90122aa6ef7..49650672456 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCopy.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCopy.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.jface.resource.ImageRegistry; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCut.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCut.java index 997b0675a0c..bb10424c0a5 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCut.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCut.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.jface.resource.ImageRegistry; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionDisconnect.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionDisconnect.java index d717a988b39..1a1417f788e 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionDisconnect.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionDisconnect.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.tm.terminal.internal.view.ITerminalView; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionNewTerminal.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionNewTerminal.java index a0c0a49322c..9dd7aad575a 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionNewTerminal.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionNewTerminal.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2005, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.tm.terminal.internal.view.ITerminalView; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionPaste.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionPaste.java index b6b3de56b2e..30ea5974689 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionPaste.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionPaste.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.jface.resource.ImageRegistry; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSelectAll.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSelectAll.java index 4c0d62e9cc5..e32216b0780 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSelectAll.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSelectAll.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.tm.terminal.internal.view.ITerminalView; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSettings.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSettings.java index a86f09e334a..3471c4faa54 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSettings.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSettings.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2004, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.actions; import org.eclipse.tm.terminal.internal.view.ITerminalView; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ITerminalView.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ITerminalView.java index cdbf0603d90..2244f4536de 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ITerminalView.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ITerminalView.java @@ -4,12 +4,10 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ - package org.eclipse.tm.terminal.internal.view; public interface ITerminalView { diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ImageConsts.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ImageConsts.java index c531dcb83dc..9805efa6164 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ImageConsts.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ImageConsts.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - extracted from TerminalConsts + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.view; public interface ImageConsts diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/PageBook.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/PageBook.java index 96b4f41d7cd..3e9432b100c 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/PageBook.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/PageBook.java @@ -1,13 +1,13 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2000, 2006 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * IBM Corporation - initial API and implementation (org.eclipse.ui.part.PageBook) + * Michael Scharf (Wind River) - consider all children for layout and hiding *******************************************************************************/ package org.eclipse.tm.terminal.internal.view; @@ -28,11 +28,12 @@ import org.eclipse.swt.widgets.Layout; */ public class PageBook extends Composite { private Point minimumPageSize = new Point(0, 0); + /** * Layout for the page container. * */ - private class PageLayout extends Layout { + private class PageBookLayout extends Layout { public Point computeSize(Composite composite, int wHint, int hHint, boolean force) { if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) return new Point(wHint, hHint); @@ -45,10 +46,12 @@ public class PageBook extends Composite { y = Math.max(y, size.y); } - if (wHint != SWT.DEFAULT) + if (wHint != SWT.DEFAULT) { x = wHint; - if (hHint != SWT.DEFAULT) + } + if (hHint != SWT.DEFAULT) { y = hHint; + } return new Point(x, y); } @@ -60,7 +63,13 @@ public class PageBook extends Composite { } } } - /** + + /** + * The current control; null if none. + */ + private Control currentPage = null; + + /** * Creates a new empty pagebook. * * @param parent the parent composite @@ -68,12 +77,8 @@ public class PageBook extends Composite { */ public PageBook(Composite parent, int style) { super(parent, style); - setLayout(new PageLayout()); + setLayout(new PageBookLayout()); } - /** - * The current control; null if none. - */ - private Control currentPage = null; /** * Shows the given page. This method has no effect if the given page is not @@ -83,21 +88,21 @@ public class PageBook extends Composite { */ public void showPage(Control page) { - if (page == currentPage) + if (page == currentPage) { return; - if (page.getParent() != this) + } + if (page==null || page.getParent() != this) { return; + } currentPage = page; // show new page - if (page != null) { - if (!page.isDisposed()) { - page.setVisible(true); - layout(true); - // if (fRequestFocusOnShowPage) - // page.setFocus(); - } + if (!page.isDisposed()) { + page.setVisible(true); + layout(true); + // if (fRequestFocusOnShowPage) + // page.setFocus(); } // hide old *after* new page has been made visible in order to avoid flashing diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/SettingStorePrefixDecorator.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/SettingStorePrefixDecorator.java index e305e0a4ea8..32db3749aef 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/SettingStorePrefixDecorator.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/SettingStorePrefixDecorator.java @@ -4,10 +4,9 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ package org.eclipse.tm.terminal.internal.view; @@ -20,6 +19,7 @@ public class SettingStorePrefixDecorator implements ISettingsStore { fPrefix=prefix; fStore=store; } + public String get(String key) { return fStore.get(fPrefix+key); } diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/SettingsStore.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/SettingsStore.java index ee715a4a54e..55a3b3d4011 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/SettingsStore.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/SettingsStore.java @@ -4,10 +4,9 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - initial API and implementation *******************************************************************************/ package org.eclipse.tm.terminal.internal.view; @@ -15,7 +14,6 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.tm.terminal.ISettingsStore; /** - * * A {@link IDialogSettings} based {@link ISettingsStore}. * * @author Michael Scharf diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalPreferencePage.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalPreferencePage.java index dddcdb38f82..52e5762e114 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalPreferencePage.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalPreferencePage.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.view; import org.eclipse.jface.preference.BooleanFieldEditor; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalSettingsDlg.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalSettingsDlg.java index 608c0c7cce7..54ca7d017d0 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalSettingsDlg.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalSettingsDlg.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.view; import org.eclipse.jface.dialogs.Dialog; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java index bbd4398e13a..9f28f3ea597 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.view; import org.eclipse.core.runtime.Preferences; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalViewPlugin.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalViewPlugin.java index 2a300c72ca6..3ba5f8ae932 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalViewPlugin.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalViewPlugin.java @@ -1,15 +1,19 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ - package org.eclipse.tm.terminal.internal.view; import java.net.MalformedURLException; @@ -26,8 +30,8 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; public class TerminalViewPlugin extends AbstractUIPlugin { protected static TerminalViewPlugin fDefault; - public static final String PLUGIN_HOME = "org.eclipse.tm.terminal"; //$NON-NLS-1$ - public static final String HELP_VIEW = PLUGIN_HOME + ".terminal_view"; //$NON-NLS-1$ + public static final String PLUGIN_HOME = "org.eclipse.tm.terminal"; //$NON-NLS-1$ + public static final String HELP_VIEW = PLUGIN_HOME + ".terminal_view"; //$NON-NLS-1$ /** * The constructor. diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ViewMessages.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ViewMessages.java index 425c31539d6..3bf1515245b 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ViewMessages.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ViewMessages.java @@ -1,17 +1,23 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * + * Initial Contributors: + * The following Wind River employees contributed to the Terminal component + * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, + * Helmut Haigermoser and Ted Williams. + * * Contributors: - * Wind River Systems, Inc. - initial implementation - * + * Michael Scharf (Wind River) - split into core, view and connector plugins + * Martin Oberhuber (Wind River) - fixed copyright headers and beautified *******************************************************************************/ package org.eclipse.tm.terminal.internal.view; import org.eclipse.osgi.util.NLS; + public class ViewMessages extends NLS { static { NLS.initializeMessages(ViewMessages.class.getName(), ViewMessages.class); diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ViewMessages.properties b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ViewMessages.properties index 5d9d0c549ed..72901a74a2a 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ViewMessages.properties +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/ViewMessages.properties @@ -1,18 +1,22 @@ ############################################################################### -# Copyright (c) 2006 Wind River Systems, Inc. and others. +# Copyright (c) 2003, 2006 Wind River Systems, Inc. and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -# +# +# Initial Contributors: +# The following Wind River employees contributed to the Terminal component +# that contains this file: Chris Thew, Fran Litterio, Stephen Lamb, +# Helmut Haigermoser and Ted Williams. +# # Contributors: -# Wind River Systems, Inc. - initial implementation -# +# Michael Scharf (Wind River) - split into core, view and connector plugins +# Martin Oberhuber (Wind River) - fixed copyright headers and beautified ############################################################################### PROP_TITLE = Terminal SETTINGS = Settings - TERMINALSETTINGS = Terminal Settings CONNECTIONTYPE = Connection Type diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/view/Activator.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/view/Activator.java deleted file mode 100644 index 9f05051e652..00000000000 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/view/Activator.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Wind River Systems, Inc. - initial implementation - * - *******************************************************************************/ -package org.eclipse.tm.terminal.view; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.tm.terminal.view"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -}