summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorDmitry Kozlov2012-04-05 09:01:26 (EDT)
committer Roland Grunberg2012-04-12 17:01:32 (EDT)
commit5c5907b7a73ca6664e6eaae85c706649b25ab8a7 (patch)
treea7ca2784f53bd28b918cbe93bf1eea879a6b970b
parentef8bab8a736647e75bbf1520bacd7c01e087cd37 (diff)
downloadorg.eclipse.linuxtools-5c5907b7a73ca6664e6eaae85c706649b25ab8a7.zip
org.eclipse.linuxtools-5c5907b7a73ca6664e6eaae85c706649b25ab8a7.tar.gz
org.eclipse.linuxtools-5c5907b7a73ca6664e6eaae85c706649b25ab8a7.tar.bz2
Cleanup leading underscores from identifiers' names in org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage.
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelImage.java86
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/DependentProcessor.java6
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataProcessor.java20
3 files changed, 56 insertions, 56 deletions
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelImage.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelImage.java
index 87a9b42..5468c67 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelImage.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelImage.java
@@ -20,119 +20,119 @@ public class OpModelImage {
public static final int IMAGE_PARSE_ERROR = -1;
//The count of all samples from this image
- private int _count;
+ private int count;
//the count for all dependent images -- needed?
- private int _depcount;
+ private int depcount;
//The name of this image (the full path, where applicable)
- private String _name;
+ private String name;
//The symbols profiled in this image
- private OpModelSymbol[] _symbols;
+ private OpModelSymbol[] symbols;
//Any dependent images on this image (usually shared libs, kernel modules)
- private OpModelImage[] _dependents;
+ private OpModelImage[] dependents;
- private String _printTabs = ""; //for nice output //$NON-NLS-1$
+ private String printTabs = ""; //for nice output //$NON-NLS-1$
public OpModelImage() {
- _name = ""; //$NON-NLS-1$
- _count = 0;
- _depcount = 0;
- _symbols = null;
- _dependents = null;
+ name = ""; //$NON-NLS-1$
+ count = 0;
+ depcount = 0;
+ symbols = null;
+ dependents = null;
}
public int getCount() {
- return _count;
+ return count;
}
public int getDepCount() {
- return _depcount;
+ return depcount;
}
public String getName() {
- return _name;
+ return name;
}
public OpModelSymbol[] getSymbols() {
- return _symbols;
+ return symbols;
}
public OpModelImage[] getDependents() {
- return _dependents;
+ return dependents;
}
public boolean hasDependents() {
- return (_dependents == null || _dependents.length == 0 ? false : true);
+ return (dependents == null || dependents.length == 0 ? false : true);
}
/**
* This method is not meant to be called publicly, used only
* from the XML processors
- * @param _count
+ * @param count
*/
- public void _setCount(int _count) {
- this._count = _count;
+ public void setCount(int count) {
+ this.count = count;
}
/**
* This method is not meant to be called publicly, used only
* from the XML processors
- * @param _depcount
+ * @param depcount
*/
- public void _setDepCount(int _depcount) {
- this._depcount = _depcount;
+ public void setDepCount(int depcount) {
+ this.depcount = depcount;
}
/**
* This method is not meant to be called publicly, used only
* from the XML processors
- * @param _name
+ * @param name
*/
- public void _setName(String _name) {
- this._name = _name;
+ public void setName(String name) {
+ this.name = name;
}
/**
* This method is not meant to be called publicly, used only
* from the XML processors
- * @param _symbols
+ * @param symbols
*/
- public void _setSymbols(OpModelSymbol[] _symbols) {
- this._symbols = _symbols;
+ public void setSymbols(OpModelSymbol[] symbols) {
+ this.symbols = symbols;
}
/**
* This method is not meant to be called publicly, used only
* from the XML processors
- * @param _dependents
+ * @param dependents
*/
- public void _setDependents(OpModelImage[] _dependents) {
- this._dependents = _dependents;
+ public void setDependents(OpModelImage[] dependents) {
+ this.dependents = dependents;
}
public String toString(String tabs) {
- _printTabs = tabs;
+ printTabs = tabs;
String s = toString();
- _printTabs = ""; //$NON-NLS-1$
+ printTabs = ""; //$NON-NLS-1$
return s;
}
@Override
public String toString() {
- String s = _name + ", Count: " + _count + (_depcount !=0 ? ", Dependent Count: " + _depcount + "\n" : "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- if (_symbols != null) {
- for (int i = 0; i < _symbols.length; i++) {
- s += _printTabs + "Symbols: "; //$NON-NLS-1$
- s += _symbols[i].toString(_printTabs + "\t"); //$NON-NLS-1$
+ String s = name + ", Count: " + count + (depcount !=0 ? ", Dependent Count: " + depcount + "\n" : "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ if (symbols != null) {
+ for (int i = 0; i < symbols.length; i++) {
+ s += printTabs + "Symbols: "; //$NON-NLS-1$
+ s += symbols[i].toString(printTabs + "\t"); //$NON-NLS-1$
}
}
- if (_dependents != null) {
- for (int i = 0; i < _dependents.length; i++) {
- s += _printTabs + "Dependent Image: "; //$NON-NLS-1$
- s += _dependents[i].toString(_printTabs + "\t"); //$NON-NLS-1$
+ if (dependents != null) {
+ for (int i = 0; i < dependents.length; i++) {
+ s += printTabs + "Dependent Image: "; //$NON-NLS-1$
+ s += dependents[i].toString(printTabs + "\t"); //$NON-NLS-1$
}
}
return s;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/DependentProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/DependentProcessor.java
index 00dcc32..979e5ba 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/DependentProcessor.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/DependentProcessor.java
@@ -46,8 +46,8 @@ public class DependentProcessor extends XMLProcessor {
public void startElement(String name, Attributes attrs, Object callData) {
if (name.equals(IMAGE_TAG)) {
- _image._setName(valid_string(attrs.getValue(ATTR_IMAGENAME)));
- _image._setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
+ _image.setName(valid_string(attrs.getValue(ATTR_IMAGENAME)));
+ _image.setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
} else if (name.equals(SYMBOLS_TAG)) {
OprofileSAXHandler.getInstance(callData).push(_symbolsProcessor);
}
@@ -60,7 +60,7 @@ public class DependentProcessor extends XMLProcessor {
_imageList.add(_image);
_image = new OpModelImage();
} else if (name.equals(SYMBOLS_TAG)) {
- _image._setSymbols(_symbolsProcessor.getSymbols());
+ _image.setSymbols(_symbolsProcessor.getSymbols());
} else if (name.equals(DEPENDENT_TAG)) {
OprofileSAXHandler.getInstance(callData).pop(DEPENDENT_TAG);
}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataProcessor.java
index 8863264..ab27356 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataProcessor.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataProcessor.java
@@ -55,15 +55,15 @@ public class ModelDataProcessor extends XMLProcessor {
public void startElement(String name, Attributes attrs, Object callData) {
if (name.equals(IMAGE_TAG)) {
if (img_seen == 0) {
- _image._setName(valid_string(attrs.getValue(ATTR_IMAGENAME)));
- _image._setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
+ _image.setName(valid_string(attrs.getValue(ATTR_IMAGENAME)));
+ _image.setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
}
img_seen++;
} else if (name.equals(SYMBOLS_TAG)) {
OprofileSAXHandler.getInstance(callData).push(_symbolsProcessor);
} else if (name.equals(DEPENDENT_TAG)) {
- _image._setDepCount(Integer.parseInt(attrs.getValue(ATTR_DEPCOUNT)));
+ _image.setDepCount(Integer.parseInt(attrs.getValue(ATTR_DEPCOUNT)));
OprofileSAXHandler.getInstance(callData).push(_dependentProcessor);
} else {
super.startElement(name, attrs, callData);
@@ -75,16 +75,16 @@ public class ModelDataProcessor extends XMLProcessor {
if (img_seen > 1) {
//should only ever be one image, otherwise oprofile was run
// outside of eclipse and the ui would not handle it properly
- _image._setCount(OpModelImage.IMAGE_PARSE_ERROR);
- _image._setDepCount(0);
- _image._setDependents(null);
- _image._setSymbols(null);
- _image._setName(""); //$NON-NLS-1$
+ _image.setCount(OpModelImage.IMAGE_PARSE_ERROR);
+ _image.setDepCount(0);
+ _image.setDependents(null);
+ _image.setSymbols(null);
+ _image.setName(""); //$NON-NLS-1$
}
} else if (name.equals(SYMBOLS_TAG)){
- _image._setSymbols(_symbolsProcessor.getSymbols());
+ _image.setSymbols(_symbolsProcessor.getSymbols());
} else if (name.equals(DEPENDENT_TAG)){
- _image._setDependents(_dependentProcessor.getImages());
+ _image.setDependents(_dependentProcessor.getImages());
} else {
super.endElement(name, callData);
}