Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2014-04-29 04:28:08 +0000
committerAlexander Kurtakov2014-04-29 05:18:56 +0000
commitf32fcc7b4d90c4be3fdf1cbf1dea993ad72bb0f4 (patch)
tree0096dbb18f9c8a99d7879765392e8ac76d2420a9 /systemtap
parent241ba2b436801aa4112ea7fa6c696e5570360802 (diff)
downloadorg.eclipse.linuxtools-f32fcc7b4d90c4be3fdf1cbf1dea993ad72bb0f4.tar.gz
org.eclipse.linuxtools-f32fcc7b4d90c4be3fdf1cbf1dea993ad72bb0f4.tar.xz
org.eclipse.linuxtools-f32fcc7b4d90c4be3fdf1cbf1dea993ad72bb0f4.zip
Various cleanups.
* Unused public or protected field * Javadoc fixes * Unread public/protected field * Unused imports * Unused modifiers * Avoid modifiers which are implied by the context Change-Id: Ieac08a3cf3b3ffd824ea7af0a63864d2ae17cc54 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/25706 Tested-by: Hudson CI
Diffstat (limited to 'systemtap')
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextView.java2
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java4
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapData.java3
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraph.java3
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraphParser.java5
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.graphing.core/src/org/eclipse/linuxtools/systemtap/graphing/core/filters/IDataSetFilter.java8
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java4
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java2
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ConsoleStreamDaemon.java3
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java4
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FuncparamNodeData.java5
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FunctionNodeData.java5
12 files changed, 10 insertions, 38 deletions
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextView.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextView.java
index b646b14162..e5aa28bd49 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextView.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextView.java
@@ -211,7 +211,7 @@ public class SystemTapTextView extends SystemTapView {
public void updateMethod() {
if (getParser().getData() instanceof String) {
String data = (String) getParser().getData();
- if (data.length() > 0) {
+ if (!data.isEmpty()) {
prettyPrintln((String) getParser().getData());
}
}
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java
index 556d96c23c..8865509ee1 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java
@@ -47,7 +47,6 @@ import org.eclipse.linuxtools.internal.callgraph.core.PluginConstants;
import org.eclipse.linuxtools.internal.callgraph.core.SystemTapUIErrorMessages;
import org.eclipse.linuxtools.profiling.launch.ProfileLaunchShortcut;
import org.eclipse.swt.widgets.Button;
-import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.model.WorkbenchLabelProvider;
/**
@@ -103,7 +102,6 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
*/
public abstract class SystemTapLaunchShortcut extends ProfileLaunchShortcut {
- protected IEditorPart editor;
private static final String USER_SELECTED_ALL = "ALL"; //$NON-NLS-1$
private static final String MAIN_FUNC_NAME = "main"; //$NON-NLS-1$
@@ -125,7 +123,6 @@ public abstract class SystemTapLaunchShortcut extends ProfileLaunchShortcut {
protected IBinary bin;
private boolean testMode = false;
- protected String secondaryID = ""; //$NON-NLS-1$
/**
* Initialize variables. Highly recommend calling this function within the
@@ -140,7 +137,6 @@ public abstract class SystemTapLaunchShortcut extends ProfileLaunchShortcut {
generatedScript = LaunchConfigurationConstants.DEFAULT_GENERATED_SCRIPT;
needToGenerate = false;
useColours = false;
- secondaryID = ""; //$NON-NLS-1$
}
@Override
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapData.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapData.java
index 1156584555..6b927ba3cd 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapData.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapData.java
@@ -19,7 +19,7 @@ import java.util.List;
*/
public class StapData {
public static final int NOT_PART_OF_COLLAPSED_NODE = -10;
- public boolean hasCollapsedChildren, isCollapsed, marked;
+ public boolean isCollapsed, marked;
public boolean onlyChildWithThisName; //Should show up as collapsed and uncollapsed
public int id;
public int timesCalled, parent, style;
@@ -54,7 +54,6 @@ public class StapData {
this.id = currentID;
this.name = txt;
this.graph = graphModel;
- this.hasCollapsedChildren = false;
this.isCollapsed = false;
this.onlyChildWithThisName = false;
this.partOfCollapsedNode= NOT_PART_OF_COLLAPSED_NODE;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraph.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraph.java
index 829f4a3a5e..0fa53d6bd9 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraph.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraph.java
@@ -1217,8 +1217,6 @@ public class StapGraph extends Graph {
if (nodeDataMap.get(id).children.size() == 0) {
return true;
}
- nodeDataMap.get(id).hasCollapsedChildren = true;
-
// Name, id
HashMap<String, Integer> newNodeMap = new HashMap<>();
@@ -1347,7 +1345,6 @@ public class StapGraph extends Graph {
collapsedNodesWithOnlyOneNodeInThem.clear();
newNodeMap.clear();
- nodeDataMap.get(id).hasCollapsedChildren = true;
return true;
}
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraphParser.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraphParser.java
index 1e9c9698e0..d3fbbc1bcc 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraphParser.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/StapGraphParser.java
@@ -48,8 +48,6 @@ public class StapGraphParser extends SystemTapParser {
public Map<String, Integer> countMap;
public List<Integer> callOrderList;
public Map<Integer, String> markedMap;
- public String markedNodes;
- public int validator;
public Long endingTimeInNS;
public long totalTime;
public Map<Integer, Integer> lastFunctionMap;
@@ -66,8 +64,6 @@ public class StapGraphParser extends SystemTapParser {
public long startTime = -1;
- public String text;
-
@Override
protected void initialize() {
//INITIALIZE MAPS
@@ -95,7 +91,6 @@ public class StapGraphParser extends SystemTapParser {
serialMap.clear();
aggregateTimeMap.clear();
countMap.clear();
- text = ""; //$NON-NLS-1$
callOrderList.clear();
shouldGetEndingTimeForID.clear();
nameMaps.clear();
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/src/org/eclipse/linuxtools/systemtap/graphing/core/filters/IDataSetFilter.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/src/org/eclipse/linuxtools/systemtap/graphing/core/filters/IDataSetFilter.java
index 3197470de8..abf27ca4f6 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/src/org/eclipse/linuxtools/systemtap/graphing/core/filters/IDataSetFilter.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/src/org/eclipse/linuxtools/systemtap/graphing/core/filters/IDataSetFilter.java
@@ -14,14 +14,14 @@ package org.eclipse.linuxtools.systemtap.graphing.core.filters;
import java.util.List;
public interface IDataSetFilter {
- public List<Object>[] filter(List<Object>[] data);
- public String getID();
+ List<Object>[] filter(List<Object>[] data);
+ String getID();
/**
* @since 2.0
*/
- public String getInfo();
+ String getInfo();
/**
* @since 2.0
*/
- public int getColumn();
+ int getColumn();
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java
index e50c97211e..4e21cec6c8 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java
@@ -62,10 +62,6 @@ public abstract class AbstractChartWithAxisBuilder extends AbstractChartBuilder
return defaultMargin;
}
- /**
- * Title of X axis.
- */
- protected String xTitle = null;
protected boolean xLineGrid, yLineGrid;
/**
* @since 3.0
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java
index 54c848e58d..f0d29c3297 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java
@@ -63,8 +63,6 @@ public abstract class AbstractChartBuilder extends Composite implements IUpdateL
* Provides data for chart.
*/
protected IAdapter adapter = null;
- protected int xseries;
- protected int[] yseries;
protected static final Color WHITE = Display.getDefault().getSystemColor(SWT.COLOR_WHITE);
protected static final Color BLACK = Display.getDefault().getSystemColor(SWT.COLOR_BLACK);
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 2ddd4f98fa..514cea302b 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
@@ -25,7 +25,6 @@ import org.eclipse.ui.console.IOConsoleOutputStream;
*/
public class ConsoleStreamDaemon implements IGobblerListener {
public ConsoleStreamDaemon(ScriptConsole console) {
- this.console = console;
if(null != console) {
ioConsole = console.newOutputStream();
}
@@ -69,13 +68,11 @@ public class ConsoleStreamDaemon implements IGobblerListener {
if(!disposed) {
disposed = true;
output = null;
- console = null;
ioConsole = null;
}
}
protected String output;
- protected ScriptConsole console;
protected IOConsoleOutputStream ioConsole;
private boolean disposed;
}
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 638feb3a90..30b2a2b4f2 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
@@ -81,11 +81,11 @@ public class ScriptConsole extends IOConsole {
/**
* @since 2.0
*/
- public static interface ScriptConsoleObserver {
+ public interface ScriptConsoleObserver {
/**
* @since 3.0
*/
- public void runningStateChanged(boolean started, boolean stopped);
+ void runningStateChanged(boolean started, boolean stopped);
}
private final List<ScriptConsoleObserver> activeConsoleObservers = new LinkedList<>();
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FuncparamNodeData.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FuncparamNodeData.java
index 8733da589b..7fbdc33638 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FuncparamNodeData.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FuncparamNodeData.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.systemtap.ui.ide.structures;
-import org.eclipse.linuxtools.systemtap.structures.TreeNode;
-
-
/**
* A structure for containing extra information of SystemTap function parameters.
* @since 3.0
@@ -34,7 +31,7 @@ public class FuncparamNodeData implements ISingleTypedNode {
/**
* Create a new instance of function parameter information. (Note that the name of a function
- * or parameter is stored in a {@link TreeNode}, not here.)
+ * or parameter is stored in a {@link org.eclipse.linuxtools.systemtap.structures.TreeNode}, not here.)
* @param line The <code>String</code> representation of the entire parameter.
* @param type The <code>String</code> representation of only the parameter's type.
*/
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FunctionNodeData.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FunctionNodeData.java
index 6ae140a078..4ad3f85c9d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FunctionNodeData.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/structures/FunctionNodeData.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.systemtap.ui.ide.structures;
-import org.eclipse.linuxtools.systemtap.structures.TreeNode;
-
-
/**
* A structure for containing extra information of SystemTap functions.
* @since 3.0
@@ -50,7 +47,7 @@ public class FunctionNodeData implements ISearchableNode, ISingleTypedNode {
/**
* Create a new instance of function node information. (Note that the name of a function
- * or parameter is stored in a {@link TreeNode}, not here.)
+ * or parameter is stored in a {@link org.eclipse.linuxtools.systemtap.structures.TreeNode}, not here.)
* @param line Set this to the original script text that defines this function.
* @param type The <code>String</code> representation of the return type of the function.
*/

Back to the top