1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-12 19:45:22 +02:00

[cleanup] organize imports: make not-exported classes internal in tests.framework

This commit is contained in:
Martin Oberhuber 2007-04-03 08:13:12 +00:00
parent 407435a206
commit 786f1d6fc7
19 changed files with 253 additions and 245 deletions

View file

@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.tests.framework.examples;singleton:=true Bundle-SymbolicName: org.eclipse.rse.tests.framework.examples;singleton:=true
Bundle-Version: 1.0.1.qualifier Bundle-Version: 1.0.100.qualifier
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.junit, Require-Bundle: org.junit,
org.eclipse.rse.tests.framework org.eclipse.rse.tests.framework
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4
Export-Package: org.eclipse.rse.tests.framework.examples

View file

@ -2,11 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.tests.framework;singleton:=true Bundle-SymbolicName: org.eclipse.rse.tests.framework;singleton:=true
Bundle-Version: 1.0.2.qualifier Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.rse.tests.framework.TestFrameworkPlugin Bundle-Activator: org.eclipse.rse.internal.tests.framework.TestFrameworkPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Export-Package: org.eclipse.rse.tests.framework, Export-Package: org.eclipse.rse.internal.tests.framework;x-internal:=true,
org.eclipse.rse.internal.tests.framework.actions;x-internal:=true,
org.eclipse.rse.internal.tests.framework.ui;x-internal:=true,
org.eclipse.rse.tests.framework,
org.eclipse.rse.tests.framework.scripting org.eclipse.rse.tests.framework.scripting
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui, org.eclipse.ui,

View file

@ -15,7 +15,9 @@ bin.includes = META-INF/,\
html/,\ html/,\
icons/,\ icons/,\
schema/,\ schema/,\
. .,\
about.html
jars.compile.order = . jars.compile.order = .
source.. = src/ source.. = src/
output.. = bin/ output.. = bin/
src.includes = about.html

View file

@ -11,7 +11,7 @@
</category> </category>
<view <view
icon="icons/HolderView.gif" icon="icons/HolderView.gif"
class="org.eclipse.rse.tests.framework.ui.TestSuiteHolderView" class="org.eclipse.rse.internal.tests.framework.ui.TestSuiteHolderView"
category="org.eclipse.rse.projects.testing" category="org.eclipse.rse.projects.testing"
name="%TestSuiteHolderView.view.name" name="%TestSuiteHolderView.view.name"
id="org.eclipse.rse.tests.framework.HolderView"> id="org.eclipse.rse.tests.framework.HolderView">
@ -41,7 +41,7 @@
<action <action
enablesFor="*" enablesFor="*"
label="%SelectAllHoldersDelegate.label" label="%SelectAllHoldersDelegate.label"
class="org.eclipse.rse.tests.framework.actions.SelectAllHoldersDelegate" class="org.eclipse.rse.internal.tests.framework.actions.SelectAllHoldersDelegate"
menubarPath="additions" menubarPath="additions"
id="org.eclipse.rse.tests.framework.SelectAllHolders"/> id="org.eclipse.rse.tests.framework.SelectAllHolders"/>
</viewerContribution> </viewerContribution>
@ -51,13 +51,13 @@
<action <action
enablesFor="+" enablesFor="+"
label="%ResetHolderDelegate.label" label="%ResetHolderDelegate.label"
class="org.eclipse.rse.tests.framework.actions.ResetHolderDelegate" class="org.eclipse.rse.internal.tests.framework.actions.ResetHolderDelegate"
menubarPath="additions" menubarPath="additions"
id="org.eclipse.rse.tests.framework.ResetHolder"/> id="org.eclipse.rse.tests.framework.ResetHolder"/>
<action <action
enablesFor="+" enablesFor="+"
label="%RunHolderDelegate.label" label="%RunHolderDelegate.label"
class="org.eclipse.rse.tests.framework.actions.RunHolderDelegate" class="org.eclipse.rse.internal.tests.framework.actions.RunHolderDelegate"
menubarPath="additions" menubarPath="additions"
id="org.eclipse.rse.tests.framework.RunHolder"/> id="org.eclipse.rse.tests.framework.RunHolder"/>
</objectContribution> </objectContribution>
@ -68,7 +68,7 @@
id="org.eclipse.rse.tests.framework.HolderViewActions" id="org.eclipse.rse.tests.framework.HolderViewActions"
targetID="org.eclipse.rse.tests.framework.HolderView"> targetID="org.eclipse.rse.tests.framework.HolderView">
<action <action
class="org.eclipse.rse.tests.framework.actions.ToggleRunInBackgroundDelegate" class="org.eclipse.rse.internal.tests.framework.actions.ToggleRunInBackgroundDelegate"
icon="icons/GreenDot.gif" icon="icons/GreenDot.gif"
id="org.eclipse.rse.tests.framework.runInBackgroundToggle" id="org.eclipse.rse.tests.framework.runInBackgroundToggle"
label="%ToggleRunInBackgroundDelegate.label" label="%ToggleRunInBackgroundDelegate.label"
@ -101,10 +101,10 @@
<extension <extension
point="org.eclipse.rse.tests.framework.suites"> point="org.eclipse.rse.tests.framework.suites">
<type <type
class="org.eclipse.rse.tests.framework.impl.StandardTestSuiteHolder" class="org.eclipse.rse.internal.tests.framework.StandardTestSuiteHolder"
name="standard"/> name="standard"/>
<type <type
class="org.eclipse.rse.tests.framework.impl.TestSuiteGeneratorHolder" class="org.eclipse.rse.internal.tests.framework.TestSuiteGeneratorHolder"
name="generated"/> name="generated"/>
<!-- <!--
<type <type

View file

@ -62,6 +62,9 @@
<documentation> <documentation>
The class of the test suite. This must be an extension of &lt;code&gt;junit.framework.TestSuite&lt;/code&gt;. The class of the test suite. This must be an extension of &lt;code&gt;junit.framework.TestSuite&lt;/code&gt;.
</documentation> </documentation>
<appInfo>
<meta.attribute kind="java" basedOn="junit.framework.TestSuite"/>
</appInfo>
</annotation> </annotation>
</attribute> </attribute>
<attribute name="name" type="string" use="required"> <attribute name="name" type="string" use="required">
@ -157,7 +160,7 @@
<meta.section type="copyright"/> <meta.section type="copyright"/>
</appInfo> </appInfo>
<documentation> <documentation>
(c) Copyright IBM Corporation 2004, 2006. (c) Copyright 2004, 2007 IBM Corporation and others.
</documentation> </documentation>
</annotation> </annotation>

View file

@ -1,42 +1,42 @@
/* ******************************************************************************* /* *******************************************************************************
* Copyright (c) 2006 IBM Corporation. All rights reserved. * Copyright (c) 2006 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms * 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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.impl; package org.eclipse.rse.internal.tests.framework;
import org.eclipse.rse.tests.framework.AbstractTestSuiteHolder; import org.eclipse.rse.tests.framework.AbstractTestSuiteHolder;
import junit.framework.TestSuite; import junit.framework.TestSuite;
/** /**
* A BasicHolder provides a simple wrapper for a test suite. Use this if you just want to contribute a JUnit * A BasicHolder provides a simple wrapper for a test suite. Use this if you just want to contribute a JUnit
* test suite that you already have without defining it in an extension point. * test suite that you already have without defining it in an extension point.
*/ */
public class BasicTestSuiteHolder extends AbstractTestSuiteHolder { public class BasicTestSuiteHolder extends AbstractTestSuiteHolder {
private TestSuite testSuite; private TestSuite testSuite;
public BasicTestSuiteHolder(TestSuite testSuite) { public BasicTestSuiteHolder(TestSuite testSuite) {
this.testSuite = testSuite; this.testSuite = testSuite;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.rse.tests.framework.AbstractTestSuiteHolder#getName() * @see org.eclipse.rse.tests.framework.AbstractTestSuiteHolder#getName()
*/ */
public String getName() { public String getName() {
return testSuite.getName(); return testSuite.getName();
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.rse.tests.framework.AbstractTestSuiteHolder#getTestSuite() * @see org.eclipse.rse.tests.framework.AbstractTestSuiteHolder#getTestSuite()
*/ */
public TestSuite getTestSuite() { public TestSuite getTestSuite() {
return testSuite; return testSuite;
} }
} }

View file

@ -7,7 +7,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.impl; package org.eclipse.rse.internal.tests.framework;
import junit.framework.TestSuite; import junit.framework.TestSuite;

View file

@ -7,7 +7,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework; package org.eclipse.rse.internal.tests.framework;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;

View file

@ -7,7 +7,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.impl; package org.eclipse.rse.internal.tests.framework;
import junit.framework.TestSuite; import junit.framework.TestSuite;

View file

@ -1,61 +1,61 @@
/* ******************************************************************************* /* *******************************************************************************
* Copyright (c) 2006 IBM Corporation. All rights reserved. * Copyright (c) 2006 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms * 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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.actions; package org.eclipse.rse.internal.tests.framework.actions;
import java.util.Iterator; import java.util.Iterator;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.tests.framework.AbstractTestSuiteHolder; import org.eclipse.rse.tests.framework.AbstractTestSuiteHolder;
import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPart;
/** /**
* This implements the delegate for the "Reset Test Suite" action presented in the UI. * This implements the delegate for the "Reset Test Suite" action presented in the UI.
* The UI Proxy invokes this delegate. * The UI Proxy invokes this delegate.
* @see IObjectActionDelegate * @see IObjectActionDelegate
*/ */
public class ResetHolderDelegate implements IObjectActionDelegate { public class ResetHolderDelegate implements IObjectActionDelegate {
private ISelection selection; private ISelection selection;
/** /**
* The constructor. * The constructor.
*/ */
public ResetHolderDelegate() { public ResetHolderDelegate() {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/ */
public void run(IAction action) { public void run(IAction action) {
if (selection instanceof IStructuredSelection) { if (selection instanceof IStructuredSelection) {
IStructuredSelection ss = (IStructuredSelection) selection; IStructuredSelection ss = (IStructuredSelection) selection;
for (Iterator z = ss.iterator(); z.hasNext();) { for (Iterator z = ss.iterator(); z.hasNext();) {
AbstractTestSuiteHolder holder = (AbstractTestSuiteHolder) z.next(); AbstractTestSuiteHolder holder = (AbstractTestSuiteHolder) z.next();
holder.reset(); holder.reset();
} }
} }
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/ */
public void selectionChanged(IAction action, ISelection selection) { public void selectionChanged(IAction action, ISelection selection) {
this.selection = selection; this.selection = selection;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
*/ */
public void setActivePart(IAction action, IWorkbenchPart targetPart) { public void setActivePart(IAction action, IWorkbenchPart targetPart) {
} }
} }

View file

@ -7,7 +7,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.actions; package org.eclipse.rse.internal.tests.framework.actions;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.Iterator; import java.util.Iterator;
@ -22,8 +22,8 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.internal.tests.framework.TestFrameworkPlugin;
import org.eclipse.rse.tests.framework.AbstractTestSuiteHolder; import org.eclipse.rse.tests.framework.AbstractTestSuiteHolder;
import org.eclipse.rse.tests.framework.TestFrameworkPlugin;
import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.IWorkbenchPartSite;

View file

@ -1,52 +1,52 @@
/* ******************************************************************************* /* *******************************************************************************
* Copyright (c) 2006 IBM Corporation. All rights reserved. * Copyright (c) 2006 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms * 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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.actions; package org.eclipse.rse.internal.tests.framework.actions;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.rse.tests.framework.ui.TestSuiteHolderView; import org.eclipse.rse.internal.tests.framework.ui.TestSuiteHolderView;
import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewPart;
/** /**
* This implements the delegate for the "Select All" action presented in the UI. * This implements the delegate for the "Select All" action presented in the UI.
* The UI Proxy invokes this delegate. * The UI Proxy invokes this delegate.
* @see IViewActionDelegate * @see IViewActionDelegate
*/ */
public class SelectAllHoldersDelegate implements IViewActionDelegate { public class SelectAllHoldersDelegate implements IViewActionDelegate {
private IViewPart view; private IViewPart view;
/** /**
* The constructor. * The constructor.
*/ */
public SelectAllHoldersDelegate() { public SelectAllHoldersDelegate() {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/ */
public void run(IAction action) { public void run(IAction action) {
((TestSuiteHolderView)view).selectAll(); ((TestSuiteHolderView)view).selectAll();
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/ */
public void selectionChanged(IAction action, ISelection selection) { public void selectionChanged(IAction action, ISelection selection) {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
*/ */
public void init(IViewPart view) { public void init(IViewPart view) {
this.view = view; this.view = view;
} }
} }

View file

@ -7,12 +7,12 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.actions; package org.eclipse.rse.internal.tests.framework.actions;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.rse.tests.framework.TestFrameworkPlugin; import org.eclipse.rse.internal.tests.framework.TestFrameworkPlugin;
import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewPart;

View file

@ -7,7 +7,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.ui; package org.eclipse.rse.internal.tests.framework.ui;
import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory; import org.eclipse.ui.IPerspectiveFactory;

View file

@ -7,7 +7,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.ui; package org.eclipse.rse.internal.tests.framework.ui;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Color;

View file

@ -7,7 +7,7 @@
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.ui; package org.eclipse.rse.internal.tests.framework.ui;
import java.net.URL; import java.net.URL;
import java.text.DateFormat; import java.text.DateFormat;
@ -31,11 +31,11 @@ import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.rse.internal.tests.framework.TestFrameworkPlugin;
import org.eclipse.rse.tests.framework.AbstractTestSuiteHolder; import org.eclipse.rse.tests.framework.AbstractTestSuiteHolder;
import org.eclipse.rse.tests.framework.DelegatingTestSuiteHolder; import org.eclipse.rse.tests.framework.DelegatingTestSuiteHolder;
import org.eclipse.rse.tests.framework.ITestSuiteHolder; import org.eclipse.rse.tests.framework.ITestSuiteHolder;
import org.eclipse.rse.tests.framework.ITestSuiteHolderListener; import org.eclipse.rse.tests.framework.ITestSuiteHolderListener;
import org.eclipse.rse.tests.framework.TestFrameworkPlugin;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.events.SelectionListener;

View file

@ -1,65 +1,65 @@
/* ******************************************************************************* /* *******************************************************************************
* Copyright (c) 2006 IBM Corporation. All rights reserved. * Copyright (c) 2006 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms * 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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* David Dykstal (IBM) - initial contribution. * David Dykstal (IBM) - initial contribution.
* *******************************************************************************/ * *******************************************************************************/
package org.eclipse.rse.tests.framework.ui; package org.eclipse.rse.internal.tests.framework.ui;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.part.ViewPart;
/** /**
* Provides a view of any image that needs to be displayed by a test case. * Provides a view of any image that needs to be displayed by a test case.
*/ */
public class TestSuiteImageView extends ViewPart { public class TestSuiteImageView extends ViewPart {
private Canvas imageCanvas; private Canvas imageCanvas;
private Image image; private Image image;
private Color backgroundColor; private Color backgroundColor;
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
*/ */
public void createPartControl(Composite parent) { public void createPartControl(Composite parent) {
imageCanvas = new Canvas(parent, SWT.H_SCROLL | SWT.V_SCROLL); imageCanvas = new Canvas(parent, SWT.H_SCROLL | SWT.V_SCROLL);
backgroundColor = new Color(parent.getDisplay(), new RGB(255, 255, 255)); backgroundColor = new Color(parent.getDisplay(), new RGB(255, 255, 255));
clearImage(); clearImage();
} }
public void setImage(ImageDescriptor descriptor) { public void setImage(ImageDescriptor descriptor) {
clearImage(); clearImage();
image = descriptor.createImage(); image = descriptor.createImage();
imageCanvas.setBackgroundImage(image); imageCanvas.setBackgroundImage(image);
} }
public void clearImage() { public void clearImage() {
if (imageCanvas != null) { if (imageCanvas != null) {
imageCanvas.setBackground(backgroundColor); imageCanvas.setBackground(backgroundColor);
} }
if (image != null) { if (image != null) {
image.dispose(); image.dispose();
} }
image = null; image = null;
} }
public void setFocus() { public void setFocus() {
} }
public void dispose() { public void dispose() {
clearImage(); clearImage();
backgroundColor.dispose(); backgroundColor.dispose();
} }
} }

View file

@ -12,9 +12,9 @@ package org.eclipse.rse.tests.framework.scripting;
import java.net.URL; import java.net.URL;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.tests.framework.ui.TestSuiteConsoleView; import org.eclipse.rse.internal.tests.framework.ui.TestSuiteConsoleView;
import org.eclipse.rse.tests.framework.ui.TestSuiteHolderView; import org.eclipse.rse.internal.tests.framework.ui.TestSuiteHolderView;
import org.eclipse.rse.tests.framework.ui.TestSuiteImageView; import org.eclipse.rse.internal.tests.framework.ui.TestSuiteImageView;
import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IViewReference; import org.eclipse.ui.IViewReference;
import org.eclipse.ui.IViewSite; import org.eclipse.ui.IViewSite;

View file

@ -15,7 +15,7 @@ import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.rse.tests.framework.TestFrameworkPlugin; import org.eclipse.rse.internal.tests.framework.TestFrameworkPlugin;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
/** /**