diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java index 42ceaa1988d..c7ee065cd1c 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - Fix 154874 - handle files with space or $ in the name * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType + * Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants ********************************************************************************/ package org.eclipse.rse.internal.shells.ui.view; @@ -79,7 +80,7 @@ import org.eclipse.ui.themes.IThemeManager; /** * Class for a remote shell session on a connection */ -public class CommandsViewPage implements SelectionListener, ISystemThemeConstants, IPropertyChangeListener, ISelectionChangedListener, +public class CommandsViewPage implements SelectionListener, IPropertyChangeListener, ISelectionChangedListener, FocusListener { @@ -343,9 +344,9 @@ FocusListener { //Display display = getViewer().getControl().getDisplay(); IThemeManager mgr = PlatformUI.getWorkbench().getThemeManager(); - Color bg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_BG_COLOR); - Color fg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_FG_COLOR); - Font fFont =mgr.getCurrentTheme().getFontRegistry().get(REMOTE_COMMANDS_VIEW_FONT); + Color bg = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.REMOTE_COMMANDS_VIEW_BG_COLOR); + Color fg = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.REMOTE_COMMANDS_VIEW_FG_COLOR); + Font fFont =mgr.getCurrentTheme().getFontRegistry().get(ISystemThemeConstants.REMOTE_COMMANDS_VIEW_FONT); _inputEntry.getControl().setBackground(bg); _inputEntry.getControl().setForeground(fg); diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java index 3fee1301a0f..b440966f552 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2007 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 @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants ********************************************************************************/ package org.eclipse.rse.shells.ui.view; @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.themes.IThemeManager; -public class SystemCommandsView extends SystemTableView implements ISystemThemeConstants, IPropertyChangeListener +public class SystemCommandsView extends SystemTableView implements IPropertyChangeListener { public class CommandsViewFilter extends ViewerFilter { @@ -98,9 +98,9 @@ public class SystemCommandsView extends SystemTableView implements ISystemThemeC if (table != null) { IThemeManager mgr = PlatformUI.getWorkbench().getThemeManager(); - Color bg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_BG_COLOR); - Color fg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_FG_COLOR); - Font fFont = mgr.getCurrentTheme().getFontRegistry().get(REMOTE_COMMANDS_VIEW_FONT); + Color bg = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.REMOTE_COMMANDS_VIEW_BG_COLOR); + Color fg = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.REMOTE_COMMANDS_VIEW_FG_COLOR); + Font fFont = mgr.getCurrentTheme().getFontRegistry().get(ISystemThemeConstants.REMOTE_COMMANDS_VIEW_FONT); table.setBackground(bg); table.setForeground(fg); table.setFont(fFont); @@ -108,11 +108,11 @@ public class SystemCommandsView extends SystemTableView implements ISystemThemeC { mgr.addPropertyChangeListener(this); } - _errColor = mgr.getCurrentTheme().getColorRegistry().get(MESSAGE_ERROR_COLOR); - _outColor = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_FG_COLOR); - _infColor = mgr.getCurrentTheme().getColorRegistry().get(MESSAGE_INFORMATION_COLOR); - _warColor = mgr.getCurrentTheme().getColorRegistry().get(MESSAGE_WARNING_COLOR); - _prmColor = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_PROMPT_COLOR); + _errColor = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.MESSAGE_ERROR_COLOR); + _outColor = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.REMOTE_COMMANDS_VIEW_FG_COLOR); + _infColor = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.MESSAGE_INFORMATION_COLOR); + _warColor = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.MESSAGE_WARNING_COLOR); + _prmColor = mgr.getCurrentTheme().getColorRegistry().get(ISystemThemeConstants.REMOTE_COMMANDS_VIEW_PROMPT_COLOR); } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java index f9a0c386730..c75b6da71d2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2007 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 @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [180562] dont implement ISystemThemeConstants ********************************************************************************/ package org.eclipse.rse.internal.ui.view.monitor; @@ -39,7 +39,6 @@ import org.eclipse.rse.model.SystemRegistry; import org.eclipse.rse.model.SystemResourceChangeEvent; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; -import org.eclipse.rse.ui.ISystemThemeConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; @@ -77,7 +76,7 @@ import org.eclipse.ui.texteditor.ITextEditorActionConstants; /** * Class for a remote shell session on a connection */ -public class MonitorViewPage implements SelectionListener, ISystemThemeConstants, IPropertyChangeListener, ISelectionChangedListener, Listener, +public class MonitorViewPage implements SelectionListener, IPropertyChangeListener, ISelectionChangedListener, Listener, FocusListener { private static SystemMessage _queryMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_QUERY_PROGRESS);