1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-03 22:35:43 +02:00

[178599] more refactorings

This commit is contained in:
David McKnight 2007-03-28 18:30:13 +00:00
parent 58f046c8b2
commit 91a6edda68
34 changed files with 54 additions and 831 deletions

View file

@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.rse.core,
org.eclipse.rse.ui
Eclipse-LazyStart: true
Export-Package: org.eclipse.rse.shells.ui,
Export-Package: org.eclipse.rse.internal.shells.ui.propertypages,
org.eclipse.rse.shells.ui,
org.eclipse.rse.shells.ui.actions,
org.eclipse.rse.shells.ui.propertypages,
org.eclipse.rse.shells.ui.view
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4

View file

@ -23,7 +23,7 @@ Contributors:
name="%View.RemoteCommands"
icon="icons/full/cview16/commands_view.gif"
category="org.eclipse.rse.ui.view"
class="org.eclipse.rse.shells.ui.view.SystemCommandsViewPart"
class="org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewPart"
id="org.eclipse.rse.shells.ui.view.commandsView">
</view>
</extension>
@ -37,7 +37,7 @@ Contributors:
<page
name="%PropertyPage.EnvVariables"
class="org.eclipse.rse.shells.ui.propertypages.EnvironmentVariablesPropertyPage"
class="org.eclipse.rse.internal.shells.ui.propertypages.EnvironmentVariablesPropertyPage"
id="org.eclipse.rse.shells.ui.propertypages.EnvironmentVariablesPropertyPage">
<!--
<filter name="envVarPP" value="true"/>
@ -49,7 +49,7 @@ Contributors:
<page
name="%PropertyPage.ShellSettings"
class="org.eclipse.rse.shells.ui.propertypages.SystemShellPropertyPage"
class="org.eclipse.rse.internal.shells.ui.propertypages.SystemShellPropertyPage"
id="org.eclipse.rse.shells.ui.propertypages.SystemShellPropertyPage">
<enabledWhen>
<instanceof value="org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem"/>
@ -67,7 +67,7 @@ Contributors:
</page>
<page
name="%PropertyPage.Service"
class="org.eclipse.rse.shells.ui.propertypages.ShellServicesPropertyPage"
class="org.eclipse.rse.internal.shells.ui.propertypages.ShellServicesPropertyPage"
id="org.eclipse.rse.shells.ui.propertypages.ShellServicesPropertyPage">
<enabledWhen>
<instanceof value="org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem"/>

View file

@ -14,13 +14,15 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui;
package org.eclipse.rse.internal.shells.ui;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISubSystemConfigurationCategories;
import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.shells.ui.RemoteCommandHelpers;
import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.subsystems.files.core.model.ISystemRemoteCommand;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
import org.eclipse.rse.ui.RSEUIPlugin;

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.propertypages;
package org.eclipse.rse.internal.shells.ui.propertypages;

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.propertypages;
package org.eclipse.rse.internal.shells.ui.propertypages;
import java.util.ArrayList;
import java.util.List;

View file

@ -15,13 +15,13 @@
********************************************************************************/
package org.eclipse.rse.shells.ui.propertypages;
package org.eclipse.rse.internal.shells.ui.propertypages;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.rse.internal.shells.ui.view.EncodingForm;
import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.view.EncodingForm;
import org.eclipse.rse.subsystems.shells.core.subsystems.RemoteCmdSubSystem;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.propertypages.SystemBasePropertyPage;

View file

@ -14,7 +14,7 @@
* Martin Oberhuber (Wind River) - Fix 154874 - handle files with space or $ in the name
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.NullProgressMonitor;
@ -34,6 +34,9 @@ import org.eclipse.rse.model.ISystemRegistryUI;
import org.eclipse.rse.services.clientserver.PathUtility;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.view.CommandEntryViewerConfiguration;
import org.eclipse.rse.shells.ui.view.SystemCommandEditor;
import org.eclipse.rse.shells.ui.view.SystemCommandsView;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.shells.core.model.ISystemOutputRemoteTypes;
import org.eclipse.rse.subsystems.shells.core.model.RemoteOutput;

View file

@ -14,9 +14,11 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.rse.shells.ui.view.SystemCommandsView;
import org.eclipse.rse.shells.ui.view.TabFolderLayout;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.rse.ui.view.SystemTableView;

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import java.io.UnsupportedEncodingException;
import java.util.Collections;

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import java.util.ArrayList;
import java.util.List;

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager;

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.ui.IWorkbenchPage;
@ -32,10 +32,8 @@ public class SystemCommandsUI
// singleton instance
private static SystemCommandsUI instance;
private static SystemCommandsViewPart _viewPart;
private static SystemBuildErrorViewPart _errorPart;
public static final String COMMANDS_VIEW_ID = SystemCommandsViewPart.ID;
public static final String BUILD_ERROR_VIEW_ID = SystemBuildErrorViewPart.ID;
private SystemCommandsUI()
{
@ -56,21 +54,7 @@ public class SystemCommandsUI
return instance;
}
public SystemBuildErrorViewPart activateBuildErrorView()
{
try
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
_errorPart = (SystemBuildErrorViewPart) page.showView(SystemCommandsUI.BUILD_ERROR_VIEW_ID);
page.bringToTop(_errorPart);
}
catch (PartInitException e)
{
SystemBasePlugin.logError("Can not open build error view", e); //$NON-NLS-1$
}
return _errorPart;
}
public SystemCommandsViewPart activateCommandsView()
{
@ -89,10 +73,7 @@ public class SystemCommandsUI
return _viewPart;
}
public static SystemBuildErrorViewPart getBuildErrorView()
{
return _errorPart;
}
public static SystemCommandsViewPart getCommandsView()
{

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import java.util.ArrayList;
import java.util.List;
@ -47,6 +47,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.shells.ui.RemoteCommandHelpers;
import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.actions.SystemBaseShellAction;
import org.eclipse.rse.shells.ui.view.SystemViewRemoteOutputAdapter;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import org.eclipse.rse.internal.ui.view.SystemTableViewProvider;

View file

@ -14,10 +14,11 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.shells.ui.view.SystemViewRemoteOutputAdapter;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;

View file

@ -14,10 +14,11 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
package org.eclipse.rse.internal.shells.ui.view;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.internal.ui.view.SystemViewResources;
import org.eclipse.rse.shells.ui.view.SystemViewRemoteOutputAdapter;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError;
import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.view.ISystemPropertyConstants;

View file

@ -19,8 +19,8 @@ package org.eclipse.rse.shells.ui;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.shells.ui.view.ShellServiceSubSystemConfigurationAdapterFactory;
import org.eclipse.rse.shells.ui.view.SystemViewOutputAdapterFactory;
import org.eclipse.rse.internal.shells.ui.view.ShellServiceSubSystemConfigurationAdapterFactory;
import org.eclipse.rse.internal.shells.ui.view.SystemViewOutputAdapterFactory;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;

View file

@ -25,9 +25,9 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.services.clientserver.PathUtility;
import org.eclipse.rse.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;

View file

@ -30,12 +30,12 @@ import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.services.clientserver.PathUtility;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.shells.ui.RemoteCommandHelpers;
import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;

View file

@ -18,8 +18,8 @@ package org.eclipse.rse.shells.ui.actions;
import java.io.FileWriter;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.ui.ISystemIconConstants;

View file

@ -19,8 +19,8 @@ package org.eclipse.rse.shells.ui.actions;
import java.io.FileWriter;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.subsystems.files.core.SystemFileResources;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.ui.ISystemIconConstants;

View file

@ -16,9 +16,9 @@
package org.eclipse.rse.shells.ui.actions;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;

View file

@ -1,164 +0,0 @@
/********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. 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 IBM employees contributed to the Remote System Explorer
* component that contains this file: David McKnight, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.rse.internal.ui.view.SystemTableViewProvider;
import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.view.SystemTableView;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
public class SystemBuildErrorView extends SystemTableView
{
private class ErrorViewerFilter extends ViewerFilter
{
public boolean select(Viewer viewer, Object obj1, Object obj2)
{
if (obj2 instanceof IRemoteError)
{
return true;
}
return false;
}
}
public SystemBuildErrorView(Table table, ISystemMessageLine msgLine)
{
super(table, msgLine);
_provider = new SystemBuildErrorViewProvider();
setContentProvider(_provider);
addFilter(new ErrorViewerFilter());
}
public void refresh()
{
super.refresh();
Table table = getTable();
if (table != null && table.getItemCount() > 0)
{
TableItem lastItem = table.getItem(table.getItemCount() - 1);
table.showItem(lastItem);
}
}
public IPropertyDescriptor[] getVisibleDescriptors(Object object)
{
SystemViewRemoteErrorAdapter adpt = new SystemViewRemoteErrorAdapter();
return adpt.getUniquePropertyDescriptors();
}
public IPropertyDescriptor getNameDescriptor(Object object)
{
SystemViewRemoteErrorAdapter adpt = new SystemViewRemoteErrorAdapter();
return adpt.getPropertyDescriptors()[0];
}
public void setOffset(int offset)
{
((SystemBuildErrorViewProvider)_provider).setOffset(offset);
}
public synchronized void updateChildren()
{
computeLayout();
internalRefresh(getInput());
}
public void clearAllItems()
{
Object input = getInput();
SystemTableViewProvider provider = (SystemTableViewProvider) getContentProvider();
Object[] children = provider.getChildren(input);
((SystemBuildErrorViewProvider)_provider).moveOffsetToEnd();
clearFirstItems(children, children.length - 1);
provider.flushCache();
}
private void clearFirstItems(Object[] children, int items)
{
Table table = getTable();
table.setRedraw(false);
synchronized (table)
{
//int count = table.getItemCount();
table.remove(0, items);
}
table.setRedraw(true);
}
protected Item newItem(Widget parent, int flags, int ix)
{
if (parent instanceof Table)
{
return new TableItem((Table) parent, flags);
}
return null;
}
public void systemResourceChanged(ISystemResourceChangeEvent event)
{
Object child = event.getSource();
if (event.getType() == ISystemResourceChangeEvents.EVENT_REFRESH)
{
if (child == getInput())
{
SystemTableViewProvider provider = (SystemTableViewProvider) getContentProvider();
if (provider != null)
{
provider.flushCache();
updateChildren();
return;
}
}
}
//super.systemResourceChanged(event);
}
protected Object getParentForContent(Object element)
{
return getViewAdapter(element).getParent(element);
}
}

View file

@ -1,482 +0,0 @@
/********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. 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 IBM employees contributed to the Remote System Explorer
* component that contains this file: David McKnight, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.rse.core.subsystems.IRemoteLineReference;
import org.eclipse.rse.internal.ui.view.SystemTableViewProvider;
import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.ISystemResourceChangeListener;
import org.eclipse.rse.model.SystemRegistry;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.ISelectionService;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.ViewPart;
/**
* This is the wrapper class to SystemBuildErrorView.
*/
public class SystemBuildErrorViewPart extends ViewPart implements ISelectionListener, SelectionListener, ISystemResourceChangeListener, ISystemMessageLine
{
class BrowseAction extends Action
{
public BrowseAction(String label, ImageDescriptor des)
{
super(label, des);
setToolTipText(label);
}
public void checkEnabledState()
{
if (getViewer().getInput() != null)
{
setEnabled(true);
}
else
{
setEnabled(false);
}
}
public void run()
{
}
}
public class ClearAction extends BrowseAction
{
public ClearAction()
{
super(SystemResources.ACTION_CLEAR_LABEL,
// DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_CLEAR));
RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_CLEAR_ID));
ImageDescriptor des = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_CLEAR_ID);
/*
setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_CLEAR));
setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_CLEAR));
setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_CLEAR));
*/
setImageDescriptor(des);
// TODO DKM - get help for this!
//PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CLEAR_CONSOLE_ACTION);
}
public void checkEnabledState()
{
Object input = getViewer().getInput();
if (input != null)
{
if (input instanceof IRemoteCommandShell)
{
setEnabled(((IRemoteCommandShell) input).isActive());
return;
}
}
setEnabled(false);
}
public void run()
{
clear();
}
// clear contents of the current command viewer
private void clear()
{
getViewer().clearAllItems();
}
}
// constants
public static final String ID = "org.eclipse.rse.shells.ui.view.buildErrorView"; //$NON-NLS-1$
// matches id in plugin.xml, view tag
private SystemBuildErrorView _viewer;
private ClearAction _clearAction;
private boolean _enableUpdates = true;
// for ISystemMessageLine
private String _message, _errorMessage;
private SystemMessage sysErrorMessage;
private IStatusLineManager _statusLine = null;
public void setFocus()
{
_viewer.getControl().setFocus();
}
public SystemBuildErrorView getViewer()
{
return _viewer;
}
public Shell getShell()
{
return _viewer.getShell();
}
public void fillLocalToolBar()
{
boolean firstCall = false;
if (_clearAction == null)
{
firstCall = true;
_clearAction = new ClearAction();
}
IActionBars actionBars = getViewSite().getActionBars();
IToolBarManager toolBarManager = actionBars.getToolBarManager();
addToolBarItems(toolBarManager);
if (firstCall)
{
//IMenuManager menuManager = actionBars.getMenuManager();
_statusLine = actionBars.getStatusLineManager();
//addMenuItems(menuManager);
}
}
private void addToolBarItems(IToolBarManager toolBarManager)
{
toolBarManager.removeAll();
toolBarManager.add(_clearAction);
}
public void createPartControl(Composite parent)
{
// create table portion
Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
_viewer = new SystemBuildErrorView(table, this);
table.setLinesVisible(true);
ISelectionService selectionService = getSite().getWorkbenchWindow().getSelectionService();
selectionService.addSelectionListener(this);
SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
registry.addSystemResourceChangeListener(this);
_viewer.addDoubleClickListener(new IDoubleClickListener()
{
public void doubleClick(DoubleClickEvent event)
{
handleDoubleClick(event);
}
});
SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "uerr0000"); //$NON-NLS-1$
fillLocalToolBar();
}
private void handleDoubleClick(DoubleClickEvent event)
{
IStructuredSelection s = (IStructuredSelection) event.getSelection();
Object element = s.getFirstElement();
if (element == null)
return;
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter) ((IAdaptable) element).getAdapter(ISystemViewElementAdapter.class);
//boolean alreadyHandled = false;
if (adapter != null)
{
if (!adapter.hasChildren((IAdaptable)element))
{
/*alreadyHandled =*/ adapter.handleDoubleClick(element);
}
}
}
public void selectionChanged(IWorkbenchPart part, ISelection sel)
{
}
public void dispose()
{
ISelectionService selectionService = getSite().getWorkbenchWindow().getSelectionService();
selectionService.removeSelectionListener(this);
_viewer.dispose();
SystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
registry.removeSystemResourceChangeListener(this);
super.dispose();
}
public void selectionChanged(SelectionChangedEvent e)
{
}
public void resetOffset()
{
SystemBuildErrorViewProvider provider = (SystemBuildErrorViewProvider)_viewer.getContentProvider();
int size = ((IRemoteCommandShell)_viewer.getInput()).getSize();
provider.setOffset(size - 1);
}
public void setInput(IAdaptable object, String cmdString)
{
setInput(object, true, cmdString);
}
public void setInput(IAdaptable object, boolean updateHistory, String cmdString)
{
_viewer.getTable().removeAll();
setEnableUpdates(true);
if (object instanceof IRemoteCommandShell)
{
_viewer.setInput(object);
}
else
{
if (object instanceof IRemoteOutput)
{
IRemoteOutput output = (IRemoteOutput)object;
_viewer.setInput(output.getParent());
SystemBuildErrorViewProvider provider = (SystemBuildErrorViewProvider)_viewer.getContentProvider();
provider.setOffset(output.getIndex() - 1);
}
else if (object instanceof IRemoteLineReference)
{
_viewer.setInput(((IRemoteLineReference)object).getParent());
}
}
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_LIST_TITLE);
msg.makeSubstitution(cmdString);
setPartName(msg.getLevelOneText());
}
public void updateOutput()
{
if (_viewer != null)
{
((SystemTableViewProvider) _viewer.getContentProvider()).flushCache();
_viewer.updateChildren();
}
}
private void updateOutput(IRemoteCommandShell root)
{
if (root != null && _enableUpdates)
{
if (_viewer.getInput() != root)
{
_viewer.clearAllItems();
_viewer.setInput(root);
}
updateOutput();
}
}
/*
* Lock view from updates since the compile has ended
*/
public void setEnableUpdates(boolean enable)
{
if (!enable)
{
// do one last refresh to make sure
// last compile got shown
updateOutput();
}
_enableUpdates= enable;
}
public void systemResourceChanged(ISystemResourceChangeEvent event)
{
if (event.getType() == ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_FINISHED)
{
Object source = event.getSource();
if (source instanceof IRemoteCmdSubSystem)
{
//Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell();
//shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((RemoteCmdSubSystem) source));
}
else
if (source instanceof IRemoteCommandShell)
{
// find out if we're listening to this
updateOutput((IRemoteCommandShell) source);
}
}
else
if (event.getType() == ISystemResourceChangeEvents.EVENT_REFRESH)
{
Object parent = event.getParent();
if (parent instanceof IRemoteCommandShell)
{
updateOutput((IRemoteCommandShell) parent);
}
}
}
public void widgetDefaultSelected(SelectionEvent e)
{
widgetSelected(e);
}
public void widgetSelected(SelectionEvent e)
{
}
// -------------------------------
// ISystemMessageLine interface...
// -------------------------------
/**
* Clears the currently displayed error message and redisplayes
* the message which was active before the error message was set.
*/
public void clearErrorMessage()
{
_errorMessage = null;
sysErrorMessage = null;
if (_statusLine != null)
_statusLine.setErrorMessage(_errorMessage);
}
/**
* Clears the currently displayed message.
*/
public void clearMessage()
{
_message = null;
if (_statusLine != null)
_statusLine.setMessage(_message);
}
/**
* Get the currently displayed error text.
* @return The error message. If no error message is displayed <code>null</code> is returned.
*/
public String getErrorMessage()
{
return _errorMessage;
}
/**
* Get the currently displayed message.
* @return The message. If no message is displayed <code>null<code> is returned.
*/
public String getMessage()
{
return _message;
}
/**
* Display the given error message. A currently displayed message
* is saved and will be redisplayed when the error message is cleared.
*/
public void setErrorMessage(String message)
{
this._errorMessage = message;
if (_statusLine != null)
_statusLine.setErrorMessage(message);
}
/**
* Get the currently displayed error text.
* @return The error message. If no error message is displayed <code>null</code> is returned.
*/
public SystemMessage getSystemErrorMessage()
{
return sysErrorMessage;
}
/**
* Display the given error message. A currently displayed message
* is saved and will be redisplayed when the error message is cleared.
*/
public void setErrorMessage(SystemMessage message)
{
sysErrorMessage = message;
setErrorMessage(message.getLevelOneText());
}
/**
* Display the given error message. A currently displayed message
* is saved and will be redisplayed when the error message is cleared.
*/
public void setErrorMessage(Throwable exc)
{
setErrorMessage(exc.getMessage());
}
/**
* Set the message text. If the message line currently displays an error,
* the message is stored and will be shown after a call to clearErrorMessage
*/
public void setMessage(String message)
{
this._message = message;
if (_statusLine != null)
_statusLine.setMessage(message);
}
/**
*If the message line currently displays an error,
* the message is stored and will be shown after a call to clearErrorMessage
*/
public void setMessage(SystemMessage message)
{
setMessage(message.getLevelOneText());
}
}

View file

@ -1,125 +0,0 @@
/********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. 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 IBM employees contributed to the Remote System Explorer
* component that contains this file: David McKnight, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.shells.ui.view;
import java.util.ArrayList;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.subsystems.IRemoteLineReference;
import org.eclipse.rse.internal.ui.view.SystemTableViewProvider;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
/**
* This is the content and label provider for the SystemTableView.
* This class is used both to populate the SystemTableView but also
* to resolve the icon and labels for the cells in the table.
*
*/
public class SystemBuildErrorViewProvider extends SystemTableViewProvider
{
private int _offset = 0;
private Object[] _unfilteredResults = null;
public SystemBuildErrorViewProvider()
{
super();
}
public void inputChanged(Viewer visualPart, Object oldInput, Object newInput)
{
if (newInput instanceof IRemoteCommandShell)
{
IRemoteCommandShell cmd = (IRemoteCommandShell)newInput;
Object[] output = cmd.listOutput();
if (_offset == 0)
setOffset(output.length);
}
else if (newInput instanceof IRemoteOutput)
{
IRemoteOutput output = (IRemoteOutput)newInput;
//IRemoteCommandShell cmd = (IRemoteCommandShell)output.getParent();
setOffset(output.getIndex());
}
else if (newInput instanceof IRemoteLineReference)
{
//IRemoteLineReference output = (IRemoteLineReference)newInput;
//IRemoteCommandShell cmd = (IRemoteCommandShell)output.getParent();
//setOffset(output.getIndex());
}
}
public void setOffset(int offset)
{
_offset = offset;
}
public void moveOffsetToEnd()
{
if (_unfilteredResults != null)
{
_offset = _unfilteredResults.length;
}
}
public Object[] getElements(Object object)
{
Object[] results = null;
if (object == _lastObject && _lastResults != null)
{
return _lastResults;
}
else
if (object instanceof IAdaptable)
{
ISystemViewElementAdapter adapter = getAdapterFor(object);
if (adapter != null)
{
results = adapter.getChildren(new NullProgressMonitor(), (IAdaptable)object);
ArrayList filterredResults = new ArrayList();
for (int i = _offset+ 1; i <results.length;i++)
{
if (results[i] instanceof IRemoteError)
{
filterredResults.add(results[i]);
}
}
_lastResults = filterredResults.toArray();//results;
_unfilteredResults = results;
_lastObject = object;
}
}
if (results == null)
{
return new Object[0];
}
return _lastResults;
}
}

View file

@ -20,6 +20,7 @@ import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewProvider;
import org.eclipse.rse.internal.ui.view.SystemTableViewProvider;
import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;

View file

@ -33,6 +33,9 @@ import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.files.ui.actions.SystemRemoteFileLineOpenWithMenu;
import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
import org.eclipse.rse.internal.shells.ui.view.ShellServiceSubSystemConfigurationAdapter;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.internal.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.internal.ui.view.SystemView;
import org.eclipse.rse.internal.ui.view.SystemViewResources;
import org.eclipse.rse.shells.ui.ShellResources;

View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.core
Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.rse.subsystems.shells.core.Activator
Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.core.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.ui,
Eclipse-LazyStart: true
Export-Package: org.eclipse.rse.internal.subsystems.shells.servicesubsystem;x-internal:=true,
org.eclipse.rse.internal.subsystems.shells.subsystems;x-internal:=true,
org.eclipse.rse.subsystems.shells.core,
org.eclipse.rse.subsystems.shells.core.model,
org.eclipse.rse.subsystems.shells.core.subsystems,
org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.shells.core;
package org.eclipse.rse.internal.subsystems.shells.core;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;

View file

@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
package org.eclipse.rse.subsystems.shells.core;
package org.eclipse.rse.internal.subsystems.shells.core;
import org.eclipse.osgi.util.NLS;

View file

@ -19,10 +19,10 @@ package org.eclipse.rse.internal.subsystems.shells.servicesubsystem;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.rse.internal.subsystems.shells.core.ShellStrings;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.SystemRegistry;
import org.eclipse.rse.model.SystemResourceChangeEvent;
import org.eclipse.rse.subsystems.shells.core.ShellStrings;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput;
import org.eclipse.rse.ui.RSEUIPlugin;

View file

@ -34,6 +34,7 @@ import org.eclipse.rse.core.subsystems.ICommunicationsListener;
import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.IRemoteSystemEnvVar;
import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.internal.subsystems.shells.core.ShellStrings;
import org.eclipse.rse.internal.subsystems.shells.subsystems.RemoteSystemEnvVar;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.SystemRegistry;
@ -42,7 +43,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.shells.core.ShellStrings;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.widgets.Display;

View file

@ -16,12 +16,12 @@
package org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem;
import org.eclipse.rse.internal.subsystems.shells.core.ShellStrings;
import org.eclipse.rse.internal.subsystems.shells.servicesubsystem.OutputRefreshJob;
import org.eclipse.rse.services.shells.IHostOutput;
import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.rse.services.shells.IHostShellChangeEvent;
import org.eclipse.rse.services.shells.SimpleHostOutput;
import org.eclipse.rse.subsystems.shells.core.ShellStrings;
import org.eclipse.rse.subsystems.shells.core.model.RemoteCommandShell;
import org.eclipse.rse.subsystems.shells.core.model.RemoteError;
import org.eclipse.rse.subsystems.shells.core.model.RemoteOutput;