diff options
author | Anithra P Janakiraman | 2010-11-03 07:32:57 +0000 |
---|---|---|
committer | Anithra P Janakiraman | 2010-11-03 07:32:57 +0000 |
commit | c907c92dec3808b274a51c4247650a41bb9b1906 (patch) | |
tree | 29bd2e941c15237a8df26cbe8d8bbe83e82e451a /systemtap | |
parent | 73df4fa42bae1908c78fb3ffc01d99905c4c2b96 (diff) | |
download | org.eclipse.linuxtools-c907c92dec3808b274a51c4247650a41bb9b1906.tar.gz org.eclipse.linuxtools-c907c92dec3808b274a51c4247650a41bb9b1906.tar.xz org.eclipse.linuxtools-c907c92dec3808b274a51c4247650a41bb9b1906.zip |
2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com>
Bug #324405
Some minor changes that take care of the warnings.
Diffstat (limited to 'systemtap')
63 files changed, 269 insertions, 128 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog index 28c7af2634..49eee63d4e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * feature.xml: + 2010-05-18 Andrew Overholt <overholt@redhat.com> * feature.properties: Fix provider name. diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml index 64513a22cc..88c260db61 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml @@ -22,6 +22,26 @@ <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/> </url> + <requires> + <import plugin="org.eclipse.core.runtime"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.editors"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui"/> + <import plugin="org.eclipse.ui.forms"/> + <import plugin="org.eclipse.birt.chart.engine"/> + <import plugin="org.eclipse.core.resources" version="3.4.1" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui.console" version="3.3.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.help"/> + <import plugin="org.eclipse.help.appserver"/> + <import plugin="org.eclipse.help.base"/> + <import plugin="org.eclipse.help.ui"/> + <import plugin="org.eclipse.help.webapp"/> + <import plugin="org.eclipse.core.filesystem"/> + <import plugin="org.eclipse.ui.ide"/> + </requires> + <plugin id="org.eclipse.linuxtools.systemtap.ui.consolelog" download-size="0" diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog index 1e7b0d2eac..f3d696b8d3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog @@ -1,3 +1,24 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * plugin.xml: Bug #324405 + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java (act): + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java: + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java: + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java (open): + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java (start): + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java: + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java (ScpExec): + (start): + (getInputStreamListeners): + (getErrorStreamListeners): + (command): + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ConsoleStreamDaemon.java (ConsoleStreamDaemon): + (pushData): + (dispose): + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java: + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java: + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole2.java (createErrorDaemon): + 2010-06-08 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> * src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java (selectionChanged): diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.xml index b42f79411f..132cca1217 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.xml @@ -40,8 +40,8 @@ point="org.eclipse.ui.preferencePages"> <page name="%preference.consoleLog.name" - id="com.qualityeclipse.systemtap.prefs.consoleLog" + id="org.eclipse.linuxtools.systemtap.prefs.consoleLog" class="org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPreferencePage" - category="com.qualityeclipse.systemtap.prefs.view"/> + category="org.eclipse.linuxtools.systemtap.prefs.view"/> </extension> </plugin> diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java index dc3db44111..6c02d10b1d 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java @@ -24,6 +24,7 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.DMResponse; * @author patrickm * */ +@SuppressWarnings("deprecation") public final class ClientSession extends Thread { private static ClientSession instance = null; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java index 757b719c5e..ce31d97a32 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java @@ -11,6 +11,7 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPref import java.io.*; +@SuppressWarnings("deprecation") public class ScpClient{ private Session session; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java index 2bbb0bb984..f402327f5f 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java @@ -9,14 +9,15 @@ import com.jcraft.jsch.*; import java.io.*; import java.util.ArrayList; +@SuppressWarnings("deprecation") public class ScpExec implements Runnable { private Session session; private Channel channel; - private String moduleName; +// private String moduleName; public ScpExec(String cmd[], String moduleName) { - this.moduleName = moduleName; + // this.moduleName = moduleName; this.command = new String(); try{ @@ -46,7 +47,7 @@ public class ScpExec implements Runnable { t.start(); } else { stop(); - returnVal = Integer.MIN_VALUE; + // returnVal = Integer.MIN_VALUE; } } @@ -197,6 +198,7 @@ public class ScpExec implements Runnable { * Returns the list of everything that is listening the the InputStream * @return List of all <code>IGobblerListeners</code> that are monitoring the stream. */ + @SuppressWarnings("unchecked") public ArrayList getInputStreamListeners() { if(null != inputGobbler) return inputListeners; @@ -208,6 +210,7 @@ public class ScpExec implements Runnable { * Returns the list of everything that is listening the the ErrorStream * @return List of all <code>IGobblerListeners</code> that are monitoring the stream. */ + @SuppressWarnings("unchecked") public ArrayList getErrorStreamListeners() { if(null != errorGobbler) return errorListeners; @@ -292,7 +295,7 @@ public class ScpExec implements Runnable { private StreamGobbler errorGobbler = null; private ArrayList<IGobblerListener> inputListeners = new ArrayList<IGobblerListener>(); //Only used to allow adding listeners before creating the StreamGobbler private ArrayList<IGobblerListener> errorListeners = new ArrayList<IGobblerListener>(); //Only used to allow adding listeners before creating the StreamGobbler - private int returnVal = Integer.MAX_VALUE; + //private int returnVal = Integer.MAX_VALUE; private String command; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java index 3132c62ac3..c20ca01e74 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java @@ -110,6 +110,7 @@ public abstract class ConsoleAction extends Action implements IWorkbenchWindowAc listener = null; } + @SuppressWarnings("unused") private IAction act; private IPropertyListener listener = new IPropertyListener() { public void propertyChanged(Object o, int i) { diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java index 7800389b77..dd81c63f3b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java @@ -15,7 +15,7 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.events.SelectionEvent; - +@SuppressWarnings("deprecation") public class SCPDetails extends Dialog { private Text userText; private Text passwordText; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java index cd44ed8cea..24e42ebc56 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java @@ -28,6 +28,7 @@ public class SelectServerDialog extends Dialog { super(parent); } + @SuppressWarnings("deprecation") public void open() { if (ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)) { return; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java index 9e7e40f2af..fddb69175c 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java @@ -33,6 +33,7 @@ public class ConsoleLogPlugin extends AbstractUIPlugin { /** * This method is called upon plug-in activation */ + @SuppressWarnings("deprecation") public void start(BundleContext context) throws Exception { super.start(context); this.internalInitializeDefaultPluginPreferences(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ConsoleStreamDaemon.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ConsoleStreamDaemon.java index 18432e74ce..844d4733d0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ConsoleStreamDaemon.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ConsoleStreamDaemon.java @@ -11,8 +11,10 @@ package org.eclipse.linuxtools.systemtap.ui.consolelog.structures; +import java.io.IOException; + import org.eclipse.linuxtools.systemtap.ui.structures.listeners.IGobblerListener; -import org.eclipse.ui.console.MessageConsoleStream; +import org.eclipse.ui.console.IOConsoleOutputStream; @@ -24,7 +26,7 @@ public class ConsoleStreamDaemon implements IGobblerListener { public ConsoleStreamDaemon(ScriptConsole console) { this.console = console; if(null != console) - msgConsole = console.newMessageStream(); + ioConsole = console.newOutputStream(); disposed = false; } @@ -32,8 +34,13 @@ public class ConsoleStreamDaemon implements IGobblerListener { * Prints out the new output data to the console */ protected void pushData() { - if(null != msgConsole) - msgConsole.print(output); + if(null != ioConsole) + try { + ioConsole.write(output); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } /** @@ -60,12 +67,12 @@ public class ConsoleStreamDaemon implements IGobblerListener { disposed = true; output = null; console = null; - msgConsole = null; + ioConsole = null; } } protected String output; protected ScriptConsole console; - protected MessageConsoleStream msgConsole; + protected IOConsoleOutputStream ioConsole; private boolean disposed; } diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java index 44abd3bfb2..efadd52b15 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java @@ -21,6 +21,7 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPref * @author patrickm * */ +@SuppressWarnings("deprecation") public class DMRequest extends DMPacket { // packet size diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java index 3270af12ba..abf1bf2cec 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java @@ -25,7 +25,7 @@ import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; -import org.eclipse.ui.console.MessageConsole; +import org.eclipse.ui.console.IOConsole; @@ -36,7 +36,7 @@ import org.eclipse.ui.console.MessageConsole; * running. * @author Ryan Morse */ -public class ScriptConsole extends MessageConsole { +public class ScriptConsole extends IOConsole { /** * This method is used to get a reference to a <code>ScriptConsole</code>. If there * is already an console that has the same name as that provided it will be stopped, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole2.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole2.java index d3725d3262..154c805aac 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole2.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole2.java @@ -19,7 +19,7 @@ import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; -import org.eclipse.ui.console.MessageConsole; +import org.eclipse.ui.console.IOConsole; import org.eclipse.linuxtools.systemtap.ui.consolelog.actions.StopScriptAction; import org.eclipse.linuxtools.systemtap.ui.consolelog.internal.Localization; @@ -35,7 +35,7 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.Subscription; * running. * @author Ryan Morse */ -public class ScriptConsole2 extends MessageConsole { +public class ScriptConsole2 extends IOConsole { /** * This method is used to get a reference to a <code>ScriptConsole</code>. If there * is already an console that has the same name as that provided it will be stopped, @@ -134,6 +134,7 @@ public class ScriptConsole2 extends MessageConsole { * <code>LoggedCommand</code>'s ErrorStream to the Console and ErrorView. */ protected void createErrorDaemon(IErrorParser parser) { + @SuppressWarnings("unused") ErrorView errorView = null; try { IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ErrorView.ID); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog index 7ff8c967fa..a3cac311f2 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog @@ -1,3 +1,23 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * plugin.xml: Bug #324405 + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java (addActionListener): + (listeners): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java (runScript): + (addActionListener): + (listeners): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java (addActionListener): + (listeners): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java (DashboardShimButtonController.widgetSelected): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java (externalQueue): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java (allmodules): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java (readData): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java (filters): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java (add): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java (add): + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java (ViewLabelProvider.getFont): + (ViewLabelProvider.getBackground): + 2010-06-07 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> * plugin.xml: Removing invalid Menu Extensions diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml index afb57f6195..05ac40ca0a 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml @@ -166,9 +166,9 @@ point="org.eclipse.ui.preferencePages"> <page name="%preference.dashboard.name" - id="com.qualityeclipse.systemtap.prefs.dashboard" + id="org.eclipse.linuxtools.systemtap.prefs.dashboard" class="org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferencePage" - category="com.qualityeclipse.systemtap.prefs.view"/> + category="org.eclipse.linuxtools.systemtap.prefs.view"/> </extension> <extension diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java index 0af0b08bd3..11c1a59c05 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java @@ -284,7 +284,7 @@ public class DashboardAdapter { Control[] children = c.getChildren(); for(int i = 0; i < children.length; i++) { if(children[i] instanceof GraphComposite) { - GraphComposite gc = (GraphComposite)children[i]; + // GraphComposite gc = (GraphComposite)children[i]; if(!maximized) { composite.maximize(shim); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java index 3ef2f4f822..acc0611f55 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java @@ -58,7 +58,7 @@ public class DashboardComposite { * Queue at the end of the list. When there are 8 objects rendering and a 9th object is added, * it is placed on this queue and displayed when an internal composite is released. */ - private final ArrayList externalQueue = new ArrayList(); + private final ArrayList<DashboardAdapter> externalQueue = new ArrayList<DashboardAdapter>(); /** * The actual rendering surface. */ diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java index 97224ef177..4214dccb9c 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java @@ -20,5 +20,6 @@ import java.util.ArrayList; */ public class DashboardSessionSettings { public static String password = null; + @SuppressWarnings("unchecked") public static ArrayList allmodules = null; } diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java index 32581ac379..3c0ff916f7 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java @@ -136,6 +136,7 @@ public class PauseModuleAction extends Action implements IViewActionDelegate, IW * is pressed. * @param listener The class interested in knowing when scripts are paused */ + @SuppressWarnings("unchecked") public static void addActionListener(IActionListener listener) { listeners.add(listener); } @@ -225,5 +226,6 @@ public class PauseModuleAction extends Action implements IViewActionDelegate, IW private IViewPart view; private IAction act; + @SuppressWarnings("unchecked") private static ArrayList listeners = new ArrayList(); } diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java index dfa48d2e2b..fec1e6398a 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java @@ -45,7 +45,7 @@ import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule; import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView; import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView; import org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures.ChartStreamDaemon2; -import org.eclipse.linuxtools.systemtap.ui.systemtapgui.preferences.EnvironmentVariablesPreferencePage; + /** * This action is used to run the selected dashboard module. @@ -53,6 +53,8 @@ import org.eclipse.linuxtools.systemtap.ui.systemtapgui.preferences.EnvironmentV * are also added to the main window the the user to monitor. * @author Ryan Morse */ + +@SuppressWarnings("deprecation") public class RunModuleAction extends Action implements IViewActionDelegate, IWorkbenchWindowActionDelegate { // public RunModuleAction(){ // buildEnablementChecks(); @@ -162,9 +164,9 @@ public class RunModuleAction extends Action implements IViewActionDelegate, IWor ((ActiveModuleBrowserView)ivp).add(display, amd); } - private String[] getEnvironmentVariables() { + /*private String[] getEnvironmentVariables() { return EnvironmentVariablesPreferencePage.getEnvironmentVariables(); - } + }*/ private void runScript(DashboardModule module) { @@ -294,6 +296,7 @@ public class RunModuleAction extends Action implements IViewActionDelegate, IWor * is pressed. * @param listener The class interested in knowing when scripts are run */ + @SuppressWarnings("unchecked") public static void addActionListener(IActionListener listener) { listeners.add(listener); } @@ -406,6 +409,7 @@ public class RunModuleAction extends Action implements IViewActionDelegate, IWor } private IViewPart view; + @SuppressWarnings("unchecked") private static ArrayList listeners = new ArrayList(); private String fileName = null; protected IWorkbenchWindow fWindow = null; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java index 66fffbdd1a..81154291b0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java @@ -190,6 +190,7 @@ public class StopModuleAction extends Action implements IViewActionDelegate, IWo * is pressed. * @param listener The class interested in knowing when scripts are stopped */ + @SuppressWarnings("unchecked") public static void addActionListener(IActionListener listener) { listeners.add(listener); } @@ -265,5 +266,6 @@ public class StopModuleAction extends Action implements IViewActionDelegate, IWo private IViewPart view; private IAction act; + @SuppressWarnings("unchecked") private static ArrayList listeners = new ArrayList(); } diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java index dcebcbb696..74f0aa1396 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java @@ -76,6 +76,7 @@ public class DashboardMetaData { * and populates the DashboardModule structure from it. * @return boolean representing whether or not the meta data was succesfuly read */ + @SuppressWarnings("unchecked") private boolean readData() { if(null == metaFile) return false; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java index 18165a1d1f..46c8bc416d 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java @@ -33,6 +33,7 @@ public class DashboardModule { public String[] labels; public IDataSetParser parser; public GraphData[] graphs; + @SuppressWarnings("unchecked") public ArrayList[] filters; public String location; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java index e068654473..95ed75fe96 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java @@ -84,6 +84,7 @@ public class ActiveModuleBrowserView extends ModuleView { * @param display The string used as a title for the module * @param data The <code>ActiveModuleData</code> representing the item to add. */ + @SuppressWarnings("unchecked") public void add(String display, ActiveModuleData data) { Display disp = PlatformUI.getWorkbench().getDisplay(); Cursor cursor = new Cursor(disp, SWT.CURSOR_WAIT); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java index 6aed947a38..e2381357bf 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java @@ -86,6 +86,7 @@ public class DashboardGraphsBrowserView extends GraphsView { super.makeActions(); } + @SuppressWarnings("unchecked") public void add(String display, ActiveModuleData data) { TreeNode root = (TreeNode)viewer.getInput(); ActiveModuleTreeNode child = new ActiveModuleTreeNode(data, display, true); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java index 50422ce1f2..e9f63f59e2 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java @@ -124,7 +124,7 @@ public class ViewLabelProvider extends LabelProvider public Font getFont(Object element) { Font font = Display.getCurrent().getSystemFont(); - TreeNode parent = ((TreeNode)element); + //TreeNode parent = ((TreeNode)element); /*if (parent.getChildCount()>0) { font = registry.getBold(Display.getCurrent().getSystemFont().g); }*/ @@ -132,7 +132,7 @@ public class ViewLabelProvider extends LabelProvider } public Color getBackground(Object element) { - TreeNode parent = ((TreeNode)element); + // TreeNode parent = ((TreeNode)element); Color c = null; // if (parent.getChildCount()>0) { // c = new Color(Display.getCurrent(), IGraphColorConstants.COLORS[j]); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog index b1297fee86..350476d1bd 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog @@ -1,3 +1,7 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java: + 2010-06-07 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> * plugin.xml: Removing invalid Menu Extensions diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java index 397f2860ac..4342d7730b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java @@ -28,6 +28,7 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin; import org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferenceConstants; +@SuppressWarnings("deprecation") public class ScriptDetails extends Dialog { private Text dirText; private Text scriptText; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog index 199e567564..8ca13bf4d0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog @@ -1,3 +1,8 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java (run): + * src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java (dataSet): + 2010-06-07 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> * plugin.xml: Removing invalid Menu Extensions diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java index c6498e5c90..73320e7ace 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java @@ -48,6 +48,7 @@ public class ModifyParsingAction extends ConsoleAction implements IWorkbenchWind * Finally, it will dispose of the old <code>ChartStreamDaemon2</code> and add an new * one in its place. */ + @SuppressWarnings("unchecked") public void run() { DataSetWizard wizard = new DataSetWizard(GraphingConstants.DataSetMetaData, getFilePath()); IWorkbench workbench = PlatformUI.getWorkbench(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java index 3900a3911f..3ee2175e31 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java @@ -13,6 +13,7 @@ package org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions; import org.eclipse.jface.wizard.WizardDialog; + import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; @@ -44,6 +45,7 @@ import org.eclipse.linuxtools.systemtap.ui.ide.structures.StapErrorParser; * and send the output to both the <code>ScriptConsole</code> window and a <code>DataSet</code>. * @author Ryan Morse */ +@SuppressWarnings("deprecation") public class RunScriptChartAction extends RunScriptAction implements IWorkbenchWindowActionDelegate { public RunScriptChartAction() { super(); @@ -151,7 +153,14 @@ public class RunScriptChartAction extends RunScriptAction implements IWorkbenchW } - private boolean useOptions = false; + /* protected String getFilePath() { + + IEditorPart ed = fWindow.getActivePage().getActiveEditor(); + return ((PathEditorInput)ed.getEditorInput()).getPath().toString(); + + }*/ + + //private boolean useOptions = false; private IDataSet dataSet = null; private IDataSetParser parser = null; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog index 708363cae7..ffbe4235be 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog @@ -1,3 +1,13 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * plugin.xml: Bug #324405 + * src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java (GraphDisplaySet): + (ButtonClickListener): + (ButtonClickListener.widgetSelected): + (addTabListener): + (tabListeners): + (builders): + 2010-06-02 Roland Grunberg <rgrunber@redhat.com> * plugin.xml: Fix BZ #315223. Identical ActionSet in GraphicalRun diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml index 5f285ccd88..1e189c43ba 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml @@ -37,9 +37,9 @@ point="org.eclipse.ui.preferencePages"> <page name="%preference.graphing.name" - id="com.qualityeclipse.systemtap.prefs.graphing" + id="org.eclipse.linuxtools.systemtap.prefs.graphing" class="org.eclipse.linuxtools.systemtap.ui.graphing.preferences.GraphingPreferencePage" - category="com.qualityeclipse.systemtap.prefs.view"/> + category="org.eclipse.linuxtools.systemtap.prefs.view"/> </extension> <extension diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java index a3d7dfdf64..cc13a5615c 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java @@ -55,6 +55,7 @@ import org.eclipse.ui.PlatformUI; * @author Ryan Morse */ public class GraphDisplaySet { + @SuppressWarnings("unchecked") public GraphDisplaySet(Composite parent, IDataSet data) { LogManager.logDebug("Start GraphSelectorView:", this); LogManager.logInfo("Initializing", this); @@ -202,6 +203,7 @@ public class GraphDisplaySet { */ public class ButtonClickListener implements SelectionListener { public void widgetDefaultSelected(SelectionEvent event) {} + @SuppressWarnings("unchecked") public void widgetSelected(SelectionEvent event) { CTabFolder folder = (CTabFolder)event.getSource(); @@ -240,6 +242,7 @@ public class GraphDisplaySet { } } + @SuppressWarnings("unchecked") public void addTabListener(ITabListener listener) { tabListeners.add(listener); } @@ -268,8 +271,10 @@ public class GraphDisplaySet { private CTabFolder folder; private ButtonClickListener listener; private UpdateManager updater; + @SuppressWarnings("unchecked") private ArrayList tabListeners; // private ArrayList graphs; + @SuppressWarnings("unchecked") private ArrayList builders; }
\ No newline at end of file diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog index cf759baa80..2ddfe155a4 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog @@ -1,3 +1,23 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * META-INF/MANIFEST.MF: + * plugin.xml: + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ChartCanvas.java (ChartCanvas): + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AreaChartBuilder.java: + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/BarChartBuilder.java: + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/LineChartBuilder.java (LineChartBuilder): + (buildXSeries): + (buildYSeries): + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/MeterChartBuilder.java (MeterChartBuilder): + (buildYSeries): + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/PieChartBuilder.java (PieChartBuilder): + (buildYSeries): + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/ScatterChartBuilder.java (ScatterChartBuilder): + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java: + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java (GraphComposite): + * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java (getAvailableGraphs): + (createGraph): + 2010-06-04 Andrew Overholt <overholt@redhat.com> Bug #282039 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF index fa48951fed..b04ae5cfec 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Require-Bundle: org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui;visibility org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.ui.forms, - org.eclipse.birt.chart.engine + org.eclipse.birt.chart.engine;bundle-version="2.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.birt.chart.model.component diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml index ae405e66c7..82f213cab3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml @@ -4,20 +4,20 @@ <extension point="org.eclipse.ui.preferencePages"> <page - category="com.qualityeclipse.systemtap.prefs.view" + category="org.eclipse.linuxtools.systemtap.prefs.view" class="org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.GraphingAPIPreferencePage" - id="com.qualityeclipse.generic.prefs.graphingapi" + id="org.eclipse.linuxtools.generic.prefs.graphingapi" name="%preference.graphing.name"/> <page name="%preference.dataTable.name" - id="com.qualityeclipse.generic.prefs.graphing.datatable" + id="org.eclipse.linuxtools.generic.prefs.graphing.datatable" class="org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.DataTablePreferencePage" - category="com.qualityeclipse.generic.prefs.graphingapi"/> + category="org.eclipse.linuxtools.generic.prefs.graphingapi"/> <page name="%preference.graph.name" - id="com.qualityeclipse.generic.prefs.graphing.graph" + id="org.eclipse.linuxtools.generic.prefs.graphing.graph" class="org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.GraphPreferencePage" - category="com.qualityeclipse.generic.prefs.graphingapi"/> + category="org.eclipse.linuxtools.generic.prefs.graphingapi"/> </extension> <extension diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ChartCanvas.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ChartCanvas.java index 4176c20d0b..7d31ec8c9b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ChartCanvas.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ChartCanvas.java @@ -22,7 +22,6 @@ import org.eclipse.birt.chart.factory.Generator; import org.eclipse.birt.chart.model.Chart; import org.eclipse.birt.chart.model.attribute.Bounds; import org.eclipse.birt.chart.model.attribute.impl.BoundsImpl; -import org.eclipse.birt.chart.util.PluginSettings; import org.eclipse.birt.core.framework.PlatformConfig; import org.eclipse.swt.SWT; import org.eclipse.swt.events.PaintEvent; @@ -40,14 +39,14 @@ public class ChartCanvas extends Canvas{ protected Chart chart = null; protected AbstractChartBuilder builder = null; protected GeneratedChartState state = null; - private boolean bFirstPaint = true; + // private boolean bFirstPaint = true; public ChartCanvas(Composite parent, int style) { super(parent, style | SWT.V_SCROLL | SWT.H_SCROLL); try { // INITIALIZE THE SWT RENDERING DEVICE //ChartEngine ce = ChartEngine.instance(); - PluginSettings ps = PluginSettings.instance(); + // PluginSettings ps = PluginSettings.instance(); PlatformConfig pf = new PlatformConfig(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AreaChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AreaChartBuilder.java index d625cd29c4..79c08391fb 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AreaChartBuilder.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AreaChartBuilder.java @@ -60,6 +60,7 @@ import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.GraphingAP * * @author Qi Liang */ +@SuppressWarnings("deprecation") public class AreaChartBuilder extends AbstractChartWithAxisBuilder { /** @@ -88,7 +89,6 @@ public class AreaChartBuilder extends AbstractChartWithAxisBuilder { protected ChartWithAxes chart = null; protected AbstractChartBuilder builder = null; protected GeneratedChartState state = null; - private boolean bFirstPaint = true; public AreaChartBuilder(Composite parent, int style, String title,IAdapter adapter) { super(adapter, parent, style); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/BarChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/BarChartBuilder.java index dd712cabc4..59780ea5db 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/BarChartBuilder.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/BarChartBuilder.java @@ -58,6 +58,8 @@ import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.GraphingAP * * @author Qi Liang */ + +@SuppressWarnings("deprecation") public class BarChartBuilder extends AbstractChartWithAxisBuilder { /** @@ -86,7 +88,7 @@ public class BarChartBuilder extends AbstractChartWithAxisBuilder { protected ChartWithAxes chart = null; protected AbstractChartBuilder builder = null; protected GeneratedChartState state = null; - private boolean bFirstPaint = true; + public BarChartBuilder(Composite parent, int style, String title,IAdapter adapter) { super(adapter, parent, style); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/LineChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/LineChartBuilder.java index 7c46483857..787748f178 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/LineChartBuilder.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/LineChartBuilder.java @@ -88,8 +88,6 @@ public class LineChartBuilder extends AbstractChartWithAxisBuilder { protected ChartWithAxes chart = null; protected AbstractChartBuilder builder = null; protected GeneratedChartState state = null; - private boolean bFirstPaint = true; - public LineChartBuilder(Composite parent, int style, String title,IAdapter adapter) { super(adapter, parent, style); this.title = title; @@ -237,7 +235,8 @@ public class LineChartBuilder extends AbstractChartWithAxisBuilder { * * @see com.ibm.examples.chart.widget.chart.AbstractChartBuilder#buildXSeries() */ - protected void buildXSeries() { + @SuppressWarnings("deprecation") + protected void buildXSeries() { data = adapter.getData(); @@ -272,7 +271,8 @@ public class LineChartBuilder extends AbstractChartWithAxisBuilder { * * @see com.ibm.examples.chart.widget.AbstractChartBuilder#buildYSeries() */ - protected void buildYSeries() { + @SuppressWarnings("deprecation") + protected void buildYSeries() { try{ //NumberDataSet orthoValuesDataSet1 = NumberDataSetImpl.create(new double[] { 4, 5, 6, 7}); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/MeterChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/MeterChartBuilder.java index 515b8e52b5..555fc33359 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/MeterChartBuilder.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/MeterChartBuilder.java @@ -64,7 +64,7 @@ public class MeterChartBuilder extends AbstractChartWithoutAxisBuilder { protected DialChart chart = null; protected AbstractChartBuilder builder = null; protected GeneratedChartState state = null; - private boolean bFirstPaint = true; + // private boolean bFirstPaint = true; public MeterChartBuilder(Composite parent, int style, String title,IAdapter adapter) { super(adapter, parent, style); @@ -236,7 +236,7 @@ public class MeterChartBuilder extends AbstractChartWithoutAxisBuilder { try{ int starting = 0; if (data.length > xSeriesTicks ) starting = data.length - xSeriesTicks; - int yseriescount = adapter.getSeriesCount(); + // int yseriescount = adapter.getSeriesCount(); NumberDataSet orthoValuesDataSet; DialSeries ds1; SeriesDefinition sdY; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/PieChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/PieChartBuilder.java index 40dcbb4d95..469888e9a0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/PieChartBuilder.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/PieChartBuilder.java @@ -50,12 +50,13 @@ import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.GraphingAP * * @author Qi Liang */ +@SuppressWarnings("deprecation") public class PieChartBuilder extends AbstractChartWithoutAxisBuilder { protected IDeviceRenderer render = null; protected ChartWithoutAxes chart = null; protected AbstractChartBuilder builder = null; protected GeneratedChartState state = null; - private boolean bFirstPaint = true; + // private boolean bFirstPaint = true; public PieChartBuilder(Composite parent, int style, String title,IAdapter adapter) { super(adapter, parent, style); @@ -228,7 +229,7 @@ public class PieChartBuilder extends AbstractChartWithoutAxisBuilder { try{ int starting = 0; if (data.length > xSeriesTicks ) starting = data.length - xSeriesTicks; - int yseriescount = adapter.getSeriesCount(); + // int yseriescount = adapter.getSeriesCount(); NumberDataSet orthoValuesDataSet; PieSeries ps1; SeriesDefinition sdY; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/ScatterChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/ScatterChartBuilder.java index d8769d013b..a9acee977b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/ScatterChartBuilder.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/ScatterChartBuilder.java @@ -62,6 +62,7 @@ import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.GraphingAP * * @author Qi Liang */ +@SuppressWarnings("deprecation") public class ScatterChartBuilder extends AbstractChartWithAxisBuilder { /** @@ -76,7 +77,7 @@ public class ScatterChartBuilder extends AbstractChartWithAxisBuilder { protected ChartWithAxes chart = null; protected AbstractChartBuilder builder = null; protected GeneratedChartState state = null; - private boolean bFirstPaint = true; + // private boolean bFirstPaint = true; public ScatterChartBuilder(Composite parent, int style, String title,IAdapter adapter) { super(adapter, parent, style); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java index dbf2519d47..2814f78140 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java @@ -34,6 +34,7 @@ import org.eclipse.swt.widgets.Button; +@SuppressWarnings("deprecation") public abstract class AGraph extends AChart implements IGraph { public AGraph(GraphComposite parent, int style, String title, IAdapter adapt) { super(parent, style, title, adapt); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java index a8fb8ee76d..e06f2c4eeb 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java @@ -48,7 +48,7 @@ public class GraphComposite extends Composite { layout.marginWidth = 5; layout.marginHeight = 5; this.setLayout(layout); - checkOptions = new ArrayList(); + checkOptions = new ArrayList<Button>(); label = new Label(this, SWT.HORIZONTAL | SWT.BORDER | SWT.BOLD | SWT.CENTER); scale = scales[7]; @@ -244,6 +244,6 @@ public class GraphComposite extends Composite { private Label label; private Label pluslabel; - private ArrayList checkOptions; + private ArrayList<Button> checkOptions; } diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java index 6aefb044b6..bd6a7cb247 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java @@ -26,7 +26,6 @@ import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.LineChartBuilde import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.MeterChartBuilder; import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.PieChartBuilder; import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.ScatterChartBuilder; -import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.BarGraph; import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.PieChart; import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.internal.GraphingAPIUIPlugin; import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.internal.Localization; @@ -73,7 +72,7 @@ public final class GraphFactory { }; public static String[] getAvailableGraphs(IDataSet data) { - LinkedList ids = new LinkedList(); + LinkedList<String> ids = new LinkedList<String>(); if(data instanceof IHistoricalDataSet) { ids.add(ScatterChartBuilder.ID); ids.add(LineChartBuilder.ID); @@ -152,8 +151,7 @@ public final class GraphFactory { builder = new LineChartBuilder(comp, style, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key)); break; case 2: - BarGraph g; - if(!(data instanceof IBlockDataSet) || (null != gd.key)) + if(!(data instanceof IBlockDataSet) || (null != gd.key)) //g = new BarGraph(comp, SWT.NONE, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key)); { builder = new BarChartBuilder(comp, style, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key)); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog index ace189b69b..6a8f641ae3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog @@ -1,3 +1,12 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * plugin.xml: Bug #324405 + * src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java (getImportedTapsets): + * src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java (dispose): + * src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java (setupDocument): + * src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java (build): + * src/org/eclipse/linuxtools/systemtap/ui/ide/views/KernelBrowserView.java: + 2010-06-08 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> * src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java (getFilePath): diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml index e5c21a7a19..1bba44943e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml @@ -77,54 +77,54 @@ point="org.eclipse.ui.preferencePages"> <page name="%preference.ide.name" - id="com.qualityeclipse.systemtap.prefs.ide" + id="org.eclipse.linuxtools.systemtap.prefs.ide" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.IDEPreferencePage" - category="com.qualityeclipse.systemtap.prefs.view"/> + category="org.eclipse.linuxtools.systemtap.prefs.view"/> <page name="%preference.editor.name" - id="com.qualityeclipse.systemtap.prefs.ide.editor" + id="org.eclipse.linuxtools.systemtap.prefs.ide.editor" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.EditorPreferencePage" - category="com.qualityeclipse.systemtap.prefs.ide"/> + category="org.eclipse.linuxtools.systemtap.prefs.ide"/> <page name="%preference.codeAssist.name" - id="com.qualityeclipse.systemtap.prefs.ide.codeassist" + id="org.eclipse.linuxtools.systemtap.prefs.ide.codeassist" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.CodeAssistPreferencePage" - category="com.qualityeclipse.systemtap.prefs.ide.editor"/> + category="org.eclipse.linuxtools.systemtap.prefs.ide.editor"/> <page name="%preference.conditionalFilter.name" - id="com.qualityeclipse.systemtap.prefs.ide.conditionalfilters" + id="org.eclipse.linuxtools.systemtap.prefs.ide.conditionalfilters" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.ConditionalFilterPreferencePage" - category="com.qualityeclipse.systemtap.prefs.ide.editor"/> + category="org.eclipse.linuxtools.systemtap.prefs.ide.editor"/> <page name="%preference.syntaxColor.name" - id="com.qualityeclipse.systemtap.prefs.ide.syntaxcoloring" + id="org.eclipse.linuxtools.systemtap.prefs.ide.syntaxcoloring" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.SyntaxColoringPreferencePage" - category="com.qualityeclipse.systemtap.prefs.ide.editor"/> + category="org.eclipse.linuxtools.systemtap.prefs.ide.editor"/> <page name="%preference.typeing.name" - id="com.qualityeclipse.systemtap.prefs.ide.typeing" + id="org.eclipse.linuxtools.systemtap.prefs.ide.typeing" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.TypeingPreferencePage" - category="com.qualityeclipse.systemtap.prefs.ide.editor"/> + category="org.eclipse.linuxtools.systemtap.prefs.ide.editor"/> <page name="%preference.path.name" - id="com.qualityeclipse.systemtap.prefs.ide.path" + id="org.eclipse.linuxtools.systemtap.prefs.ide.path" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.PathPreferencePage" - category="com.qualityeclipse.systemtap.prefs.ide"/> + category="org.eclipse.linuxtools.systemtap.prefs.ide"/> <page name="%preference.stap.name" - id="com.qualityeclipse.systemtap.prefs.ide.stap" + id="org.eclipse.linuxtools.systemtap.prefs.ide.stap" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.StapPreferencePage" - category="com.qualityeclipse.systemtap.prefs.ide"/> + category="org.eclipse.linuxtools.systemtap.prefs.ide"/> <!--page name="%preference.stapOptions.name" - id="com.qualityeclipse.systemtap.prefs.ide.stapoptions" + id="org.eclipse.linuxtools.systemtap.prefs.ide.stapoptions" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.StapOptionsPreferencePage" - category="com.qualityeclipse.systemtap.prefs.view/com.qualityeclipse.systemtap.prefs.ide/com.qualityeclipse.systemtap.prefs.ide.stap"/--> + category="org.eclipse.linuxtools.systemtap.prefs.view/org.eclipse.linuxtools.systemtap.prefs.ide/org.eclipse.linuxtools.systemtap.prefs.ide.stap"/--> <page name="%preference.tapsets.name" - id="com.qualityeclipse.systemtap.prefs.ide.tapsets" + id="org.eclipse.linuxtools.systemtap.prefs.ide.tapsets" class="org.eclipse.linuxtools.systemtap.ui.ide.preferences.TapsetsPreferencePage" - category="com.qualityeclipse.systemtap.prefs.ide.stap"/> + category="org.eclipse.linuxtools.systemtap.prefs.ide.stap"/> </extension> <extension diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java index 21044bb52f..74ef3a1064 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java @@ -54,6 +54,8 @@ import org.eclipse.ui.ide.ResourceUtil; * This <code>Action</code> is used to run a SystemTap script that is currently open in the editor. * @author Ryan Morse */ + +@SuppressWarnings("deprecation") public class RunScriptAction extends Action implements IWorkbenchWindowActionDelegate { public RunScriptAction() { super(); @@ -199,7 +201,7 @@ public class RunScriptAction extends Action implements IWorkbenchWindowActionDel * Adds the tapsets that the user has added in preferences to the input <code>ArrayList</code> * @param cmdList The list to add the user-specified tapset locations to. */ - @SuppressWarnings("deprecation") + protected void getImportedTapsets(ArrayList<String> cmdList) { Preferences pref = IDEPlugin.getDefault().getPluginPreferences(); String[] tapsets = pref.getString(IDEPreferenceConstants.P_TAPSETS).split(File.pathSeparator); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java index a0b77be195..5b25feb743 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java @@ -30,7 +30,6 @@ import org.eclipse.linuxtools.systemtap.ui.ide.internal.IDEPlugin; import org.eclipse.linuxtools.systemtap.ui.ide.internal.Localization; import org.eclipse.linuxtools.systemtap.ui.ide.preferences.IDEPreferenceConstants; import org.eclipse.linuxtools.systemtap.ui.logging.LogManager; -import org.eclipse.linuxtools.systemtap.ui.structures.runnable.Command; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; @@ -49,6 +48,7 @@ import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor; * @author Henry Hughes * @author Ryan Morse */ +@SuppressWarnings("deprecation") public class CEditor extends AbstractDecoratedTextEditor { private ColorManager colorManager; /** @@ -232,36 +232,6 @@ public class CEditor extends AbstractDecoratedTextEditor { LogManager.logDebug("End internal_init", this); } - /** - * Runs the probe passed to it as a single-line SystemTap script. Used as a helper method - * by the <code>RulerDoubleClickHandler</code> class to check locations in the current file. - * @param probe the systemtap probe to test for validity - * @return true when the probe is a valid probe - */ - private boolean checkProbe(String probe) { - LogManager.logDebug("Start checkProbe: probe-" + probe, this); - String[] stap = new String[4]; - stap[0] = "stap"; - stap[1] = "-p2"; - stap[2] = "-e"; - stap[3] = probe; - LogManager.logDebug("running " + probe, this); - - Command cmd = new Command(stap, null, null, 0); - cmd.start(); - while(cmd.isRunning()) { - try { - Thread.sleep(100); - } catch(InterruptedException e) { - LogManager.logCritical("InterruptedException runStap: " + e.getMessage(), this); - } - } - boolean success = cmd.getReturnValue() == 0; - cmd.dispose(); - LogManager.logDebug("End checkProbe:", this); - return success; - } - public void dispose() { LogManager.logDebug("Start dispose:", this); LogManager.logInfo("Disposing", this); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java index a8d4ec4dd7..bdf4abe46b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java @@ -22,7 +22,7 @@ import org.eclipse.linuxtools.systemtap.ui.editor.SimpleDocumentProvider; import org.eclipse.linuxtools.systemtap.ui.logging.LogManager; public class STPDocumentProvider extends SimpleDocumentProvider { - private IDocument document; + //private IDocument document; /* (non-Javadoc) * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#getDocument(java.lang.Object) diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java index 48bb3adf4b..7d8f0822d0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java @@ -12,19 +12,15 @@ package org.eclipse.linuxtools.systemtap.ui.ide.editors.stp; + import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintStream; import java.net.URL; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; -import java.util.ResourceBundle; + /** * @@ -181,19 +177,20 @@ public class STPMetadataSingleton { return data.substring(data.indexOf('.') + 1, data.length()); } + /** * * Decide whether cached metadata exists on disk. * * @return - whether metadata exists. */ - private boolean haveMetadata(String location) { + /*private boolean haveMetadata(String location) { File fileExists = new File(location); if ((fileExists.canRead()) && fileExists.exists()) return true; return false; - } + }*/ /** * @@ -203,7 +200,7 @@ public class STPMetadataSingleton { * @throws FileNotFoundException * */ - private void buildCompletionMetadata(String location) throws FileNotFoundException { + /*private void buildCompletionMetadata(String location) throws FileNotFoundException { String[] tapsets = { "syscall", "signal", "netdev", "ioblock", "ioscheduler", "nd_syscall", "vm", "nfsd", "process", "sunrpc", "scheduler", "scsi", "socket", "tcp", "udp", "generic.fop" }; @@ -244,7 +241,7 @@ public class STPMetadataSingleton { out.println(line.toString().trim()); } out.close(); - } + }*/ /** * @@ -258,7 +255,7 @@ public class STPMetadataSingleton { // and be tolerant of faults. As it is we ship default meta-data // so this should never be executed in the user context. But eventually // an option will be made available to the user to regenerate the data. - private StringBuffer[] executeSystemTap(String tapset) { + /*private StringBuffer[] executeSystemTap(String tapset) { ArrayList<StringBuffer> data = new ArrayList<StringBuffer>(); @@ -291,7 +288,7 @@ public class STPMetadataSingleton { // System.out.println(bundle.containsKey("syscall")); // System.out.println(bundle.containsKey("syscall.")); System.out.println(bundle.getKeys()); - } + }*/ public void build(URL fileURL) { try { diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/views/KernelBrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/views/KernelBrowserView.java index da9e0be617..92e44187dd 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/views/KernelBrowserView.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/views/KernelBrowserView.java @@ -38,6 +38,8 @@ import org.eclipse.ui.PlatformUI; * @author Henry Hughes * @author Ryan Morse */ + +@SuppressWarnings("deprecation") public class KernelBrowserView extends BrowserView { public KernelBrowserView() { super(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog index 10f0cd6622..c7b594463e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog @@ -1,3 +1,7 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * plugin.xml: Bug #324405 + 2010-06-04 Andrew Overholt <overholt@redhat.com> Bug #282039 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.xml index 9c6bef8dee..ed92f1d2f2 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.xml @@ -9,9 +9,9 @@ <extension point="org.eclipse.ui.preferencePages"> <page - category="com.qualityeclipse.systemtap.prefs.view" + category="org.eclipse.linuxtools.systemtap.prefs.view" class="org.eclipse.linuxtools.systemtap.ui.logging.preferences.LoggingPreferencePage" - id="com.qualityeclipse.generic.prefs.logging" + id="org.eclipse.linuxtools.generic.prefs.logging" name="%preference.logging.name"/> </extension> </plugin> diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog index 0769791b78..f3134346a9 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog @@ -1,3 +1,10 @@ +2010-11-03 Anithra P Janakiraman <anithra@linux.vnet.ibm.com> + + * aboutImage.gif: Removed. + * splash2.bmp: Removed. + * build.properties: + * plugin.xml: + 2010-06-08 Roland Grunberg <rgrunber@redhat.com> Bug #315303 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/aboutImage.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/aboutImage.gif Binary files differdeleted file mode 100644 index 4a8ae9b315..0000000000 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/aboutImage.gif +++ /dev/null diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/build.properties index 540f037315..30a4e720e4 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/build.properties @@ -5,7 +5,6 @@ bin.includes = plugin.xml,\ .,\ splash.bmp,\ about.html,\ - aboutImage.gif,\ documentation/,\ toc.xml,\ plugin_customization.ini,\ diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.xml index 93f2801b53..c97dd70cdb 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.xml @@ -40,13 +40,13 @@ point="org.eclipse.ui.preferencePages"> <page name="%preference.systemTap.name" - id="com.qualityeclipse.systemtap.prefs.view" + id="org.eclipse.linuxtools.systemtap.prefs.view" class="org.eclipse.linuxtools.systemtap.ui.systemtapgui.preferences.SystemTapPreferencePage"/> <page name="%preference.envVars.name" - id="com.qualityeclipse.systemtap.prefs.environmentvariables" + id="org.eclipse.linuxtools.systemtap.prefs.environmentvariables" class="org.eclipse.linuxtools.systemtap.ui.systemtapgui.preferences.EnvironmentVariablesPreferencePage" - category="com.qualityeclipse.systemtap.prefs.view"/> + category="org.eclipse.linuxtools.systemtap.prefs.view"/> </extension> <extension diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/splash2.bmp b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/splash2.bmp Binary files differdeleted file mode 100644 index 54bd540dbb..0000000000 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/splash2.bmp +++ /dev/null |