aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Kozlov2012-04-05 09:11:57 (EDT)
committerRoland Grunberg2012-04-12 17:01:33 (EDT)
commitc50e342232ec1e5dff1cb5ac0ae35600b9d0d97b (patch)
tree60ef384343d6250598e08a18655c206f2d94d89e
parentc0d2108f6b149bae950cd808363706e2a609902b (diff)
downloadorg.eclipse.linuxtools-c50e342232ec1e5dff1cb5ac0ae35600b9d0d97b.zip
org.eclipse.linuxtools-c50e342232ec1e5dff1cb5ac0ae35600b9d0d97b.tar.gz
org.eclipse.linuxtools-c50e342232ec1e5dff1cb5ac0ae35600b9d0d97b.tar.bz2
Cleanup leading underscores from identifiers' names in org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor.
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/XMLProcessor.java6
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java6
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/DefaultsProcessor.java2
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/EventListProcessor.java14
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/OpInfoProcessor.java6
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SamplesProcessor.java6
6 files changed, 20 insertions, 20 deletions
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/XMLProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/XMLProcessor.java
index f83d9c5..fda588a 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/XMLProcessor.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/XMLProcessor.java
@@ -20,7 +20,7 @@ import org.xml.sax.Attributes;
*/
public class XMLProcessor {
// The characters in the current tag
- protected String _characters;
+ protected String characters;
/**
* This method is called whenever the SAXHandler is about to invoke the
@@ -40,7 +40,7 @@ public class XMLProcessor {
* @param callData call data for the processor (usually the result is stored here)
*/
public void startElement(String name, Attributes attrs, Object callData) {
- _characters = new String();
+ characters = new String();
}
/**
@@ -59,7 +59,7 @@ public class XMLProcessor {
* @param callData call data for the processor (usually the result is stored here)
*/
public void characters(String chars, Object callData) {
- _characters = chars;
+ characters = chars;
}
/**
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java
index 22fcfc6..7c73e4d 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java
@@ -44,11 +44,11 @@ public class CheckEventsProcessor extends XMLProcessor {
*/
public void endElement(String name, Object callData) {
if (name.equals(_RESULT_TAG)) {
- if (_characters.equals(_EVENT_OK)) {
+ if (characters.equals(_EVENT_OK)) {
_result = EVENT_OK;
- } else if (_characters.equals(_INVALID_UMASK)) {
+ } else if (characters.equals(_INVALID_UMASK)) {
_result = INVALID_UMASK;
- } else if (_characters.equals(_INVALID_COUNTER)) {
+ } else if (characters.equals(_INVALID_COUNTER)) {
_result = INVALID_COUNTER;
}
} else if (name.equals(_CHECK_EVENTS_TAG)) {
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/DefaultsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/DefaultsProcessor.java
index 1a1e118..bcc275c 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/DefaultsProcessor.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/DefaultsProcessor.java
@@ -44,7 +44,7 @@ public class DefaultsProcessor extends XMLProcessor {
info.setDefaults(_map);
OprofileSAXHandler.getInstance(callData).pop(name);
} else {
- _map.put(name, _characters);
+ _map.put(name, characters);
}
}
}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/EventListProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/EventListProcessor.java
index 8476a94..9e2e92d 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/EventListProcessor.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/EventListProcessor.java
@@ -60,9 +60,9 @@ public class EventListProcessor extends XMLProcessor {
public void endElement(String name, Object callData) {
if (name.equals(_VALUE_TAG)) {
// Set mask's value
- _info.value = Integer.parseInt(_characters);
+ _info.value = Integer.parseInt(characters);
} else if (name.equals(_DESCRIPTION_TAG)) {
- _info.description = _characters;
+ _info.description = characters;
} else if (name.equals(_MASK_TAG)) {
// Pop and pass mask tag to previous processor (UnitMaskProcessor)
OprofileSAXHandler.getInstance(callData).pop(_MASK_TAG);
@@ -131,10 +131,10 @@ public class EventListProcessor extends XMLProcessor {
public void endElement(String name, Object callData) {
if (name.equals(_MASK_TYPE_TAG)) {
// Set the mask type
- _unitMask.setType(_getTypeFromString(_characters));
+ _unitMask.setType(_getTypeFromString(characters));
} else if (name.equals(_MASK_DEFAULT_TAG)) {
// Set the default mask
- _unitMask.setDefault(Integer.parseInt(_characters));
+ _unitMask.setDefault(Integer.parseInt(characters));
} else if (name.equals(_MASK_TAG)) {
// Add this mask description to the list of all masks
_masks.add(_maskProcessor.getResult());
@@ -214,13 +214,13 @@ public class EventListProcessor extends XMLProcessor {
_currentEvent.setUnitMask(_umProcessor.getResult());
} else if (name.equals(_NAME_TAG)) {
// Set event's name
- _currentEvent.setText(_characters);
+ _currentEvent.setText(characters);
} else if (name.equals(_DESCRIPTION_TAG)) {
// Set event's description
- _currentEvent.setTextDescription(_characters);
+ _currentEvent.setTextDescription(characters);
} else if (name.equals(_MINIMUM_COUNT_TAG)) {
// Set event's minimum count
- _currentEvent.setMinCount(Integer.parseInt(_characters));
+ _currentEvent.setMinCount(Integer.parseInt(characters));
} else if (name.equals(OpInfoProcessor.EVENT_LIST_TAG)) {
OprofileSAXHandler.getInstance(callData).pop(name);
}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/OpInfoProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/OpInfoProcessor.java
index e9ef386..f226e4e 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/OpInfoProcessor.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/OpInfoProcessor.java
@@ -57,17 +57,17 @@ public class OpInfoProcessor extends XMLProcessor {
*/
public void endElement(String name, Object callData) {
if (name.equals(CPU_FREQUENCY_TAG)) {
- double speed = Double.parseDouble(_characters);
+ double speed = Double.parseDouble(characters);
OpInfo info = (OpInfo) callData;
info.setCPUSpeed(speed);
} else if (name.equals(TIMER_MODE)) {
- boolean timerMode = Boolean.parseBoolean(_characters);
+ boolean timerMode = Boolean.parseBoolean(characters);
OpInfo info = (OpInfo) callData;
info.setTimerMode(timerMode);
} else if (name.equals(NUM_COUNTERS_TAG)) {
int numCounters = 0;
try {
- numCounters = Integer.parseInt(_characters);
+ numCounters = Integer.parseInt(characters);
} catch (NumberFormatException nfe) {
}
OpInfo info = (OpInfo) callData;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SamplesProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SamplesProcessor.java
index 51a6f1e..699622c 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SamplesProcessor.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SamplesProcessor.java
@@ -45,11 +45,11 @@ public class SamplesProcessor extends XMLProcessor {
*/
public void endElement(String name, Object callData) {
if (name.equals(COUNT_TAG)) {
- _sample.setCount(Integer.parseInt(_characters));
+ _sample.setCount(Integer.parseInt(characters));
} else if (name.equals(LINE_TAG)) {
- _sample.setLine(Integer.parseInt(_characters));
+ _sample.setLine(Integer.parseInt(characters));
} else if (name.equals(FILE_TAG)) {
- _sample.setFilePath(_characters);
+ _sample.setFilePath(characters);
} else if (name.equals(SAMPLE_TAG)) {
_sampleList.add(_sample);
_sample = new OpModelSample();