diff options
author | Sami Wagiaalla | 2013-04-30 14:35:28 +0000 |
---|---|---|
committer | Camilo Bernal | 2013-05-01 17:05:35 +0000 |
commit | 8fa10880836baa856c7d8941f17ebdcd6baba27a (patch) | |
tree | cdc60d5090d0e2a702d1c018dba3cb26878cad48 /systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src | |
parent | 0a1a9e41a78692cd56a0fa5abdf788b9bdb0530c (diff) | |
download | org.eclipse.linuxtools-8fa10880836baa856c7d8941f17ebdcd6baba27a.tar.gz org.eclipse.linuxtools-8fa10880836baa856c7d8941f17ebdcd6baba27a.tar.xz org.eclipse.linuxtools-8fa10880836baa856c7d8941f17ebdcd6baba27a.zip |
Remove all e.printStackTrace() calls
Also,
- Organized imports.
- Added braces around single line if/while statements.
- Externalize strings.
Change-Id: I81ddcc593666629c79f24e35192407a8c3a2abfa
Reviewed-on: https://git.eclipse.org/r/12386
Tested-by: Hudson CI
Reviewed-by: Camilo Bernal <cabernal@redhat.com>
IP-Clean: Camilo Bernal <cabernal@redhat.com>
Tested-by: Camilo Bernal <cabernal@redhat.com>
Diffstat (limited to 'systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src')
10 files changed, 77 insertions, 47 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPCompletionProcessor.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPCompletionProcessor.java index e395d8a32e..50059749d4 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPCompletionProcessor.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPCompletionProcessor.java @@ -85,8 +85,7 @@ public class STPCompletionProcessor implements IContentAssistProcessor, ITextHov try { partition = document.getPartition(offset); } catch (BadLocationException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + return NO_COMPLETIONS; } String prefix = ""; //$NON-NLS-1$ @@ -156,25 +155,32 @@ public class STPCompletionProcessor implements IContentAssistProcessor, ITextHov } private ICompletionProposal[] getProbeVariableCompletions(IDocument document, int offset, String prefix){ - String probe = getProbe(document, offset); - String[] completionData = stpMetadataSingleton.getProbeVariableCompletions(probe, prefix); - ICompletionProposal[] result = new ICompletionProposal[completionData.length]; - - int prefixLength = prefix.length(); - for (int i = 0; i < completionData.length; i++){ - int endIndex = completionData[i].indexOf(':'); - String variableName = completionData[i].substring(0, endIndex); - result[i] = new CompletionProposal( - completionData[i].substring(prefixLength, endIndex), - offset, - 0, - endIndex - prefixLength, - null, - completionData[i] + " - variable", //$NON-NLS-1$ - null, - TapsetLibrary.getAndCacheDocumentation("probe::" + probe + "::" + variableName)); //$NON-NLS-1$ //$NON-NLS-2$ + try { + String probe; + probe = getProbe(document, offset); + String[] completionData = stpMetadataSingleton + .getProbeVariableCompletions(probe, prefix); + ICompletionProposal[] result = new ICompletionProposal[completionData.length]; + + int prefixLength = prefix.length(); + for (int i = 0; i < completionData.length; i++) { + int endIndex = completionData[i].indexOf(':'); + String variableName = completionData[i].substring(0, endIndex); + result[i] = new CompletionProposal(completionData[i].substring( + prefixLength, endIndex), + offset, + 0, + endIndex - prefixLength, + null, + completionData[i] + " - variable", //$NON-NLS-1$ + null, + TapsetLibrary + .getAndCacheDocumentation("probe::" + probe + "::" + variableName)); //$NON-NLS-1$ //$NON-NLS-2$ + } + return result; + } catch (BadLocationException e) { + return NO_COMPLETIONS; } - return result; } /** @@ -184,21 +190,18 @@ public class STPCompletionProcessor implements IContentAssistProcessor, ITextHov * @param document * @param offset * @return the probe name + * @throws BadLocationException */ - private String getProbe(IDocument document, int offset){ + private String getProbe(IDocument document, int offset) throws BadLocationException{ String probePoint = null; - try { - ITypedRegion partition = document.getPartition(offset); - String probe = document.get(partition.getOffset(), partition.getLength()); + ITypedRegion partition = document.getPartition(offset); + String probe = document.get(partition.getOffset(), partition.getLength()); - // make sure that we are inside a probe - if (probe.startsWith(PROBE_KEYWORD)){ - probePoint = probe.substring(PROBE_KEYWORD.length(), probe.indexOf('{')); - probePoint = probePoint.trim(); - } - } catch (BadLocationException e) { - e.printStackTrace(); + // make sure that we are inside a probe + if (probe.startsWith(PROBE_KEYWORD)){ + probePoint = probe.substring(PROBE_KEYWORD.length(), probe.indexOf('{')); + probePoint = probePoint.trim(); } return probePoint; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/Messages.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/Messages.java index f021817b2d..a2b8bc3f82 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/Messages.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/Messages.java @@ -43,6 +43,8 @@ public class Messages extends NLS { public static String SystemTapScriptLaunchConfigurationTab_9; public static String SystemTapScriptLaunchConfigurationTab_10; public static String SystemTapScriptLaunchConfigurationTab_11; + + public static String SystemTapScriptLaunchConfigurationTab_errorInitializingTab; public static String SystemTapScriptLaunchConfigurationTab_options; public static String SystemTapScriptLaunchConfigurationTab_runWithChart; public static String SystemTapScriptLaunchShortcut_couldNotFindConfig; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java index d3bc5520d8..7c452080bf 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java @@ -22,6 +22,7 @@ import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin; +import org.eclipse.linuxtools.systemtap.graphingapi.ui.widgets.ExceptionErrorDialog; import org.eclipse.linuxtools.systemtap.ui.editor.PathEditorInput; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -246,7 +247,7 @@ public class SystemTapScriptLaunchConfigurationTab extends this.localHostCheckButton.setSelection(configuration.getAttribute(LOCAL_HOST_ATTR, true)); this.hostNameText.setText(configuration.getAttribute(HOST_NAME_ATTR, "")); //$NON-NLS-1$ } catch (CoreException e) { - e.printStackTrace(); + ExceptionErrorDialog.openError(Messages.SystemTapScriptLaunchConfigurationTab_errorInitializingTab, e); } } diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/messages.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/messages.properties index 5084e7dab1..9cf8ab0295 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/messages.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/messages.properties @@ -36,6 +36,7 @@ SystemTapScriptLaunchConfigurationTab_8=Host Name: SystemTapScriptLaunchConfigurationTab_9=General SystemTapScriptLaunchConfigurationTab_10=Systemtap SystemTapScriptLaunchConfigurationTab_11=Select Systemtap Script +SystemTapScriptLaunchConfigurationTab_errorInitializingTab=Could not initialize tab SystemTapScriptLaunchConfigurationTab_options=Options: SystemTapScriptLaunchConfigurationTab_runWithChart=Run the script with a chart. SystemTapScriptLaunchShortcut_couldNotFindConfig=Could Not Find configuration diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties index c4626c6495..4b5ff2342b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties @@ -3,9 +3,11 @@ RunScriptAction.NoScriptFile=No Script File\! RunScriptAction.Problem=Problem RunScriptAction.TapsetDirectoryRun=Can not run files in tapset directory\! RunScriptAction.Error=Error -RunScriptHandler.1=Error Connecting To Server -RunScriptHandler.2=Please check the supplied username, password and server address -RunScriptHandler.3=IO Error with remote server +RunScriptHandler.couldNotOpenScriptFile=Could not open script file. +RunScriptHandler.serverError=Error Connecting To Server +RunScriptHandler.checkCredentials=Please check the supplied username, password and server address +RunScriptHandler.ioError=IO Error with remote server +RunScriptHandler.fileIOError=Error reading script file. KernelSourceAction.Insert=&Insert KernelSourceAction.InsertSelectedFunction=Insert the Selected Function @@ -77,3 +79,5 @@ TapsetLibrary.0=Fetch Systemtap Function Documentation TapsetLibrary.1=Fetch Systemtap Probe Documentation KernelBrowserView.NoKernelSourceFound=The kernel source directory was not defined in SystemTap Prefereces.\n\nYou can set that in Window->Preferences,\nselect SystemTap->IDE->Kernel Source Path KernelBrowserView.KernelSourceDirNotFound=Kernel Source Directory not found + +KernelBrowserView.CouldNotInitializeTree=Could not initialize kernel source tree diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/Messages.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/Messages.java index d5105c88a9..1946ba0c56 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/Messages.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/Messages.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2013 Red Hat, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat - initial API and implementation + *******************************************************************************/ package org.eclipse.linuxtools.internal.systemtap.ui.ide.structures; import org.eclipse.osgi.util.NLS; @@ -7,6 +17,7 @@ import org.eclipse.osgi.util.NLS; */ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.systemtap.ui.ide.structures.messages"; //$NON-NLS-1$ + public static String ProbeParser_errorInitializingStaticProbes; public static String TapsetParser_CannotRunStapMessage; public static String TapsetParser_CannotRunStapTitle; public static String TapsetParser_ErrorRunningSystemtap; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/ProbeParser.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/ProbeParser.java index 0dd28600e1..58f14d93ca 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/ProbeParser.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/ProbeParser.java @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin; import org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.IDEPreferenceConstants; +import org.eclipse.linuxtools.systemtap.graphingapi.ui.widgets.ExceptionErrorDialog; import org.eclipse.linuxtools.systemtap.structures.TreeDefinitionNode; import org.eclipse.linuxtools.systemtap.structures.TreeNode; @@ -46,8 +47,9 @@ public class ProbeParser extends TapsetParser { static ProbeParser parser = null; public static ProbeParser getInstance(){ - if (parser != null) + if (parser != null) { return parser; + } String[] tapsets = IDEPlugin.getDefault().getPreferenceStore() .getString(IDEPreferenceConstants.P_TAPSETS).split(File.pathSeparator); @@ -201,9 +203,9 @@ public class ProbeParser extends TapsetParser { } input.close(); } catch (FileNotFoundException e) { - e.printStackTrace(); + ExceptionErrorDialog.openError(Messages.ProbeParser_errorInitializingStaticProbes, e); } catch (IOException e) { - e.printStackTrace(); + ExceptionErrorDialog.openError(Messages.ProbeParser_errorInitializingStaticProbes, e); } return probes.toString(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/messages.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/messages.properties index 324d922cb6..5ee380b400 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/messages.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/messages.properties @@ -9,6 +9,7 @@ # Red Hat - initial API and implementation ############################################################################### +ProbeParser_errorInitializingStaticProbes=Could not initialize static probe list TapsetParser_CannotRunStapMessage=Make sure systemtap is installed. TapsetParser_CannotRunStapTitle=Cannot Run Systemtap TapsetParser_ErrorRunningSystemtap=Error Running Systemtap diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/KernelBrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/KernelBrowserView.java index c49f7bf0c2..77f15516b4 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/KernelBrowserView.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/KernelBrowserView.java @@ -31,6 +31,7 @@ import org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.IDEPreferenc import org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.PathPreferencePage; import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy; import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager; +import org.eclipse.linuxtools.systemtap.graphingapi.ui.widgets.ExceptionErrorDialog; import org.eclipse.linuxtools.systemtap.structures.KernelSourceTree; import org.eclipse.linuxtools.systemtap.structures.TreeNode; import org.eclipse.swt.widgets.Composite; @@ -64,7 +65,11 @@ public class KernelBrowserView extends BrowserView { KernelSourceTree kst = new KernelSourceTree(); String excluded[] = p.getString(IDEPreferenceConstants.P_EXCLUDED_KERNEL_SOURCE).split(File.pathSeparator); if (remote) { - kst.buildKernelTree(kernelLocationURI, excluded, proxy, monitor); + try { + kst.buildKernelTree(kernelLocationURI, excluded, proxy, monitor); + } catch (CoreException e) { + ExceptionErrorDialog.openError(Localization.getString("KernelBrowserView.CouldNotInitializeTree"), e); //$NON-NLS-1$ + } } else { kst.buildKernelTree(kernelSource, excluded); } @@ -146,8 +151,9 @@ public class KernelBrowserView extends BrowserView { error = true; } else { proxy = RemoteProxyManager.getInstance().getFileProxy(kernelLocationURI); - if (!validateProxy(proxy, kernelSource)) + if (!validateProxy(proxy, kernelSource)) { error = true; + } } } catch (CoreException e2) { error = true; diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptHandler.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptHandler.java index 4adb249a04..c044109b2b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptHandler.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptHandler.java @@ -105,11 +105,11 @@ public class RunScriptHandler extends AbstractHandler { } catch (JSchException e) { ErrorDialog.openError(PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getShell(), - Localization.getString("RunScriptHandler.1"), Localization.getString("RunScriptHandler.1"), //$NON-NLS-1$ //$NON-NLS-2$ - new Status(IStatus.ERROR, IDEPlugin.PLUGIN_ID, Localization.getString("RunScriptHandler.2"))); //$NON-NLS-1$ + Localization.getString("RunScriptHandler.serverError"), Localization.getString("RunScriptHandler.serverError"), //$NON-NLS-1$ //$NON-NLS-2$ + new Status(IStatus.ERROR, IDEPlugin.PLUGIN_ID, Localization.getString("RunScriptHandler.checkCredentials"))); //$NON-NLS-1$ return null; } catch (IOException e) { - ExceptionErrorDialog.openError(Localization.getString("RunScriptHandler.3"), e); //$NON-NLS-1$ + ExceptionErrorDialog.openError(Localization.getString("RunScriptHandler.ioError"), e); //$NON-NLS-1$ return null; } } @@ -271,9 +271,8 @@ public class RunScriptHandler extends AbstractHandler { * Checks the current script to determine if guru mode is required in order to run. This is determined * by the presence of embedded C. * @return True if the script contains embedded C code. - * @since 2.0 */ - protected boolean isGuru() { + private boolean isGuru() { try { File f = new File(fileName); FileReader fr = new FileReader(f); @@ -306,9 +305,9 @@ public class RunScriptHandler extends AbstractHandler { return true; } } catch (FileNotFoundException fnfe) { - fnfe.printStackTrace(); + ExceptionErrorDialog.openError(Localization.getString("RunScriptHandler.couldNotOpenScriptFile"), fnfe); //$NON-NLS-1$ } catch (IOException ie) { - ie.printStackTrace(); + ExceptionErrorDialog.openError(Localization.getString("RunScriptHandler.fileIOError"), ie); //$NON-NLS-1$ } return false; } |