summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorDmitry Kozlov2012-04-05 09:15:48 (EDT)
committer Roland Grunberg2012-04-12 17:01:33 (EDT)
commit6eaf0377fe4eeaf3f7dc1f2361fb6c01a6031247 (patch)
tree5f8f91f7aac8dc76042f0b39a14129526f024fab
parentc50e342232ec1e5dff1cb5ac0ae35600b9d0d97b (diff)
downloadorg.eclipse.linuxtools-6eaf0377fe4eeaf3f7dc1f2361fb6c01a6031247.zip
org.eclipse.linuxtools-6eaf0377fe4eeaf3f7dc1f2361fb6c01a6031247.tar.gz
org.eclipse.linuxtools-6eaf0377fe4eeaf3f7dc1f2361fb6c01a6031247.tar.bz2
Cleanup leading underscores from identifiers' names in org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent.
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventAdapter.java8
-rw-r--r--oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java34
2 files changed, 21 insertions, 21 deletions
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventAdapter.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventAdapter.java
index 937dc9c..85514d1 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventAdapter.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventAdapter.java
@@ -97,13 +97,13 @@ public class CheckEventAdapter extends AbstractDataAdapter {
// type:bitmask unit mask support
String unitMaskType = EventIdCache.getInstance().getUnitMaskType(eventName);
if (unitMaskType.equals("bitmask")){ //$NON-NLS-1$
- int tmp_val = Integer.parseInt(unitMask);
+ int tmpVal = Integer.parseInt(unitMask);
int count = 0;
- while (tmp_val != 0){
- if (tmp_val % 2 != 0 && ! bitMaskSet.contains((int)Math.pow(2, count))){
+ while (tmpVal != 0){
+ if (tmpVal % 2 != 0 && ! bitMaskSet.contains((int)Math.pow(2, count))){
return false;
}
- tmp_val = tmp_val / 2;
+ tmpVal = tmpVal / 2;
count ++;
}
return true;
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 7c73e4d..6cf6ed4 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
@@ -23,37 +23,37 @@ public class CheckEventsProcessor extends XMLProcessor {
public static final int INVALID_UMASK = 3; //invalid unit mask value
public static final int INVALID_COUNTER = 4; //invalid event for given counter number
- private static final String _RESULT_TAG = "result"; //$NON-NLS-1$
- private static final String _CHECK_EVENTS_TAG ="check-events"; //$NON-NLS-1$
+ private static final String RESULT_TAG = "result"; //$NON-NLS-1$
+ private static final String CHECK_EVENTS_TAG ="check-events"; //$NON-NLS-1$
- private static final String _EVENT_OK = "ok"; //$NON-NLS-1$
- private static final String _INVALID_UMASK = "invalid-um"; //$NON-NLS-1$
- private static final String _INVALID_COUNTER = "invalid-counter"; //$NON-NLS-1$
+ private static final String EVENT_OK_STR = "ok"; //$NON-NLS-1$
+ private static final String INVALID_UMASK_STR = "invalid-um"; //$NON-NLS-1$
+ private static final String INVALID_COUNTER_STR = "invalid-counter"; //$NON-NLS-1$
- private int _result;
+ private int result;
/**
* @see org.eclipse.linuxtools.internal.oprofile.core.XMLProcessor#reset()
*/
public void reset(Object callData) {
- _result = INVALID_UNKNOWN;
+ result = INVALID_UNKNOWN;
}
/**
* @see org.eclipse.linuxtools.internal.oprofile.core.XMLProcessor#endElement(String)
*/
public void endElement(String name, Object callData) {
- if (name.equals(_RESULT_TAG)) {
- if (characters.equals(_EVENT_OK)) {
- _result = EVENT_OK;
- } else if (characters.equals(_INVALID_UMASK)) {
- _result = INVALID_UMASK;
- } else if (characters.equals(_INVALID_COUNTER)) {
- _result = INVALID_COUNTER;
+ if (name.equals(RESULT_TAG)) {
+ if (characters.equals(EVENT_OK_STR)) {
+ result = EVENT_OK;
+ } else if (characters.equals(INVALID_UMASK_STR)) {
+ result = INVALID_UMASK;
+ } else if (characters.equals(INVALID_COUNTER_STR)) {
+ result = INVALID_COUNTER;
}
- } else if (name.equals(_CHECK_EVENTS_TAG)) {
- int[] result = (int[]) callData;
- result[0] = _result;
+ } else if (name.equals(CHECK_EVENTS_TAG)) {
+ int[] r = (int[]) callData;
+ r[0] = result;
}
}
}